From 47926959555e124e6e9d298e73fb99dc33b37711 Mon Sep 17 00:00:00 2001
From: DewGew <pierlar@hotmail.com>
Date: Wed, 31 Jan 2024 08:42:00 +0100
Subject: [PATCH 01/10] Add Batterylevel on dashboard devices

---
 templates/dashboard.html | 56 ++++++++++++++++++++++++++++++----------
 1 file changed, 42 insertions(+), 14 deletions(-)

diff --git a/templates/dashboard.html b/templates/dashboard.html
index 030d747..4f308f3 100644
--- a/templates/dashboard.html
+++ b/templates/dashboard.html
@@ -115,7 +115,9 @@ <h5 id="title_switches">Switches</h5>
 						</div>
 					  </div><!-- End Vertically centered Modal-->
 					<div class="card-footer col-sm-12">
-					 <small class="float-start" style="font-size: x-small;" id="lastUpdate_{{ v['customData']['idx'] }}">Not available</small><i class="bi bi-bar-chart-fill float-end" onClick="getLigthLog({{ v['customData']['idx'] }})" data-bs-toggle="modal" data-bs-target="#light-log_{{ v['customData']['idx'] }}" style="font-size: x-small;"></i>
+					 <small class="float-start" style="font-size: x-small;" id="lastUpdate_{{ v['customData']['idx'] }}">Not available</small>
+					 <small class="bi bi-bar-chart-fill float-end" onClick="getLigthLog({{ v['customData']['idx'] }})" data-bs-toggle="modal" data-bs-target="#light-log_{{ v['customData']['idx'] }}" style="font-size: x-small;"></small>
+					 <small class="float-end" style="font-size: x-small;" id="batteryLevel_{{ v['customData']['idx'] }}"></small>
 					 <div class="modal fade" id="light-log_{{ v['customData']['idx'] }}" tabindex="-1">
 						<div class="modal-dialog modal-dialog-centered modal-lg">
 						  <div class="modal-content">
@@ -140,7 +142,9 @@ <h5 class="card-title">Device log <span>| {{ v['name']['name'] }}</span></h5>
 					<i class="material-symbols-outlined" id="icon_{{ v['customData']['idx'] }}">doorbell_3p</i>
 					<div class="label">{{ v['name']['name'] }}</div>
 					<div class="card-footer col-sm-12">
-					 <small class="float-start" style="font-size: x-small;" id="lastUpdate_{{ v['customData']['idx'] }}">Not available</small><i class="bi bi-bar-chart-fill float-end" onClick="getLigthLog({{ v['customData']['idx'] }})" data-bs-toggle="modal" data-bs-target="#light-log_{{ v['customData']['idx'] }}" style="font-size: x-small;"></i>
+					 <small class="float-start" style="font-size: x-small;" id="lastUpdate_{{ v['customData']['idx'] }}">Not available</small>
+					 <small class="bi bi-bar-chart-fill float-end" onClick="getLigthLog({{ v['customData']['idx'] }})" data-bs-toggle="modal" data-bs-target="#light-log_{{ v['customData']['idx'] }}" style="font-size: x-small;"></small>
+					 <small class="float-end" style="font-size: x-small;" id="batteryLevel_{{ v['customData']['idx'] }}"></small>
 					 <div class="modal fade" id="light-log_{{ v['customData']['idx'] }}" tabindex="-1">
 						<div class="modal-dialog modal-dialog-centered modal-lg">
 						  <div class="modal-content">
@@ -185,7 +189,9 @@ <h5 class="card-title">Device log <span>| {{ v['name']['name'] }}</span></h5>
 						</div>
 					  </div><!-- End Vertically centered Modal-->
 					 <div class="card-footer col-sm-12">
-					 <small class="float-start" style="font-size: x-small;" id="lastUpdate_{{ v['customData']['idx'] }}">Not available</small><i class="bi bi-bar-chart-fill float-end" onClick="getLigthLog({{ v['customData']['idx'] }})" data-bs-toggle="modal" data-bs-target="#light-log_{{ v['customData']['idx'] }}" style="font-size: x-small;"></i>
+					 <small class="float-start" style="font-size: x-small;" id="lastUpdate_{{ v['customData']['idx'] }}">Not available</small>
+					 <small class="bi bi-bar-chart-fill float-end" onClick="getLigthLog({{ v['customData']['idx'] }})" data-bs-toggle="modal" data-bs-target="#light-log_{{ v['customData']['idx'] }}" style="font-size: x-small;"></small>
+					 <small class="float-end" style="font-size: x-small;" id="batteryLevel_{{ v['customData']['idx'] }}"></small>
 					 <div class="modal fade" id="light-log_{{ v['customData']['idx'] }}" tabindex="-1">
 						<div class="modal-dialog modal-dialog-centered modal-lg">
 						  <div class="modal-content">
@@ -222,7 +228,9 @@ <h5 class="card-title">Device log <span>| {{ v['name']['name'] }}</span></h5>
 					<input id="slider_{{ v['customData']['idx'] }}" type="range" min="0" max="100" step="1" onchange="changeDimmers({{ v['customData']['idx'] }}, this.value)">
 					{% endif %}
 					<div class="card-footer col-sm-12">
-					 <small class="float-start" style="font-size: x-small;" id="lastUpdate_{{ v['customData']['idx'] }}">Not available</small><i class="bi bi-bar-chart-fill float-end" onClick="getLigthLog({{ v['customData']['idx'] }})" data-bs-toggle="modal" data-bs-target="#light-log_{{ v['customData']['idx'] }}" style="font-size: x-small;"></i>
+					 <small class="float-start" style="font-size: x-small;" id="lastUpdate_{{ v['customData']['idx'] }}">Not available</small>
+					 <small class="bi bi-bar-chart-fill float-end" onClick="getLigthLog({{ v['customData']['idx'] }})" data-bs-toggle="modal" data-bs-target="#light-log_{{ v['customData']['idx'] }}" style="font-size: x-small;"></small>
+					 <small class="float-end" style="font-size: x-small;" id="batteryLevel_{{ v['customData']['idx'] }}"></small>
 					 <div class="modal fade" id="light-log_{{ v['customData']['idx'] }}" tabindex="-1">
 						<div class="modal-dialog modal-dialog-centered modal-lg">
 						  <div class="modal-content">
@@ -287,7 +295,9 @@ <h5 class="card-title">Device log <span>| {{ v['name']['name'] }}</span></h5>
 						</div>
 					  </div><!-- End Vertically centered Modal-->
 					<div class="card-footer col-sm-12">
-					 <small class="float-start" style="font-size: x-small;" id="lastUpdate_{{ v['customData']['idx'] }}">Not available</small><i class="bi bi-bar-chart-fill float-end" onClick="getLigthLog({{ v['customData']['idx'] }})" data-bs-toggle="modal" data-bs-target="#light-log_{{ v['customData']['idx'] }}" style="font-size: x-small;"></i>
+					 <small class="float-start" style="font-size: x-small;" id="lastUpdate_{{ v['customData']['idx'] }}">Not available</small>
+					 <small class="bi bi-bar-chart-fill float-end" onClick="getLigthLog({{ v['customData']['idx'] }})" data-bs-toggle="modal" data-bs-target="#light-log_{{ v['customData']['idx'] }}" style="font-size: x-small;"></small>
+					 <small class="float-end" style="font-size: x-small;" id="batteryLevel_{{ v['customData']['idx'] }}"></small>
 					 <div class="modal fade" id="light-log_{{ v['customData']['idx'] }}" tabindex="-1">
 						<div class="modal-dialog modal-dialog-centered modal-lg">
 						  <div class="modal-content">
@@ -317,7 +327,9 @@ <h5 class="card-title">Device log <span>| {{ v['name']['name'] }}</span></h5>
 					<input id="slider_{{ v['customData']['idx'] }}" type="range" min="0" max="100" step="1" onchange="changeDimmers({{ v['customData']['idx'] }}, this.value)">
 					<input type="color" class="form-control form-control-color" id="rgb_{{ v['customData']['idx'] }}" value="#4154f1" title="Choose your color" onchange="changeRGB({{ v['customData']['idx'] }}, this.value)">
 					<div class="card-footer col-sm-12">
-					 <small class="float-start" style="font-size: x-small;" id="lastUpdate_{{ v['customData']['idx'] }}">Not available</small><i class="bi bi-bar-chart-fill float-end" onClick="getLigthLog({{ v['customData']['idx'] }})" data-bs-toggle="modal" data-bs-target="#light-log_{{ v['customData']['idx'] }}" style="font-size: x-small;"></i>
+					 <small class="float-start" style="font-size: x-small;" id="lastUpdate_{{ v['customData']['idx'] }}">Not available</small>
+					 <small class="bi bi-bar-chart-fill float-end" onClick="getLigthLog({{ v['customData']['idx'] }})" data-bs-toggle="modal" data-bs-target="#light-log_{{ v['customData']['idx'] }}" style="font-size: x-small;"></small>
+					 <small class="float-end" style="font-size: x-small;" id="batteryLevel_{{ v['customData']['idx'] }}"></small>
 					 <div class="modal fade" id="light-log_{{ v['customData']['idx'] }}" tabindex="-1">
 						<div class="modal-dialog modal-dialog-centered modal-lg">
 						  <div class="modal-content">
@@ -371,7 +383,9 @@ <h5 class="card-title">Device log <span>| {{ v['name']['name'] }}</span></h5>
 						</div>
 					  </div><!-- End Vertically centered Modal-->
 					<div class="card-footer col-sm-12">
-					 <small class="float-start" style="font-size: x-small;" id="lastUpdate_{{ v['customData']['idx'] }}">Not available</small><i class="bi bi-bar-chart-fill float-end" onClick="getLigthLog({{ v['customData']['idx'] }})" data-bs-toggle="modal" data-bs-target="#light-log_{{ v['customData']['idx'] }}" style="font-size: x-small;"></i>
+					 <small class="float-start" style="font-size: x-small;" id="lastUpdate_{{ v['customData']['idx'] }}">Not available</small>
+					 <small class="bi bi-bar-chart-fill float-end" onClick="getLigthLog({{ v['customData']['idx'] }})" data-bs-toggle="modal" data-bs-target="#light-log_{{ v['customData']['idx'] }}" style="font-size: x-small;"></small>
+					 <small class="float-end" style="font-size: x-small;" id="batteryLevel_{{ v['customData']['idx'] }}"></small>
 					 <div class="modal fade" id="light-log_{{ v['customData']['idx'] }}" tabindex="-1">
 						<div class="modal-dialog modal-dialog-centered modal-lg">
 						  <div class="modal-content">
@@ -397,7 +411,9 @@ <h5 class="card-title">Device log <span>| {{ v['name']['name'] }}</span></h5>
 					<div class="label">{{ v['name']['name'] }}</div>
 					<small id="data_{{ v['customData']['idx'] }}">Not available</small>
 					<div class="card-footer col-sm-12">
-					 <small class="float-start" style="font-size: x-small;" id="lastUpdate_{{ v['customData']['idx'] }}">Not available</small><i class="bi bi-bar-chart-fill float-end" onClick="getLigthLog({{ v['customData']['idx'] }})" data-bs-toggle="modal" data-bs-target="#light-log_{{ v['customData']['idx'] }}" style="font-size: x-small;"></i>
+					 <small class="float-start" style="font-size: x-small;" id="lastUpdate_{{ v['customData']['idx'] }}">Not available</small>
+					 <small class="bi bi-bar-chart-fill float-end" onClick="getLigthLog({{ v['customData']['idx'] }})" data-bs-toggle="modal" data-bs-target="#light-log_{{ v['customData']['idx'] }}" style="font-size: x-small;"></small>
+					 <small class="float-end" style="font-size: x-small;" id="batteryLevel_{{ v['customData']['idx'] }}"></small>
 					 <div class="modal fade" id="light-log_{{ v['customData']['idx'] }}" tabindex="-1">
 						<div class="modal-dialog modal-dialog-centered modal-lg">
 						  <div class="modal-content">
@@ -442,7 +458,9 @@ <h5 class="card-title">Device log <span>| {{ v['name']['name'] }}</span></h5>
 						</div>
 					  </div><!-- End Vertically centered Modal-->
 					<div class="card-footer col-sm-12">
-					 <small class="float-start" style="font-size: x-small;" id="lastUpdate_{{ v['customData']['idx'] }}">Not available</small><i class="bi bi-bar-chart-fill float-end" onClick="getLigthLog({{ v['customData']['idx'] }})" data-bs-toggle="modal" data-bs-target="#light-log_{{ v['customData']['idx'] }}" style="font-size: x-small;"></i>
+					 <small class="float-start" style="font-size: x-small;" id="lastUpdate_{{ v['customData']['idx'] }}">Not available</small>
+					 <small class="bi bi-bar-chart-fill float-end" onClick="getLigthLog({{ v['customData']['idx'] }})" data-bs-toggle="modal" data-bs-target="#light-log_{{ v['customData']['idx'] }}" style="font-size: x-small;"></small>
+					 <small class="float-end" style="font-size: x-small;" id="batteryLevel_{{ v['customData']['idx'] }}"></small>
 					 <div class="modal fade" id="light-log_{{ v['customData']['idx'] }}" tabindex="-1">
 						<div class="modal-dialog modal-dialog-centered modal-lg">
 						  <div class="modal-content">
@@ -477,7 +495,9 @@ <h5 id="title_temps">Thermostats/Temperatures</h5>
 					 <small id="data_{{ v['customData']['idx'] }}">Not available</small>
 					<div class="label">{{ v['name']['name'] }}</div>
 					<div class="card-footer col-sm-12">
-					 <small class="float-start" style="font-size: x-small;" id="lastUpdate_{{ v['customData']['idx'] }}">Not available</small><i class="bi bi-bar-chart-fill float-end" onClick="getlog('domoticz-chart-block_{{ v['customData']['idx'] }}', '{{ v['customData']['idx'] }}', '{{ v['name']['name'] }}', 'month');" data-bs-toggle="modal" data-bs-target="#temp-chart_{{ v['customData']['idx'] }}" style="font-size: x-small;"></i>
+					 <small class="float-start" style="font-size: x-small;" id="lastUpdate_{{ v['customData']['idx'] }}">Not available</small>
+					 <small class="bi bi-bar-chart-fill float-end" onClick="getlog('domoticz-chart-block_{{ v['customData']['idx'] }}', '{{ v['customData']['idx'] }}', '{{ v['name']['name'] }}', 'month');" data-bs-toggle="modal" data-bs-target="#temp-chart_{{ v['customData']['idx'] }}" style="font-size: x-small;"></small>
+					 <small class="float-end" style="font-size: x-small;" id="batteryLevel_{{ v['customData']['idx'] }}"></small>
 					</div>
 					<div class="modal fade" id="temp-chart_{{ v['customData']['idx'] }}" tabindex="-1">
 						<div class="modal-dialog modal-dialog-centered modal-lg">
@@ -556,7 +576,9 @@ <h5 class="card-title">Temperature Chart <span>| {{ v['name']['name'] }}</span><
 						</div>
 					  </div><!-- End Vertically centered Modal-->
 					<div class="card-footer col-sm-12">
-					 <small class="float-start" style="font-size: x-small;" id="lastUpdate_{{ v['customData']['idx'] }}">Not available</small><i class="bi bi-bar-chart-fill float-end" onClick="getlog('domoticz-chart-block_{{ v['customData']['idx'] }}', '{{ v['customData']['idx'] }}', '{{ v['name']['name'] }}', 'month');" data-bs-toggle="modal" data-bs-target="#temp-chart_{{ v['customData']['idx'] }}" style="font-size: x-small;"></i>
+					 <small class="float-start" style="font-size: x-small;" id="lastUpdate_{{ v['customData']['idx'] }}">Not available</small>
+					 <small class="bi bi-bar-chart-fill float-end" onClick="getlog('domoticz-chart-block_{{ v['customData']['idx'] }}', '{{ v['customData']['idx'] }}', '{{ v['name']['name'] }}', 'month');" data-bs-toggle="modal" data-bs-target="#temp-chart_{{ v['customData']['idx'] }}" style="font-size: x-small;"></small>
+					 <small class="float-end" style="font-size: x-small;" id="batteryLevel_{{ v['customData']['idx'] }}"></small>
 					</div>
 					<div class="modal fade" id="temp-chart_{{ v['customData']['idx'] }}" tabindex="-1">
 						<div class="modal-dialog modal-dialog-centered modal-lg">
@@ -626,7 +648,9 @@ <h5 id="title_security">Security devices</h5>
 						</div>
 					  </div><!-- End Vertically centered Modal-->
 					<div class="card-footer col-sm-12">
-					 <small class="float-start" style="font-size: x-small;" id="lastUpdate_{{ v['customData']['idx'] }}">Not available</small><i class="bi bi-bar-chart-fill float-end" onClick="getLigthLog({{ v['customData']['idx'] }})" data-bs-toggle="modal" data-bs-target="#light-log_{{ v['customData']['idx'] }}" style="font-size: x-small;"></i>
+					 <small class="float-start" style="font-size: x-small;" id="lastUpdate_{{ v['customData']['idx'] }}">Not available</small>
+					 <small class="bi bi-bar-chart-fill float-end" onClick="getLigthLog({{ v['customData']['idx'] }})" data-bs-toggle="modal" data-bs-target="#light-log_{{ v['customData']['idx'] }}" style="font-size: x-small;"></small>
+					 <small class="float-end" style="font-size: x-small;" id="batteryLevel_{{ v['customData']['idx'] }}"></small>
 					 <div class="modal fade" id="light-log_{{ v['customData']['idx'] }}" tabindex="-1">
 						<div class="modal-dialog modal-dialog-centered modal-lg">
 						  <div class="modal-content">
@@ -653,7 +677,9 @@ <h5 class="card-title">Device log <span>| {{ v['name']['name'] }}</span></h5>
 					<div class="label">{{ v['name']['name'] }}</div>
 					<small id="data_smoke_{{ v['customData']['idx'] }}">Not available</small>
 					<div class="card-footer col-sm-12">
-					 <small class="float-start" style="font-size: x-small;" id="lastUpdate_{{ v['customData']['idx'] }}">Not available</small><i class="bi bi-bar-chart-fill float-end" onClick="getLigthLog({{ v['customData']['idx'] }})" data-bs-toggle="modal" data-bs-target="#light-log_{{ v['customData']['idx'] }}" style="font-size: x-small;"></i>
+					 <small class="float-start" style="font-size: x-small;" id="lastUpdate_{{ v['customData']['idx'] }}">Not available</small>
+					 <small class="bi bi-bar-chart-fill float-end" onClick="getLigthLog({{ v['customData']['idx'] }})" data-bs-toggle="modal" data-bs-target="#light-log_{{ v['customData']['idx'] }}" style="font-size: x-small;"></small>
+					 <small class="float-end" style="font-size: x-small;" id="batteryLevel_{{ v['customData']['idx'] }}"></small>
 					 <div class="modal fade" id="light-log_{{ v['customData']['idx'] }}" tabindex="-1">
 						<div class="modal-dialog modal-dialog-centered modal-lg">
 						  <div class="modal-content">
@@ -679,7 +705,9 @@ <h5 class="card-title">Device log <span>| {{ v['name']['name'] }}</span></h5>
 					<div class="label">{{ v['name']['name'] }}</div>
 					<small id="data_motion_{{ v['customData']['idx'] }}">Not available</small>
 					<div class="card-footer col-sm-12">
-					 <small class="float-start" style="font-size: x-small;" id="lastUpdate_{{ v['customData']['idx'] }}">Not available</small><i class="bi bi-bar-chart-fill float-end" onClick="getLigthLog({{ v['customData']['idx'] }})" data-bs-toggle="modal" data-bs-target="#light-log_{{ v['customData']['idx'] }}" style="font-size: x-small;"></i>
+					 <small class="float-start" style="font-size: x-small;" id="lastUpdate_{{ v['customData']['idx'] }}">Not available</small>
+					 <small class="bi bi-bar-chart-fill float-end" onClick="getLigthLog({{ v['customData']['idx'] }})" data-bs-toggle="modal" data-bs-target="#light-log_{{ v['customData']['idx'] }}" style="font-size: x-small;"></small>
+					 <small class="float-end" style="font-size: x-small;" id="batteryLevel_{{ v['customData']['idx'] }}"></small>
 					 <div class="modal fade" id="light-log_{{ v['customData']['idx'] }}" tabindex="-1">
 						<div class="modal-dialog modal-dialog-centered modal-lg">
 						  <div class="modal-content">

From 5f0e860d9776be879c8517ee383a47a5dcb40b9c Mon Sep 17 00:00:00 2001
From: DewGew <pierlar@hotmail.com>
Date: Wed, 31 Jan 2024 08:46:12 +0100
Subject: [PATCH 02/10] Add BatteryLevel

---
 static/js/smarthome.js | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/static/js/smarthome.js b/static/js/smarthome.js
index 073c9cc..ef37a46 100644
--- a/static/js/smarthome.js
+++ b/static/js/smarthome.js
@@ -67,9 +67,14 @@ function refreshTemp(updateTemp) {
 			var temp = jsonData.result[0].Temp;
 			var setpoint = jsonData.result[0].SetPoint
 			var lastUpdate = jsonData.result[0].LastUpdate
+			var batterylevel = jsonData.result[0].BatteryLevel
 			if (lastUpdate != null){ 
 				$('#lastUpdate_' + idx).html(moment(lastUpdate).fromNow())
 			}
+			if (batterylevel != 255){
+				$('#batteryLevel_' + idx).addClass('bi bi-battery-full')
+				$('#batteryLevel_' + idx).html(batterylevel + '%&nbsp;')
+			};
 			$('button[id="switch_' + idx + '"]').html(data)
 			$('#data_'+ idx).html(data)
 			$('#actual_data_'+ idx).html(temp)
@@ -87,9 +92,14 @@ function refreshSwitches(updateSwitches) {
 		requestAPI(url).then(jsonData => {
 			var data = jsonData.result[0].Data;
 			var lastUpdate = jsonData.result[0].LastUpdate
+			var batterylevel = jsonData.result[0].BatteryLevel
 			if (lastUpdate != null){
 				$('#lastUpdate_' + idx).html(moment(lastUpdate).fromNow())
 			};
+			if (batterylevel != 255){
+				$('#batteryLevel_' + idx).addClass('bi bi-battery-full')
+				$('#batteryLevel_' + idx).html(batterylevel + '%&nbsp;')
+			};
 			$('button[id="switch_' + idx + '"]').html(data);
 			$('#data_' + idx).html(data);
 
@@ -149,6 +159,11 @@ function refreshSelectors(updateSelector) {
 			if (lastUpdate != null){
 				$('#lastUpdate_' + idx).html(moment(lastUpdate).fromNow())
 			}
+			var batterylevel = jsonData.result[0].BatteryLevel
+			if (batterylevel != 255){
+				$('#batteryLevel_' + idx).addClass('bi bi-battery-full')
+				$('#batteryLevel_' + idx).html(batterylevel + '%&nbsp;')
+			};
 			btns = decodeBase64(levelnames).split('|');
 			$.each(btns, function (i, lvlname) {
 				if (i != '0') {

From cfa5d57eec035d6aec27aa6c17c78d67a73eec9c Mon Sep 17 00:00:00 2001
From: DewGew <pierlar@hotmail.com>
Date: Wed, 31 Jan 2024 08:56:37 +0100
Subject: [PATCH 03/10] Add report low battery level

---
 modules/trait.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/modules/trait.py b/modules/trait.py
index ff5e53d..9839fb3 100644
--- a/modules/trait.py
+++ b/modules/trait.py
@@ -126,6 +126,9 @@ def query(custom_data, device, user_id):
             response["currentArmLevel"] = state['Data']
 
     response['online'] = True
+    if state['BatteryLevel'] != 255:
+        if state['BatteryLevel'] <= 10: # Report low battery below 10%
+            response['exceptionCode'] = 'lowBattery'
 
     return response
 
@@ -251,7 +254,8 @@ def execute(device, command, params, user_id, challenge):
             response['online'] = True
             return response
         else:
-            return {"status": "ERROR", "errorCode": "streamUnavailable"}
+            raise SmartHomeError('streamUnavailable',
+                             'Unable to execute {} for {}'.format(command, device['id']))
 
     if command == 'action.devices.commands.ArmDisarm':
 

From 1e416a25d8da0bafd28f398b7228ca26f3bc3496 Mon Sep 17 00:00:00 2001
From: DewGew <pierlar@hotmail.com>
Date: Wed, 31 Jan 2024 09:45:20 +0100
Subject: [PATCH 04/10] Add energystorage trait to check batterylevel

---
 modules/domoticz.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/modules/domoticz.py b/modules/domoticz.py
index 172992b..5d00fa4 100644
--- a/modules/domoticz.py
+++ b/modules/domoticz.py
@@ -168,7 +168,7 @@ def getAog(device, user_id=None):
     aog.customData['idx'] = device.get('idx')
     aog.customData['domain'] = domain
     aog.customData['protected'] = device.get('Protected')
-    aog.notificationSupportedByAgent = (True if domain in ['SmokeDetector', 'Doorbell', 'DoorLock', 'DoorLockInverted'] else False)
+    aog.notificationSupportedByAgent = (True if domain in ['SmokeDetector', 'Doorbell', 'DoorLock', 'DoorLockInverted'] else False)       
 
     if domain == 'Scene':
         aog.type = 'action.devices.types.SCENE'
@@ -342,6 +342,12 @@ def getAog(device, user_id=None):
             ],
             'cameraStreamNeedAuthToken': False
         }
+    
+    batteryLevel = device.get('BatteryLevel')
+    if domain not in ['Group', 'Scene'] and batteryLevel != 255:
+        aog.traits.append('action.devices.traits.EnergyStorage')
+        aog.attributes['queryOnlyEnergyStorage'] = True
+        aog.attributes['isRechargeable'] = False
 
     return aog
 

From 05a489d3e70e2315b62c79df0e6af1b3ebb22625 Mon Sep 17 00:00:00 2001
From: DewGew <pierlar@hotmail.com>
Date: Wed, 31 Jan 2024 09:46:12 +0100
Subject: [PATCH 05/10] Adde energystorage to check batterylevel

---
 modules/trait.py | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/modules/trait.py b/modules/trait.py
index 9839fb3..bb29b9e 100644
--- a/modules/trait.py
+++ b/modules/trait.py
@@ -124,9 +124,31 @@ def query(custom_data, device, user_id):
         response["isArmed"] = state['Data'] != "Normal"
         if response["isArmed"]:
             response["currentArmLevel"] = state['Data']
+            
+    if 'action.devices.traits.EnergyStorage' in device['traits']:
+        if state['BatteryLevel'] != 255:
+            battery = state['BatteryLevel']
+            if battery is not None:
+                if battery == 100:
+                    descriptive_capacity_remaining = "FULL"
+                elif 75 <= battery < 100:
+                    descriptive_capacity_remaining = "HIGH"
+                elif 25 <= battery < 75:
+                    descriptive_capacity_remaining = "MEDIUM"
+                elif 10 <= battery < 25:
+                    descriptive_capacity_remaining = "LOW"
+                elif 0 <= battery < 10:
+                    descriptive_capacity_remaining = "CRITICALLY_LOW"
+                    
+                response['descriptiveCapacityRemaining'] = descriptive_capacity_remaining
+                response['capacityRemaining'] = [{
+                    'unit': 'PERCENTAGE',
+                    'rawValue': battery
+                }]
+            
 
     response['online'] = True
-    if state['BatteryLevel'] != 255:
+    if domain not in ['Group', 'Scene'] and state['BatteryLevel'] != 255:
         if state['BatteryLevel'] <= 10: # Report low battery below 10%
             response['exceptionCode'] = 'lowBattery'
 

From 2432bf6b4546a1248d0ff904ff28e42e496fb8ec Mon Sep 17 00:00:00 2001
From: DewGew <pierlar@hotmail.com>
Date: Wed, 31 Jan 2024 09:58:38 +0100
Subject: [PATCH 06/10] Add batterylevel on dashboard devices

---
 static/js/smarthome.js | 38 +++++++++++++++++++++++++++++++++++++-
 1 file changed, 37 insertions(+), 1 deletion(-)

diff --git a/static/js/smarthome.js b/static/js/smarthome.js
index ef37a46..8ad4834 100644
--- a/static/js/smarthome.js
+++ b/static/js/smarthome.js
@@ -73,6 +73,14 @@ function refreshTemp(updateTemp) {
 			}
 			if (batterylevel != 255){
 				$('#batteryLevel_' + idx).addClass('bi bi-battery-full')
+				if (batterylevel <= 50){
+					$('#batteryLevel_' + idx).removeClass('bi bi-battery-full')
+					$('#batteryLevel_' + idx).addClass('bi bi-battery-half')
+				}
+				if (batterylevel <= 15){
+					$('#batteryLevel_' + idx).removeClass('bi bi-battery-full')
+					$('#batteryLevel_' + idx).addClass('bi bi-battery').css('color','#ED2939')
+				}
 				$('#batteryLevel_' + idx).html(batterylevel + '%&nbsp;')
 			};
 			$('button[id="switch_' + idx + '"]').html(data)
@@ -98,6 +106,14 @@ function refreshSwitches(updateSwitches) {
 			};
 			if (batterylevel != 255){
 				$('#batteryLevel_' + idx).addClass('bi bi-battery-full')
+				if (batterylevel <= 50){
+					$('#batteryLevel_' + idx).removeClass('bi bi-battery-full')
+					$('#batteryLevel_' + idx).addClass('bi bi-battery-half')
+				}
+				if (batterylevel <= 15){
+					$('#batteryLevel_' + idx).removeClass('bi bi-battery-full')
+					$('#batteryLevel_' + idx).addClass('bi bi-battery').css('color','#ED2939')
+				}
 				$('#batteryLevel_' + idx).html(batterylevel + '%&nbsp;')
 			};
 			$('button[id="switch_' + idx + '"]').html(data);
@@ -162,6 +178,14 @@ function refreshSelectors(updateSelector) {
 			var batterylevel = jsonData.result[0].BatteryLevel
 			if (batterylevel != 255){
 				$('#batteryLevel_' + idx).addClass('bi bi-battery-full')
+				if (batterylevel <= 50){
+					$('#batteryLevel_' + idx).removeClass('bi bi-battery-full')
+					$('#batteryLevel_' + idx).addClass('bi bi-battery-half')
+				}
+				if (batterylevel <= 15){
+					$('#batteryLevel_' + idx).removeClass('bi bi-battery-full')
+					$('#batteryLevel_' + idx).addClass('bi bi-battery').css('color','#ED2939')
+				}
 				$('#batteryLevel_' + idx).html(batterylevel + '%&nbsp;')
 			};
 			btns = decodeBase64(levelnames).split('|');
@@ -237,7 +261,19 @@ function refreshDimmers(updateDimmers) {
 			if (lastUpdate != null){
 				$('#lastUpdate_' + idx).html(moment(lastUpdate).fromNow())
 			}
-
+			var batterylevel = jsonData.result[0].BatteryLevel
+			if (batterylevel != 255){
+				$('#batteryLevel_' + idx).addClass('bi bi-battery-full')
+				if (batterylevel <= 50){
+					$('#batteryLevel_' + idx).removeClass('bi bi-battery-full')
+					$('#batteryLevel_' + idx).addClass('bi bi-battery-half')
+				}
+				if (batterylevel <= 15){
+					$('#batteryLevel_' + idx).removeClass('bi bi-battery-full')
+					$('#batteryLevel_' + idx).addClass('bi bi-battery').css('color','#ED2939')
+				}
+				$('#batteryLevel_' + idx).html(batterylevel + '%&nbsp;')
+			};
 			if (jsonData.result[0].Type == 'Color Switch'){
 				var color = JSON.parse(jsonData.result[0].Color)
 				var color_decimal = color.r * 65536 + color.g * 256 + color.b

From d0a8224e7482716de0273a3c0caa38fcf2be41da Mon Sep 17 00:00:00 2001
From: DewGew <pierlar@hotmail.com>
Date: Wed, 31 Jan 2024 12:12:44 +0100
Subject: [PATCH 07/10] Update VERSION.md

---
 VERSION.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/VERSION.md b/VERSION.md
index 5cdd6dd..424155f 100644
--- a/VERSION.md
+++ b/VERSION.md
@@ -1,3 +1,6 @@
+24.4
+- Added battery level on dashboard devices
+- Added Enerygystorgae trait uses to check battery level
 24.3
 - Fixed DoorLockInverted
 - Security Update. DZGA now reads smart-home-key.json file from config folder. Move .json file or upload a new.

From c41aa3696f4c45297f1dfd2d0dbe78d319746b51 Mon Sep 17 00:00:00 2001
From: DewGew <pierlar@hotmail.com>
Date: Wed, 31 Jan 2024 13:28:55 +0100
Subject: [PATCH 08/10] Update VERSION.md

---
 VERSION.md | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/VERSION.md b/VERSION.md
index 424155f..7039e70 100644
--- a/VERSION.md
+++ b/VERSION.md
@@ -1,8 +1,3 @@
 24.4
 - Added battery level on dashboard devices
 - Added Enerygystorgae trait uses to check battery level
-24.3
-- Fixed DoorLockInverted
-- Security Update. DZGA now reads smart-home-key.json file from config folder. Move .json file or upload a new.
-- Added new device, Door Lock Inverted.
-- Changed check version, get latest updates.

From fe98d24391a692d78018d2fd61b1ba40b9102d23 Mon Sep 17 00:00:00 2001
From: DewGew <pierlar@hotmail.com>
Date: Wed, 31 Jan 2024 13:36:33 +0100
Subject: [PATCH 09/10] Fix Lighting 4 issue

---
 modules/domoticz.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/domoticz.py b/modules/domoticz.py
index 5d00fa4..83b9879 100644
--- a/modules/domoticz.py
+++ b/modules/domoticz.py
@@ -106,7 +106,7 @@ def getAog(device, user_id=None):
         'name': device.get('Name'),
         'nicknames': []
         }
-    if device.get('Type') in ['Light/Switch', 'Color Switch', 'Lighting 1', 'Lighting 2', 'Lighting 5', 'RFY', 'Value']:
+    if device.get('Type') in ['Light/Switch', 'Color Switch', 'Lighting 1', 'Lighting 2', 'Lighting 3','Lighting 4', 'Lighting 5', 'RFY', 'Value']:
         aog.type = 'action.devices.types.LIGHT'
     if device.get('Image') == 'WallSocket':
         aog.type = 'action.devices.types.OUTLET'

From e80a02b3613009de3ececb8698af3c201745dd05 Mon Sep 17 00:00:00 2001
From: DewGew <pierlar@hotmail.com>
Date: Wed, 31 Jan 2024 13:38:10 +0100
Subject: [PATCH 10/10] Update VERSION.md

---
 VERSION.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/VERSION.md b/VERSION.md
index 7039e70..e68b0bf 100644
--- a/VERSION.md
+++ b/VERSION.md
@@ -1,3 +1,4 @@
 24.4
+- Fixes Lighting 4 devices
 - Added battery level on dashboard devices
 - Added Enerygystorgae trait uses to check battery level