Version 1.0.4

Added sensor reading error message.
Updated components.

README.md

@@ -12,7 +12,7 @@ ESP-NOW based switch for ESP32 ESP-IDF and ESP8266 RTOS SDK. Alternate firmware
 1. Saves the last state when the power is turned off.
 2. Automatically adds switch configuration to Home Assistan via MQTT discovery as a switch.
 3. Update firmware from HTTPS server via ESP-NOW.
-4. Optional support one external sensor (DS18B20, DHT11, DHT22).
+4. Optional support one external 1-wire sensor (DS18B20/DHT11/DHT22/AM2302/AM2320).
 5. Direct or mesh work mode.
 
 ## Notes
@@ -21,7 +21,7 @@ ESP-NOW based switch for ESP32 ESP-IDF and ESP8266 RTOS SDK. Alternate firmware
 2. ESP-NOW mesh network based on the [zh_network](https://github.com/aZholtikov/zh_network).
 3. For initial settings use "menuconfig -> ZH ESP-NOW Switch Configuration". After first boot all settings will be stored in NVS memory for prevente change during OTA firmware update.
 4. To restart the switch, send the "restart" command to the root topic of the switch (example - "homeassistant/espnow_switch/24-62-AB-F9-1F-A8").
-5. To update the switch firmware, send the "update" command to the root topic of the switch (example - "homeassistant/espnow_switch/70-03-9F-44-BE-F7"). The update path should be like as "https://your_server/zh_espnow_switch_esp32.bin" (for ESP32) or "https://your_server/zh_espnow_switch_esp8266.app1.bin + https://your_server/zh_espnow_switch_esp8266.app2.bin" (for ESP8266). The time and success of the update depends on the load on WiFi channel 1. Average update time is up to five minutes. The online status of the update will be displayed in the root switch topic.
+5. To update the switch firmware, send the "update" command to the root topic of the switch (example - "homeassistant/espnow_switch/70-03-9F-44-BE-F7"). The update path should be like as "https://your_server/zh_espnow_switch_esp32.bin" (for ESP32) or "https://your_server/zh_espnow_switch_esp8266.app1.bin + https://your_server/zh_espnow_switch_esp8266.app2.bin" (for ESP8266). Average update time is up to some minutes. The online status of the update will be displayed in the root switch topic.
 6. To change initial settings of the switch (except work mode), send the X1,X2,X3,X4,X5,X6,X7,X8,X9,X10 command to the hardware topic of the switch (example - "homeassistant/espnow_switch/70-03-9F-44-BE-F7/hardware"). The configuration will only be accepted if it does not cause errors. The current configuration status is displayed in the configuration topic of the switch (example - "homeassistant/espnow_switch/70-03-9F-44-BE-F7/config").
 
 MQTT configuration message should filled according to the template "X1,X2,X3,X4,X5,X6,X7,X8,X9,X10". Where:
@@ -35,7 +35,7 @@ MQTT configuration message should filled according to the template "X1,X2,X3,X4,
 7. X7 - External button GPIO number. 0 - 48 (according to the module used), 255 if not used.
 8. X8 - External button trigger level. 1 for high, 0 for low. Only affected when X7 is used.
 9. X9 - Sensor GPIO number. 0 - 48 (according to the module used). 255 if not used.
-10. X10 - Sensor type. 1 for DS18B20, 2 for DHT11, 3 for DHT22. Only affected when X9 is used.
+10. X10 - Sensor type. 1 for DS18B20, 8 for DHT. Only affected when X9 is used.
 
 ## Build and flash
 

main/zh_espnow_switch.c

@@ -402,22 +402,29 @@ void zh_send_sensor_config_message(const switch_config_t *switch_config)
     data.payload_data.config_message.sensor_config_message.qos = 2;
     data.payload_data.config_message.sensor_config_message.retain = true;
     char *unit_of_measurement = NULL;
+    // For compatibility with zh_espnow_sensor.
+    data.payload_data.config_message.sensor_config_message.unique_id = 2;
+    data.payload_data.config_message.sensor_config_message.sensor_device_class = HASDC_VOLTAGE;
+    unit_of_measurement = "V";
+    strcpy(data.payload_data.config_message.sensor_config_message.unit_of_measurement, unit_of_measurement);
+    zh_send_message(switch_config->gateway_mac, (uint8_t *)&data, sizeof(zh_espnow_data_t));
+    // For compatibility with zh_espnow_sensor.
     switch (switch_config->hardware_config.sensor_type)
     {
     case HAST_DS18B20:
-        data.payload_data.config_message.sensor_config_message.unique_id = 2;
+        data.payload_data.config_message.sensor_config_message.unique_id = 3;
         data.payload_data.config_message.sensor_config_message.sensor_device_class = HASDC_TEMPERATURE;
         unit_of_measurement = "°C";
         strcpy(data.payload_data.config_message.sensor_config_message.unit_of_measurement, unit_of_measurement);
         zh_send_message(switch_config->gateway_mac, (uint8_t *)&data, sizeof(zh_espnow_data_t));
         break;
     case HAST_DHT:
-        data.payload_data.config_message.sensor_config_message.unique_id = 2;
+        data.payload_data.config_message.sensor_config_message.unique_id = 3;
         data.payload_data.config_message.sensor_config_message.sensor_device_class = HASDC_TEMPERATURE;
         unit_of_measurement = "°C";
         strcpy(data.payload_data.config_message.sensor_config_message.unit_of_measurement, unit_of_measurement);
         zh_send_message(switch_config->gateway_mac, (uint8_t *)&data, sizeof(zh_espnow_data_t));
-        data.payload_data.config_message.sensor_config_message.unique_id = 3;
+        data.payload_data.config_message.sensor_config_message.unique_id = 4;
         data.payload_data.config_message.sensor_config_message.sensor_device_class = HASDC_HUMIDITY;
         unit_of_measurement = "%";
         strcpy(data.payload_data.config_message.sensor_config_message.unit_of_measurement, unit_of_measurement);
@@ -464,55 +471,39 @@ void zh_send_sensor_status_message_task(void *pvParameter)
     data.payload_data.status_message.sensor_status_message.sensor_type = switch_config->hardware_config.sensor_type;
     for (;;)
     {
+        esp_err_t err = ESP_OK;
         switch (switch_config->hardware_config.sensor_type)
         {
         case HAST_DS18B20:
-        ZH_DS18B20_READ:
-            switch (zh_ds18b20_read(NULL, &temperature))
+            err = zh_ds18b20_read(NULL, &temperature);
+            if (err == ESP_OK)
             {
-            case ESP_OK:
                 data.payload_data.status_message.sensor_status_message.temperature = temperature;
-                break;
-            case ESP_FAIL:
-                vTaskDelay(10000 / portTICK_PERIOD_MS);
-                goto ZH_DS18B20_READ;
-                break;
-            case ESP_ERR_INVALID_CRC:
-                vTaskDelay(1000 / portTICK_PERIOD_MS);
-                goto ZH_DS18B20_READ;
-                break;
-            default:
-                break;
+                data.payload_data.status_message.sensor_status_message.voltage = 3.3; // For future development.
             }
             break;
         case HAST_DHT:
-        ZH_DHT_READ:
-            switch (zh_dht_read(&humidity, &temperature))
+            err = zh_dht_read(&humidity, &temperature);
+            if (err == ESP_OK)
             {
-            case ESP_OK:
                 data.payload_data.status_message.sensor_status_message.humidity = humidity;
                 data.payload_data.status_message.sensor_status_message.temperature = temperature;
-                break;
-            case ESP_ERR_INVALID_RESPONSE:
-                vTaskDelay(10000 / portTICK_PERIOD_MS);
-                goto ZH_DHT_READ;
-                break;
-            case ESP_ERR_TIMEOUT:
-                vTaskDelay(10000 / portTICK_PERIOD_MS);
-                goto ZH_DHT_READ;
-                break;
-            case ESP_ERR_INVALID_CRC:
-                vTaskDelay(3000 / portTICK_PERIOD_MS);
-                goto ZH_DHT_READ;
-                break;
-            default:
-                break;
+                data.payload_data.status_message.sensor_status_message.voltage = 3.3; // For future development.
             }
             break;
         default:
             break;
         }
-        zh_send_message(switch_config->gateway_mac, (uint8_t *)&data, sizeof(zh_espnow_data_t));
+        if (err == ESP_OK)
+        {
+            zh_send_message(switch_config->gateway_mac, (uint8_t *)&data, sizeof(zh_espnow_data_t));
+        }
+        else
+        {
+            data.payload_type = ZHPT_ERROR;
+            strcpy(data.payload_data.status_message.error_message.message, "Sensor reading error.");
+            zh_send_message(switch_config->gateway_mac, (uint8_t *)&data, sizeof(zh_espnow_data_t));
+        }
         vTaskDelay(ZH_SENSOR_STATUS_MESSAGE_FREQUENCY * 1000 / portTICK_PERIOD_MS);
     }
     vTaskDelete(NULL);

main/zh_espnow_switch.h

@@ -159,14 +159,14 @@ void zh_send_switch_attributes_message_task(void *pvParameter);
 void zh_send_switch_config_message(const switch_config_t *switch_config);
 
 /**
- * @brief Function for prepare the sensor hardware configuration message and sending it to the gateway.
+ * @brief Function for prepare the switch hardware configuration message and sending it to the gateway.
  *
  * @param[in] switch_config Pointer to the structure of data exchange between tasks, functions and event handlers.
  */
 void zh_send_switch_hardware_config_message(const switch_config_t *switch_config);
 
 /**
- * @brief Task for prepare the sensor keep alive message and sending it to the gateway.
+ * @brief Task for prepare the switch keep alive message and sending it to the gateway.
  *
  * @param[in] pvParameter Pointer to the structure of data exchange between tasks, functions and event handlers.
  */

version.txt

@@ -1 +1 @@
-1.0.2
+1.0.4