Removing the need for _get_time_func to be a member variable

Author: aentinger

src/ArduinoIoTCloudTCP.cpp

@@ -50,7 +50,7 @@ const static int CONNECT_FAILURE_SUBSCRIBE					         = -1;
    LOCAL MODULE FUNCTIONS
  ******************************************************************************/
 
-static unsigned long getTime()
+extern "C" unsigned long getTime()
 {
   return time_service.getTime();
 }
@@ -135,7 +135,6 @@ int ArduinoIoTCloudTCP::begin(String brokerAddress, uint16_t brokerPort)
   _ota_topic_in   = getTopic_ota_in();
 
   _thing.begin(&_property_container);
-  _property_container.begin(getTime);
 
   printConnectionStatus(_iot_status);
 

src/property/PropertyContainer.cpp

@@ -25,33 +25,18 @@
 
 #include "types/CloudWrapperBase.h"
 
-/******************************************************************************
-   CTOR/DTOR
- ******************************************************************************/
-
-PropertyContainer::PropertyContainer()
-: _get_time_func{nullptr}
-{
-
-}
-
 /******************************************************************************
    PUBLIC MEMBER FUNCTIONS
  ******************************************************************************/
 
-void PropertyContainer::begin(GetTimeCallbackFunc func)
-{
-  _get_time_func = func;
-}
-
-Property & PropertyContainer::addPropertyReal(Property & property, String const & name, Permission const permission, int propertyIdentifier)
+Property & PropertyContainer::addPropertyReal(Property & property, String const & name, Permission const permission, int propertyIdentifier, GetTimeCallbackFunc func)
 {
   /* Check whether or not the property already has been added to the container */
   Property * p = getProperty(name);
   if(p != nullptr) return (*p);
 
   /* Initialize property and add it to the container */
-  property.init(name, permission, _get_time_func);
+  property.init(name, permission, func);
 
   addProperty(&property, propertyIdentifier);
   return property;

src/property/PropertyContainer.h

@@ -28,6 +28,16 @@
 #undef min
 #include <list>
 
+/******************************************************************************
+   DECLARATION OF getTime
+ ******************************************************************************/
+
+#ifdef HAS_LORA
+static unsigned long constexpr getTime() { return 0; }
+#else
+extern "C" unsigned long getTime();
+#endif
+
 /******************************************************************************
    CLASS DECLARATION
  ******************************************************************************/
@@ -37,13 +47,11 @@ class PropertyContainer
 
 public:
 
-  PropertyContainer();
-
-  
-  void begin(GetTimeCallbackFunc func);
-
-
-  Property & addPropertyReal(Property & property, String const & name, Permission const permission, int propertyIdentifier = -1);
+  Property & addPropertyReal(Property & property,
+                             String const & name,
+                             Permission const permission,
+                             int propertyIdentifier = -1,
+                             GetTimeCallbackFunc func = getTime);
 
 
   Property * getProperty          (String const & name);
@@ -58,7 +66,6 @@ class PropertyContainer
 
 private:
 
-  GetTimeCallbackFunc _get_time_func;
   std::list<Property *> _property_list;
 
   void addProperty(Property * property_obj, int propertyIdentifier);