Remove internal calls to deprecated addPropertyReal

arduino-libraries · Feb 19, 2024 · 5675efc · 5675efc
1 parent 7b125f4
commit 5675efc
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 21 deletions.
diff --git a/src/ArduinoIoTCloudTCP.cpp b/src/ArduinoIoTCloudTCP.cpp
@@ -251,7 +251,15 @@ Property& ArduinoIoTCloudTCP::addInternalPropertyReal(Property& property, String
 
 void ArduinoIoTCloudTCP::addInternalPropertyReal(Property& property, String name, int tag, permissionType permission_type, long seconds, void(*fn)(void), float minDelta, void(*synFn)(Property & property))
 {
-  _arduinoCloudThing.addPropertyReal(property, name, tag, permission_type, seconds, fn, minDelta, synFn);
+  Permission permission = Permission::ReadWrite;
+  if (permission_type == READ) {
+    permission = Permission::Read;
+  } else if (permission_type == WRITE) {
+    permission = Permission::Write;
+  } else {
+    permission = Permission::ReadWrite;
+  }
+  _arduinoCloudThing.addPropertyReal(property, name, tag, permission).publishOnChange(minDelta, Property::DEFAULT_MIN_TIME_BETWEEN_UPDATES_MILLIS).onUpdate(fn).onSync(synFn);
 }
 
 void ArduinoIoTCloudTCP::push()

diff --git a/src/ArduinoIoTCloudTCPThing.cpp b/src/ArduinoIoTCloudTCPThing.cpp
@@ -105,27 +105,12 @@ int ArduinoIoTCloudTCPThing::connected()
   return _mqttClient->connected();
 }
 
-Property& ArduinoIoTCloudTCPThing::addPropertyReal(Property& property, String name, int tag, Permission const permission)
+Property&  ArduinoIoTCloudTCPThing::addPropertyReal(Property& property, String name, int tag, Permission const permission, long seconds, void(*fn)(void), float minDelta, void(*synFn)(Property & property))
 {
-  return addPropertyToContainer(_thing_property_container, property, name, permission, tag);
-}
-
-void ArduinoIoTCloudTCPThing::addPropertyReal(Property& property, String name, int tag, permissionType permission_type, long seconds, void(*fn)(void), float minDelta, void(*synFn)(Property & property))
-{
-  Permission permission = Permission::ReadWrite;
-  if (permission_type == READ) {
-    permission = Permission::Read;
-  } else if (permission_type == WRITE) {
-    permission = Permission::Write;
-  } else {
-    permission = Permission::ReadWrite;
-  }
-
   if (seconds == ON_CHANGE) {
-    addPropertyToContainer(_thing_property_container, property, name, permission, tag).publishOnChange(minDelta, Property::DEFAULT_MIN_TIME_BETWEEN_UPDATES_MILLIS).onUpdate(fn).onSync(synFn);
-  } else {
-    addPropertyToContainer(_thing_property_container, property, name, permission, tag).publishEvery(seconds).onUpdate(fn).onSync(synFn);
+    return addPropertyToContainer(_thing_property_container, property, name, permission, tag).publishOnChange(minDelta, Property::DEFAULT_MIN_TIME_BETWEEN_UPDATES_MILLIS).onUpdate(fn).onSync(synFn);
   }
+  return addPropertyToContainer(_thing_property_container, property, name, permission, tag).publishEvery(seconds).onUpdate(fn).onSync(synFn);
 }
 
 void ArduinoIoTCloudTCPThing::push()

diff --git a/src/ArduinoIoTCloudTCPThing.h b/src/ArduinoIoTCloudTCPThing.h
@@ -52,8 +52,7 @@ class ArduinoIoTCloudTCPThing
     int connected();
     void updateTimezoneInfo();
 
-    void addPropertyReal(Property& property, String name, int tag, permissionType permission_type = READWRITE, long seconds = ON_CHANGE, void(*fn)(void) = NULL, float minDelta = 0.0f, void(*synFn)(Property & property) = CLOUD_WINS);
-    Property& addPropertyReal(Property& property, String name, int tag, Permission const permission);
+    Property& addPropertyReal(Property& property, String name, int tag, Permission const permission, long seconds = ON_CHANGE, void(*fn)(void) = NULL, float minDelta = 0.0f, void(*synFn)(Property & property) = CLOUD_WINS);
 
     void push();
     bool setTimestamp(String const & prop_name, unsigned long const timestamp);