From fd98de9aebddac961a163ec50c176021071d6469 Mon Sep 17 00:00:00 2001
From: DewGew <pierlar@hotmail.com>
Date: Fri, 9 Feb 2024 10:25:02 +0100
Subject: [PATCH 01/12] Update devices.html

---
 templates/devices.html | 62 +++++++++++++++++++++++++++++++-----------
 1 file changed, 46 insertions(+), 16 deletions(-)

diff --git a/templates/devices.html b/templates/devices.html
index 28b8d38..6c41dca 100644
--- a/templates/devices.html
+++ b/templates/devices.html
@@ -48,7 +48,7 @@ <h5 class="card-title">Added devices <span>| {{ user.username }}</span></h5>
                         <th class="pointer" scope="row" data-bs-toggle="modal" data-bs-target="#devicesModal_{{ k }}">{{ k }}</th>
 						
 							  <div class="modal fade" id="devicesModal_{{ k }}" tabindex="-1">
-								<div class="modal-dialog modal-lg">
+								<div class="modal-dialog modal-lg modal-dialog-scrollable">
 								  <div class="modal-content">
 									<div class="modal-header">
 									  <h5 class="modal-title">Sync request json for {{ k }}</h5>
@@ -57,15 +57,15 @@ <h5 class="modal-title">Sync request json for {{ k }}</h5>
 									<div class="modal-body">
 										<pre id="json_{{ v['customData']['idx'] }}">
 										</pre>
-<!-- 									<div class="modal-footer">
+									<div class="modal-footer">
 									  <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
-									  <button type="button" class="btn btn-primary">Save changes</button>
-									</div> -->
+									  <!-- <button type="button" class="btn btn-primary">Save changes</button> -->
+									</div>
 								  </div>
 								</div>
 							  </div><!-- End Vertically centered Modal-->
 
-                        <td>{{ v['name']['name'] }}</td>
+                        <td>{{ v['name']['name'] }} <small class="form-text">{% if v['customData']['merge_thermo_idx'] %}(Merged with idx:{{ v['customData']['merge_thermo_idx'] }}){% elif v['customData']['actual_temp_idx']%}(Merged with idx:{{ v['customData']['actual_temp_idx'] }}){% endif %}</small></td>
                         <td class="text-primary pointer" data-bs-toggle="modal" data-bs-target="#descriptionModal_{{ k }}" >{{ v['customData']['domain'] }}</td>
 						    <div class="modal fade" id="descriptionModal_{{ k }}" tabindex="-1">
 								<div class="modal-dialog modal-lg">
@@ -96,12 +96,12 @@ <h5 class="card-title">Description <span>| {{ v['name']['name'] }}</span></h5>
 										<div class="form-check form-switch">
 										  <input class="form-check-input" type="checkbox" id="checkState" name="checkState" {% if v['customData']['check_state'] == True %}checked{% endif %}>
 										  <label class="form-check-label" for="checkState">Check State</label></br>
-										  <small class="form-text">Turns on/off already in state error message</small>
+										  <small class="form-text">Turns on/off 'already in state' error message</small>
 										</div>
 										<div class="form-check form-switch">
 										  <input class="form-check-input" type="checkbox" id="notification" name="notification" {% if v['notificationSupportedByAgent'] == True %}checked {% endif %} disabled>
-										  <label class="form-check-label" for="notification">Notification Supported</label></br>
-										  {% if v['notificationSupportedByAgent'] == True %}<small class="form-text">User can turn on or off notifications in Google Home App</small>{% endif %}
+										  <label class="form-check-label" for="notification">Support Notification</label></br>
+										  {% if v['notificationSupportedByAgent'] == True %}<small class="form-text">User can turn on/off notifications in Google Home App</small>{% endif %}
 										</div>
 										<div class="form-check form-switch">
 										  <input class="form-check-input" type="checkbox" id="secondaryUserVerificationCheck_{{ v['id'] }}" {% if ('acknowledge' in v['customData'] or v['customData']['protected'] == True) %}checked{% endif %}{% if 'Hidden' in v['customData']['domain'] %} disabled{% endif %}>
@@ -118,10 +118,10 @@ <h5 class="card-title">Description <span>| {{ v['name']['name'] }}</span></h5>
 											  </label>
 											</div>
 											<div class="form-check">
-											  <input class="form-check-input" type="radio" name="2FA" id="pinNeeded" value="pinNeeded" {% if v['customData']['protected'] == True %}checked{% endif %}{% if ('Hidden' in v['customData']['domain'] or v['customData']['protected'] != True) %} disabled{% endif %}>
+											  <input class="form-check-input" type="radio" name="2FA" id="pinNeeded" value="pinNeeded" {% if v['customData']['protected'] == True %}checked{% endif %}{% if dzUserAdmin is not true %} disabled{% endif %}>
 											  <label class="form-check-label" for="pinNeeded">
 												Pincode Needed 
-											  </label> <small>(Set device as protected in Domoticz)</small>
+											  </label>{% if dzUserAdmin is not true %} <small class="form-text">(Set device as protected in Domoticz)</small>{% endif %}
 											</div>
 										  </div>
 										</fieldset>
@@ -236,13 +236,13 @@ <h5 class="card-title">Description <span>| {{ v['name']['name'] }}</span></h5>
 										</div>
 										 {% if (v['customData']['domain'] in ['Thermostat', 'Setpoint']) %}
 										<div class="row mb-3">
-										  <label for="inputText" class="col-sm-3 col-form-label">Min Threehold</label>
+										  <label for="inputText" class="col-sm-3 col-form-label">Min Threehold {{ dbsettings.tempunit }}&#176;</label>
 										  <div class="col-sm-2">
 											<input type="number" class="form-control" name="minThreehold" value="{{ v['attributes']['thermostatTemperatureRange']['minThresholdCelsius'] }}">
 										  </div>
 										</div>
 										<div class="row mb-3">
-										  <label for="inputText" class="col-sm-3 col-form-label">Max Threehold</label>
+										  <label for="inputText" class="col-sm-3 col-form-label">Max Threehold {{ dbsettings.tempunit }}&#176;</label>
 										  <div class="col-sm-2">
 											<input type="number" class="form-control" name="maxThreehold" value="{{ v['attributes']['thermostatTemperatureRange']['maxThresholdCelsius'] }}">
 										  </div>
@@ -256,6 +256,36 @@ <h5 class="card-title">Description <span>| {{ v['name']['name'] }}</span></h5>
 										  </div>
 										</div>
 									  {% endif %}
+									  {% if v['customData']['domain'] in ['OnOff'] and v['type'] in ['action.devices.types.HEATER', 'action.devices.types.WATERHEATER', 'action.devices.types.KETTLE', 'action.devices.types.OVEN'] %}
+										{% if v['customData']['merge_thermo_idx'] %}
+										<div class="row mb-3">
+										  <label for="inputText" class="col-sm-3 col-form-label">Min Threehold {{ dbsettings.tempunit }}&#176;</label>
+										  <div class="col-sm-2">
+											<input type="number" class="form-control" name="minThreehold" value="{{ devices['Setpoint_' + v['customData']['merge_thermo_idx']]['attributes']['thermostatTemperatureRange']['minThresholdCelsius'] }}">
+										  </div>
+										</div>
+										<div class="row mb-3">
+										  <label for="inputText" class="col-sm-3 col-form-label">Max Threehold {{ dbsettings.tempunit }}&#176;</label>
+										  <div class="col-sm-2">
+											<input type="number" class="form-control" name="maxThreehold" value="{{ devices['Setpoint_' + v['customData']['merge_thermo_idx']]['attributes']['thermostatTemperatureRange']['maxThresholdCelsius'] }}">
+										  </div>
+										</div>
+										{% endif %}
+									   <div class="row mb-3">
+										  <label for="inputText" class="col-sm-3 col-form-label">Get setpoint</label>
+										  <div class="col-sm-6">
+											<select id="merge_thermo_idx" name="merge_thermo_idx" class="form-select" aria-describedby="actTempHelp">
+											   <option value="" {% if v['customData']['merge_thermo_idx'] == None %}selected{% endif %} >None</option>
+											   {% for n, p in devices.items() %}
+													{% if 'Setpoint' in n %}
+													<option value="{{ p['customData']['idx'] }}" {% if v['customData']['merge_thermo_idx'] == p['customData']['idx'] %}selected{% endif %}>{{ p['name']['name'].replace('_',' ') }}, idx: {{ p['customData']['idx'] }}</option>
+													{% endif %}
+												{% endfor %}
+											</select>
+											<div id="modesHelp" class="form-text">Control temp from a setpoint device.</div>
+										  </div>
+										</div>
+									  {% endif %}
 									  {% if v['customData']['domain'] in ['Thermostat', 'Setpoint'] %}
 									   <div class="row mb-3">
 										  <label for="inputText" class="col-sm-3 col-form-label">Get actual temp</label>
@@ -276,8 +306,8 @@ <h5 class="card-title">Description <span>| {{ v['name']['name'] }}</span></h5>
 										<div class="row mb-3">
 										  <label for="inputText" class="col-sm-3 col-form-label">Get modes</label>
 										  <div class="col-sm-6">
-											<select id="actual_temp_idx" name="actual_temp_idx" class="form-select" aria-describedby="modesHelp">
-											   <option value="" {% if v['customData']['actual_temp_idx'] == None %}selected{% endif %} >None</option>
+											<select id="selector_modes_idx" name="selector_modes_idx" class="form-select" aria-describedby="modesHelp">
+											   <option value="" {% if v['customData']['selector_modes_idx'] == None %}selected{% endif %} >None</option>
 											   {% for n, p in devices.items() %}
 													{% if 'Selector' in n %}
 													<option value="{{ p['customData']['idx'] }}" {% if v['customData']['selector_modes_idx'] == p['customData']['idx'] %}selected{% endif %}>{{ p['name']['name'].replace('_',' ') }}, idx: {{ p['customData']['idx'] }}</option>
@@ -319,9 +349,9 @@ <h5 class="card-title">Description <span>| {{ v['name']['name'] }}</span></h5>
 							  </div><!-- End Vertically centered Modal-->
                         <td>
 						{% if v['customData']['protected'] == False %}
-							<button class="btn btn-outline-success btn-sm" onclick="toogleProtected({{ v['customData']['idx'] }}, 'true')" {% if not user.admin %}disabled{% endif %}>No
+							<button class="btn btn-outline-success btn-sm" onclick="toogleProtected({{ v['customData']['idx'] }}, 'true')" title="Domoticz Admin user can turn protection on/off here"{% if dzUserAdmin is not true %} disabled{% endif %}>No
 							{% else %}
-							<button class="btn btn-outline-danger btn-sm" onclick="toogleProtected({{ v['customData']['idx'] }}, 'false')" {% if not user.admin %}disabled{% endif %}>Yes
+							<button class="btn btn-outline-danger btn-sm" onclick="toogleProtected({{ v['customData']['idx'] }}, 'false')" title="Domoticz Admin user can turn protection on/off here"{% if dzUserAdmin is not true %} disabled{% endif %}>Yes
 						{% endif %}							
 						</button></td>
 						<td><button class="btn btn-light btn-sm" id="switch_{{ v['customData']['idx'] }}" disabled>Not available</button></td>

From 2bbaf103f8de6a4e6e88418d7615652c2aaa0f20 Mon Sep 17 00:00:00 2001
From: DewGew <pierlar@hotmail.com>
Date: Fri, 9 Feb 2024 10:27:25 +0100
Subject: [PATCH 02/12] Added merge setpoint and TemperatureControl trait

---
 modules/trait.py | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/modules/trait.py b/modules/trait.py
index d06ecbb..7c6e926 100644
--- a/modules/trait.py
+++ b/modules/trait.py
@@ -97,6 +97,10 @@ def query(custom_data, device, user_id):
         if domain in ['Temp', 'TempHumidity', 'TempHumidityBaro']:
             current_temp = float(state['Temp'])
             response['temperatureAmbientCelsius'] = round(_tempConvert(current_temp, dbsettings.tempunit), 1)
+        if domain in ['OnOff'] and 'merge_thermo_idx' in custom_data:
+            merged_state = getDomoticzState(user_id, custom_data['merge_thermo_idx'])
+            current_temp = float(merged_state['Data'])
+            response['temperatureAmbientCelsius'] = round(_tempConvert(current_temp, dbsettings.tempunit), 1)
 
     if 'action.devices.traits.Toggles' in device['traits']:
         levelName = base64.b64decode(state.get("LevelNames")).decode('UTF-8').split("|")
@@ -144,8 +148,7 @@ def query(custom_data, device, user_id):
                 response['capacityRemaining'] = [{
                     'unit': 'PERCENTAGE',
                     'rawValue': battery
-                }]
-            
+                }]            
 
     response['online'] = True
     if domain not in ['Group', 'Scene'] and state['BatteryLevel'] != 255:
@@ -327,8 +330,8 @@ def execute(device, command, params, user_id, challenge):
                     url += "setsecstatus&secstatus=2"
         else:
             if state['Data'] == "Normal" and check_state:
-                raise SmartHomeError('alreadyInState',
-                                   'Unable to execute {} for {}. Already in state '.format(command, device['id']))
+                raise SmartHomeError('alreadyDisarmed',
+                                   'Unable to execute {} for {}. Already disarmed '.format(command, device['id']))
             else:
                 url += "setsecstatus&secstatus=0"
 
@@ -348,6 +351,19 @@ def execute(device, command, params, user_id, challenge):
                 slevel = str(levelName.index(key) * 10)
 
             url += 'switchlight&idx=' + idx + '&switchcmd=Set%20Level&level=' + slevel
+            
+    if command == 'action.devices.commands.TimerStart':
+    
+        url += 'customevent&event=TIMER&data={"idx":' + idx + ',"time":' + str(params['timerTimeSec']) + ',"on":true}'
+        
+    if command == 'action.devices.commands.TimerCancel':
+
+        url += 'customevent&event=TIMER&data={"idx":' + idx + ',"cancel":true}'
+        
+    if command == 'action.devices.commands.SetTemperature':
+        if 'merge_thermo_idx' in custom_data:
+            url += 'setsetpoint&idx=' + custom_data['merge_thermo_idx'] + '&setpoint=' + str(
+                            params['temperature'])
 
     if state['Protected'] is True:
         url = url + '&passcode=' + challenge.get('pin')

From b7c41d8787da92c191704b9e9f4b15f9ca76204a Mon Sep 17 00:00:00 2001
From: DewGew <pierlar@hotmail.com>
Date: Fri, 9 Feb 2024 10:28:48 +0100
Subject: [PATCH 03/12] Add merge setpoint,

---
 modules/domoticz.py | 38 ++++++++++++++++++++++++++++++++++----
 1 file changed, 34 insertions(+), 4 deletions(-)

diff --git a/modules/domoticz.py b/modules/domoticz.py
index b3ad4d2..67aee7e 100644
--- a/modules/domoticz.py
+++ b/modules/domoticz.py
@@ -157,7 +157,7 @@ def getAog(device, user_id=None):
         st = desc.get('devicetype', None)
         if st is not None and st.lower() in config.TYPES:
             aog.type = 'action.devices.types.' + st.upper()
-        if domain in ['Thermostat', 'Setpoint']:
+        if domain in ['Thermostat', 'Setpoint', 'OnOff']:
             minT = desc.get('minThreehold', None)
             if minT is not None:
                 minThreehold = minT
@@ -170,6 +170,10 @@ def getAog(device, user_id=None):
             modes_idx = desc.get('selector_modes_idx', None)
             if modes_idx is not None:
                 aog.customData['selector_modes_idx'] = modes_idx
+        if domain in ['OnOff']:
+            thermo_idx = desc.get('merge_thermo_idx', None)
+            if thermo_idx is not None:
+                aog.customData['merge_thermo_idx'] = thermo_idx
         if domain in ['Doorbell', 'Camera']:
             camurl = desc.get('camurl', None)
             if camurl:
@@ -181,7 +185,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'
@@ -316,8 +320,8 @@ def getAog(device, user_id=None):
         aog.traits.append('action.devices.traits.TemperatureSetting')
         aog.attributes = {'thermostatTemperatureUnit': dbsettings.tempunit,
                           'thermostatTemperatureRange': {
-                            'minThresholdCelsius': minThreehold,
-                            'maxThresholdCelsius': maxThreehold},
+                            'minThresholdCelsius': (minThreehold if dbsettings.tempunit == 'C' else (minThreehold-32) * 5/9),
+                            'maxThresholdCelsius': (maxThreehold if dbsettings.tempunit == 'C' else (maxThreehold-32) * 5/9)},
                           'availableThermostatModes':  ['heat', 'cool'],
                         }
         if 'selector_modes_idx' in aog.customData:
@@ -350,6 +354,19 @@ def getAog(device, user_id=None):
             ],
             'cameraStreamNeedAuthToken': False
         }
+    if domain in ['OnOff'] and aog.type in ['action.devices.types.HEATER', 'action.devices.types.WATERHEATER', 'action.devices.types.KETTLE', 'action.devices.types.OVEN']:
+        if 'merge_thermo_idx' in aog.customData:
+           aog.traits.append('action.devices.traits.TemperatureControl')
+           aog.attributes['temperatureUnitForUX'] = dbsettings.tempunit
+           aog.attributes['temperatureRange'] = {
+                    'minThresholdCelsius': (minThreehold if dbsettings.tempunit == 'C' else (minThreehold-32) * 5/9),
+                    'maxThresholdCelsius': (maxThreehold if dbsettings.tempunit == 'C' else (maxThreehold-32) * 5/9)}
+           aog.attributes['temperatureStepCelsius'] = (5 if dbsettings.tempunit == 'C' else 2.778)     
+        
+    if domain in ['OnOff', 'Dimmer', 'ColorSwitch']:
+        aog.traits.append('action.devices.traits.Timer')
+        aog.attributes['maxTimerLimitSec'] = 7200
+        aog.attributes['commandOnlyTimer'] = True
     
     batteryLevel = device.get('BatteryLevel')
     if domain not in ['Group', 'Scene'] and batteryLevel != 255:
@@ -425,3 +442,16 @@ def getDomoticzState(user_id, idx, device='id'):
         data = d
 
     return data
+
+
+def getDzUser(user_id):
+
+    url = "?type=command&param=getusers"
+    try:
+        r = json.loads(queryDomoticz(user_id, url))
+        if r['status'] == 'OK':
+            return True
+        else:
+            return False
+    except Exception as err:
+        return False

From 5edd23850ad4f7f115d8c11ff9ac54dab539b313 Mon Sep 17 00:00:00 2001
From: DewGew <pierlar@hotmail.com>
Date: Fri, 9 Feb 2024 10:30:55 +0100
Subject: [PATCH 04/12] Add merge setpoint

---
 modules/routes.py | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/modules/routes.py b/modules/routes.py
index 6a3fc70..59bc29a 100644
--- a/modules/routes.py
+++ b/modules/routes.py
@@ -9,7 +9,7 @@
 from werkzeug.security import generate_password_hash, check_password_hash
 from modules.reportstate import ReportState
 from modules.database import db, User, Settings
-from modules.domoticz import saveJson, getDomoticzDevices
+from modules.domoticz import saveJson, getDomoticzDevices, getDzUser
 from modules.helpers import logger, get_devices, generateToken, remove_user, getVersion
 from sqlalchemy import or_
 
@@ -44,6 +44,7 @@ def devices():
     devices = get_devices(current_user.username)
     dbuser = User.query.filter_by(username=current_user.username).first()
     version = getVersion()
+    dzUserAdmin = getDzUser(current_user.username)
 
     if request.method == "POST":
 
@@ -64,6 +65,7 @@ def devices():
             actual_temp_idx = request.form.get('actual_temp_idx')
             selector_modes_idx = request.form.get('selector_modes_idx')
             check_state = request.form.get('checkState')
+            merge_thermo_idx = request.form.get('merge_thermo_idx')
 
             if idx not in deviceconfig.keys():
                 deviceconfig[idx] = {}
@@ -136,6 +138,12 @@ def devices():
                     deviceconfig[idx].update({'selector_modes_idx': selector_modes_idx})
                 elif idx in deviceconfig.keys() and 'selector_modes_idx' in deviceconfig[idx]:
                     deviceconfig[idx].pop('selector_modes_idx')
+                    
+            if merge_thermo_idx is not None:
+                if merge_thermo_idx != '':
+                    deviceconfig[idx].update({'merge_thermo_idx': merge_thermo_idx})
+                elif idx in deviceconfig.keys() and 'merge_thermo_idx' in deviceconfig[idx]:
+                    deviceconfig[idx].pop('merge_thermo_idx')
 
             if camurl is not None:
                 if camurl != '':
@@ -180,7 +188,8 @@ def devices():
                                reportstate=reportstate,
                                devices=devices,
                                _csrf_token=session['_csrf_token'],
-                               version = version
+                               version = version,
+                               dzUserAdmin = dzUserAdmin
                                )
 
 
@@ -302,6 +311,7 @@ def settings():
         reportstate = report_state.report_state_enabled()
         devices = get_devices(current_user.username)
         version = getVersion()
+        dzUserAdmin = getDzUser(current_user.username)
 
         return render_template('settings.html',
                                user=User.query.filter_by(username=current_user.username).first(),
@@ -310,7 +320,8 @@ def settings():
                                reportstate=reportstate,
                                devices=devices,
                                _csrf_token=session['_csrf_token'],
-                               version = version
+                               version = version,
+                               dzUserAdmin = dzUserAdmin
                                )
 
 

From c7ca741ae30f5719826bd8cd8aea98a56a2533e9 Mon Sep 17 00:00:00 2001
From: DewGew <pierlar@hotmail.com>
Date: Fri, 9 Feb 2024 11:05:08 +0100
Subject: [PATCH 05/12] Update devices.html

---
 templates/devices.html | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/templates/devices.html b/templates/devices.html
index 6c41dca..3ab09e8 100644
--- a/templates/devices.html
+++ b/templates/devices.html
@@ -234,7 +234,8 @@ <h5 class="card-title">Description <span>| {{ v['name']['name'] }}</span></h5>
 											  </select>
 										  </div>
 										</div>
-										 {% if (v['customData']['domain'] in ['Thermostat', 'Setpoint']) %}
+										{% endif %}
+										 {% if (v['customData']['domain'] in ['Thermostat', 'Setpoint', 'Setpoint_Hidden']) %}
 										<div class="row mb-3">
 										  <label for="inputText" class="col-sm-3 col-form-label">Min Threehold {{ dbsettings.tempunit }}&#176;</label>
 										  <div class="col-sm-2">
@@ -286,7 +287,7 @@ <h5 class="card-title">Description <span>| {{ v['name']['name'] }}</span></h5>
 										  </div>
 										</div>
 									  {% endif %}
-									  {% if v['customData']['domain'] in ['Thermostat', 'Setpoint'] %}
+									  {% if v['customData']['domain'] in ['Thermostat', 'Setpoint', 'Setpoint_Hidden'] %}
 									   <div class="row mb-3">
 										  <label for="inputText" class="col-sm-3 col-form-label">Get actual temp</label>
 										  <div class="col-sm-6">
@@ -302,7 +303,7 @@ <h5 class="card-title">Description <span>| {{ v['name']['name'] }}</span></h5>
 										  </div>
 										</div>
 									  {% endif %}
-									  {% if v['customData']['domain'] in ['Thermostat', 'Setpoint'] %}
+									  {% if v['customData']['domain'] in ['Thermostat', 'Setpoint', 'Setpoint_Hidden'] %}
 										<div class="row mb-3">
 										  <label for="inputText" class="col-sm-3 col-form-label">Get modes</label>
 										  <div class="col-sm-6">
@@ -318,7 +319,7 @@ <h5 class="card-title">Description <span>| {{ v['name']['name'] }}</span></h5>
 										  </div>
 										  </div>
 									  {% endif %}
-									  {% endif %}
+									  
 									   {% if (v['customData']['domain'] == 'Security' and user.admin) %}
 									   <div class="row mb-3" {% if dbsettings.language == 'en' %}style="display: none;"{% endif %}>
 									  	<div id="armhome_div" class="col-md-12">
@@ -384,7 +385,7 @@ <h5 class="card-title">Description <span>| {{ v['name']['name'] }}</span></h5>
   {% include 'footer.html' %}
   
 <script>
-var updateInterval = 15000
+var updateInterval = 30000
 var updateSwitches_block = [];
 var updateScenes_block = [];
 var updateDimmers_block = [];

From 23e592ccf29ca66a57aa216696ca07fe803486ce Mon Sep 17 00:00:00 2001
From: DewGew <pierlar@hotmail.com>
Date: Fri, 9 Feb 2024 11:05:53 +0100
Subject: [PATCH 06/12] Update domoticz.py

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

diff --git a/modules/domoticz.py b/modules/domoticz.py
index 67aee7e..037ee35 100644
--- a/modules/domoticz.py
+++ b/modules/domoticz.py
@@ -316,7 +316,7 @@ def getAog(device, user_id=None):
                           'queryOnlyTemperatureSetting': True,
                           'availableThermostatModes': ['heat', 'cool'],
                         }
-    if domain in ['Thermostat', 'Setpoint']:
+    if domain in ['Thermostat', 'Setpoint', 'Setpoint_Hidden']:
         aog.traits.append('action.devices.traits.TemperatureSetting')
         aog.attributes = {'thermostatTemperatureUnit': dbsettings.tempunit,
                           'thermostatTemperatureRange': {

From 611ee873aea83c118cc00e4f0bf46e73966d280d Mon Sep 17 00:00:00 2001
From: DewGew <pierlar@hotmail.com>
Date: Fri, 9 Feb 2024 12:50:45 +0100
Subject: [PATCH 07/12] Update serveradmin.html

---
 templates/serveradmin.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/serveradmin.html b/templates/serveradmin.html
index 8ebd4ad..55ccdfb 100644
--- a/templates/serveradmin.html
+++ b/templates/serveradmin.html
@@ -25,8 +25,8 @@ <h5 class="card-title">Server settings <span>| Admin</span></h5>
 	<div class="col-6">
 	  <label for="tempunit" class="form-label">Temperture unit</label>
 	  <select id="tempunit" name="tempunit" class="form-select">
-		<option {% if dbsettings.language == 'C' %} selected {% endif %}value="C">Celsius</option>
-		<option {% if dbsettings.language == 'F' %} selected {% endif %}value="F">Fahrenheit</option>
+		<option {% if dbsettings.tempunit == 'C' %} selected {% endif %}value="C">Celsius</option>
+		<option {% if dbsettings.tempunit == 'F' %} selected {% endif %}value="F">Fahrenheit</option>
 	  </select>
 	</div>
 	<div class="col-md-6">

From 4413cda8bc18fa8c32e236bc8d81f290c8f5b7b6 Mon Sep 17 00:00:00 2001
From: DewGew <pierlar@hotmail.com>
Date: Fri, 9 Feb 2024 12:56:32 +0100
Subject: [PATCH 08/12] Add fahrenhit in device UI

---
 templates/devices.html | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/templates/devices.html b/templates/devices.html
index 3ab09e8..199af48 100644
--- a/templates/devices.html
+++ b/templates/devices.html
@@ -239,13 +239,21 @@ <h5 class="card-title">Description <span>| {{ v['name']['name'] }}</span></h5>
 										<div class="row mb-3">
 										  <label for="inputText" class="col-sm-3 col-form-label">Min Threehold {{ dbsettings.tempunit }}&#176;</label>
 										  <div class="col-sm-2">
+										  {% if dbsettings.tempunit == 'F'%}
+											<input type="number" class="form-control" name="minThreehold" value="{{ ((v['attributes']['thermostatTemperatureRange']['minThresholdCelsius']*1.8)+32)|round|int }}">
+										  {% else %}
 											<input type="number" class="form-control" name="minThreehold" value="{{ v['attributes']['thermostatTemperatureRange']['minThresholdCelsius'] }}">
+										  {% endif %}
 										  </div>
 										</div>
 										<div class="row mb-3">
 										  <label for="inputText" class="col-sm-3 col-form-label">Max Threehold {{ dbsettings.tempunit }}&#176;</label>
 										  <div class="col-sm-2">
+										  {% if dbsettings.tempunit == 'F'%}
+											<input type="number" class="form-control" name="maxThreehold" value="{{ ((v['attributes']['thermostatTemperatureRange']['maxThresholdCelsius']*1.8)+32)|round|int }}">
+										  {% else %}
 											<input type="number" class="form-control" name="maxThreehold" value="{{ v['attributes']['thermostatTemperatureRange']['maxThresholdCelsius'] }}">
+									      {% endif %}
 										  </div>
 										</div>
 									  {% endif %}
@@ -262,13 +270,21 @@ <h5 class="card-title">Description <span>| {{ v['name']['name'] }}</span></h5>
 										<div class="row mb-3">
 										  <label for="inputText" class="col-sm-3 col-form-label">Min Threehold {{ dbsettings.tempunit }}&#176;</label>
 										  <div class="col-sm-2">
-											<input type="number" class="form-control" name="minThreehold" value="{{ devices['Setpoint_' + v['customData']['merge_thermo_idx']]['attributes']['thermostatTemperatureRange']['minThresholdCelsius'] }}">
+										  {% if dbsettings.tempunit == 'F'%}
+											<input type="number" class="form-control" name="minThreehold" readonly value="{{ ((devices['Setpoint_' + v['customData']['merge_thermo_idx']]['attributes']['thermostatTemperatureRange']['minThresholdCelsius']*1.8)+32)|round|int }}">
+											{% else %}
+											<input type="number" class="form-control" name="minThreehold" readonly value="{{ devices['Setpoint_' + v['customData']['merge_thermo_idx']]['attributes']['thermostatTemperatureRange']['minThresholdCelsius']|round|int }}">
+										  {% endif %}
 										  </div>
 										</div>
 										<div class="row mb-3">
 										  <label for="inputText" class="col-sm-3 col-form-label">Max Threehold {{ dbsettings.tempunit }}&#176;</label>
 										  <div class="col-sm-2">
-											<input type="number" class="form-control" name="maxThreehold" value="{{ devices['Setpoint_' + v['customData']['merge_thermo_idx']]['attributes']['thermostatTemperatureRange']['maxThresholdCelsius'] }}">
+										  {% if dbsettings.tempunit == 'F'%}
+											<input type="number" class="form-control" name="maxThreehold" readonly value="{{ ((devices['Setpoint_' + v['customData']['merge_thermo_idx']]['attributes']['thermostatTemperatureRange']['maxThresholdCelsius']*1.8)+32)|round|int }}">
+											{% else %}
+											<input type="number" class="form-control" name="maxThreehold" readonly value="{{ devices['Setpoint_' + v['customData']['merge_thermo_idx']]['attributes']['thermostatTemperatureRange']['maxThresholdCelsius']|round|int }}">
+										  {% endif %}
 										  </div>
 										</div>
 										{% endif %}

From 9121358141841c8b8c811b320415729b90c39131 Mon Sep 17 00:00:00 2001
From: DewGew <pierlar@hotmail.com>
Date: Fri, 9 Feb 2024 12:57:22 +0100
Subject: [PATCH 09/12] Add fahrenheit threehold

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

diff --git a/modules/domoticz.py b/modules/domoticz.py
index 037ee35..55a786d 100644
--- a/modules/domoticz.py
+++ b/modules/domoticz.py
@@ -320,8 +320,8 @@ def getAog(device, user_id=None):
         aog.traits.append('action.devices.traits.TemperatureSetting')
         aog.attributes = {'thermostatTemperatureUnit': dbsettings.tempunit,
                           'thermostatTemperatureRange': {
-                            'minThresholdCelsius': (minThreehold if dbsettings.tempunit == 'C' else (minThreehold-32) * 5/9),
-                            'maxThresholdCelsius': (maxThreehold if dbsettings.tempunit == 'C' else (maxThreehold-32) * 5/9)},
+                            'minThresholdCelsius': (minThreehold if dbsettings.tempunit == 'C' else (minThreehold-32)/1.8),
+                            'maxThresholdCelsius': (maxThreehold if dbsettings.tempunit == 'C' else (maxThreehold-32)/1.8)},
                           'availableThermostatModes':  ['heat', 'cool'],
                         }
         if 'selector_modes_idx' in aog.customData:
@@ -359,8 +359,8 @@ def getAog(device, user_id=None):
            aog.traits.append('action.devices.traits.TemperatureControl')
            aog.attributes['temperatureUnitForUX'] = dbsettings.tempunit
            aog.attributes['temperatureRange'] = {
-                    'minThresholdCelsius': (minThreehold if dbsettings.tempunit == 'C' else (minThreehold-32) * 5/9),
-                    'maxThresholdCelsius': (maxThreehold if dbsettings.tempunit == 'C' else (maxThreehold-32) * 5/9)}
+                    'minThresholdCelsius': (minThreehold if dbsettings.tempunit == 'C' else (minThreehold-32)/1.8),
+                    'maxThresholdCelsius': (maxThreehold if dbsettings.tempunit == 'C' else (maxThreehold-32)/1.8)}
            aog.attributes['temperatureStepCelsius'] = (5 if dbsettings.tempunit == 'C' else 2.778)     
         
     if domain in ['OnOff', 'Dimmer', 'ColorSwitch']:

From 1f3cee7b056176efc0c3e6a0bd52c2ce922c22d1 Mon Sep 17 00:00:00 2001
From: Xenomes <xenomes@outlook.com>
Date: Sat, 10 Feb 2024 10:38:03 +0100
Subject: [PATCH 10/12] Revert "Create stale.yml"

This reverts commit 71c353497be3607652557aced80c3a30685043fd.
---
 .github/workflows/stale.yml | 15 ---------------
 1 file changed, 15 deletions(-)
 delete mode 100644 .github/workflows/stale.yml

diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
deleted file mode 100644
index 0748c19..0000000
--- a/.github/workflows/stale.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-name: "Close stale issues"
-on:
-  schedule:
-  - cron: "0 0 * * *"
-
-jobs:
-  stale:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/stale@v1
-      with:
-        repo-token: ${{ secrets.GITHUB_TOKEN }}
-        stale-issue-message: 'This issue is stale because it has been open 30 days with no activity. Remove stale label or comment or this will be closed in 5 days'
-        days-before-stale: 30
-        days-before-close: 5

From 53cfa61ed2eda6274d9ec05c3cf11548afcb4627 Mon Sep 17 00:00:00 2001
From: Xenomes <xenomes@outlook.com>
Date: Sun, 11 Feb 2024 13:08:55 +0100
Subject: [PATCH 11/12] Smallfix for device battery between 101 and 255

---
 modules/trait.py | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/modules/trait.py b/modules/trait.py
index 7c6e926..60c7577 100644
--- a/modules/trait.py
+++ b/modules/trait.py
@@ -128,12 +128,12 @@ 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:
+                if battery >= 100:
                     descriptive_capacity_remaining = "FULL"
                 elif 50 <= battery < 100:
                     descriptive_capacity_remaining = "HIGH"
@@ -143,12 +143,12 @@ def query(custom_data, device, user_id):
                     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 domain not in ['Group', 'Scene'] and state['BatteryLevel'] != 255:
@@ -181,7 +181,7 @@ def execute(device, command, params, user_id, challenge):
         else:
             data = state['Data']
             url += 'switchlight&idx=' + idx + '&switchcmd='
-        
+
         if check_state:
             if params['on'] is True and data == 'Off':
                 url += 'On'
@@ -190,15 +190,15 @@ def execute(device, command, params, user_id, challenge):
             else:
                 raise SmartHomeError('alreadyInState',
                                    'Unable to execute {} for {}. Already in state '.format(command, device['id']))
-        else:                      
+        else:
             url += ('On' if params['on'] else 'Off')
 
         response['on'] = params['on']
 
     if command == 'action.devices.commands.LockUnlock':
-    
+
         url += 'switchlight&idx=' + idx + '&switchcmd='
-        
+
         if check_state:
             if params['lock'] is True and state['Data'] == 'Unlocked':
                 url += ('Off' if domain in ['DoorLockInverted'] else 'On')
@@ -279,7 +279,7 @@ def execute(device, command, params, user_id, challenge):
         else:
             p = params.get('openPercent', 50)
             url += 'switchlight&idx=' + idx + '&switchcmd='
-            
+
             if check_state:
                 if p == 100 and state['Data'] in ['Closed', 'Stopped']:
                     url += 'Open'
@@ -351,15 +351,15 @@ def execute(device, command, params, user_id, challenge):
                 slevel = str(levelName.index(key) * 10)
 
             url += 'switchlight&idx=' + idx + '&switchcmd=Set%20Level&level=' + slevel
-            
+
     if command == 'action.devices.commands.TimerStart':
-    
+
         url += 'customevent&event=TIMER&data={"idx":' + idx + ',"time":' + str(params['timerTimeSec']) + ',"on":true}'
-        
+
     if command == 'action.devices.commands.TimerCancel':
 
         url += 'customevent&event=TIMER&data={"idx":' + idx + ',"cancel":true}'
-        
+
     if command == 'action.devices.commands.SetTemperature':
         if 'merge_thermo_idx' in custom_data:
             url += 'setsetpoint&idx=' + custom_data['merge_thermo_idx'] + '&setpoint=' + str(

From 12ce46e1c8eacf9f0f951bfa72ae693344d0e4fe Mon Sep 17 00:00:00 2001
From: DewGew <pierlar@hotmail.com>
Date: Sun, 11 Feb 2024 18:11:11 +0100
Subject: [PATCH 12/12] Update VERSION.md

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

diff --git a/VERSION.md b/VERSION.md
index a376937..9f40b60 100644
--- a/VERSION.md
+++ b/VERSION.md
@@ -1,5 +1,7 @@
-24.8
-- Sync devices when saving device config
-- Added more API
+24.9
+- Added Timer trait, a timer script is needed read in wiki
+- Added temepeture control trait
+- Added merge setpoint to Heater, waterheater, oven types.
+- Small fixes
 - Added already in state error message
 - Added REST API read more in wiki