diff --git a/esp3d/configuration.h b/esp3d/configuration.h index e158ab09..27bf772f 100644 --- a/esp3d/configuration.h +++ b/esp3d/configuration.h @@ -178,13 +178,13 @@ #define DIRECT_PIN_FEATURE //TIMESTAMP_FEATURE: set time system -//#define TIMESTAMP_FEATURE +#define TIMESTAMP_FEATURE //FILESYSTEM_TIMESTAMP_FEATURE: display last write time from Flash files //#define FILESYSTEM_TIMESTAMP_FEATURE //FILESYSTEM_TIMESTAMP_FEATURE:display last write time from SD files -//#define SD_TIMESTAMP_FEATURE +#define SD_TIMESTAMP_FEATURE //MDNS_FEATURE: this feature allow type the name defined //in web browser by default: http:\\esp8266.local and connect @@ -226,7 +226,7 @@ //#define USE_BOARD_HEADER 1 //CAMERA_MODEL_ESP32_CAM_BOARD /CAMERA_MODEL_ESP32S2_CAM_BOARD //#define CAMERA_DEVICE_FLIP_VERTICALY //comment to disable //#define CAMERA_DEVICE_FLIP_HORIZONTALY//comment to disable -#define CUSTOM_CAMERA_NAME "ESP32-CAM" +//#define CUSTOM_CAMERA_NAME "ESP32-CAM" //Allow remote access by enabling cross origin access diff --git a/esp3d/src/core/esp3doutput.cpp b/esp3d/src/core/esp3doutput.cpp index acb0ec2d..cee64161 100644 --- a/esp3d/src/core/esp3doutput.cpp +++ b/esp3d/src/core/esp3doutput.cpp @@ -558,7 +558,6 @@ size_t ESP3DOutput::printERROR(const char * s, int code_error) if (_client == ESP_SCREEN_CLIENT) { return print(s); } - _code = code_error; if (_client == ESP_HTTP_CLIENT) { #ifdef HTTP_FEATURE (void)code_error; @@ -571,7 +570,7 @@ size_t ESP3DOutput::printERROR(const char * s, int code_error) display =""; } display += s; - _webserver->send (_code, "text/plain", display.c_str()); + _webserver->send (code_error, "text/plain", display.c_str()); _headerSent = true; _footerSent = true; return display.length(); diff --git a/esp3d/src/include/pins.h b/esp3d/src/include/pins.h index e9ddaee4..e1159415 100644 --- a/esp3d/src/include/pins.h +++ b/esp3d/src/include/pins.h @@ -50,6 +50,8 @@ #define USE_BOARD_HEADER 0 #endif //USE_BOARD_HEADER +#if defined (CAMERA_DEVICE) + #if CAMERA_DEVICE == CAMERA_MODEL_CUSTOM #define CAM_LED_PIN 4 #define CAM_PULLUP1 -1 @@ -393,6 +395,7 @@ #define PCLK_GPIO_NUM 13 #endif //CAMERA_MODEL_ESP32S3_EYE +#endif //CAMERA_DEVICE //Pins for the support of SD Card Reader //-1 means use default pins of your board defined core diff --git a/esp3d/src/modules/wifi/wificonfig.cpp b/esp3d/src/modules/wifi/wificonfig.cpp index 6eb427ea..4414d685 100644 --- a/esp3d/src/modules/wifi/wificonfig.cpp +++ b/esp3d/src/modules/wifi/wificonfig.cpp @@ -176,6 +176,11 @@ bool WiFiConfig::StartSTA() if(WiFi.isConnected()) { WiFi.disconnect(); } else { +#if defined (ARDUINO_ARCH_ESP32) + WiFi.setMinSecurity(WIFI_AUTH_WEP); + WiFi.setScanMethod(WIFI_ALL_CHANNEL_SCAN); + WiFi.setSortMethod(WIFI_CONNECT_AP_BY_SIGNAL); +#endif //ARDUINO_ARCH_ESP32 WiFi.begin(); } }