From 2d2fb6e3624e506f78b9030403adcbc0dfb67d0c Mon Sep 17 00:00:00 2001 From: Alexander Entinger Date: Wed, 10 Jun 2020 07:25:34 +0200 Subject: [PATCH 1/3] Swapping position of addPropertyReal for String types to be in the code aligned with their peer functions --- src/ArduinoIoTCloud.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ArduinoIoTCloud.h b/src/ArduinoIoTCloud.h index 58f73b0d7..452b4e0f8 100644 --- a/src/ArduinoIoTCloud.h +++ b/src/ArduinoIoTCloud.h @@ -116,7 +116,7 @@ class ArduinoIoTCloudClass Property& addPropertyReal(bool& property, String name, Permission const permission); Property& addPropertyReal(float& property, String name, Permission const permission); Property& addPropertyReal(int& property, String name, Permission const permission); - Property& addPropertyReal(String& property, String name, int tag, Permission const permission); + Property& addPropertyReal(String& property, String name, Permission const permission); /* The following methods are for MKR WAN 1300/1310 LoRa boards since * they use a number to identify a given property within a CBOR message. @@ -133,7 +133,7 @@ class ArduinoIoTCloudClass Property& addPropertyReal(bool& property, String name, int tag, Permission const permission); Property& addPropertyReal(float& property, String name, int tag, Permission const permission); Property& addPropertyReal(int& property, String name, int tag, Permission const permission); - Property& addPropertyReal(String& property, String name, Permission const permission); + Property& addPropertyReal(String& property, String name, int tag, Permission const permission); protected: From 8e53b74eb2d8766f880d24d5b57d071d55979b5b Mon Sep 17 00:00:00 2001 From: Alexander Entinger Date: Wed, 10 Jun 2020 07:33:42 +0200 Subject: [PATCH 2/3] Add 2 new methods which allow the addition of a PropertyType using the shortened property, name, permission parameters and returninga reference to the property for further configuration via concatenation of methods, such as .publishOnChange,etc. --- src/ArduinoIoTCloud.cpp | 10 ++++++++++ src/ArduinoIoTCloud.h | 2 ++ 2 files changed, 12 insertions(+) diff --git a/src/ArduinoIoTCloud.cpp b/src/ArduinoIoTCloud.cpp index 98f5c7145..92c8557fd 100644 --- a/src/ArduinoIoTCloud.cpp +++ b/src/ArduinoIoTCloud.cpp @@ -70,6 +70,16 @@ void ArduinoIoTCloudClass::addPropertyReal(Property& property, String name, int } } +Property& ArduinoIoTCloudClass::addPropertyReal(Property& property, String name, Permission const permission) +{ + return addPropertyToContainer(_property_container, property, name, permission); +} + +Property& ArduinoIoTCloudClass::addPropertyReal(Property& property, String name, int tag, Permission const permission) +{ + return addPropertyToContainer(_property_container, property, name, permission, tag); +} + void ArduinoIoTCloudClass::addPropertyReal(bool& property, String name, permissionType permission_type, long seconds, void(*fn)(void), float minDelta, void(*synFn)(Property & property)) { addPropertyReal(property, name, -1, permission_type, seconds, fn, minDelta, synFn); diff --git a/src/ArduinoIoTCloud.h b/src/ArduinoIoTCloud.h index 452b4e0f8..38bdb5467 100644 --- a/src/ArduinoIoTCloud.h +++ b/src/ArduinoIoTCloud.h @@ -113,6 +113,7 @@ class ArduinoIoTCloudClass void addPropertyReal(int& property, String name, permissionType permission_type = READWRITE, long seconds = ON_CHANGE, void(*fn)(void) = NULL, float minDelta = 0.0, void(*synFn)(Property & property) = CLOUD_WINS); void addPropertyReal(String& property, String name, 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, Permission const permission); Property& addPropertyReal(bool& property, String name, Permission const permission); Property& addPropertyReal(float& property, String name, Permission const permission); Property& addPropertyReal(int& property, String name, Permission const permission); @@ -130,6 +131,7 @@ class ArduinoIoTCloudClass void addPropertyReal(int& property, String name, int tag, permissionType permission_type = READWRITE, long seconds = ON_CHANGE, void(*fn)(void) = NULL, float minDelta = 0.0, void(*synFn)(Property & property) = CLOUD_WINS); void addPropertyReal(String& 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(bool& property, String name, int tag, Permission const permission); Property& addPropertyReal(float& property, String name, int tag, Permission const permission); Property& addPropertyReal(int& property, String name, int tag, Permission const permission); From 83f2c8e9de8c5654a5bdddd1de09b5b5184d19fa Mon Sep 17 00:00:00 2001 From: Alexander Entinger Date: Wed, 10 Jun 2020 07:44:08 +0200 Subject: [PATCH 3/3] Deprecate all old-style Property initialisation functions --- src/ArduinoIoTCloud.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/ArduinoIoTCloud.h b/src/ArduinoIoTCloud.h index 38bdb5467..23e3b3a80 100644 --- a/src/ArduinoIoTCloud.h +++ b/src/ArduinoIoTCloud.h @@ -107,11 +107,11 @@ class ArduinoIoTCloudClass * name of the property to identify a given property within a CBOR message. */ - void addPropertyReal(Property& property, String name, permissionType permission_type = READWRITE, long seconds = ON_CHANGE, void(*fn)(void) = NULL, float minDelta = 0.0f, void(*synFn)(Property & property) = CLOUD_WINS); - void addPropertyReal(bool& property, String name, permissionType permission_type = READWRITE, long seconds = ON_CHANGE, void(*fn)(void) = NULL, float minDelta = 0.0f, void(*synFn)(Property & property) = CLOUD_WINS); - void addPropertyReal(float& property, String name, permissionType permission_type = READWRITE, long seconds = ON_CHANGE, void(*fn)(void) = NULL, float minDelta = 0.0f, void(*synFn)(Property & property) = CLOUD_WINS); - void addPropertyReal(int& property, String name, permissionType permission_type = READWRITE, long seconds = ON_CHANGE, void(*fn)(void) = NULL, float minDelta = 0.0, void(*synFn)(Property & property) = CLOUD_WINS); - void addPropertyReal(String& property, String name, permissionType permission_type = READWRITE, long seconds = ON_CHANGE, void(*fn)(void) = NULL, float minDelta = 0.0f, void(*synFn)(Property & property) = CLOUD_WINS); + void addPropertyReal(Property& property, String name, permissionType permission_type = READWRITE, long seconds = ON_CHANGE, void(*fn)(void) = NULL, float minDelta = 0.0f, void(*synFn)(Property & property) = CLOUD_WINS) __attribute__((deprecated("Use addProperty(property, Permission::ReadWrite) instead."))); + void addPropertyReal(bool& property, String name, permissionType permission_type = READWRITE, long seconds = ON_CHANGE, void(*fn)(void) = NULL, float minDelta = 0.0f, void(*synFn)(Property & property) = CLOUD_WINS) __attribute__((deprecated("Use addProperty(property, Permission::ReadWrite) instead."))); + void addPropertyReal(float& property, String name, permissionType permission_type = READWRITE, long seconds = ON_CHANGE, void(*fn)(void) = NULL, float minDelta = 0.0f, void(*synFn)(Property & property) = CLOUD_WINS) __attribute__((deprecated("Use addProperty(property, Permission::ReadWrite) instead."))); + void addPropertyReal(int& property, String name, permissionType permission_type = READWRITE, long seconds = ON_CHANGE, void(*fn)(void) = NULL, float minDelta = 0.0, void(*synFn)(Property & property) = CLOUD_WINS) __attribute__((deprecated("Use addProperty(property, Permission::ReadWrite) instead."))); + void addPropertyReal(String& property, String name, permissionType permission_type = READWRITE, long seconds = ON_CHANGE, void(*fn)(void) = NULL, float minDelta = 0.0f, void(*synFn)(Property & property) = CLOUD_WINS) __attribute__((deprecated("Use addProperty(property, Permission::ReadWrite) instead."))); Property& addPropertyReal(Property& property, String name, Permission const permission); Property& addPropertyReal(bool& property, String name, Permission const permission); @@ -125,11 +125,11 @@ class ArduinoIoTCloudClass * important when using LoRa. */ - 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); - void addPropertyReal(bool& 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); - void addPropertyReal(float& 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); - void addPropertyReal(int& property, String name, int tag, permissionType permission_type = READWRITE, long seconds = ON_CHANGE, void(*fn)(void) = NULL, float minDelta = 0.0, void(*synFn)(Property & property) = CLOUD_WINS); - void addPropertyReal(String& 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); + 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) __attribute__((deprecated("Use addProperty(property, Permission::ReadWrite) instead."))); + void addPropertyReal(bool& 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) __attribute__((deprecated("Use addProperty(property, Permission::ReadWrite) instead."))); + void addPropertyReal(float& 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) __attribute__((deprecated("Use addProperty(property, Permission::ReadWrite) instead."))); + void addPropertyReal(int& property, String name, int tag, permissionType permission_type = READWRITE, long seconds = ON_CHANGE, void(*fn)(void) = NULL, float minDelta = 0.0, void(*synFn)(Property & property) = CLOUD_WINS) __attribute__((deprecated("Use addProperty(property, Permission::ReadWrite) instead."))); + void addPropertyReal(String& 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) __attribute__((deprecated("Use addProperty(property, Permission::ReadWrite) instead."))); Property& addPropertyReal(Property& property, String name, int tag, Permission const permission); Property& addPropertyReal(bool& property, String name, int tag, Permission const permission);