Bugfix + test code - if a property is manipulated in its onChange callback function to its origin state the change is still propagated to the cloud

Author: aentinger

ArduinoCloudProperty.hpp

@@ -77,7 +77,7 @@ class ArduinoCloudProperty {
   inline bool   isReadableByCloud () const { return (_permission == Permission::Read ) || (_permission == Permission::ReadWrite); }
   inline bool   isWriteableByCloud() const { return (_permission == Permission::Write) || (_permission == Permission::ReadWrite); }
 
-  bool shouldBeUpdated        () const;
+  bool shouldBeUpdated        ();
   void execCallbackOnChange   ();
 
   void append                 (CborEncoder * encoder, CloudProtocol const cloud_protocol);
@@ -91,7 +91,8 @@ class ArduinoCloudProperty {
   UpdateCallbackFunc _update_callback_func;
 
   UpdatePolicy       _update_policy;
-  bool               _has_been_updated_once;
+  bool               _has_been_updated_once,
+                     _has_been_modified_in_callback;
   /* Variables used for UpdatePolicy::OnChange */
   T                  _min_delta_property;
   unsigned long      _min_time_between_updates_millis;

ArduinoCloudProperty.ipp

@@ -11,6 +11,7 @@ ArduinoCloudProperty<T>::ArduinoCloudProperty(T & property, String const & name,
   _update_callback_func(NULL),
   _update_policy(UpdatePolicy::OnChange),
   _has_been_updated_once(false),
+  _has_been_modified_in_callback(false),
   _min_delta_property(getInitialMinDeltaPropertyValue()),
   _min_time_between_updates_millis(0),
   _last_updated_millis(0),
@@ -52,9 +53,14 @@ ArduinoCloudProperty<T> & ArduinoCloudProperty<T>::publishEvery(unsigned long co
 }
 
 template <typename T>
-bool ArduinoCloudProperty<T>::shouldBeUpdated() const {
+bool ArduinoCloudProperty<T>::shouldBeUpdated() {
   if(!_has_been_updated_once) return true;
 
+  if(_has_been_modified_in_callback) {
+    _has_been_modified_in_callback = false;
+    return true;
+  }
+
   if     (_update_policy == UpdatePolicy::OnChange) {
     return (isValueDifferent(_property, _shadow_property) && ((millis() - _last_updated_millis) >= (_min_time_between_updates_millis)));
   }
@@ -72,6 +78,10 @@ void ArduinoCloudProperty<T>::execCallbackOnChange() {
     if(_update_callback_func != NULL) {
       _update_callback_func();
     }
+
+    if(!isValueDifferent(_property, _shadow_property)) {
+      _has_been_modified_in_callback = true;
+    }
   }
 }