Redefining Wrapper kind property as template class

Author: andreagilardoni

extras/test/src/test_CloudWrapperFloat.cpp

@@ -10,7 +10,7 @@
 
 #include <CBORDecoder.h>
 
-#include <property/types/CloudWrapperFloat.h>
+#include <property/PropertyContainer.h>
 
 /**************************************************************************************
   TEST CODE

extras/test/src/test_callback.cpp

@@ -11,7 +11,6 @@
 #include <util/CBORTestUtil.h>
 #include <CBORDecoder.h>
 #include <PropertyContainer.h>
-#include "types/CloudWrapperBool.h"
 #include <memory>
 
 /**************************************************************************************

extras/test/src/test_decode.cpp

@@ -14,9 +14,6 @@
 #include <util/CBORTestUtil.h>
 
 #include <CBORDecoder.h>
-#include "types/CloudWrapperBool.h"
-#include "types/CloudWrapperFloat.h"
-#include "types/CloudWrapperInt.h"
 #include "types/CloudWrapperString.h"
 #include "types/automation/CloudColoredLight.h"
 #include "types/automation/CloudDimmedLight.h"

extras/test/src/test_encode.cpp

@@ -11,9 +11,6 @@
 #include <memory>
 
 #include <util/CBORTestUtil.h>
-#include "types/CloudWrapperBool.h"
-#include "types/CloudWrapperFloat.h"
-#include "types/CloudWrapperInt.h"
 #include "types/CloudWrapperString.h"
 
 /**************************************************************************************

src/ArduinoIoTCloud.h

@@ -39,10 +39,6 @@
 
 #include "property/Property.h"
 #include "property/PropertyContainer.h"
-#include "property/types/CloudWrapperBool.h"
-#include "property/types/CloudWrapperFloat.h"
-#include "property/types/CloudWrapperInt.h"
-#include "property/types/CloudWrapperUnsignedInt.h"
 #include "property/types/CloudWrapperString.h"
 
 #include "utility/time/TimeService.h"

src/ArduinoIoTCloudThing.cpp

@@ -19,8 +19,6 @@
 
 #include "ArduinoIoTCloudThing.h"
 #include "interfaces/CloudProcess.h"
-#include "property/types/CloudWrapperInt.h"
-#include "property/types/CloudWrapperUnsignedInt.h"
 
 /******************************************************************************
  * CTOR/DTOR

src/property/PropertyContainer.h

@@ -54,10 +54,15 @@ extern "C" unsigned long getTime();
 
 typedef std::list<Property *> PropertyContainer;
 
-typedef PropertyPrimitive<bool>           CloudBool;
-typedef PropertyPrimitive<float>          CloudFloat;
-typedef PropertyPrimitive<int>            CloudInt;
-typedef PropertyPrimitive<unsigned int>   CloudUnsignedInt;
+typedef PropertyPrimitive<bool>              CloudBool;
+typedef PropertyPrimitive<float>             CloudFloat;
+typedef PropertyPrimitive<int>               CloudInt;
+typedef PropertyPrimitive<unsigned int>      CloudUnsignedInt;
+
+typedef CloudWrapperProperty<bool>           CloudWrapperBool;
+typedef CloudWrapperProperty<float>          CloudWrapperFloat;
+typedef CloudWrapperProperty<int>            CloudWrapperInt;
+typedef CloudWrapperProperty<unsigned int>   CloudWrapperUnsignedInt;
 
 typedef CloudFloat CloudEnergy;
 typedef CloudFloat CloudForce;

src/property/types/CloudWrapperBase.cpp

@@ -0,0 +1,8 @@
+#include "CloudWrapperBase.h"
+#include "../math_utils.h"
+
+// template specialization for float CloudWrapperProperty to handle nan values
+template<>
+bool CloudWrapperProperty<float>::isDifferentFromCloud() {
+    return arduino::math::ieee754_different(_primitive_value, _cloud_value, Property::_min_delta_property);
+}

src/property/types/CloudWrapperBase.h

@@ -23,16 +23,52 @@
  ******************************************************************************/
 
 #include <Arduino.h>
-#include "../Property.h"
+#include "PropertyPrimitive.h"
 
 /******************************************************************************
    CLASS DECLARATION
  ******************************************************************************/
 
-class CloudWrapperBase : public Property {
+class CloudWrapperBaseInterface {
   public:
     virtual bool isChangedLocally() = 0;
 };
 
+class CloudWrapperBase : public Property, public CloudWrapperBaseInterface {
+  public:
+    virtual bool isChangedLocally() = 0;
+};
+
+template<typename T>
+class CloudWrapperProperty : public PropertyPrimitive<T>, public CloudWrapperBaseInterface {
+public:
+    CloudWrapperProperty(T& value)
+    : PropertyPrimitive<T>(value), _primitive_value(value) { }
+
+    bool isDifferentFromCloud() override {
+      return _primitive_value != PropertyPrimitive<T>::_cloud_value;
+    }
+
+    void fromCloudToLocal() override {
+      _primitive_value = PropertyPrimitive<T>::_cloud_value;
+    }
+    void fromLocalToCloud() override {
+      PropertyPrimitive<T>::_cloud_value = _primitive_value;
+    }
+
+    CborError appendAttributesToCloud(CborEncoder *encoder) override {
+      return PropertyPrimitive<T>::appendAttribute(_primitive_value, "", encoder);
+    }
+    void setAttributesFromCloud() override {
+      PropertyPrimitive<T>::setAttribute(PropertyPrimitive<T>::_cloud_value, "");
+    }
+
+    bool isChangedLocally() override {
+      return _primitive_value != PropertyPrimitive<T>::_value;
+    }
+protected:
+    T &_primitive_value;
+};
+
 
 #endif /* CLOUDWRAPPERBASE_H_ */