feat(zigbee examples): revert sleepy temp hum sensor instead add example to ota client

Author: Rippanda12

libraries/Zigbee/examples/Zigbee_OTA_Client/Zigbee_OTA_Client.ino

@@ -44,6 +44,18 @@ uint8_t button = BOOT_PIN;
 
 ZigbeeLight zbLight = ZigbeeLight(ZIGBEE_LIGHT_ENDPOINT);
 
+volatile bool otaRunning = false;
+
+/********************* Callbacks *************************/
+void otaActiveCallback(bool otaActive) {
+  otaRunning = otaActive;
+  if (otaActive) {
+    Serial.println("OTA started");
+  } else {
+    Serial.println("OTA finished");
+  }
+}
+
 /********************* RGB LED functions **************************/
 void setLED(bool value) {
   digitalWrite(led, value);
@@ -69,6 +81,9 @@ void setup() {
   // Add OTA client to the light bulb
   zbLight.addOTAClient(OTA_UPGRADE_RUNNING_FILE_VERSION, OTA_UPGRADE_DOWNLOADED_FILE_VERSION, OTA_UPGRADE_HW_VERSION);
 
+  // Optional: Register callback for OTA state change
+  zbLight.onOTAStateChange(otaActiveCallback);
+
   // Add endpoint to Zigbee Core
   Serial.println("Adding ZigbeeLight endpoint to Zigbee Core");
   Zigbee.addEndpoint(&zbLight);
@@ -99,6 +114,10 @@ void loop() {
     while (digitalRead(button) == LOW) {
       delay(50);
       if ((millis() - startTime) > 3000) {
+        if (otaRunning) {
+          Serial.println("OTA in progress, cannot reset now");
+          break;
+        }
         // If key pressed for more than 3secs, factory reset Zigbee and reboot
         Serial.println("Resetting Zigbee to factory and rebooting in 1s.");
         delay(1000);

libraries/Zigbee/examples/Zigbee_Temp_Hum_Sensor_Sleepy/Zigbee_Temp_Hum_Sensor_Sleepy.ino

@@ -32,12 +32,6 @@
 
 #include "Zigbee.h"
 
-/* Zigbee OTA configuration */
-
-#define OTA_UPGRADE_RUNNING_FILE_VERSION    0x01010100  // Increment this value when the running image is updated
-#define OTA_UPGRADE_DOWNLOADED_FILE_VERSION 0x01010101  // Increment this value when the downloaded image is updated
-#define OTA_UPGRADE_HW_VERSION              0x0101      // The hardware version, this can be used to differentiate between different hardware versions
-
 #define USE_GLOBAL_ON_RESPONSE_CALLBACK 1  // Set to 0 to use local callback specified directly for the endpoint.
 
 /* Zigbee temperature + humidity sensor configuration */
@@ -51,7 +45,6 @@ uint8_t button = BOOT_PIN;
 
 ZigbeeTempSensor zbTempSensor = ZigbeeTempSensor(TEMP_SENSOR_ENDPOINT_NUMBER);
 
-volatile bool otaInhibitSleep = false;
 uint8_t dataToSend = 2;  // Temperature and humidity values are reported in same endpoint, so 2 values are reported
 bool resend = false;
 
@@ -80,15 +73,6 @@ void onResponse(zb_cmd_type_t command, esp_zb_zcl_status_t status) {
 }
 #endif
 
-void otaSleepInhibitCallback(bool otaActive) {
-  otaInhibitSleep = otaActive;
-  if (otaActive) {
-    Serial.println("OTA started: inhibiting sleep");
-  } else {
-    Serial.println("OTA finished: sleep allowed");
-  }
-}
-
 /************************ Temp sensor *****************************/
 static void meausureAndSleep(void *arg) {
   // Measure temperature sensor value
@@ -131,10 +115,8 @@ static void meausureAndSleep(void *arg) {
   }
 
   // Put device to deep sleep after data was sent successfully or timeout
-  if (!otaInhibitSleep) {
-    Serial.println("Going to sleep now");
-    esp_deep_sleep_start();
-  }
+  Serial.println("Going to sleep now");
+  esp_deep_sleep_start();
 }
 
 /********************* Arduino functions **************************/
@@ -150,12 +132,6 @@ void setup() {
   // Optional: set Zigbee device name and model
   zbTempSensor.setManufacturerAndModel("Espressif", "SleepyZigbeeTempSensor");
 
-  // Optional: set ota
-  zbTempSensor.addOTAClient(OTA_UPGRADE_RUNNING_FILE_VERSION, OTA_UPGRADE_DOWNLOADED_FILE_VERSION, OTA_UPGRADE_HW_VERSION);
-  
-  // Optional: Register callback for OTA state change (inhibit sleep during OTA)
-  zbTempSensor.onOTAStateChange(otaSleepInhibitCallback);
-
   // Set minimum and maximum temperature measurement value (10-50°C is default range for chip temperature measurement)
   zbTempSensor.setMinMaxValue(10, 50);
 
@@ -204,9 +180,6 @@ void setup() {
   Serial.println();
   Serial.println("Successfully connected to Zigbee network");
 
-  // Start Zigbee OTA client query, first request is within a minute and the next requests are sent every hour automatically
-  zbTempSensor.requestOTAUpdate();
-
   // Start Temperature sensor reading task
   xTaskCreate(meausureAndSleep, "temp_sensor_update", 2048, NULL, 10, NULL);
 }
@@ -220,10 +193,6 @@ void loop() {
     while (digitalRead(button) == LOW) {
       delay(50);
       if ((millis() - startTime) > 10000) {
-        if (otaInhibitSleep) {
-          Serial.println("OTA in progress, cannot reset now");
-          break;
-        }
         // If key pressed for more than 10secs, factory reset Zigbee and reboot
         Serial.println("Resetting Zigbee to factory and rebooting in 1s.");
         delay(1000);