homebridge-deconz 0.0.26 → 0.1.0

package/config.schema.json

@@ -14,13 +14,6 @@
         "required": true,
         "default": "deCONZ"
       },
-      "brightnessAdjustment": {
-        "description": "Adjustment factor for brightness for adaptive lighting.  Default: 100.",
-        "type": "integer",
-        "placeholder": 100,
-        "minimum": 10,
-        "maximum": 100
-      },
       "forceHttp": {
         "description": "Use plain http instead of https.",
         "type": "boolean"

package/lib/Deconz/ApiError.js

@@ -21,21 +21,28 @@ const nonCriticalApiErrorTypes = [
   * @memberof Deconz
   */
 class ApiError extends homebridgeLib.HttpClient.HttpError {
-  constructor (message, response, type, description) {
-    super(message, response.request, response.statusCode, response.statusMessage)
+  constructor (e, response) {
+    super(
+      `${e.address}: api error ${e.type}: ${e.description}`,
+      response.request, response.statusCode, response.statusMessage
+    )
 
     /** @member {integer} - The API error type.
       */
-    this.type = type
+    this.type = e.type
+
+    /** @member {string} - The address causing the error.
+      */
+    this.address = e.address
 
     /** @member {string} - The API error description.
       */
-    this.description = description
+    this.description = e.description
 
     /** @member {boolean} - Indication that the request might still succeed
       * for other attributes.
       */
-    this.nonCritical = nonCriticalApiErrorTypes.includes(type)
+    this.nonCritical = nonCriticalApiErrorTypes.includes(e.type)
   }
 }
 

package/lib/Deconz/ApiResponse.js

@@ -33,17 +33,20 @@ class ApiResponse extends homebridgeLib.HttpClient.HttpResponse {
       for (const id in response.body) {
         const e = response.body[id].error
         if (e != null && typeof e === 'object') {
-          this.errors.push(new Deconz.ApiError(
-            `api error ${e.type}: ${e.description}`,
-            response, e.type, e.description
-          ))
+          this.errors.push(new Deconz.ApiError(e, response))
         }
         const s = response.body[id].success
         if (s != null && typeof s === 'object') {
           for (const path of Object.keys(s)) {
-            const a = path.split('/')
-            const key = a[a.length - 1]
-            this.success[key] = s[path]
+            const keys = path.split('/')
+            let obj = this.success
+            for (let i = 1; i < keys.length - 1; i++) {
+              if (obj[keys[i]] == null) {
+                obj[keys[i]] = {}
+              }
+              obj = obj[keys[i]]
+            }
+            obj[keys[keys.length - 1]] = s[path]
           }
         }
       }

package/lib/Deconz/Resource.js

@@ -21,6 +21,7 @@ const sensorsPrios = [
   'Power',
   'Consumption',
   'Temperature',
+  'LightLevel',
   'Motion',
   'OpenClose',
   'AirPurifier',
@@ -231,6 +232,27 @@ class Resource {
           alert: body.state.alert !== undefined,
           colorLoop: body.state.effect !== undefined
         }
+        if (body.capabilities != null) {
+          const cap = body.capabilities
+          if (cap.color != null) {
+            if (cap.color.ct != null) {
+              this.capabilities.ctMax = cap.color.ct.max
+              this.capabilities.ctMin = cap.color.ct.min
+            }
+            if (cap.color.effects != null && cap.color.effects.length > 2) {
+              this.capabilities.effects = cap.color.effects.slice(2).map((effect) => {
+                return effect[0].toUpperCase() + effect.slice(1)
+              })
+            }
+            if (cap.color.xy != null) {
+              this.capabilities.gamut = {
+                r: cap.color.xy.red,
+                g: cap.color.xy.green,
+                b: cap.color.xy.blue
+              }
+            }
+          }
+        }
         break
       }
       case 'WarningDevice':
@@ -487,14 +509,15 @@ class Resource {
         }
         break
       case 'Philips':
-      case 'Signify Netherlands B.V.': {
+      case 'Signify Netherlands B.V.':
         // See: http://www.developers.meethue.com/documentation/supported-lights
         this.manufacturer = 'Signify Netherlands B.V.'
         this.capabilities.breathe = true
         this.capabilities.computesXy = true
-        const gamut = hueGamutTypeByModel[this.model] || 'C'
-        this.capabilities.gamut = hueGamutType[gamut]
-      }
+        if (this.body.capabilities == null) {
+          const gamut = hueGamutTypeByModel[this.model] || 'C'
+          this.capabilities.gamut = hueGamutType[gamut]
+        }
         break
       default:
         break

package/lib/DeconzAccessory/AirPurifier.js

@@ -26,8 +26,6 @@ class AirPurifier extends DeconzAccessory {
       this.createService(resource)
     }
 
-    this.createSettingsService()
-
     setImmediate(() => {
       this.debug('initialised')
       this.emit('initialised')