fix: HaHelper::publishDynamicSensor() for DHT sensors fixed

.gitignore

@@ -1,5 +1,4 @@
 .pio
-.dummy
 .vscode
 .PVS-Studio
 build/*
@@ -11,4 +10,5 @@ package-lock.json
 *.lock
 sdkconfig.*
 CMakeLists.txt
+!sdkconfig.defaults
 !.gitkeep

platformio.ini

@@ -4,7 +4,7 @@ extra_configs           = secrets.default.ini
 core_dir                = .pio
 
 [env]
-version                 = 1.6.0-passiveble
+version                 = 1.6.0-async-dht
 framework               = arduino
 lib_deps                = ESP32Async/AsyncTCP@^3.4.10
                           ESP32Async/ESPAsyncWebServer@^3.9.4
@@ -17,14 +17,14 @@ lib_deps                = ESP32Async/AsyncTCP@^3.4.10
                           gyverlibs/GyverPID@^3.3.2
                           gyverlibs/GyverBlinker@^1.1.1
                           pstolarz/OneWireNg@^0.14.1
-                          milesburton/DallasTemperature@^4.0.6
+                          ;milesburton/DallasTemperature@^4.0.5
+                          https://github.com/Laxilef/Arduino-Temperature-Control-Library#fix_85c
                           https://github.com/Laxilef/esp32DHT#idf5
                           ;laxilef/TinyLogger@^1.1.1
                           https://github.com/Laxilef/TinyLogger#custom_handlers
 lib_ignore              = OneWire
 build_type              = ${secrets.build_type}
-build_flags             = ;-mtext-section-literals
+build_flags             = -mtext-section-literals
-                          -O2
                           -Wno-deprecated-declarations
                           -D MQTT_CLIENT_STD_FUNCTION_CALLBACK=1
                           ;-D DEBUG_ESP_CORE -D DEBUG_ESP_WIFI -D DEBUG_ESP_HTTP_SERVER -D DEBUG_ESP_PORT=Serial
@@ -63,7 +63,7 @@ check_flags             = ;pvs-studio: --analysis-mode=4 --exclude-path=./.pio/l
 
 ; Defaults
 [esp32_defaults]
-platform                = https://github.com/pioarduino/platform-espressif32/releases/download/55.03.37/platform-espressif32.zip
+platform                = https://github.com/pioarduino/platform-espressif32/releases/download/55.03.36/platform-espressif32.zip
 platform_packages       = ${env.platform_packages}
 board_build.partitions  = esp32_partitions.csv
 lib_deps                = ${env.lib_deps}
@@ -98,12 +98,10 @@ custom_component_remove = espressif/esp_hosted
                           espressif/esp-zboss-lib
                           espressif/esp-zigbee-lib
                           chmorgan/esp-libhelix-mp3
-extra_scripts           = pre:tools/add_build_commit.py
+extra_scripts           = post:tools/esp32.py
-                          post:tools/esp32.py
                           post:tools/build.py
 build_type              = ${env.build_type}
 build_flags             = ${env.build_flags}
-                          -D MYNEWT_VAL_BLE_ROLE_CENTRAL=0
                           -D CORE_DEBUG_LEVEL=0
                           -Wl,--wrap=esp_panic_handler
 check_tool              = ${env.check_tool}
@@ -148,7 +146,7 @@ extends                 = esp32_defaults
 board                   = lolin_c3_mini
 lib_deps                = ${esp32_defaults.lib_deps}
                           ${esp32_defaults.nimble_lib}
-;build_unflags           = -mtext-section-literals
+build_unflags           = -mtext-section-literals
 build_flags             = ${esp32_defaults.build_flags}
                           -D MYNEWT_VAL_BLE_EXT_ADV=1
                           -D USE_BLE=1
@@ -196,7 +194,7 @@ extends                 = esp32_defaults
 board                   = esp32-c6-devkitc-1
 lib_deps                = ${esp32_defaults.lib_deps}
                           ${esp32_defaults.nimble_lib}
-;build_unflags           = -mtext-section-literals
+build_unflags           = -mtext-section-literals
 build_flags             = ${esp32_defaults.build_flags}
                           -D USE_BLE=1
                           -D DEFAULT_OT_IN_GPIO=15
@@ -205,18 +203,13 @@ build_flags             = ${esp32_defaults.build_flags}
                           -D DEFAULT_SENSOR_INDOOR_GPIO=0
                           -D DEFAULT_STATUS_LED_GPIO=11
                           -D DEFAULT_OT_RX_LED_GPIO=10
-custom_sdkconfig        = '# CONFIG_OPENTHREAD_ENABLED is not set'
-                          '# CONFIG_ESP_WIFI_ENTERPRISE_SUPPORT is not set'
-                          '# CONFIG_LWIP_IPV6 is not set'
-                          '# CONFIG_LWIP_IPV6_AUTOCONFIG is not set'
-                          '# CONFIG_LWIP_PPP_SUPPORT is not set'
 
 [env:otthing]
 extends                 = esp32_defaults
 board                   = lolin_c3_mini
 lib_deps                = ${esp32_defaults.lib_deps}
                           ${esp32_defaults.nimble_lib}
-;build_unflags           = -mtext-section-literals
+build_unflags           = -mtext-section-literals
 build_flags             = ${esp32_defaults.build_flags}
                           -D MYNEWT_VAL_BLE_EXT_ADV=1
                           -D USE_BLE=1

sdkconfig.defaults

@@ -0,0 +1,33 @@
+# Source:
+# https://github.com/pioarduino/platform-espressif32/tree/main/examples/espidf-arduino-h2zero-BLE_scan
+
+CONFIG_FREERTOS_HZ=1000
+CONFIG_MBEDTLS_PSK_MODES=y
+CONFIG_MBEDTLS_KEY_EXCHANGE_PSK=y
+CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_SIZE=y
+CONFIG_COMPILER_OPTIMIZATION_SIZE=y
+CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
+CONFIG_ESPTOOLPY_HEADER_FLASHSIZE_UPDATE=y
+
+#
+# BT config
+CONFIG_BT_ENABLED=y
+CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y
+CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=n
+CONFIG_BTDM_CTRL_MODE_BTDM=n
+CONFIG_BT_BLUEDROID_ENABLED=n
+CONFIG_BT_NIMBLE_ENABLED=y
+
+#
+# Arduino Configuration
+CONFIG_AUTOSTART_ARDUINO=y
+CONFIG_ARDUINO_SELECTIVE_COMPILATION=y
+CONFIG_ARDUINO_SELECTIVE_Zigbee=n
+CONFIG_ARDUINO_SELECTIVE_Matter=n
+CONFIG_ARDUINO_SELECTIVE_WiFiProv=n
+CONFIG_ARDUINO_SELECTIVE_BLE=n
+CONFIG_ARDUINO_SELECTIVE_BluetoothSerial=n
+CONFIG_ARDUINO_SELECTIVE_SimpleBLE=n
+CONFIG_ARDUINO_SELECTIVE_RainMaker=n
+CONFIG_ARDUINO_SELECTIVE_OpenThread=n
+CONFIG_ARDUINO_SELECTIVE_Insights=n

src/MainTask.h

@@ -49,10 +49,6 @@ protected:
     return "Main";
   }
 
-  uint32_t getTaskStackSize() override {
-    return 6000;
-  }
-
   /*BaseType_t getTaskCore() override {
     return 1;
   }*/

src/OpenThermTask.h

@@ -37,13 +37,9 @@ protected:
   const char* getTaskName() override {
     return "OpenTherm";
   }
-
-  uint32_t getTaskStackSize() override {
-    return 7500;
-  }
   
   BaseType_t getTaskCore() override {
-    return 0;
+    return 1;
   }
 
   int getTaskPriority() override {

src/PortalTask.h

@@ -552,7 +552,6 @@ protected:
 
       auto docBuild = doc[FPSTR(S_BUILD)].to<JsonObject>();
       docBuild[FPSTR(S_VERSION)] = BUILD_VERSION;
-      docBuild[FPSTR(S_COMMIT)] = BUILD_COMMIT;
       docBuild[FPSTR(S_DATE)] = __DATE__ " " __TIME__;
       docBuild[FPSTR(S_ENV)] = BUILD_ENV;
       docBuild[FPSTR(S_CORE)] = ESP.getCoreVersion();
@@ -593,7 +592,6 @@ protected:
 
       auto docBuild = doc[FPSTR(S_BUILD)].to<JsonObject>();
       docBuild[FPSTR(S_VERSION)] = BUILD_VERSION;
-      docBuild[FPSTR(S_COMMIT)] = BUILD_COMMIT;
       docBuild[FPSTR(S_DATE)] = __DATE__ " " __TIME__;
       docBuild[FPSTR(S_ENV)] = BUILD_ENV;
       docBuild[FPSTR(S_CORE)] = ESP.getCoreVersion();

src/RegulatorTask.h

@@ -20,10 +20,6 @@ protected:
     return "Regulator";
   }
 
-  uint32_t getTaskStackSize() override {
-    return 5000;
-  }
-  
   /*BaseType_t getTaskCore() override {
     return 1;
   }*/

src/defines.h

@@ -30,10 +30,6 @@
   #define BUILD_VERSION                 "0.0.0"
 #endif
 
-#ifndef BUILD_COMMIT
-  #define BUILD_COMMIT                  "undefined"
-#endif
-
 #ifndef BUILD_ENV
   #define BUILD_ENV                     "undefined"
 #endif

src/idf_component.yml

@@ -0,0 +1,3 @@
+dependencies:
+  idf: ">=5.3.2"
+  h2zero/esp-nimble-cpp: ">=2.2.1"

src/strings.h

@@ -57,7 +57,6 @@ const char S_CHANNEL[]                              PROGMEM = "channel";
 const char S_CH2_ALWAYS_ENABLED[]                   PROGMEM = "ch2AlwaysEnabled";
 const char S_CHIP[]                                 PROGMEM = "chip";
 const char S_CODE[]                                 PROGMEM = "code";
-const char S_COMMIT[]                               PROGMEM = "commit";
 const char S_CONNECTED[]                            PROGMEM = "connected";
 const char S_CONTINUES[]                            PROGMEM = "continues";
 const char S_COOLING[]                              PROGMEM = "cooling";

src_data/locales/cn.json

@@ -44,7 +44,6 @@
         "build": {
           "title": "Build",
           "version": "固件版本",
-          "commit": "Commit",
           "date": "日期",
           "core": "内核版本",
           "sdk": "SDK"

src_data/locales/en.json

@@ -44,7 +44,6 @@
         "build": {
           "title": "Build",
           "version": "Version",
-          "commit": "Commit",
           "date": "Date",
           "core": "Core",
           "sdk": "SDK"

src_data/locales/it.json

@@ -44,7 +44,6 @@
         "build": {
           "title": "Build",
           "version": "Versione",
-          "commit": "Commit",
           "date": "Data",
           "core": "Core",
           "sdk": "SDK"

src_data/locales/nl.json

@@ -40,7 +40,6 @@
         "build": {
           "title": "Build",
           "version": "Versie",
-          "commit": "Commit",
           "date": "Datum",
           "core": "Core",
           "sdk": "SDK"

src_data/locales/ru.json

@@ -44,7 +44,6 @@
         "build": {
           "title": "Билд",
           "version": "Версия",
-          "commit": "Коммит",
           "date": "Дата",
           "core": "Ядро",
           "sdk": "SDK"

src_data/pages/index.html

@@ -104,7 +104,6 @@
                 <th scope="row" data-i18n>index.system.build.title</th>
                 <td>
                   Env: <b id="build-env"></b><br />
-                  <span data-i18n>index.system.build.commit</span>: <b id="build-commit"></b><br />
                   <span data-i18n>index.system.build.date</span>: <b id="build-date"></b><br />
                   <span data-i18n>index.system.build.core</span>: <b id="build-core"></b><br />
                   <span data-i18n>index.system.build.sdk</span>: <b id="build-sdk"></b>
@@ -207,7 +206,6 @@
             setBusy('#main-busy', '#main-table', false);
 
             setValue('#build-version', result.build.version);
-            setValue('#build-commit', result.build.commit);
             setValue('#build-date', result.build.date);
             setValue('#build-env', result.build.env);
             setValue('#build-core', result.build.core);

tools/add_build_commit.py

@@ -1,16 +0,0 @@
-import subprocess
-Import("env")
-
-try:
-  commit_hash = "undefined"
-  result = subprocess.check_output(
-    ["git", "rev-parse", "--short", "HEAD"]
-  )
-  commit_hash = result.decode("utf-8").strip()
-  env.Append(
-    CPPDEFINES=[
-      ("BUILD_COMMIT", '\\"{}\\"'.format(commit_hash))
-    ]
-  )
-except Exception as error:
-  print("Failed to get commit hash: {}".format(error))