Merge pull request #56 from mozilla-iot/diegojuc-master

Manual updates to #47

Author: hobinjk

ESPWebThingAdapter.h

@@ -167,6 +167,27 @@ class WebThingAdapter {
         prop["type"] = "string";
         break;
       }
+
+      if (property->readOnly) {
+        prop["readOnly"] = true;
+      }
+
+      if (property->unit != "") {
+        prop["unit"] = property->unit;
+      }
+
+      const char **enumVal = property->propertyEnum;
+      bool hasEnum = (property->propertyEnum != nullptr) && ((*property->propertyEnum) != nullptr);
+
+      if (hasEnum) {
+        enumVal = property->propertyEnum;
+        JsonArray &propEnum = prop.createNestedArray("enum");
+        while (property->propertyEnum != nullptr && (*enumVal) != nullptr){
+          propEnum.add(*enumVal);
+          enumVal++;
+        }
+      }
+
       if (property->atType != nullptr) {
         prop["@type"] = property->atType;
       }

Thing.h

@@ -32,6 +32,10 @@ class ThingProperty {
   String atType;
   ThingProperty* next = nullptr;
 
+  bool readOnly = false;
+  const char** propertyEnum = nullptr;
+  String unit = "";
+
   ThingProperty(const char* id_, const char* description_, ThingPropertyType type_, const char* atType_):
     id(id_),
     description(description_),

WiFi101WebThingAdapter.h

@@ -429,6 +429,27 @@ class WebThingAdapter {
         prop["type"] = "string";
         break;
       }
+
+      if (property->readOnly) {
+        prop["readOnly"] = true;
+      }
+
+      if (property->unit != "") {
+        prop["unit"] = property->unit;
+      }
+
+      const char **enumVal = property->propertyEnum;
+      bool hasEnum = (property->propertyEnum != nullptr) && ((*property->propertyEnum) != nullptr);
+
+      if (hasEnum) {
+        enumVal = property->propertyEnum;
+        JsonArray &propEnum = prop.createNestedArray("enum");
+        while (property->propertyEnum != nullptr && (*enumVal) != nullptr){
+          propEnum.add(*enumVal);
+          enumVal++;
+        }
+      }
+
       if (property->atType != nullptr) {
         prop["@type"] = property->atType;
       }

examples/PlatformIO/BME280/platformio.ini

@@ -19,7 +19,7 @@ env_default = samw25
 ; https://platformio.org/lib/show/2848/ArduinoMDNS
 lib_deps =
   https://github.com/mozilla-iot/webthing-arduino.git
-  ArduinoJson
+  ArduinoJson@5.13.4
   WiFi101
   ArduinoMDNS
   BME280

examples/PlatformIO/BME280/src/BME280.cpp

@@ -45,9 +45,9 @@
 
 WebThingAdapter* adapter;
 
-const char* bme280Types[] = {nullptr};
+const char* bme280Types[] = {"TemperatureSensor", nullptr};
 ThingDevice weather("bme280", "BME280 Weather Sensor", bme280Types);
-ThingProperty weatherTemp("temperature", "", NUMBER, nullptr);
+ThingProperty weatherTemp("temperature", "", NUMBER, "TemperatureProperty");
 ThingProperty weatherHum("humidity", "", NUMBER, nullptr);
 ThingProperty weatherPres("pressure", "", NUMBER, nullptr);
 
@@ -122,6 +122,7 @@ void setup() {
   digitalWrite(LED_BUILTIN, PIN_STATE_HIGH);
   adapter = new WebThingAdapter("weathersensor", WiFi.localIP());
 
+  weatherTemp.unit = "c";
   weather.addProperty(&weatherTemp);
   weather.addProperty(&weatherPres);
   weather.addProperty(&weatherHum);

examples/PlatformIO/LED/platformio.ini

@@ -18,7 +18,7 @@
 [global]
 lib_deps =
     https://github.com/mozilla-iot/webthing-arduino.git
-    ArduinoJson
+    ArduinoJson@5.13.4
 monitor_speed = 115200
 
 [env:d1]

examples/PlatformIO/TextDisplay/platformio.ini

@@ -17,7 +17,7 @@
 [global]
 lib_deps =
     https://github.com/mozilla-iot/webthing-arduino.git
-    ArduinoJson
+    ArduinoJson@5.13.4
     Adafruit GFX Library
     Adafruit SSD1306
 

examples/RGBLamp/RGBLamp.ino

@@ -25,6 +25,10 @@ const int ledPin = LED_BUILTIN;
 const int ledPin = 13;  // manully configure LED pin
 #endif
 
+//for optional properties
+//const char * valEnum[5] = {"RED", "GREEN", "BLACK", "white", nullptr};
+//const char * valEnum[5] = {"#db4a4a", "#4adb58", "000000", "ffffff", nullptr};
+
 WebThingAdapter* adapter;
 
 const char* deviceTypes = {"Light", "OnOffSwitch", "ColorControl", nullptr};
@@ -89,6 +93,11 @@ void setup(void) {
   deviceLevel.setValue(levelValue);
   device.addProperty(&deviceLevel);
 
+  //optional properties
+  //deviceColor.propertyEnum = valEnum;
+  //deviceColor.readOnly = true;
+  //deviceColor.unit = "HEX";
+
   ThingPropertyValue colorValue;
   colorValue.string = &lastColor; //default color is white
   deviceColor.setValue(colorValue);