Async Property, Tested in example (#55)

Author: lgLindstrom

Thing.h

@@ -322,12 +322,16 @@ class ThingItem {
 };
 
 class ThingProperty : public ThingItem {
+private:
+  void (*callback)(ThingPropertyValue);
+
 public:
   const char **propertyEnum = nullptr;
 
   ThingProperty(const char *id_, const char *description_, ThingDataType type_,
-                const char *atType_)
-      : ThingItem(id_, description_, type_, atType_) {}
+                const char *atType_,
+                void (*callback_)(ThingPropertyValue) = nullptr)
+      : ThingItem(id_, description_, type_, atType_), callback(callback_) {}
 
   void serialize(JsonObject obj, String deviceId, String resourceType) {
     ThingItem::serialize(obj, deviceId, resourceType);
@@ -344,6 +348,12 @@ class ThingProperty : public ThingItem {
       }
     }
   }
+
+  void changed(ThingPropertyValue newValue) {
+    if (callback != nullptr) {
+      callback(newValue);
+    }
+  }
 };
 
 #ifndef WITHOUT_WS
@@ -575,22 +585,26 @@ class ThingDevice {
       ThingDataValue value;
       value.boolean = newValue.as<bool>();
       property->setValue(value);
+      property->changed(value);
       break;
     }
     case NUMBER: {
       ThingDataValue value;
       value.number = newValue.as<double>();
       property->setValue(value);
+      property->changed(value);
       break;
     }
     case INTEGER: {
       ThingDataValue value;
       value.integer = newValue.as<signed long long>();
       property->setValue(value);
+      property->changed(value);
       break;
     }
     case STRING:
       *(property->getValue().string) = newValue.as<String>();
+      property->changed(property->getValue());
       break;
     }
   }

examples/PlatformIO/AsyncProperty/platformio.ini

@@ -0,0 +1,67 @@
+; PlatformIO Project Configuration File
+;
+;   Build options: build flags, source filter
+;   Upload options: custom upload port, speed and extra flags
+;   Library options: dependencies, extra library storages
+;   Advanced options: extra scripting
+;
+; Please visit documentation for the other options and examples
+; http://docs.platformio.org/page/projectconf.html
+
+[platformio]
+; uncomment below to build a one env
+; env_default= d1
+; env_default= nodemcuv2
+; env_default= esp32dev
+; env_default= samd21g18a
+
+[global]
+lib_deps =
+    https://github.com/mozilla-iot/webthing-arduino.git
+    ArduinoJson
+monitor_speed = 115200
+
+[env:d1]
+platform = espressif8266
+board = d1
+framework = arduino
+lib_deps =
+    ${global.lib_deps}
+    ESP Async WebServer
+lib_ignore = WiFi101
+lib_ldf_mode = deep+
+monitor_speed =  ${global.monitor_speed}
+
+[env:nodemcuv2]
+platform = espressif8266
+board = nodemcuv2
+framework = arduino
+lib_deps =
+    ${global.lib_deps}
+    ESP Async WebServer
+lib_ignore =
+    ArduinoMDNS
+    WiFi101
+lib_ldf_mode = deep+
+monitor_speed =  ${global.monitor_speed}
+
+[env:esp32dev]
+platform = espressif32
+board = esp32dev
+framework = arduino
+lib_deps =
+    ${global.lib_deps}
+    ESP Async WebServer
+lib_ignore = WiFi101
+lib_ldf_mode = deep+
+monitor_speed =  ${global.monitor_speed}
+
+[env:samd21g18a]
+platform = atmelsam
+board = samd21g18a
+framework = arduino
+lib_deps =
+    ${global.lib_deps}
+    WiFi101
+    ArduinoMDNS
+lib_ldf_mode = deep+

examples/PlatformIO/AsyncProperty/src/main.cpp

@@ -0,0 +1,98 @@
+/**
+ * Test of webthing-arduino with async behavior. Works with
+ * thing-url-adapter.
+ */
+
+#include <Arduino.h>
+#include <Thing.h>
+#include <WebThingAdapter.h>
+
+const char *ssid = "XXXXXXX";
+const char *password = "XXXXXXX";
+
+int loginCounter;
+WebThingAdapter *adapter;
+// Forward declaration
+void onOffChanged(ThingPropertyValue newValue);
+void textChanged(ThingPropertyValue newValue);
+void numberChanged(ThingPropertyValue newValue);
+
+const char *asyncProperties[] = {"asyncProperty", nullptr};
+ThingDevice textDisplay("asyncProperty", "AsyncProperty Test",
+                        asyncProperties);
+ThingProperty text("text", "", STRING, nullptr, textChanged);
+ThingProperty onOff("bool", "", BOOLEAN, "OnOffProperty", onOffChanged);
+ThingProperty number("number", "", NUMBER, nullptr, numberChanged);
+
+String message = "message";
+String lastMessage = message;
+boolean lastState = false;
+int lastNumber = 0;
+
+// Callback functions
+//
+void onOffChanged(ThingPropertyValue newValue) {
+  Serial.print("On/Off changed to : ");
+  Serial.println(newValue.boolean);
+}
+
+void textChanged(ThingPropertyValue newValue) {
+  Serial.print("New message : ");
+  Serial.println(*newValue.string);
+}
+
+void numberChanged(ThingPropertyValue newValue) {
+  Serial.print("New number : ");
+  Serial.println(newValue.number);
+}
+
+void setup() {
+  Serial.begin(115200);
+
+  // counter used for login time out, function needed with ESP32
+  loginCounter = 0;
+
+#if defined(ESP8266) || defined(ESP32)
+  WiFi.mode(WIFI_STA);
+#endif
+
+  Serial.print("Connecting : ");
+  WiFi.begin(ssid, password);
+
+  // Wait for connection
+  while (WiFi.status() != WL_CONNECTED) {
+
+    // more than 5 sec wait, try to login again.
+    if (loginCounter == 10) {
+      loginCounter = 0;
+      WiFi.begin(ssid, password);
+    } else {
+      loginCounter++;
+    }
+    delay(500);
+    Serial.print(".");
+  }
+
+  Serial.println("");
+  Serial.print("Connected to ");
+  Serial.println(ssid);
+  Serial.print("IP address: ");
+  Serial.println(WiFi.localIP());
+
+  adapter = new WebThingAdapter("asyncProperty", WiFi.localIP());
+
+  ThingPropertyValue value;
+  value.string = &message;
+  text.setValue(value);
+
+  textDisplay.addProperty(&text);
+  textDisplay.addProperty(&onOff);
+  textDisplay.addProperty(&number);
+  adapter->addDevice(&textDisplay);
+  adapter->begin();
+}
+
+void loop() {
+  delay(500);
+  adapter->update();
+}