Thing: use non-composition APIs

facchinm · facchinm · commit 646c92ae6276 · 2018-09-03T17:30:25.000+02:00
diff --git a/src/ArduinoCloudV2.h b/src/ArduinoCloudV2.h
@@ -45,15 +45,15 @@ class ArduinoCloudClass {
   #define addProperty( v, ...) addPropertyReal(v, #v, __VA_ARGS__)
 
   template<typename T> void addPropertyReal(T& property, String name, permissionType _permission = READWRITE, long seconds = ON_CHANGE, T minDelta = T(0), void(*fn)(void) = NULL) {
-    Thing.addPropertyReal(property, name).publishEvery(seconds).setPermission(_permission).onUpdate(fn).minimumDelta(&minDelta);
+    Thing.addPropertyReal(property, name, _permission, seconds, fn, minDelta);
   }
 
   template<typename T> void addPropertyReal(T& property, String name, permissionType _permission = READWRITE, long seconds = ON_CHANGE, void(*fn)(void) = NULL, T minDelta = T(0)) {
-    Thing.addPropertyReal(property, name).publishEvery(seconds).setPermission(_permission).onUpdate(fn).minimumDelta(&minDelta);
+    Thing.addPropertyReal(property, name, _permission, seconds, fn, minDelta);
   }
 
   template<typename T> void addPropertyReal(T& property, String name, permissionType _permission = READWRITE, void(*fn)(void) = NULL, long seconds = ON_CHANGE, T minDelta = T(0)) {
-    Thing.addPropertyReal(property, name).publishEvery(seconds).setPermission(_permission).onUpdate(fn).minimumDelta(&minDelta);
+    Thing.addPropertyReal(property, name, _permission, seconds, fn, minDelta);
   }
 
 protected:

Original file line number	Diff line number	Diff line change
`@@ -45,15 +45,15 @@ class ArduinoCloudClass {`
`45`	`45`	`#define addProperty( v, ...) addPropertyReal(v, #v, __VA_ARGS__)`
`46`	`46`
`47`	`47`	`template<typename T> void addPropertyReal(T& property, String name, permissionType _permission = READWRITE, long seconds = ON_CHANGE, T minDelta = T(0), void(*fn)(void) = NULL) {`
`48`		`- Thing.addPropertyReal(property, name).publishEvery(seconds).setPermission(_permission).onUpdate(fn).minimumDelta(&minDelta);`
	`48`	`+ Thing.addPropertyReal(property, name, _permission, seconds, fn, minDelta);`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`template<typename T> void addPropertyReal(T& property, String name, permissionType _permission = READWRITE, long seconds = ON_CHANGE, void(*fn)(void) = NULL, T minDelta = T(0)) {`
`52`		`- Thing.addPropertyReal(property, name).publishEvery(seconds).setPermission(_permission).onUpdate(fn).minimumDelta(&minDelta);`
	`52`	`+ Thing.addPropertyReal(property, name, _permission, seconds, fn, minDelta);`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`template<typename T> void addPropertyReal(T& property, String name, permissionType _permission = READWRITE, void(*fn)(void) = NULL, long seconds = ON_CHANGE, T minDelta = T(0)) {`
`56`		`- Thing.addPropertyReal(property, name).publishEvery(seconds).setPermission(_permission).onUpdate(fn).minimumDelta(&minDelta);`
	`56`	`+ Thing.addPropertyReal(property, name, _permission, seconds, fn, minDelta);`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`protected:`