chore: update version name

* feat: Added support DHT11/DHT22 sensors

* chore: formatting

* fix: typo

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

* refactor: optimization of wired sensors

platformio.ini

@@ -4,7 +4,7 @@ extra_configs           = secrets.default.ini
 core_dir                = .pio
 
 [env]
-version                 = 1.6.0-async-dht
+version                 = 1.6.0-async
 framework               = arduino
 lib_deps                = ESP32Async/AsyncTCP@^3.4.10
                           ESP32Async/ESPAsyncWebServer@^3.9.4
@@ -98,13 +98,8 @@ custom_component_remove = espressif/esp_hosted
                           espressif/esp-zboss-lib
                           espressif/esp-zigbee-lib
                           chmorgan/esp-libhelix-mp3
-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'
-                          CONFIG_LIBC_NEWLIB_NANO_FORMAT=y
-extra_scripts           = post:tools/esp32.py
+extra_scripts           = pre:tools/add_build_commit.py
+                          post:tools/esp32.py
                           post:tools/build.py
 build_type              = ${env.build_type}
 build_flags             = ${env.build_flags}
@@ -209,6 +204,11 @@ 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

sdkconfig.defaults

@@ -1,33 +0,0 @@
-# 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/PortalTask.h

@@ -552,6 +552,7 @@ 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();
@@ -592,6 +593,7 @@ 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/SensorsTask.h

@@ -51,27 +51,23 @@ protected:
 class SensorsTask : public LeanTask {
 public:
   SensorsTask(bool _enabled = false, unsigned long _interval = 0) : LeanTask(_enabled, _interval) {
+    this->gpioLastPollingTime.reserve(2);
+
     // OneWire
     this->owInstances.reserve(2);
     this->dallasInstances.reserve(2);
     this->dallasSearchTime.reserve(2);
     this->dallasPolling.reserve(2);
-    this->dallasLastPollingTime.reserve(2);
-
-    // DHT
-    this->dhtLastPollingTime.reserve(2);
   }
 
   ~SensorsTask() {
+    this->gpioLastPollingTime.clear();
+
     // OneWire
     this->dallasInstances.clear();
     this->owInstances.clear();
     this->dallasSearchTime.clear();
     this->dallasPolling.clear();
-    this->dallasLastPollingTime.clear();
-
-    // DHT
-    this->dhtLastPollingTime.clear();
   }
 
 protected:
@@ -85,17 +81,17 @@ protected:
   const unsigned int bleSetDtInterval = 7200000;
   #endif
 
+  std::unordered_map<uint8_t, unsigned long> gpioLastPollingTime;
+
   // OneWire
   std::unordered_map<uint8_t, OneWire> owInstances;
   std::unordered_map<uint8_t, DallasTemperature> dallasInstances;
   std::unordered_map<uint8_t, unsigned long> dallasSearchTime;
   std::unordered_map<uint8_t, bool> dallasPolling;
-  std::unordered_map<uint8_t, unsigned long> dallasLastPollingTime;
 
   // DHT
   DHT dhtInstance;
   bool dhtIsPolling = false;
-  std::unordered_map<uint8_t, unsigned long> dhtLastPollingTime;
 
   #if USE_BLE
   // Bluetooth
@@ -194,7 +190,7 @@ protected:
 
       this->dallasSearchTime[sSensor.gpio] = 0;
       this->dallasPolling[sSensor.gpio] = false;
-      this->dallasLastPollingTime[sSensor.gpio] = 0;
+      this->gpioLastPollingTime[sSensor.gpio] = 0;
 
       auto& instance = this->dallasInstances[sSensor.gpio];
       instance.setOneWire(&owInstance);
@@ -229,7 +225,7 @@ protected:
         this->owInstances.erase(gpio);
         this->dallasSearchTime.erase(gpio);
         this->dallasPolling.erase(gpio);
-        this->dallasLastPollingTime.erase(gpio);
+        this->gpioLastPollingTime.erase(gpio);
 
         Log.sinfoln(FPSTR(L_SENSORS_DALLAS), F("Stopped on GPIO %hhu"), gpio);
         continue;
@@ -350,7 +346,7 @@ protected:
 
       if (this->dallasPolling[gpio]) {
         unsigned long minPollingTime = instance.millisToWaitForConversion(12) * 2;
-        unsigned long estimatePollingTime = ts - this->dallasLastPollingTime[gpio];
+        unsigned long estimatePollingTime = ts - this->gpioLastPollingTime[gpio];
 
         // check conversion time
         // isConversionComplete does not work with chinese clones!
@@ -402,7 +398,7 @@ protected:
         this->dallasPolling[gpio] = false;
 
       } else if (newPolling) {
-        auto estimateLastPollingTime = ts - this->dallasLastPollingTime[gpio];
+        auto estimateLastPollingTime = ts - this->gpioLastPollingTime[gpio];
 
         // check last polling time
         if (estimateLastPollingTime < this->dallasPollingInterval) {
@@ -413,7 +409,7 @@ protected:
         instance.setResolution(12);
         instance.requestTemperatures();
         this->dallasPolling[gpio] = true;
-        this->dallasLastPollingTime[gpio] = ts;
+        this->gpioLastPollingTime[gpio] = ts;
 
         Log.straceln(FPSTR(L_SENSORS_DALLAS), F("GPIO %hhu, polling..."), gpio);
       }
@@ -437,7 +433,7 @@ protected:
         continue;
       }
 
-      if (this->dhtLastPollingTime.count(sSensor.gpio) && millis() - this->dhtLastPollingTime[sSensor.gpio] < this->dhtPollingInterval) {
+      if (this->gpioLastPollingTime.count(sSensor.gpio) && millis() - this->gpioLastPollingTime[sSensor.gpio] < this->dhtPollingInterval) {
         continue;
       }
 
@@ -463,7 +459,7 @@ protected:
             rSensor.signalQuality++;
           }
 
-          this->dhtLastPollingTime[sSensor.gpio] = millis();
+          this->gpioLastPollingTime[sSensor.gpio] = millis();
           this->dhtIsPolling = false;
         });
 
@@ -480,7 +476,7 @@ protected:
             rSensor.signalQuality--;
           }
           
-          this->dhtLastPollingTime[sSensor.gpio] = millis();
+          this->gpioLastPollingTime[sSensor.gpio] = millis();
           this->dhtIsPolling = false;
         });
 

src/defines.h

@@ -30,6 +30,10 @@
   #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

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

src/strings.h

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

src_data/locales/en.json

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

src_data/locales/it.json

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

src_data/locales/nl.json

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

src_data/locales/ru.json

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

src_data/pages/index.html

@@ -104,6 +104,7 @@
                 <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>
@@ -206,6 +207,7 @@
             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

@@ -0,0 +1,16 @@
+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))