chore: bump version

platformio.ini

@@ -51,7 +51,7 @@ monitor_speed = 115200
 monitor_filters = direct
 board_build.flash_mode = dio
 board_build.filesystem = littlefs
-version = 1.4.0-rc.22
+version = 1.4.0-rc.23
 
 ; Defaults
 [esp8266_defaults]
@@ -67,6 +67,8 @@ board_build.ldscript = eagle.flash.4m1m.ld
 
 [esp32_defaults]
 platform = espressif32@^6.6
+platform_packages =
+    platformio/framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32/archive/refs/tags/2.0.15.zip
 board_build.partitions = esp32_partitions.csv
 lib_deps =
 	${env.lib_deps}
@@ -131,13 +133,18 @@ build_flags =
 
 [env:s2_mini]
 platform = ${esp32_defaults.platform}
+platform_packages = ${esp32_defaults.platform_packages}
 board = lolin_s2_mini
 board_build.partitions = ${esp32_defaults.board_build.partitions}
 lib_deps = ${esp32_defaults.lib_deps}
 lib_ignore = ${esp32_defaults.lib_ignore}
 extra_scripts = ${esp32_defaults.extra_scripts}
+build_unflags =
+	-DARDUINO_USB_MODE=1
 build_flags = 
 	${esp32_defaults.build_flags}
+	-D ARDUINO_USB_MODE=0
+	-D ARDUINO_USB_CDC_ON_BOOT=1
 	-D DEFAULT_OT_IN_GPIO=33
 	-D DEFAULT_OT_OUT_GPIO=35
 	-D DEFAULT_SENSOR_OUTDOOR_GPIO=9
@@ -147,6 +154,7 @@ build_flags =
 
 [env:s3_mini] 
 platform = ${esp32_defaults.platform}
+platform_packages = ${esp32_defaults.platform_packages}
 board = lolin_s3_mini
 board_build.partitions = ${esp32_defaults.board_build.partitions}
 lib_deps = 
@@ -154,8 +162,12 @@ lib_deps =
 	h2zero/NimBLE-Arduino@^1.4.1
 lib_ignore = ${esp32_defaults.lib_ignore}
 extra_scripts = ${esp32_defaults.extra_scripts}
+build_unflags =
+	-DARDUINO_USB_MODE=1
 build_flags = 
 	${esp32_defaults.build_flags}
+	-D ARDUINO_USB_MODE=0
+	-D ARDUINO_USB_CDC_ON_BOOT=1
 	-D USE_BLE=1
 	-D DEFAULT_OT_IN_GPIO=35
 	-D DEFAULT_OT_OUT_GPIO=36
@@ -166,6 +178,8 @@ build_flags =
 
 [env:c3_mini] 
 platform = ${esp32_defaults.platform}
+platform_packages =
+    platformio/framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32/archive/refs/tags/2.0.15.zip
 board = lolin_c3_mini
 board_build.partitions = ${esp32_defaults.board_build.partitions}
 lib_deps = 
@@ -187,6 +201,7 @@ build_flags =
 
 [env:nodemcu_32s]
 platform = ${esp32_defaults.platform}
+platform_packages = ${esp32_defaults.platform_packages}
 board = nodemcu-32s
 board_build.partitions = ${esp32_defaults.board_build.partitions}
 lib_deps = 
@@ -207,6 +222,7 @@ build_flags =
 
 [env:d1_mini32]
 platform = ${esp32_defaults.platform}
+platform_packages = ${esp32_defaults.platform_packages}
 board = wemos_d1_mini32
 board_build.partitions = ${esp32_defaults.board_build.partitions}
 lib_deps = 

src/OpenThermTask.h

@@ -383,19 +383,28 @@ protected:
       float convertedTemp = convertTemp(vars.parameters.heatingSetpoint, settings.system.unitSystem, settings.opentherm.unitSystem);
       Log.sinfoln(FPSTR(L_OT_HEATING), F("Set temp: %u (converted: %.2f)"), vars.parameters.heatingSetpoint, convertedTemp);
 
-      // Set heating temp
-      if (this->instance->setHeatingCh1Temp(convertedTemp) || this->setMaxHeatingTemp(convertedTemp)) {
+      // Set max heating temp
+      if (this->setMaxHeatingTemp(convertedTemp)) {
         currentHeatingTemp = vars.parameters.heatingSetpoint;
         this->heatingSetTempTime = millis();
 
       } else {
-        Log.swarningln(FPSTR(L_OT_HEATING), F("Failed set temp"));
+        Log.swarningln(FPSTR(L_OT_HEATING), F("Failed set max heating temp"));
+      }
+
+      // Set heating temp
+      if (this->instance->setHeatingCh1Temp(convertedTemp)) {
+        currentHeatingTemp = vars.parameters.heatingSetpoint;
+        this->heatingSetTempTime = millis();
+
+      } else {
+        Log.swarningln(FPSTR(L_OT_HEATING), F("Failed set CH1 temp"));
       }
 
       // Set heating temp to CH2
       if (settings.opentherm.heatingCh1ToCh2) {
         if (!this->instance->setHeatingCh2Temp(convertedTemp)) {
-          Log.swarningln(FPSTR(L_OT_HEATING), F("Failed set ch2 temp"));
+          Log.swarningln(FPSTR(L_OT_HEATING), F("Failed set CH2 temp"));
         }
       }
     }

src/PortalTask.h

@@ -344,7 +344,11 @@ protected:
       auto apCount = WiFi.scanComplete();
       if (apCount <= 0) {
         if (apCount != WIFI_SCAN_RUNNING) {
+          #ifdef ARDUINO_ARCH_ESP8266
           WiFi.scanNetworks(true, true);
+          #else
+          WiFi.scanNetworks(true, true, true);
+          #endif
         }
         
         this->webServer->send(404);

src/defines.h

@@ -1,5 +1,5 @@
 #define PROJECT_NAME                "OpenTherm Gateway"
-#define PROJECT_VERSION             "1.4.0-rc.22"
+#define PROJECT_VERSION             "1.4.0-rc.23"
 #define PROJECT_REPO                "https://github.com/Laxilef/OTGateway"
 
 #define MQTT_RECONNECT_INTERVAL     15000

src/main.cpp

@@ -59,7 +59,7 @@ void setup() {
     return tm{sec, min, hour};
   });
   
-  Serial.begin(settings.system.serial.baudrate);
+  Serial.begin(115200);
   Log.addStream(&Serial);
   Log.print("\n\n\r");
 
@@ -110,8 +110,15 @@ void setup() {
 
   // logs
   if (!settings.system.serial.enable) {
-    Log.clearStreams();
     Serial.end();
+    Log.clearStreams();
+
+  } else if (settings.system.serial.baudrate != 115200) {
+    Serial.end();
+    Log.clearStreams();
+
+    Serial.begin(settings.system.serial.baudrate);
+    Log.addStream(&Serial);
   }
 
   if (settings.system.telnet.enable) {

src_data/dashboard.html

@@ -287,7 +287,7 @@
 
         document.querySelector('#thermostat-dhw-enabled').addEventListener('change', (event) => {
           modifiedTime = Date.now();
-          newSettings.heating.dhw = event.currentTarget.checked;
+          newSettings.dhw.enable = event.currentTarget.checked;
         });
 
         setTimeout(async function onLoadPage() {

src_data/network.html

@@ -76,7 +76,7 @@
         </hgroup>
 
         <form action="/api/network/scan" id="network-scan">
-          <figure style="max-height: 25em;">
+          <div style="max-height: 25rem;" class="overflow-auto">
             <table id="networks" role="grid">
               <thead>
                 <tr>
@@ -87,7 +87,7 @@
               </thead>
               <tbody></tbody>
             </table>
-          </figure>
+          </div>
 
           <button type="submit">Refresh</button>
         </form>

src_data/settings.html

@@ -116,9 +116,7 @@
                   <small>Default: 23</small>
                 </label>
               </div>
-            </fieldset>
 
-            <fieldset>
               <mark>After changing this settings, the ESP must be restarted for the changes to take effect.</mark>
             </fieldset>