fix issue with channel write not working and add helper button functions to prop class

Author: davirxavier

EmberChannelDefinition.h

@@ -34,6 +34,10 @@
 #ifndef EMBERCHANNELDEF_H
 #define EMBERCHANNELDEF_H
 
+#define EMBER_BUTTON_OFF 0
+#define EMBER_BUTTON_ON 1
+#define EMBER_BUTTON_PUSH 2
+
 class EmberIotProp
 {
 public:
@@ -66,6 +70,15 @@ class EmberIotProp
         return this->data;
     }
 
+    bool toButtonIsOn() const
+    {
+        return toInt() == EMBER_BUTTON_ON;
+    }
+
+    bool toButtonIsPush() const {
+        return toInt() == EMBER_BUTTON_PUSH;
+    }
+
     /**
      * True if the value itself has changed from the last emitted value.
      */
@@ -987,7 +1000,9 @@ EmberIotUpdateCallback callbacks[EMBER_CHANNEL_COUNT] = {
 #endif
 };
 
-#define EMBER_CHANNEL_CB(channel) \
-    void ember_channel_cb_##channel (const EmberIotProp &prop)
+// Macro indirection for forcing expansion, so users are able to use macros as a parameter to EMBER_CHANNEL_CB
+#define EMBER_CH_CB_IN(x) void ember_channel_cb_##x (const EmberIotProp &prop)
+#define EMBER_CH_CB_IN_INDIR(x) EMBER_CH_CB_IN(x)
+#define EMBER_CHANNEL_CB(x) EMBER_CH_CB_IN_INDIR(x)
 
 #endif

EmberIot.h

@@ -38,15 +38,10 @@
 #include <EmberIotUtil.h>
 #include <WithSecureClient.h>
 #include <EmberIotAuth.h>
-#include <EmberIotShared.h>
-#include <EmberIotShared.h>
 #include <EmberIotStream.h>
 #include <time.h>
 
 #define UPDATE_LAST_SEEN_INTERVAL 120000
-#define EMBER_BUTTON_OFF 0
-#define EMBER_BUTTON_ON 1
-#define EMBER_BUTTON_PUSH 2
 
 /**
  * @param dbUrl Realtime database URL, without protocol and slashes at the end. Example value: my-rtdb.firebaseio.com
@@ -239,7 +234,7 @@ class EmberIot : WithSecureClient
      */
     void channelWrite(uint8_t channel, const char* value)
     {
-        if (!checkChannelChanged(updateDataByChannel[channel], value))
+        if (hasUpdateByChannel[channel] && !checkChannelChanged(updateDataByChannel[channel], value))
         {
             return;
         }
@@ -366,6 +361,7 @@ class EmberIot : WithSecureClient
             default:
                 {
                     channelWrite(job->dataChannel, job->value);
+                    snprintf(writtenData, sizeof(writtenData), "%s", job->value);
                 }
             }
 

EmberIotNotifications.h

@@ -197,7 +197,8 @@ class FCMEmberNotifications
             return;
         }
 
-        if (!FirePropUtil::isTimeInitialized() || clientPtr == nullptr)
+
+        if (WiFi.status() != WL_CONNECTED || !FirePropUtil::isTimeInitialized() || clientPtr == nullptr)
         {
             return;
         }
@@ -393,6 +394,7 @@ class FCMEmberNotifications
 #endif
 
         HTTP_LOGN("Send pending notifications.");
+        unsigned long timeCounter = 0;
 
         EmberIotNotification notif = notificationQueue[currentNotification-1];
 
@@ -503,7 +505,7 @@ class FCMEmberNotifications
 
         if (HTTP_UTIL::isSuccess(responseStatus))
         {
-            HTTP_LOGN("Notification sent successfully.");
+            HTTP_LOGF("Notification sent successfully, time taken: %lu\n", millis() - timeCounter);
             currentNotification--;
         }
         else