From 34ec571e1b39b22c9fe27cef2858ed41df6eaabb Mon Sep 17 00:00:00 2001 From: DewGew Date: Thu, 1 Feb 2024 14:43:40 +0100 Subject: [PATCH 1/8] Move aog.type before check device config --- modules/domoticz.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/modules/domoticz.py b/modules/domoticz.py index 83b9879..78116fd 100644 --- a/modules/domoticz.py +++ b/modules/domoticz.py @@ -116,8 +116,17 @@ def getAog(device, user_id=None): aog.type = 'action.devices.types.FAN' if device.get('Image') == 'Heating': aog.type = 'action.devices.types.HEATER' + + if domain in ['Temp', 'TempHumidity', 'TempHumidityBaro', 'DoorContact', 'Contact']: + aog.type = 'action.devices.types.SENSOR' if domain in ['Thermostat', 'Setpoint']: aog.type = 'action.devices.types.THERMOSTAT' + if domain in ['VenetianBlindsUS', 'VenetianBlindsEU', 'Blinds', 'BlindsStop', 'BlindsPercentage']: + aog.type = 'action.devices.types.BLINDS' + if domain in ['Selector']: + aog.type = 'action.devices.types.SWITCH' + if domain in ['DoorLock', 'DoorLockInverted']: + aog.type = 'action.devices.types.LOCK' # Try to get device specific voice control configuration from Domoticz aog.customData['dzTags'] = False @@ -221,11 +230,9 @@ def getAog(device, user_id=None): if domain == 'Dimmer': aog.traits.append('action.devices.traits.Brightness') if domain in ['DoorLock', 'DoorLockInverted']: - aog.type = 'action.devices.types.LOCK' aog.traits.append('action.devices.traits.LockUnlock') if domain in ['VenetianBlindsUS', 'VenetianBlindsEU', 'Blinds', 'BlindsStop', 'BlindsPercentage']: - aog.type = 'action.devices.types.BLINDS' aog.traits.append('action.devices.traits.OpenClose') if domain in ['VenetianBlindsUS', 'VenetianBlindsEU', 'BlindsStop']: aog.traits.append('action.devices.traits.StartStop') @@ -242,7 +249,6 @@ def getAog(device, user_id=None): 'temperatureMaxK': 6500} } if domain == 'Selector': - aog.type = 'action.devices.types.SWITCH' aog.traits.append('action.devices.traits.OnOff') aog.traits.append('action.devices.traits.Toggles') levelName = base64.b64decode(device.get("LevelNames")).decode('UTF-8').split("|") @@ -294,7 +300,6 @@ def getAog(device, user_id=None): # <-- Modes trait for selector not working yet if domain in ['Temp', 'TempHumidity', 'TempHumidityBaro']: - aog.type = 'action.devices.types.SENSOR' aog.traits.append('action.devices.traits.TemperatureSetting') aog.attributes = {'thermostatTemperatureUnit': dbsettings.tempunit, 'thermostatTemperatureRange': { @@ -323,7 +328,6 @@ def getAog(device, user_id=None): "occupancySensorType": "PIR", }]} if domain in ['DoorContact', 'Contact']: - aog.type = 'action.devices.types.SENSOR' aog.traits.append('action.devices.traits.OpenClose') aog.attributes = {'discreteOnlyOpenClose': True, 'queryOnlyOpenClose': True} From 76d7cae4d5b47ff26e9e24e3b976768cf24fd852 Mon Sep 17 00:00:00 2001 From: DewGew Date: Thu, 1 Feb 2024 14:56:28 +0100 Subject: [PATCH 2/8] Update devices.html --- templates/devices.html | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/templates/devices.html b/templates/devices.html index 1384805..4f99cb3 100644 --- a/templates/devices.html +++ b/templates/devices.html @@ -137,7 +137,7 @@
Description | {{ v['name']['name'] }}
{% endif %}
@@ -803,7 +804,7 @@
Other devices (not supported devices)Other devices (not supported devices) i").toggleClass('bi bi-chevron-compact-up') {% elif (v['customData']['domain'] not in ( - 'SmokeDetector', 'Security', 'VenetianBlindsEU', 'OnOff', 'VenetianBlindsUS', 'Doorbell', 'DoorLock', 'DoorLockInverted', 'DoorContact', 'BlindsPercentage', + 'SmokeDetector', 'Security', 'VenetianBlindsEU', 'OnOff', 'VenetianBlindsUS', 'Doorbell', 'DoorLock', 'DoorLockInverted', 'DoorContact', 'BlindsStop', 'BlindsPercentage', 'MotionSensor', 'PushOnButton', 'PushOffButton', 'Contact') and 'Hidden' not in v['customData']['domain']) %} updateOthers_block.push("{{ v['customData']['idx'] }}") $('#title_other').show() From 870f1346e2134d2ae201c0858a7c434e4fbcc15f Mon Sep 17 00:00:00 2001 From: DewGew Date: Thu, 1 Feb 2024 15:46:40 +0100 Subject: [PATCH 4/8] Bigger button for blinds on mobile view --- templates/dashboard.html | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/templates/dashboard.html b/templates/dashboard.html index 2a84428..4084f38 100644 --- a/templates/dashboard.html +++ b/templates/dashboard.html @@ -217,13 +217,20 @@
Device log | {{ v['name']['name'] }}
Not available
{{ v['name']['name'] }}
{% if v['customData']['domain'] in ['VenetianBlindsUS', 'VenetianBlindsEU', 'Blinds', 'BlindsStop'] %} -
+
{% if v['customData']['domain'] != 'Blinds' %} {% endif %}
+
+ + {% if v['customData']['domain'] != 'Blinds' %} + + {% endif %} + +
{% endif %} {% if v['customData']['domain'] in ['BlindsStop', 'BlindsPercentage'] %} From d6cd5e013618f8ffb70b4fc6a4cafedfe16f56f8 Mon Sep 17 00:00:00 2001 From: DewGew Date: Fri, 2 Feb 2024 08:10:09 +0100 Subject: [PATCH 5/8] Updated device type selection --- templates/devices.html | 54 +++++++++++++++++++++++++++++++++--------- 1 file changed, 43 insertions(+), 11 deletions(-) diff --git a/templates/devices.html b/templates/devices.html index 4f99cb3..4d03936 100644 --- a/templates/devices.html +++ b/templates/devices.html @@ -137,7 +137,7 @@
Description | {{ v['name']['name'] }}
From 43ca098647ed11899de47e1b49ea2530adda31dd Mon Sep 17 00:00:00 2001 From: DewGew Date: Fri, 2 Feb 2024 08:36:27 +0100 Subject: [PATCH 6/8] Update devices.html --- templates/devices.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/templates/devices.html b/templates/devices.html index 4d03936..5bd6bdf 100644 --- a/templates/devices.html +++ b/templates/devices.html @@ -149,6 +149,8 @@
Description | {{ v['name']['name'] }}
{% elif v['customData']['domain'] == 'Camera' %} + {% elif v['customData']['domain'] == 'Group' %} + {% elif v['customData']['domain'] in ['Thermostat', 'Setpoint'] %} From 224874b92a1cb5aaee08afe92d0858678a066788 Mon Sep 17 00:00:00 2001 From: DewGew Date: Fri, 2 Feb 2024 10:14:03 +0100 Subject: [PATCH 7/8] Update devices.html --- templates/devices.html | 37 ++++++++++++++++++------------------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/templates/devices.html b/templates/devices.html index 5bd6bdf..56b5601 100644 --- a/templates/devices.html +++ b/templates/devices.html @@ -81,7 +81,7 @@
Description | {{ v['name']['name'] }}
{% if v['customData']['dzTags'] %} {% endif %} @@ -130,7 +130,8 @@
Description | {{ v['name']['name'] }}
- (Add like this: Celinglamp, kitchen lamp) + +
Add like this: Celinglamp, kitchen lamp.
@@ -149,7 +150,7 @@
Description | {{ v['name']['name'] }}
{% elif v['customData']['domain'] == 'Camera' %} - {% elif v['customData']['domain'] == 'Group' %} + {% elif v['customData']['domain'] == 'Group' %} {% elif v['customData']['domain'] in ['Thermostat', 'Setpoint'] %} @@ -252,8 +253,8 @@
Description | {{ v['name']['name'] }}
{% if v['customData']['domain'] in ['Thermostat', 'Setpoint'] %}
-
- {% for n, p in devices.items() %} {% if 'Temp' in n %} @@ -261,17 +262,15 @@
Description | {{ v['name']['name'] }}
{% endif %} {% endfor %} -
-
- Get temperature from another device +
Get temperature from another device.
{% endif %} {% if v['customData']['domain'] in ['Thermostat', 'Setpoint'] %} -
+
-
- {% for n, p in devices.items() %} {% if 'Selector' in n %} @@ -279,9 +278,7 @@
Description | {{ v['name']['name'] }}
{% endif %} {% endfor %} -
-
- Get thermostat modes from another device. Supports levelnames: 'off', 'heat', 'cool', 'auto', 'fan-only', 'purifier', 'eco', 'dry' +
Get thermostat modes from another device. Supports levelnames: 'off', 'heat', 'cool', 'auto', 'fan-only', 'purifier', 'eco', 'dry'
{% endif %} @@ -290,16 +287,18 @@
Description | {{ v['name']['name'] }}
- -
(Add levels like this: home, armed home) + +
Add levels like this: home, armed home
+
- -
(Add levels like this: away, armed away) + +
Add levels like this: away, armed away
+
{% endif %}
- Sync devices after saving for the changes to take effect + Sync devices after saving for the changes to take effect
Its possible to change several devices before syncing devices
From 4ff87f7cf532b35f8daabe31a1c2c519f86f780c Mon Sep 17 00:00:00 2001 From: DewGew Date: Fri, 2 Feb 2024 12:01:07 +0100 Subject: [PATCH 8/8] Update VERSION.md --- VERSION.md | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/VERSION.md b/VERSION.md index 07dc1a9..f61208c 100644 --- a/VERSION.md +++ b/VERSION.md @@ -1,5 +1,6 @@ -24.5 -- Fix for blinds graphics in UI -- Fixes Lighting 4 devices -- Added battery level on dashboard devices -- Added Enerygystorgae trait uses to check battery level +24.6 +- Fixed "Deprecated RType () for API request" error +- Fixed camerastream not working +- Add Security device +- UI improvments +- Add more selectable device types