chore: minimizing flash size with NimBLE

* 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
+version                 = 1.6.0-passiveble
 framework               = arduino
 lib_deps                = ESP32Async/AsyncTCP@^3.4.10
                           ESP32Async/ESPAsyncWebServer@^3.9.4
@@ -18,6 +18,7 @@ lib_deps                = ESP32Async/AsyncTCP@^3.4.10
                           gyverlibs/GyverBlinker@^1.1.1
                           pstolarz/OneWireNg@^0.14.1
                           milesburton/DallasTemperature@^4.0.6
+                          https://github.com/Laxilef/esp32DHT#idf5
                           ;laxilef/TinyLogger@^1.1.1
                           https://github.com/Laxilef/TinyLogger#custom_handlers
 lib_ignore              = OneWire
@@ -33,6 +34,7 @@ build_flags             = ;-mtext-section-literals
                           -D ARDUINOJSON_USE_DOUBLE=0
                           -D ARDUINOJSON_USE_LONG_LONG=0
                           -D TINYLOGGER_GLOBAL
+                          -D DHT_TASK_STACK_SIZE=4096
                           -D DEFAULT_SERIAL_ENABLED=${secrets.serial_enabled}
                           -D DEFAULT_SERIAL_BAUD=${secrets.serial_baud}
                           -D DEFAULT_WEBSERIAL_ENABLED=${secrets.webserial_enabled}
@@ -96,10 +98,12 @@ custom_component_remove = espressif/esp_hosted
                           espressif/esp-zboss-lib
                           espressif/esp-zigbee-lib
                           chmorgan/esp-libhelix-mp3
-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}
+                          -D MYNEWT_VAL_BLE_ROLE_CENTRAL=0
                           -D CORE_DEBUG_LEVEL=0
                           -Wl,--wrap=esp_panic_handler
 check_tool              = ${env.check_tool}

src/HaHelper.h

@@ -176,9 +176,10 @@ public:
       objId.c_str()
     );
 
-    // set device class, name, value template for bluetooth sensors
+    // set device class, name, value template for Bluetooth/DHT sensors
     // or name & value template for another sensors
-    if (sSensor.type == Sensors::Type::BLUETOOTH) {
+    if (sSensor.type == Sensors::Type::BLUETOOTH ||
+        sSensor.type == Sensors::Type::DHT11 || sSensor.type == Sensors::Type::DHT22) {
       // available state topic
       doc[FPSTR(HA_AVAILABILITY)][1][FPSTR(HA_TOPIC)] = doc[FPSTR(HA_STATE_TOPIC)];
       doc[FPSTR(HA_AVAILABILITY)][1][FPSTR(HA_VALUE_TEMPLATE)] = JsonString(AVAILABILITY_SENSOR_CONN, true);

src/MainTask.h

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

src/MqttTask.h

@@ -292,6 +292,14 @@ protected:
               this->haHelper->deleteDynamicSensor(prevSettings, Sensors::ValueType::RSSI);
               break;
 
+            case Sensors::Type::DHT11:
+            case Sensors::Type::DHT22:
+              this->haHelper->deleteConnectionDynamicSensor(prevSettings);
+              this->haHelper->deleteSignalQualityDynamicSensor(prevSettings);
+              this->haHelper->deleteDynamicSensor(prevSettings, Sensors::ValueType::TEMPERATURE);
+              this->haHelper->deleteDynamicSensor(prevSettings, Sensors::ValueType::HUMIDITY);
+              break;
+
             case Sensors::Type::DALLAS_TEMP:
               this->haHelper->deleteConnectionDynamicSensor(prevSettings);
               this->haHelper->deleteSignalQualityDynamicSensor(prevSettings);
@@ -319,6 +327,14 @@ protected:
             this->haHelper->publishDynamicSensor(sSettings, Sensors::ValueType::RSSI, settings.system.unitSystem, false);
             break;
 
+          case Sensors::Type::DHT11:
+          case Sensors::Type::DHT22:
+            this->haHelper->publishConnectionDynamicSensor(sSettings);
+            this->haHelper->publishSignalQualityDynamicSensor(sSettings, false);
+            this->haHelper->publishDynamicSensor(sSettings, Sensors::ValueType::TEMPERATURE, settings.system.unitSystem);
+            this->haHelper->publishDynamicSensor(sSettings, Sensors::ValueType::HUMIDITY, settings.system.unitSystem);
+            break;
+
           case Sensors::Type::DALLAS_TEMP:
             this->haHelper->publishConnectionDynamicSensor(sSettings);
             this->haHelper->publishSignalQualityDynamicSensor(sSettings, false);

src/OpenThermTask.h

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

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/RegulatorTask.h

@@ -19,6 +19,10 @@ protected:
   const char* getTaskName() override {
     return "Regulator";
   }
+
+  uint32_t getTaskStackSize() override {
+    return 5000;
+  }
   
   /*BaseType_t getTaskCore() override {
     return 1;
@@ -28,7 +32,7 @@ protected:
     return 4;
   }
   #endif
-  
+
   void loop() {
     if (vars.states.restarting || vars.states.upgrading) {
       return;
@@ -155,7 +159,7 @@ protected:
       );
       float etResult = settings.heating.target + settings.equitherm.shift + sf * (
         tempDelta >= 0 
-          ? pow(tempDelta, 1.0f / settings.equitherm.exponent) 
+          ? pow(tempDelta, 1.0f / settings.equitherm.exponent)
           : -(pow(-(tempDelta), 1.0f / settings.equitherm.exponent))
       );
 
@@ -204,7 +208,7 @@ protected:
         }*/
 
         float error = pidRegulator.setpoint - pidRegulator.input;
-        bool hasDeadband = settings.pid.deadband.enabled 
+        bool hasDeadband = settings.pid.deadband.enabled
           && (error > -(settings.pid.deadband.thresholdHigh))
           && (error < settings.pid.deadband.thresholdLow);
 

src/Sensors.h

@@ -39,6 +39,8 @@ public:
     NTC_10K_TEMP            = 50,
     DALLAS_TEMP             = 51,
     BLUETOOTH               = 52,
+    DHT11                   = 53,
+    DHT22                   = 54,
 
     HEATING_SETPOINT_TEMP   = 253,
     MANUAL                  = 254,

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/strings.h

@@ -24,6 +24,7 @@ const char L_OT_CH2[]                               PROGMEM = "OT.CH2";
 const char L_SENSORS[]                              PROGMEM = "SENSORS";
 const char L_SENSORS_SETTINGS[]                     PROGMEM = "SENSORS.SETTINGS";
 const char L_SENSORS_DALLAS[]                       PROGMEM = "SENSORS.DALLAS";
+const char L_SENSORS_DHT[]                          PROGMEM = "SENSORS.DHT";
 const char L_SENSORS_NTC[]                          PROGMEM = "SENSORS.NTC";
 const char L_SENSORS_BLE[]                          PROGMEM = "SENSORS.BLE";
 const char L_REGULATOR[]                            PROGMEM = "REGULATOR";
@@ -56,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/utils.h

@@ -1927,6 +1927,8 @@ bool jsonToSensorSettings(const uint8_t sensorId, const JsonVariantConst src, Se
       case static_cast<uint8_t>(Sensors::Type::NTC_10K_TEMP):
       case static_cast<uint8_t>(Sensors::Type::DALLAS_TEMP):
       case static_cast<uint8_t>(Sensors::Type::BLUETOOTH):
+      case static_cast<uint8_t>(Sensors::Type::DHT11):
+      case static_cast<uint8_t>(Sensors::Type::DHT22):
       case static_cast<uint8_t>(Sensors::Type::HEATING_SETPOINT_TEMP):
       case static_cast<uint8_t>(Sensors::Type::MANUAL):
       case static_cast<uint8_t>(Sensors::Type::NOT_CONFIGURED):
@@ -1943,7 +1945,8 @@ bool jsonToSensorSettings(const uint8_t sensorId, const JsonVariantConst src, Se
 
   // gpio
   if (!src[FPSTR(S_GPIO)].isNull()) {
-    if (dst.type != Sensors::Type::DALLAS_TEMP && dst.type != Sensors::Type::NTC_10K_TEMP) {
+    if (dst.type != Sensors::Type::DALLAS_TEMP && dst.type != Sensors::Type::NTC_10K_TEMP &&
+        dst.type != Sensors::Type::DHT11 && dst.type != Sensors::Type::DHT22) {
       if (dst.gpio != GPIO_IS_NOT_CONFIGURED) {
         dst.gpio = GPIO_IS_NOT_CONFIGURED;
         changed = true;
@@ -2084,6 +2087,10 @@ void sensorResultToJson(const uint8_t sensorId, JsonVariant dst) {
     dst[FPSTR(S_BATTERY)] = roundf(rSensor.values[static_cast<uint8_t>(Sensors::ValueType::BATTERY)], 1);
     dst[FPSTR(S_RSSI)] = roundf(rSensor.values[static_cast<uint8_t>(Sensors::ValueType::RSSI)], 0);
 
+  } else if (sSensor.type == Sensors::Type::DHT11 || sSensor.type == Sensors::Type::DHT22) {
+    dst[FPSTR(S_TEMPERATURE)] = roundf(rSensor.values[static_cast<uint8_t>(Sensors::ValueType::TEMPERATURE)], 3);
+    dst[FPSTR(S_HUMIDITY)] = roundf(rSensor.values[static_cast<uint8_t>(Sensors::ValueType::HUMIDITY)], 3);
+
   } else {
     dst[FPSTR(S_VALUE)] = roundf(rSensor.values[static_cast<uint8_t>(Sensors::ValueType::PRIMARY)], 3);
   }

src_data/locales/cn.json

@@ -44,6 +44,7 @@
         "build": {
           "title": "Build",
           "version": "固件版本",
+          "commit": "Commit",
           "date": "日期",
           "core": "内核版本",
           "sdk": "SDK"
@@ -248,6 +249,8 @@
         "ntcTemp": "NTC 传感器",
         "dallasTemp": "DALLAS 传感器",
         "bluetooth": "BLE 传感器",
+        "dht11": "DHT11 传感器",
+        "dht22": "DHT22 传感器",
         "heatSetpointTemp": "Heating, setpoint temp",
         "manual": "通过 MQTT/API 手动配置",
         "notConfigured": "未配置"

src_data/locales/en.json

@@ -44,6 +44,7 @@
         "build": {
           "title": "Build",
           "version": "Version",
+          "commit": "Commit",
           "date": "Date",
           "core": "Core",
           "sdk": "SDK"
@@ -248,6 +249,8 @@
         "ntcTemp": "NTC sensor",
         "dallasTemp": "DALLAS sensor",
         "bluetooth": "BLE sensor",
+        "dht11": "DHT11 sensor",
+        "dht22": "DHT22 sensor",
         "heatSetpointTemp": "Heating, setpoint temp",
         "manual": "Manual via MQTT/API",
         "notConfigured": "Not configured"

src_data/locales/it.json

@@ -44,6 +44,7 @@
         "build": {
           "title": "Build",
           "version": "Versione",
+          "commit": "Commit",
           "date": "Data",
           "core": "Core",
           "sdk": "SDK"
@@ -248,6 +249,8 @@
         "ntcTemp": "Sensore NTC",
         "dallasTemp": "Sensore DALLAS",
         "bluetooth": "Sensore BLE",
+        "dht11": "Sensore DHT11",
+        "dht22": "Sensore DHT22",
         "heatSetpointTemp": "Riscaldamento, temp impostata",
         "manual": "Manuale via MQTT/API",
         "notConfigured": "Non configurato"

src_data/locales/nl.json

@@ -40,6 +40,7 @@
         "build": {
           "title": "Build",
           "version": "Versie",
+          "commit": "Commit",
           "date": "Datum",
           "core": "Core",
           "sdk": "SDK"
@@ -227,6 +228,8 @@
         "ntcTemp": "NTC-sensor",
         "dallasTemp": "DALLAS-sensor",
         "bluetooth": "BLE-sensor",
+        "dht11": "DHT11-sensor",
+        "dht22": "DHT22-sensor",
         "heatSetpointTemp": "Verwarming, insteltemperatuur",
         "manual": "Handmatig via MQTT/API",
         "notConfigured": "Niet geconfigureerd"

src_data/locales/ru.json

@@ -44,6 +44,7 @@
         "build": {
           "title": "Билд",
           "version": "Версия",
+          "commit": "Коммит",
           "date": "Дата",
           "core": "Ядро",
           "sdk": "SDK"
@@ -248,6 +249,8 @@
         "ntcTemp": "NTC датчик",
         "dallasTemp": "DALLAS датчик",
         "bluetooth": "BLE датчик",
+        "dht11": "DHT11 датчик",
+        "dht22": "DHT22 датчик",
         "heatSetpointTemp": "Отопление, температура уставки",
         "manual": "Вручную через MQTT/API",
         "notConfigured": "Не сконфигурировано"

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);

src_data/pages/sensors.html

@@ -118,6 +118,8 @@
                       <option value="50" data-i18n>sensors.types.ntcTemp</option>
                       <option value="51" data-i18n>sensors.types.dallasTemp</option>
                       <option value="52" data-i18n>sensors.types.bluetooth</option>
+                      <option value="53" data-i18n>sensors.types.dht11</option>
+                      <option value="54" data-i18n>sensors.types.dht22</option>
                       <option value="253" data-i18n>sensors.types.heatSetpointTemp</option>
                       <option value="254" data-i18n>sensors.types.manual</option>
                       <option value="255" data-i18n>sensors.types.notConfigured</option>
@@ -271,27 +273,35 @@
               }
 
               switch(parseInt(event.target.value)) {
-                // ntc
+                // NTC10K
                 case 50:
                   parentGpio.classList.remove("hidden");
                   parentAddress.classList.add("hidden");
                   address.removeAttribute("pattern");
                   break;
 
-                // dallas
+                // OneWire
                 case 51:
                   parentGpio.classList.remove("hidden");
                   parentAddress.classList.remove("hidden");
                   address.setAttribute("pattern", "([A-Fa-f0-9]{2}:){7}[A-Fa-f0-9]{2}");
                   break;
 
-                // ble
+                // Bluetooth
                 case 52:
                   parentGpio.classList.add("hidden");
                   parentAddress.classList.remove("hidden");
                   address.setAttribute("pattern", "([A-Fa-f0-9]{2}:){5}[A-Fa-f0-9]{2}");
                   break;
 
+                // DHT
+                case 53:
+                case 54:
+                  parentGpio.classList.remove("hidden");
+                  parentAddress.classList.add("hidden");
+                  address.removeAttribute("pattern");
+                  break;
+
                 // other
                 default:
                   parentGpio.classList.add("hidden");

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))