Merge branch 'feat/custom-sdkconfig' into dev

Co-authored-by: Cursor <cursoragent@cursor.com>

src/core/analogsensor.h

@@ -21,7 +21,7 @@
 
 #include "helpers.h"
 #include "mqtt.h"
-#include "console.h"
+#include "emsesp_console.h"
 
 #include <uuid/log.h>
 

src/core/command.h

@@ -21,7 +21,7 @@
 
 #include <map>
 
-#include "console.h"
+#include "emsesp_console.h"
 #include <esp32-psram.h>
 
 using uuid::console::Shell;

src/core/console.cpp

@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "console.h"
+#include "emsesp_console.h"
 #include "console_stream.h"
 #include "emsesp.h"
 

src/core/console_stream.h

@@ -20,7 +20,7 @@
 
 #include <uuid/console.h>
 
-#include "console.h"
+#include "emsesp_console.h"
 
 namespace emsesp {
 

src/core/default_settings.h

@@ -304,7 +304,7 @@ enum {
 #define STRINGIZE(s) #s
 #endif
 
-#define ARDUINO_VERSION_STR(major, minor, patch) "Tasmota Arduino v" STRINGIZE(major) "." STRINGIZE(minor) "." STRINGIZE(patch)
+#define ARDUINO_VERSION_STR(major, minor, patch) "Arduino v" STRINGIZE(major) "." STRINGIZE(minor) "." STRINGIZE(patch)
 #define ARDUINO_VERSION ARDUINO_VERSION_STR(ESP_ARDUINO_VERSION_MAJOR, ESP_ARDUINO_VERSION_MINOR, ESP_ARDUINO_VERSION_PATCH)
 
 #endif

src/core/emsesp.h

@@ -66,10 +66,10 @@
 #include "mqtt.h"
 #include "modbus.h"
 #include "system.h"
-#include "network.h"
+#include "emsesp_network.h"
 #include "temperaturesensor.h"
 #include "analogsensor.h"
-#include "console.h"
+#include "emsesp_console.h"
 #include "console_stream.h"
 #include "shower.h"
 #include "roomcontrol.h"

src/core/httpClient.cpp

@@ -18,7 +18,7 @@
 
 #include "emsesp.h"
 
-#include "httpClient.h"
+#include "emsesp_http_client.h"
 
 #include <WiFiClient.h>
 #include <ESP_SSLClient.h>

src/core/mqtt.h

@@ -23,7 +23,7 @@
 
 #include "helpers.h"
 #include "system.h"
-#include "console.h"
+#include "emsesp_console.h"
 #include "command.h"
 #include "emsdevicevalue.h"
 #include <esp32-psram.h>

src/core/network.cpp

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "network.h"
+#include "emsesp_network.h"
 
 #include "emsesp.h"
 

src/core/shuntingYard.cpp

@@ -22,7 +22,7 @@
 
 #include "shuntingYard.h"
 
-#include "httpClient.h"
+#include "emsesp_http_client.h"
 
 namespace emsesp {
 

src/core/system.cpp

@@ -17,7 +17,7 @@
  */
 
 #include "system.h"
-#include "network.h"
+#include "emsesp_network.h"
 #include "emsesp.h" // for send_raw_telegram() command
 
 #ifndef EMSESP_STANDALONE
@@ -34,7 +34,7 @@
 
 #include "firmwareVersion.h"
 #include "shuntingYard.h" // for compute() used by the message and sendmail commands
-#include "httpClient.h"   // for the shared TLS client settings
+#include "emsesp_http_client.h"   // for the shared TLS client settings
 
 #if defined(EMSESP_TEST)
 #include "../test/test.h"

src/core/system.h

@@ -23,7 +23,7 @@
 #include <ArduinoJson.h>
 
 #include "helpers.h"
-#include "console.h"
+#include "emsesp_console.h"
 #include "mqtt.h"
 #include "telegram.h"
 #include "led.h"

src/core/temperaturesensor.h

@@ -23,7 +23,7 @@
 
 #include "helpers.h"
 #include "mqtt.h"
-#include "console.h"
+#include "emsesp_console.h"
 
 #include <uuid/log.h>
 

src/emsesp_version.h

@@ -1 +1 @@
-#define EMSESP_APP_VERSION "3.9.0-dev.17"
+#define EMSESP_APP_VERSION "3.9.0-dev.18"

src/test/test.cpp

@@ -458,7 +458,7 @@ void Test::run_test(uuid::console::Shell & shell, const std::string & cmd, const
         // S3 has 16MB flash
         // EMSESP::system_.uploadFirmwareURL("https://github.com/emsesp/EMS-ESP32/releases/download/latest/EMS-ESP-3_7_0-dev_32-ESP32S3-16MB+.bin"); // S3
 
-        // Test for 4MB Tasmota builds
+        // Test for 4MB builds
         // EMSESP::system_.uploadFirmwareURL("https://github.com/emsesp/EMS-ESP32/releases/download/latest/EMS-ESP-3_7_2-dev_8-ESP32-4MB.bin"); // S32
         EMSESP::system_.uploadFirmwareURL("https://github.com/emsesp/EMS-ESP32/releases/download/latest/EMS-ESP-3_7_2-dev_8-ESP32-16MB.bin"); // E32
 

src/web/WebCommandService.cpp

@@ -20,7 +20,7 @@
 #include "WebCommandService.h"
 
 #include "shuntingYard.h"
-#include "httpClient.h"
+#include "emsesp_http_client.h"
 
 namespace emsesp {
 

src/web/WebStatusService.cpp

@@ -21,7 +21,7 @@
 #ifndef EMSESP_STANDALONE
 #include <esp_ota_ops.h>
 #endif
-#include "httpClient.h"
+#include "emsesp_http_client.h"
 
 namespace emsesp {