bugfixes for beta 0.2.224

thkl · Apr 19, 2020 · 7f923db · 7f923db
1 parent 0ff9a8a
commit 7f923db
Show file tree

Hide file tree

Showing 8 changed files with 58 additions and 54 deletions.
diff --git a/ChannelServices/HomeMaticHomeKitThermostatServiceIP.js b/ChannelServices/HomeMaticHomeKitThermostatServiceIP.js
@@ -13,10 +13,8 @@ class HomeMaticHomeKitIPThermostatService extends HomeKitGenericService {
       .on('get', function (callback) {
         self.query('SET_POINT_TEMPERATURE', function (value) {
           if (value < 6.0) {
-            self.getCurrentStateCharacteristic('CONTROL_MODE').setValue(1, null)
             if (callback) callback(null, 0)
           } else {
-            self.getCurrentStateCharacteristic('CONTROL_MODE').setValue(0, null)
             if (callback) callback(null, 1)
           }
         })

diff --git a/ChannelServices/HomeMaticHomeKitWeatherStationService.js b/ChannelServices/HomeMaticHomeKitWeatherStationService.js
@@ -5,7 +5,7 @@ const util = require('util')
 
 class HomeMaticHomeKitWeatherStationService extends HomeKitGenericService {
   propagateServices (homebridge, Service, Characteristic) {
-    var uuid = homebridge.uuid
+    var uuid = homebridge.homebridge.hap.uuid
 
     Characteristic.IsRainingCharacteristic = function () {
       var charUUID = uuid.generate('HomeMatic:customchar:IsRainingCharacteristic')

diff --git a/ChannelServices/HomeMaticHomeKitWeatherStationServiceIP.js b/ChannelServices/HomeMaticHomeKitWeatherStationServiceIP.js
@@ -5,8 +5,7 @@ const util = require('util')
 
 class HomeMaticHomeKitWeatherStationServiceIP extends HomeKitGenericService {
   propagateServices (homebridge, Service, Characteristic) {
-    var uuid = homebridge.uuid
-
+    var uuid = homebridge.homebridge.hap.uuid
     Characteristic.IsRainingCharacteristic = function () {
       var charUUID = uuid.generate('HomeMatic:customchar:IsRainingCharacteristic')
       Characteristic.call(this, 'Regen', charUUID)
@@ -100,6 +99,7 @@ class HomeMaticHomeKitWeatherStationServiceIP extends HomeKitGenericService {
     }
     util.inherits(Characteristic.WindRangeCharacteristic, Characteristic)
 
+    this.log.debug('[WSIP] generate WindRangeService')
     Service.WindRangeService = function (displayName, subtype) {
       var servUUID = uuid.generate('HomeMatic:customchar:WindRangeService')
       Service.call(this, displayName, servUUID, subtype)
@@ -120,6 +120,7 @@ class HomeMaticHomeKitWeatherStationServiceIP extends HomeKitGenericService {
     }
     util.inherits(Characteristic.SunshineCharacteristic, Characteristic)
 
+    this.log.debug('[WSIP] generate SunshineService')
     Service.SunshineService = function (displayName, subtype) {
       var servUUID = uuid.generate('HomeMatic:customchar:SunshineService')
       Service.call(this, displayName, servUUID, subtype)

diff --git a/ChannelServices/channel_config.json b/ChannelServices/channel_config.json
@@ -292,6 +292,10 @@
 			"type": "HM-LC-Bl1PBU-FM:BLIND",
 			"service": "HomeMaticHomeKitBlindService"
 		},
+		{ 
+			"type": "HM-LC-Bl1-PB-FM:BLIND",
+			"service": "HomeMaticHomeKitBlindService"
+		},
 		{
 			"type": "HmIP-SWD:WATER_DETECTION_TRANSMITTER",
 			"service": "HomeMaticHomeKitWaterSensorService"

diff --git a/HomeMaticServiceClassLoader.js b/HomeMaticServiceClassLoader.js
@@ -168,7 +168,6 @@ HomeMaticServiceClassLoader.prototype.loadChannelService = function (accessory,
   } else {
     self.log.warn('[ServiceClassLoader] There is no service for ' + deviceType + ':' + channelType)
   }
-  this.log.debug('[ServiceClassLoader] == End == %s ==', accessory.appliance.serviceClassName)
 }
 
 HomeMaticServiceClassLoader.prototype.loadClass = function (serviceclass) {

diff --git a/PluginConfigurationService/index.js b/PluginConfigurationService/index.js
@@ -219,59 +219,59 @@ class PluginConfigurationService {
             'service': service,
             'options': {}
           }
-          if (serviceInstance.validateConfig(config)) {
-            // build the serviceconfig
-            Object.keys(config).map(key => {
-              if (itemKeysToSave.indexOf(key) > -1) {
-                newServiceConfig.options[key] = config[key]
-              }
-            })
+          // if (serviceInstance.validateConfig(config)) {
+          // build the serviceconfig
+          Object.keys(config).map(key => {
+            if (itemKeysToSave.indexOf(key) > -1) {
+              newServiceConfig.options[key] = config[key]
+            }
+          })
 
-            // change the item in global config
-            let myServices = pluginHmConfig.services
-            if (myServices === undefined) {
-              logger.debug('[Save Config] empty services create a new Array')
-              myServices = []
+          // change the item in global config
+          let myServices = pluginHmConfig.services
+          if (myServices === undefined) {
+            logger.debug('[Save Config] empty services create a new Array')
+            myServices = []
+          }
+          // remove the old entry
+          myServices = myServices.filter(service => {
+            return (service.type !== address)
+          })
+          // add the new service config
+          myServices.push(newServiceConfig)
+
+          pluginHmConfig['services'] = myServices
+
+          // Check if its a special sevice
+          let serviceDev = this.serviceTemplates[service]
+          if ((serviceDev) && (serviceDev.special)) {
+            // load the special config setting
+            let spList = pluginHmConfig['special']
+            if (spList === undefined) {
+              spList = []
             }
-            // remove the old entry
-            myServices = myServices.filter(service => {
-              return (service.type !== address)
-            })
-            // add the new service config
-            myServices.push(newServiceConfig)
-
-            pluginHmConfig['services'] = myServices
-
-            // Check if its a special sevice
-            let serviceDev = this.serviceTemplates[service]
-            if ((serviceDev) && (serviceDev.special)) {
-              // load the special config setting
-              let spList = pluginHmConfig['special']
-              if (spList === undefined) {
-                spList = []
-              }
-              var found = false
-              spList.map(sv => {
-                if (sv.name === address) {
-                  found = true
-                }
-              })
-              if (found === false) {
-                spList.push({ name: address })
+            var found = false
+            spList.map(sv => {
+              if (sv.name === address) {
+                found = true
               }
-              pluginHmConfig['special'] = spList
+            })
+            if (found === false) {
+              spList.push({ name: address })
             }
+            pluginHmConfig['special'] = spList
+          }
 
-            this.saveMyConfig(pluginHmConfig)
-            let message = {
-              topic: 'reloadApplicances',
-              changed: data.address
-            }
-            this.process.send(message)
-            return true
-          } else {
-            logger.warn('[Config] configuration for %s is invalid', service)
+          this.saveMyConfig(pluginHmConfig)
+          let message = {
+            topic: 'reloadApplicances',
+            changed: data.address
           }
+          this.process.send(message)
+          return true
+          // } else {
+          //  logger.warn('[Config] configuration for %s is invalid', service)
+          // }
         }
       } else {
         logger.warn('Serviceclass not found')

diff --git a/index.js b/index.js
@@ -102,10 +102,12 @@ class HomeMaticPlatform {
 
         process.on('SIGINT', () => {
           self.homematicCCU.shutDown()
+          process.exit(0)
         })
 
         process.on('SIGTERM', () => {
           self.homematicCCU.shutDown()
+          process.exit(0)
         })
       }
     }

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "homebridge-homematic",
-  "version": "0.1.222",
+  "version": "0.1.224",
   "description": "Homematic plugin for homebridge: https://github.com/nfarina/homebridge",
   "license": "ISC",
   "keywords": [