code refactor and added #30 support for hap

device-config-schema.coffee

@@ -14,16 +14,17 @@ module.exports = {
         type: "integer"
         default: 60
         required: false
+      backupfolder:
+        description: "backupfolder"
+        type: "string"
+        default: null
+        required: false
   },
   RaspBeeMotionSensor: {
     title: "RaspBee MotionSensor"
     type: "object"
     extensions: ["xAttributeOptions"]
     properties:
-      deviceID:
-        description: "Raspbee device id"
-        type: "integer"
-        required: true
       resetTime:
         description: "Reset time in seconds"
         type: "integer"
@@ -35,53 +36,109 @@ module.exports = {
         default: []
         items:
           type: "integer"
+      supportsBattery:
+        description: "does this sensor have a battery?"
+        type: "boolean"
+        default: false
+      supports:
+        description: "Feature List"
+        type: "array"
+        default: []
+        items:
+          type: "string"
   },
   RaspBeeContactSensor: {
     title: "RaspBee ContactSensor"
     type: "object"
     extensions: ["xConfirm", "xLink", "xClosedLabel", "xOpenedLabel", "xAttributeOptions"]
     properties:
-      deviceID:
-        description: "Raspbee device id"
-        type: "integer"
-        required: true
       resetTime:
         description: "Optional auto reset time in milli seconds"
         type: "integer"
         default: 0
-      inverted:
-        description: "Invert open/close state of contact device."
+      sensorIDs:
+        description: "All the ids of the sensors"
+        type: "array"
+        default: []
+        items:
+          type: "integer"
+      supportsBattery:
+        description: "does this sensor have a battery?"
         type: "boolean"
         default: false
+      supports:
+        description: "Feature List"
+        type: "array"
+        default: []
+        items:
+          type: "string"
   },
   RaspBeeLightSensor: {
     title: "RaspBee LightSensor"
     type: "object"
     properties:
-      deviceID:
-        description: "Raspbee device id"
-        type: "integer"
-        required: true
+      sensorIDs:
+        description: "All the ids of the sensors"
+        type: "array"
+        default: []
+        items:
+          type: "integer"
+      supportsBattery:
+        description: "does this sensor have a battery?"
+        type: "boolean"
+        default: false
+      supports:
+        description: "Feature List"
+        type: "array"
+        default: []
+        items:
+          type: "string"
   },
   RaspBeeSwitchSensor: {
     title: "RaspBee SwitchSensor"
     type: "object"
     properties:
-      deviceID:
-        description: "Raspbee device id"
-        type: "integer"
       resetTime:
         description: "Auto reset time in milliseconds"
         type: "integer"
-        default: 100
+        default: false
+      sensorIDs:
+        description: "All the ids of the sensors"
+        type: "array"
+        default: []
+        items:
+          type: "integer"
+      supportsBattery:
+        description: "does this sensor have a battery?"
+        type: "boolean"
+        default: false
+      supports:
+        description: "Feature List"
+        type: "array"
+        default: []
+        items:
+          type: "string"
   },
   RaspBeeWaterSensor: {
     title: "RaspBee WaterSensor"
     type: "object"
     properties:
-      deviceID:
-        description: "Raspbee device id"
-        type: "integer"
+      sensorIDs:
+        description: "All the ids of the sensors"
+        type: "array"
+        default: []
+        items:
+          type: "integer"
+      supportsBattery:
+        description: "does this sensor have a battery?"
+        type: "boolean"
+        default: false
+      supports:
+        description: "Feature List"
+        type: "array"
+        default: []
+        items:
+          type: "string"
   },
   RaspBeeRemoteControlNavigator: {
     title: "RaspBee MotionSensor"
@@ -192,6 +249,7 @@ module.exports = {
       sensorIDs:
         description: "All the ids of the sensors"
         type: "array"
+        default: []
         items:
           type: "integer"
       supportsBattery:
@@ -229,6 +287,22 @@ module.exports = {
         description: "pressure acronym"
         type: "string"
         default: "P"
+      powerAcronym:
+        description: "power acronym"
+        type: "string"
+        default: "P"
+      currentAcronym:
+        description: "power acronym"
+        type: "string"
+        default: "I"
+      voltageAcronym:
+        description: "voltage acronym"
+        type: "string"
+        default: "U"
+      consumtionAcronym:
+        description: "consumtion acronym"
+        type: "string"
+        default: "W"
       resetTime:
         description: "Auto reset time in milliseconds"
         type: "integer"