diff --git a/fonctions.py b/fonctions.py index 10b3295..251acc9 100644 --- a/fonctions.py +++ b/fonctions.py @@ -350,6 +350,7 @@ def ProcessAllConfig(data): kwarg.update(ReturnUpdateValue( 'preset' , data['preset'] ) ) if 'lock' in data: kwarg.update(ReturnUpdateValue( 'lock' , data['lock'] ) ) + if 'reachable' in data: if data['reachable'] == False: kwarg.update({'TimedOut':1}) @@ -423,6 +424,10 @@ def ProcessAllState(data,model): kwarg.update(ReturnUpdateValue('bri', data['bri'], model) ) if 'lift' in data: kwarg.update(ReturnUpdateValue('lift', data['lift'], model) ) + if 'voltage' in data: + kwarg.update(ReturnUpdateValue( 'voltage' , data['voltage'], model) ) + if 'current' in data: + kwarg.update(ReturnUpdateValue( 'current' , data['current'], model ) ) #if 'lastupdated' in data: # kwarg.update(ReturnUpdateValue('lastupdated', data['lastupdated'])) @@ -641,13 +646,15 @@ def ReturnUpdateValue(command,val,model = None): else: kwarg['sValue'] = '3' - if command == 'lightlevel': + if (command == 'lightlevel') or (command == 'lux'): kwarg['nValue'] = 0 kwarg['sValue'] = str(val) - if command == 'lux': - kwarg['nValue'] = 0 - kwarg['sValue'] = str(val) + if command == 'voltage': + kwarg['voltage'] = int(val) + + if command == 'current': + kwarg['current'] = int(val) if command == 'airqualityppb': kwarg['nValue'] = int(val) @@ -656,16 +663,16 @@ def ReturnUpdateValue(command,val,model = None): if command == 'consumption': #Wh to Kwh kwh = round( float(val) * 1, 3) - #Device with power and comsuption, never see yet, so disabled - #if buffercommand.get('power'): - # p = buffercommand['power'] - # buffercommand.clear() - # kwarg['nValue'] = 0 - # kwarg['sValue'] = str(p) + ';' + str(kwh) - ##device with only consumption - #else: - kwarg['nValue'] = 0 - kwarg['sValue'] = str(kwh) + #Device with power and comsuption + if buffercommand.get('power'): + p = buffercommand['power'] + buffercommand.clear() + kwarg['nValue'] = 0 + kwarg['sValue'] = str(p) + ';' + str(kwh) + #device with only consumption + else: + kwarg['nValue'] = 0 + kwarg['sValue'] = str(kwh) if command == 'power': buffercommand['power'] = val @@ -807,7 +814,7 @@ def ButtonConvertion(val,model = 0): v = 0 Button_Number = 1 - e = int(val) + e = int(val or 0) #Green power device if e < 1000: @@ -920,9 +927,14 @@ def installFE(): except: pass + #Special part for dockers + if not os.path.exists(templates_path): + templates_path = templates_path.replace("userdata/","") + #Domoticz.Status('File size : ' + str(fs)) - if fs == 9007: + if fs == 8967: + Domoticz.Status('Plugin custom pages in date') return Domoticz.Status('Starting the installation of plugin custom page (' + str(fs) + ')...') diff --git a/frontend/deCONZ.html b/frontend/deCONZ.html index 7a1c5ea..bba591d 100644 --- a/frontend/deCONZ.html +++ b/frontend/deCONZ.html @@ -23,8 +23,8 @@

deCONZ

+ zigdevs="$ctrl.zigdevs"> +
@@ -116,14 +116,14 @@

{{:: 'Configuring Device' | translate }}

diff --git a/frontend/deCONZ.js b/frontend/deCONZ.js index fa1d0d5..8644b60 100644 --- a/frontend/deCONZ.js +++ b/frontend/deCONZ.js @@ -341,7 +341,7 @@ function(app) { var deferred = $q.defer(); console.log('Checking DeCONZdsetup') - url = 'https://dresden-light.appspot.com/discover' + url = 'https://phoscon.de/discover' $http({ method: 'GET', @@ -354,9 +354,8 @@ function(app) { deferred.resolve(response.data) },function errorCallback(response) { console.error('Error getting deCONZ Discover data:' + angular.toJson(response, true) ) - bootbox.alert('

' + $.t('Likely 503 Over Quota Error') + '


' + - $.t('This application is temporarily over its serving quota. Please try again tomorrow.') + - '

https://dresden-light.appspot.com/discover') + bootbox.alert('

' + $.t('Error getting deCONZ Discover data') + '


' + + 'https://phoscon.de/discover') deferred.reject(response) }); diff --git a/plugin.py b/plugin.py index 63234a3..bc82f1f 100644 --- a/plugin.py +++ b/plugin.py @@ -3,7 +3,7 @@ # Author: Smanar # """ - +

deCONZ Bridge


@@ -28,6 +28,7 @@ + """ - -# Combo for Heartbeat, disabled for the moment -# -# -# -# - - # All imports import Domoticz @@ -84,6 +72,9 @@ LIGHTLOG = True #To disable some activation, log will be lighter, but less informations. SETTODEFAULT = False #To set device in default state after a rejoin +ENABLEMORESENSOR = False #Create more sensors, like tension and current + +SpecialDeviceList = ["orientation", "heatsetpoint", "mode", "preset", "lock", "current", "voltage"] #https://github.com/febalci/DomoticzEarthquake/blob/master/plugin.py #https://stackoverflow.com/questions/32436864/raw-post-request-with-json-in-body @@ -113,12 +104,6 @@ def onStart(self): Domoticz.Debug("onStart called") #CreateDevice('sirene test','En test','Warning device') - #try: - # Domoticz.Log("Heartbeat set to: " + Parameters["Mode4"]) - # Domoticz.Heartbeat(int(Parameters["Mode4"])) - #except: - # pass - #Check Domoticz IP if Parameters["Address"] != '127.0.0.1' and Parameters["Address"] != 'localhost': global DOMOTICZ_IP @@ -134,6 +119,10 @@ def onStart(self): if Parameters["Mode3"] != "0": Domoticz.Debugging(int(Parameters["Mode3"])) #DumpConfigToLog() + + if "ENABLEMORESENSOR" in Parameters["Mode4"]: + Domoticz.Status("Enabling special setting ENABLEMORESENSOR") + ENABLEMORESENSOR = True #Read banned devices try: @@ -276,6 +265,8 @@ def onCommand(self, Unit, Command, Level, Hue): _json['alert'] = 'lselect' #Force Update using domoticz, because some device don't have return UpdateDeviceProc({'nValue': 1, 'sValue': 'On'}, Unit) + elif device_type.startswith('Window covering'): + _json['open'] = False else: _json['on'] = True if Level: @@ -288,6 +279,8 @@ def onCommand(self, Unit, Command, Level, Hue): _json['alert'] = 'none' #Force Update using domoticz, because some device don't have return UpdateDeviceProc({'nValue': 0, 'sValue': 'Off'}, Unit) + elif device_type.startswith('Window covering'): + _json['open'] = True else: _json['on'] = False if _type == 'config': @@ -298,90 +291,93 @@ def onCommand(self, Unit, Command, Level, Hue): #level if Command == 'Set Level': - #To prevent bug - _json['on'] = True + if device_type.startswith('Window covering'): + _json['lift'] = Level + else: + #To prevent bug + _json['on'] = True - _json['bri'] = round(Level*254/100) - - #Special situation - if _type == 'config': - _json.clear() - #Thermostat - if Devices[Unit].DeviceID.endswith('_heatsetpoint'): - _json['heatsetpoint'] = int(Level * 100) - dummy,deCONZ_ID_2 = self.GetDevicedeCONZ(Devices[Unit].DeviceID.replace('_heatsetpoint','_mode')) - if deCONZ_ID_2 and ("auto" in Devices[Unit].Options.get('LevelNames','')): - _json['mode'] = "auto" - elif Devices[Unit].DeviceID.endswith('_preset'): - if Level == 10: - _json['preset'] = "holiday" - if Level == 20: - _json['preset'] = "auto" - if Level == 30: - _json['preset'] = "manual" - if Level == 40: - _json['preset'] = "comfort" - if Level == 50: - _json['preset'] = "eco" - if Level == 60: - _json['preset'] = "boost" - if Level == 70: - _json['preset'] = "complex" - if Level == 80: - _json['preset'] = "program" - elif Devices[Unit].DeviceID.endswith('_mode'): - if Level == 0: - _json['mode'] = "off" + _json['bri'] = round(Level*254/100) + + #Special situation + if _type == 'config': + _json.clear() + #Thermostat + if Devices[Unit].DeviceID.endswith('_heatsetpoint'): + _json['heatsetpoint'] = int(Level * 100) + dummy,deCONZ_ID_2 = self.GetDevicedeCONZ(Devices[Unit].DeviceID.replace('_heatsetpoint','_mode')) + if deCONZ_ID_2 and ("auto" in Devices[Unit].Options.get('LevelNames','')): + _json['mode'] = "auto" + elif Devices[Unit].DeviceID.endswith('_preset'): + if Level == 10: + _json['preset'] = "holiday" + if Level == 20: + _json['preset'] = "auto" + if Level == 30: + _json['preset'] = "manual" + if Level == 40: + _json['preset'] = "comfort" + if Level == 50: + _json['preset'] = "eco" + if Level == 60: + _json['preset'] = "boost" + if Level == 70: + _json['preset'] = "complex" + if Level == 80: + _json['preset'] = "program" + elif Devices[Unit].DeviceID.endswith('_mode'): + if Level == 0: + _json['mode'] = "off" + if Level == 10: + _json['mode'] = "heat" + if Level == 20: + _json['mode'] = "auto" + #retreive previous value from domoticz + IEEE2 = Devices[Unit].DeviceID.replace('_mode','_heatsetpoint') + Hp = int(100*float(Devices[GetDomoDeviceInfo(IEEE2)].sValue)) + _json['heatsetpoint'] = Hp + #Chritsmas tree + elif Devices[Unit].DeviceID.endswith('_effect'): + v = ["none","steady","snow","rainbow","snake","twinkle","fireworks","flag","waves","updown","vintage","fading","collide","strobe","sparkles","carnival","glow"][int(Level/10) - 1] + _json['effect'] = v + + UpdateDeviceProc({'nValue': Level, 'sValue': str(Level)}, Unit) + + #Set special options + try : + for o in Devices[Unit].Description.split("\n"): + o2 = o.split("=") + if o2[0] == 'effectSpeed': + _json['effectSpeed'] = int(o2[1]) + if o2[0] == 'effectColours': + _json['effectColours'] = json.loads(o2[1]) + + except: + Domoticz.Log("No special effect options") + + # Get light device + _type,deCONZ_ID = self.GetDevicedeCONZ(Devices[Unit].DeviceID.replace("_effect","")) + + #Special code to force devive update for group + elif _type == 'groups': + UpdateDeviceProc({'nValue': 1, 'sValue': str(Level)}, Unit) + + #Special devices + if device_type == 'Warning device': + #Heyman Siren + _json.clear() if Level == 10: - _json['mode'] = "heat" - if Level == 20: - _json['mode'] = "auto" - #retreive previous value from domoticz - IEEE2 = Devices[Unit].DeviceID.replace('_mode','_heatsetpoint') - Hp = int(100*float(Devices[GetDomoDeviceInfo(IEEE2)].sValue)) - _json['heatsetpoint'] = Hp - #Chritsmas tree - elif Devices[Unit].DeviceID.endswith('_effect'): - v = ["none","steady","snow","rainbow","snake","twinkle","fireworks","flag","waves","updown","vintage","fading","collide","strobe","sparkles","carnival","glow"][int(Level/10) - 1] - _json['effect'] = v + _json['alert'] = "select" + elif Level == 20: + _json['alert'] = "lselect" + elif Level == 30: + _json['alert'] = "blink" + else: + _json['alert'] = "none" + #Force Update using domoticz, because some device don't have return UpdateDeviceProc({'nValue': Level, 'sValue': str(Level)}, Unit) - #Set special options - try : - for o in Devices[Unit].Description.split("\n"): - o2 = o.split("=") - if o2[0] == 'effectSpeed': - _json['effectSpeed'] = int(o2[1]) - if o2[0] == 'effectColours': - _json['effectColours'] = json.loads(o2[1]) - - except: - Domoticz.Log("No special effect options") - - # Get light device - _type,deCONZ_ID = self.GetDevicedeCONZ(Devices[Unit].DeviceID.replace("_effect","")) - - #Special code to force devive update for group - elif _type == 'groups': - UpdateDeviceProc({'nValue': 1, 'sValue': str(Level)}, Unit) - - #Special devices - if device_type == 'Warning device': - #Heyman Siren - _json.clear() - if Level == 10: - _json['alert'] = "select" - elif Level == 20: - _json['alert'] = "lselect" - elif Level == 30: - _json['alert'] = "blink" - else: - _json['alert'] = "none" - - #Force Update using domoticz, because some device don't have return - UpdateDeviceProc({'nValue': Level, 'sValue': str(Level)}, Unit) - #Pach for special device if 'NO DIMMER' in Devices[Unit].Description and 'bri' in _json: _json.pop('bri') @@ -389,15 +385,7 @@ def onCommand(self, Unit, Command, Level, Hue): #Stop for shutter if Command == 'Stop': - _json = {'bri_inc':0} - - #Special part for shutter - #if self.Devices[IEEE]['model'] == 'Window covering device': - # previous_sate = Devices[Unit].nValue - # if _json['on'] == False and previous_sate == 0: - # _json = {'bri_inc':0} - # elif _json['on'] == True and previous_sate == 1: - # _json = {'bri_inc':0} + _json = {'stop':True} #color if Command == 'Set Color': @@ -705,9 +693,22 @@ def InitDomoticzDB(self,key,_Data,Type_device): self.CreateIfnotExist(IEEE + "_lock",'Door Lock',Name) #Create the current device self.CreateIfnotExist(IEEE,'ZHADoorLock',Name) + elif Model == 'ZHEMI101': # power and consumption on the same endpoint + self.CreateIfnotExist(IEEE,Type,Name,1) else: self.CreateIfnotExist(IEEE,Type,Name) + #Bonus sensor ? + if ENABLEMORESENSOR: + # Voltage sensor ? + if 'voltage' in StateList: + self.Devices[IEEE + "_voltage"] = {'id' : key , 'type' : 'config' , 'state' : 'working' , 'model' : 'ZHAPower_voltage' } + self.CreateIfnotExist(IEEE + "_voltage",'ZHAPower_voltage',Name) + # Current Sensor ? + if 'current' in StateList: + self.Devices[IEEE + "_current"] = {'id' : key , 'type' : 'config' , 'state' : 'working' , 'model' : 'ZHAPower_current' } + self.CreateIfnotExist(IEEE + "_current",'ZHAPower_current',Name) + #update if kwarg: UpdateDevice(key,Type_device,kwarg) @@ -742,9 +743,9 @@ def InitDomoticzDB(self,key,_Data,Type_device): if GetDomoDeviceInfo(Dev_name) == False: CreateDevice(Dev_name,Name,Type) - def CreateIfnotExist(self,__IEEE,__Type,Name): + def CreateIfnotExist(self, __IEEE, __Type, Name, opt = 0): if GetDomoDeviceInfo(__IEEE) == False: - CreateDevice(__IEEE,Name,__Type) + CreateDevice(__IEEE, Name, __Type, opt) def NormalConnexion(self,_Data): @@ -1230,11 +1231,7 @@ def UpdateDevice_Special(_id,_type,kwarg, field): kwarg2 = kwarg.copy() - if field == 'mode': - kwarg2['nValue'] = value - kwarg2['sValue'] = str(value) - - if field == 'preset': + if (field == 'mode') or (field == 'preset'): kwarg2['nValue'] = value kwarg2['sValue'] = str(value) @@ -1242,7 +1239,7 @@ def UpdateDevice_Special(_id,_type,kwarg, field): kwarg2['nValue'] = value[1] kwarg2['sValue'] = value[0] - else: + else: # used for voltage, current kwarg2['nValue'] = 0 kwarg2['sValue'] = str(value) @@ -1262,16 +1259,9 @@ def UpdateDevice(_id,_type,kwarg): return #Check for special device, and remove special kwarg - if 'orientation' in kwarg: - UpdateDevice_Special(_id,_type,kwarg,"orientation") - if 'heatsetpoint' in kwarg: - UpdateDevice_Special(_id,_type,kwarg,"heatsetpoint") - if 'mode' in kwarg: - UpdateDevice_Special(_id,_type,kwarg,"mode") - if 'preset' in kwarg: - UpdateDevice_Special(_id,_type,kwarg,"preset") - if 'lock' in kwarg: - UpdateDevice_Special(_id,_type,kwarg,"lock") + for d in SpecialDeviceList: + if d in kwarg: + UpdateDevice_Special(_id, _type, kwarg, d) #Update the device UpdateDeviceProc(kwarg,Unit) @@ -1279,18 +1269,11 @@ def UpdateDevice(_id,_type,kwarg): def UpdateDeviceProc(kwarg,Unit): #Do we need to update the sensor ? NeedUpdate = False - - if 'mode' in kwarg: - kwarg.pop('mode') - if 'preset' in kwarg: - kwarg.pop('preset') - if 'heatsetpoint' in kwarg: - kwarg.pop('heatsetpoint') - if 'orientation' in kwarg: - kwarg.pop('orientation') - if 'lock' in kwarg: - kwarg.pop('lock') - + + for d in SpecialDeviceList: + if d in kwarg: + kwarg.pop(d) + for a in kwarg: if kwarg[a] != getattr(Devices[Unit], a ): NeedUpdate = True @@ -1361,7 +1344,7 @@ def UpdateDeviceProc(kwarg,Unit): else: Domoticz.Debug("### Update device ("+Devices[Unit].Name+") : " + str(kwarg) + ", IGNORED , no changes !") -def CreateDevice(IEEE,_Name,_Type): +def CreateDevice(IEEE, _Name, _Type, opt = 0): kwarg = {} Unit = FreeUnit() TypeName = '' @@ -1479,16 +1462,22 @@ def CreateDevice(IEEE,_Name,_Type): elif _Type == 'ZHAConsumption':# in kWh #Device with only comsumption - if True: # if IEEE.endswith('0702'): + if opt == 0: kwarg['Type'] = 113 kwarg['Subtype'] = 0 kwarg['Switchtype'] = 0 - #Device with power and energy, not exist (yet) + #Device with power and energy else: kwarg['TypeName'] = 'kWh' elif _Type == 'ZHAPower':# in W kwarg['TypeName'] = 'Usage' + elif _Type == 'ZHAPower_voltage': + kwarg['Type'] = 243 + kwarg['Subtype'] = 8 + elif _Type == 'ZHAPower_current': + kwarg['Type'] = 243 + kwarg['Subtype'] = 23 elif _Type == 'ZHAVibration': kwarg['Type'] = 244