From 8585b97d72eefe970be6d47a3511452b5376943a Mon Sep 17 00:00:00 2001 From: illuzn Date: Mon, 30 May 2022 14:22:38 +0930 Subject: [PATCH 1/5] Enable sleepOverride --- apps/nspanel-lovelace-ui/luibackend/config.py | 1 + apps/nspanel-lovelace-ui/luibackend/controller.py | 11 +++++++++++ 2 files changed, 12 insertions(+) diff --git a/apps/nspanel-lovelace-ui/luibackend/config.py b/apps/nspanel-lovelace-ui/luibackend/config.py index 9a6f5482..186d438a 100644 --- a/apps/nspanel-lovelace-ui/luibackend/config.py +++ b/apps/nspanel-lovelace-ui/luibackend/config.py @@ -68,6 +68,7 @@ class LuiBackendConfig(object): 'sleepTimeout': 20, 'sleepBrightness': 20, 'sleepTracking': None, + 'sleepOverride': None, 'locale': "en_US", 'timeFormat': "%H:%M", 'dateFormatBabel': "full", diff --git a/apps/nspanel-lovelace-ui/luibackend/controller.py b/apps/nspanel-lovelace-ui/luibackend/controller.py index 6025451a..dedf0346 100644 --- a/apps/nspanel-lovelace-ui/luibackend/controller.py +++ b/apps/nspanel-lovelace-ui/luibackend/controller.py @@ -42,6 +42,11 @@ class LuiController(object): bst = self._config.get("sleepTracking") if bst is not None and self._ha_api.entity_exists(bst): self._ha_api.listen_state(self.update_screensaver_brightness_state_callback, entity_id=bst) + + # call update_screensaver_brightness on entity configured in sleepOverride + sleepOverride = self._config.get("sleepOverride") + if sleepOverride is not None and sleepOverride["entity"] is not None and sleepOverride["brightness"] is not None and self._ha_api.entity_exists(sleepOverride["entity"]): + self._ha_api.listen_state(self.update_screensaver_brightness_state_callback, entity_id=sleepOverride["entity"]) # register callback for state changes on tracked value sleep_brightness_config = self._config.get("sleepBrightness") @@ -72,9 +77,15 @@ class LuiController(object): def update_screensaver_brightness(self, kwargs): bst = self._config.get("sleepTracking") + sleepOverride = self._config.get("sleepOverride") + brightness = 0 if bst is not None and self._ha_api.entity_exists(bst) and self._ha_api.get_entity(bst).state in ["not_home", "off"]: brightness = 0 + + elif sleepOverride is not None and sleepOverride["entity"] is not None and sleepOverride["brightness"] is not None and self._ha_api.entity_exists(sleepOverride["entity"]) and self._ha_api.get_entity(sleepOverride["entity"]) in ["on", "true", "home"]: + brightness = sleepOverride["brightness"] + else: self.current_screensaver_brightness = kwargs['value'] brightness = kwargs['value'] From 47c10ae2229078b206191b36d5361f7225d0975a Mon Sep 17 00:00:00 2001 From: illuzn Date: Mon, 30 May 2022 15:52:11 +0930 Subject: [PATCH 2/5] debug, change readme and example configs --- README.md | 4 ++++ appdaemon/apps-simple.yaml | 4 ++++ apps/nspanel-lovelace-ui/luibackend/controller.py | 13 ++++++++++--- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 453d94d8..d7b2be7d 100644 --- a/README.md +++ b/README.md @@ -379,6 +379,7 @@ key | optional | type | default | description `sleepTimeout` | True | integer | `20` | Timeout for the screen to enter screensaver, to disable screensaver use 0 `sleepBrightness` | True | integer/complex | `20` | Brightness for the screen to enter screensaver, see example below for complex/scheduled config. `sleepTracking` | True | string | None | Forces screensaver brightness to 0 in case entity state is not_home or off, can be a group, person or device_tracker entity. +`sleepOverride` | True | complex | None | Allows overriding of the sleepBrightness if entity state is on, true or home. Overrides sleepBrightness but sleepTracking takes precedence. `locale` | True | string | `en_US` | Used by babel to determinante Date format on screensaver, also used for localization. `dateFormatBabel` | True | string | `full` | formatting options on https://babel.pocoo.org/en/latest/dates.html?highlight=name%20of%20day#date-fields `timeFormat` | True | string | `%H:%M` | Time Format on screensaver. Substring after `?` is displayed in a seperate smaller textbox. Useful for 12h time format with AM/PM 
`"%I:%M   ?%p"`
@@ -536,6 +537,9 @@ It is possible to schedule a brightness change for the screen at specific times. value: 0 ``` +`sleepTracking` overrides this setting and sets the brightness to 0 if the state of the configured Home Assistant entity is `off` or `not_home`. You may also use a [Home Assistant group](https://www.home-assistant.io/integrations/group) to track multiple entities. + +`sleepOverride` overrides sleepBrightness but does not take precedence over sleepTracking. This is useful if, for example, you want your NSPanel to be brighter than usual if your light is on or if you want to override a panel dimming if you are in the room. #### Override Icons or Names diff --git a/appdaemon/apps-simple.yaml b/appdaemon/apps-simple.yaml index bb61f3b1..0ba92351 100644 --- a/appdaemon/apps-simple.yaml +++ b/appdaemon/apps-simple.yaml @@ -8,6 +8,10 @@ nspanel-1: updateMode: "auto-notify" sleepTimeout: 20 #sleepBrightness: 10 + sleepTracking: device_tracker.amihome + sleepOverride: + entity: sensor.isthelighton + brightness: 99 sleepBrightness: - time: "7:00:00" value: 10 diff --git a/apps/nspanel-lovelace-ui/luibackend/controller.py b/apps/nspanel-lovelace-ui/luibackend/controller.py index de6c03e8..42edb046 100644 --- a/apps/nspanel-lovelace-ui/luibackend/controller.py +++ b/apps/nspanel-lovelace-ui/luibackend/controller.py @@ -45,7 +45,8 @@ class LuiController(object): # call update_screensaver_brightness on entity configured in sleepOverride sleepOverride = self._config.get("sleepOverride") - if sleepOverride is not None and sleepOverride["entity"] is not None and sleepOverride["brightness"] is not None and self._ha_api.entity_exists(sleepOverride["entity"]): + if sleepOverride is not None and type(sleepOverride) is dict and sleepOverride["entity"] is not None and sleepOverride["brightness"] is not None and self._ha_api.entity_exists(sleepOverride["entity"]): + self._ha_api.log(f"Configuring Sleep Override. Config is {sleepOverride}") self._ha_api.listen_state(self.update_screensaver_brightness_state_callback, entity_id=sleepOverride["entity"]) # register callback for state changes on tracked value @@ -78,13 +79,19 @@ class LuiController(object): def update_screensaver_brightness(self, kwargs): bst = self._config.get("sleepTracking") sleepOverride = self._config.get("sleepOverride") + if sleepOverride is not None and type(sleepOverride) is dict: + sOEntity = sleepOverride["entity"] + sOBrightness = sleepOverride["brightness"] brightness = 0 + if bst is not None and self._ha_api.entity_exists(bst) and self._ha_api.get_entity(bst).state in ["not_home", "off"]: + self._ha_api.log(f"sleepTracking setting brightness to 0") brightness = 0 - elif sleepOverride is not None and sleepOverride["entity"] is not None and sleepOverride["brightness"] is not None and self._ha_api.entity_exists(sleepOverride["entity"]) and self._ha_api.get_entity(sleepOverride["entity"]) in ["on", "true", "home"]: - brightness = sleepOverride["brightness"] + elif sOEntity is not None and sOBrightness is not None and self._ha_api.entity_exists(sOEntity) and self._ha_api.get_entity(sOEntity).state in ["on", "true", "home"]: + self._ha_api.log(f"sleepOverride setting brightness to {sOBrightness}") + brightness = sOBrightness else: self.current_screensaver_brightness = kwargs['value'] From cdcc82590ef48ece03aeae3fcb2788fd00a6b827 Mon Sep 17 00:00:00 2001 From: illuzn Date: Mon, 30 May 2022 15:55:44 +0930 Subject: [PATCH 3/5] Clarify Readme --- README.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/README.md b/README.md index d7b2be7d..83e86596 100644 --- a/README.md +++ b/README.md @@ -541,6 +541,19 @@ It is possible to schedule a brightness change for the screen at specific times. `sleepOverride` overrides sleepBrightness but does not take precedence over sleepTracking. This is useful if, for example, you want your NSPanel to be brighter than usual if your light is on or if you want to override a panel dimming if you are in the room. +The following example configuration does nothing during the day but at night, if the bedroom light is on the NSPanel brightness will be 20 instead of 0. + +```yaml + sleepBrightness: + - time: "sunrise" + value: 20 + - time: "sunset" + value: 0 + sleepOverride: + entity: light.bedroomlight + brightness: 20 +``` + #### Override Icons or Names To overwrite Icons or Names of entities you can configure an icon and/or name in your configuration, please see the following example. From da680cd49437a62ad52b287bb073842201654c93 Mon Sep 17 00:00:00 2001 From: joBr99 <29555657+joBr99@users.noreply.github.com> Date: Tue, 31 May 2022 15:07:50 +0000 Subject: [PATCH 4/5] fixes #252 clr button on cardalarm (add nextion2text) --- HMI/US/landscape/diff-eu-version.txt | 44 +++++++++---------- HMI/US/landscape/n2t-out-visual/cardAlarm.txt | 2 + .../n2t-out-visual/nspanel_US_L_Stats.txt | 12 ++--- HMI/US/landscape/n2t-out/cardAlarm.txt | 2 + HMI/US/portrait/diff-eu-version.txt | 31 +++++-------- HMI/US/portrait/diff-filtered.txt | 33 +++++--------- HMI/US/portrait/n2t-out-visual/cardAlarm.txt | 3 ++ .../n2t-out-visual/nspanel_US_P_Stats.txt | 8 ++-- HMI/US/portrait/n2t-out/cardAlarm.txt | 3 ++ HMI/n2t-out-visual/cardAlarm.txt | 2 + HMI/n2t-out-visual/nspanel_Stats.txt | 12 ++--- HMI/n2t-out/cardAlarm.txt | 2 + 12 files changed, 73 insertions(+), 81 deletions(-) diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 8cff6894..636f4885 100644 --- a/HMI/US/landscape/diff-eu-version.txt +++ b/HMI/US/landscape/diff-eu-version.txt @@ -1,6 +1,6 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt ---- HMI/n2t-out/Program.s.txt 2022-05-30 20:13:56.889032545 +0000 -+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-30 20:13:57.965045854 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-31 15:07:44.430967227 +0000 ++++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-31 15:07:45.430982442 +0000 @@ -11,6 +11,4 @@ // dim value int dimValue=40 @@ -9,8 +9,8 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt - lcd_dev fffb 0002 0000 0020 page pageStartup diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt ---- HMI/n2t-out/cardEntities.txt 2022-05-30 20:13:56.889032545 +0000 -+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-05-30 20:13:57.969045903 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-05-31 15:07:44.430967227 +0000 ++++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-05-31 15:07:45.430982442 +0000 @@ -1925,10 +1925,6 @@ // get value spstr strCommand.txt,tTmp.txt,"~",1 @@ -23,8 +23,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt if(tInstruction.txt=="timeout") { diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt ---- HMI/n2t-out/cardGrid.txt 2022-05-30 20:13:56.889032545 +0000 -+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-05-30 20:13:57.965045854 +0000 +--- HMI/n2t-out/cardGrid.txt 2022-05-31 15:07:44.430967227 +0000 ++++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-05-31 15:07:45.430982442 +0000 @@ -846,10 +846,6 @@ // get value spstr strCommand.txt,tTmp.txt,"~",1 @@ -37,8 +37,8 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt if(tInstruction.txt=="timeout") { diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt ---- HMI/n2t-out/cardMedia.txt 2022-05-30 20:13:56.889032545 +0000 -+++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-05-30 20:13:57.965045854 +0000 +--- HMI/n2t-out/cardMedia.txt 2022-05-31 15:07:44.430967227 +0000 ++++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-05-31 15:07:45.430982442 +0000 @@ -636,10 +636,7 @@ // get value spstr strCommand.txt,tTmp.txt,"~",1 @@ -52,8 +52,8 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt if(tInstruction.txt=="timeout") { diff -bur HMI/n2t-out/cardQR.txt HMI/US/landscape/n2t-out/cardQR.txt ---- HMI/n2t-out/cardQR.txt 2022-05-30 20:13:56.889032545 +0000 -+++ HMI/US/landscape/n2t-out/cardQR.txt 2022-05-30 20:13:57.965045854 +0000 +--- HMI/n2t-out/cardQR.txt 2022-05-31 15:07:44.430967227 +0000 ++++ HMI/US/landscape/n2t-out/cardQR.txt 2022-05-31 15:07:45.430982442 +0000 @@ -582,10 +582,7 @@ // get value spstr strCommand.txt,tTmp.txt,"~",1 @@ -67,8 +67,8 @@ diff -bur HMI/n2t-out/cardQR.txt HMI/US/landscape/n2t-out/cardQR.txt if(tInstruction.txt=="timeout") { diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt ---- HMI/n2t-out/cardThermo.txt 2022-05-30 20:13:56.889032545 +0000 -+++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-05-30 20:13:57.969045903 +0000 +--- HMI/n2t-out/cardThermo.txt 2022-05-31 15:07:44.430967227 +0000 ++++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-05-31 15:07:45.430982442 +0000 @@ -1170,10 +1170,6 @@ // get value spstr strCommand.txt,tTmp.txt,"~",1 @@ -81,8 +81,8 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt if(tInstruction.txt=="timeout") { diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-05-30 20:13:56.889032545 +0000 -+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-30 20:13:57.965045854 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-31 15:07:44.430967227 +0000 ++++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-31 15:07:45.430982442 +0000 @@ -177,7 +177,7 @@ recmod=1 bauds=115200 @@ -104,8 +104,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt if(tInstruction.txt=="timeout") { diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt ---- HMI/n2t-out/popupLight.txt 2022-05-30 20:13:56.889032545 +0000 -+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-05-30 20:13:57.965045854 +0000 +--- HMI/n2t-out/popupLight.txt 2022-05-31 15:07:44.430967227 +0000 ++++ HMI/US/landscape/n2t-out/popupLight.txt 2022-05-31 15:07:45.430982442 +0000 @@ -561,10 +561,6 @@ // get value spstr strCommand.txt,tTmp.txt,"~",1 @@ -118,8 +118,8 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt if(tInstruction.txt=="timeout") { diff -bur HMI/n2t-out/popupNotify.txt HMI/US/landscape/n2t-out/popupNotify.txt ---- HMI/n2t-out/popupNotify.txt 2022-05-30 20:13:56.889032545 +0000 -+++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-05-30 20:13:57.965045854 +0000 +--- HMI/n2t-out/popupNotify.txt 2022-05-31 15:07:44.430967227 +0000 ++++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-05-31 15:07:45.430982442 +0000 @@ -311,10 +311,6 @@ // get value spstr strCommand.txt,tTmp.txt,"~",1 @@ -132,8 +132,8 @@ diff -bur HMI/n2t-out/popupNotify.txt HMI/US/landscape/n2t-out/popupNotify.txt if(tInstruction.txt=="timeout") { diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt ---- HMI/n2t-out/popupShutter.txt 2022-05-30 20:13:56.889032545 +0000 -+++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-05-30 20:13:57.969045903 +0000 +--- HMI/n2t-out/popupShutter.txt 2022-05-31 15:07:44.430967227 +0000 ++++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-05-31 15:07:45.430982442 +0000 @@ -406,10 +406,6 @@ // get value spstr strCommand.txt,tTmp.txt,"~",1 @@ -146,8 +146,8 @@ diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt if(tInstruction.txt=="time") { diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt ---- HMI/n2t-out/screensaver.txt 2022-05-30 20:13:56.889032545 +0000 -+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-05-30 20:13:57.969045903 +0000 +--- HMI/n2t-out/screensaver.txt 2022-05-31 15:07:44.430967227 +0000 ++++ HMI/US/landscape/n2t-out/screensaver.txt 2022-05-31 15:07:45.430982442 +0000 @@ -397,9 +397,6 @@ spstr strCommand.txt,tTmp.txt,"~",1 covx tTmp.txt,dimValue,0,0 diff --git a/HMI/US/landscape/n2t-out-visual/cardAlarm.txt b/HMI/US/landscape/n2t-out-visual/cardAlarm.txt index 7c04df0a..d1305502 100644 --- a/HMI/US/landscape/n2t-out-visual/cardAlarm.txt +++ b/HMI/US/landscape/n2t-out-visual/cardAlarm.txt @@ -1261,6 +1261,7 @@ Timer tmSerial vis b8,1 vis b9,1 vis b10,1 + vis b11,1 vis tCode,1 }else { @@ -1275,6 +1276,7 @@ Timer tmSerial vis b8,0 vis b9,0 vis b10,0 + vis b11,0 vis tCode,0 } //flashing status diff --git a/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt b/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt index 794a19f1..bde71504 100644 --- a/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt +++ b/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt @@ -38,14 +38,14 @@ popupShutter 20 Component(s) 245 Line(s) of event code 139 Unique line(s) of event code +cardAlarm + 40 Component(s) + 387 Line(s) of event code + 237 Unique line(s) of event code cardThermo 56 Component(s) 543 Line(s) of event code 293 Unique line(s) of event code -cardAlarm - 40 Component(s) - 385 Line(s) of event code - 235 Unique line(s) of event code cardEntities 65 Component(s) 1130 Line(s) of event code @@ -58,5 +58,5 @@ screensaver Total 13 Page(s) 406 Component(s) - 4479 Line(s) of event code - 1185 Unique line(s) of event code + 4481 Line(s) of event code + 1187 Unique line(s) of event code diff --git a/HMI/US/landscape/n2t-out/cardAlarm.txt b/HMI/US/landscape/n2t-out/cardAlarm.txt index 57f6e110..c265c131 100644 --- a/HMI/US/landscape/n2t-out/cardAlarm.txt +++ b/HMI/US/landscape/n2t-out/cardAlarm.txt @@ -679,6 +679,7 @@ Timer tmSerial vis b8,1 vis b9,1 vis b10,1 + vis b11,1 vis tCode,1 }else { @@ -693,6 +694,7 @@ Timer tmSerial vis b8,0 vis b9,0 vis b10,0 + vis b11,0 vis tCode,0 } //flashing status diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index 0c8901ce..0d782b30 100644 --- a/HMI/US/portrait/diff-eu-version.txt +++ b/HMI/US/portrait/diff-eu-version.txt @@ -1,6 +1,6 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt ---- HMI/n2t-out/Program.s.txt 2022-05-30 20:13:56.889032545 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-30 20:13:57.417039079 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-31 15:07:44.430967227 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-31 15:07:44.910974530 +0000 @@ -11,6 +11,6 @@ // dim value int dimValue=40 @@ -10,20 +10,9 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt + // fix touch offset (Removed for US version) + //lcd_dev fffb 0002 0000 0020 page pageStartup -diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt ---- HMI/n2t-out/cardAlarm.txt 2022-05-30 20:13:56.889032545 +0000 -+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-30 20:13:57.421039128 +0000 -@@ -33,7 +33,6 @@ - vis b8,0 - vis b9,0 - vis b10,0 -- vis b11,0 - vis tCode,0 - vis bPrev,0 - vis bNext,0 diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt ---- HMI/n2t-out/cardEntities.txt 2022-05-30 20:13:56.889032545 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-30 20:13:57.421039128 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-05-31 15:07:44.430967227 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-31 15:07:44.910974530 +0000 @@ -63,6 +63,16 @@ vis bText4,0 vis hSlider4,0 @@ -479,8 +468,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt if(tInstruction.txt=="pageType") { diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt ---- HMI/n2t-out/cardQR.txt 2022-05-30 20:13:56.889032545 +0000 -+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-30 20:13:57.417039079 +0000 +--- HMI/n2t-out/cardQR.txt 2022-05-31 15:07:44.430967227 +0000 ++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-31 15:07:44.910974530 +0000 @@ -35,7 +35,7 @@ Attributes Scope : local @@ -491,8 +480,8 @@ diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt Variable (string) entn Attributes diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-05-30 20:13:56.889032545 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-30 20:13:57.421039128 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-31 15:07:44.430967227 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-31 15:07:44.910974530 +0000 @@ -142,7 +142,7 @@ Disable release event after dragging: 0 Send Component ID : disabled @@ -512,8 +501,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt ---- HMI/n2t-out/screensaver.txt 2022-05-30 20:13:56.889032545 +0000 -+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-30 20:13:57.421039128 +0000 +--- HMI/n2t-out/screensaver.txt 2022-05-31 15:07:44.430967227 +0000 ++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-31 15:07:44.910974530 +0000 @@ -474,22 +474,6 @@ vis tMainIconAlt,1 vis tMRIcon,1 diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index f29700df..70b59351 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,19 +1,8 @@ -+++ HMI/US/portrait/diff-eu-version.txt 2022-05-30 20:13:57.437039326 +0000 -+--- HMI/n2t-out/Program.s.txt 2022-05-30 20:13:56.889032545 +0000 -++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-30 20:13:57.417039079 +0000 -+diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt -+--- HMI/n2t-out/cardAlarm.txt 2022-05-30 20:13:56.889032545 +0000 -++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-30 20:13:57.421039128 +0000 -+@@ -33,7 +33,6 @@ -+ vis b8,0 -+ vis b9,0 -+ vis b10,0 -+- vis b11,0 -+ vis tCode,0 -+ vis bPrev,0 -+ vis bNext,0 -+--- HMI/n2t-out/cardEntities.txt 2022-05-30 20:13:56.889032545 +0000 -++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-30 20:13:57.421039128 +0000 ++++ HMI/US/portrait/diff-eu-version.txt 2022-05-31 15:07:44.926974773 +0000 ++--- HMI/n2t-out/Program.s.txt 2022-05-31 15:07:44.430967227 +0000 +++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-31 15:07:44.910974530 +0000 ++--- HMI/n2t-out/cardEntities.txt 2022-05-31 15:07:44.430967227 +0000 +++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-31 15:07:44.910974530 +0000 +@@ -63,6 +63,16 @@ +@@ -120,6 +130,18 @@ +@@ -156,6 +178,15 @@ @@ -23,11 +12,11 @@ +@@ -970,6 +1149,33 @@ +@@ -1075,6 +1281,28 @@ +@@ -1850,6 +2078,169 @@ -+--- HMI/n2t-out/cardQR.txt 2022-05-30 20:13:56.889032545 +0000 -++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-30 20:13:57.417039079 +0000 ++--- HMI/n2t-out/cardQR.txt 2022-05-31 15:07:44.430967227 +0000 +++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-31 15:07:44.910974530 +0000 +@@ -35,7 +35,7 @@ -+--- HMI/n2t-out/pageStartup.txt 2022-05-30 20:13:56.889032545 +0000 -++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-30 20:13:57.421039128 +0000 -+--- HMI/n2t-out/screensaver.txt 2022-05-30 20:13:56.889032545 +0000 -++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-30 20:13:57.421039128 +0000 ++--- HMI/n2t-out/pageStartup.txt 2022-05-31 15:07:44.430967227 +0000 +++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-31 15:07:44.910974530 +0000 ++--- HMI/n2t-out/screensaver.txt 2022-05-31 15:07:44.430967227 +0000 +++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-31 15:07:44.910974530 +0000 +@@ -474,22 +474,6 @@ diff --git a/HMI/US/portrait/n2t-out-visual/cardAlarm.txt b/HMI/US/portrait/n2t-out-visual/cardAlarm.txt index 294a8805..393b1074 100644 --- a/HMI/US/portrait/n2t-out-visual/cardAlarm.txt +++ b/HMI/US/portrait/n2t-out-visual/cardAlarm.txt @@ -41,6 +41,7 @@ Page cardAlarm vis b8,0 vis b9,0 vis b10,0 + vis b11,0 vis tCode,0 vis bPrev,0 vis bNext,0 @@ -1260,6 +1261,7 @@ Timer tmSerial vis b8,1 vis b9,1 vis b10,1 + vis b11,1 vis tCode,1 }else { @@ -1274,6 +1276,7 @@ Timer tmSerial vis b8,0 vis b9,0 vis b10,0 + vis b11,0 vis tCode,0 } //flashing status diff --git a/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt b/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt index 13c982d3..62aee09d 100644 --- a/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt +++ b/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt @@ -44,8 +44,8 @@ cardMedia 183 Unique line(s) of event code cardAlarm 40 Component(s) - 384 Line(s) of event code - 234 Unique line(s) of event code + 387 Line(s) of event code + 237 Unique line(s) of event code pageStartup 19 Component(s) 157 Line(s) of event code @@ -58,5 +58,5 @@ screensaver Total 13 Page(s) 418 Component(s) - 4720 Line(s) of event code - 1241 Unique line(s) of event code + 4723 Line(s) of event code + 1244 Unique line(s) of event code diff --git a/HMI/US/portrait/n2t-out/cardAlarm.txt b/HMI/US/portrait/n2t-out/cardAlarm.txt index f028be52..c265c131 100644 --- a/HMI/US/portrait/n2t-out/cardAlarm.txt +++ b/HMI/US/portrait/n2t-out/cardAlarm.txt @@ -33,6 +33,7 @@ Page cardAlarm vis b8,0 vis b9,0 vis b10,0 + vis b11,0 vis tCode,0 vis bPrev,0 vis bNext,0 @@ -678,6 +679,7 @@ Timer tmSerial vis b8,1 vis b9,1 vis b10,1 + vis b11,1 vis tCode,1 }else { @@ -692,6 +694,7 @@ Timer tmSerial vis b8,0 vis b9,0 vis b10,0 + vis b11,0 vis tCode,0 } //flashing status diff --git a/HMI/n2t-out-visual/cardAlarm.txt b/HMI/n2t-out-visual/cardAlarm.txt index 36c23069..302857f3 100644 --- a/HMI/n2t-out-visual/cardAlarm.txt +++ b/HMI/n2t-out-visual/cardAlarm.txt @@ -1261,6 +1261,7 @@ Timer tmSerial vis b8,1 vis b9,1 vis b10,1 + vis b11,1 vis tCode,1 }else { @@ -1275,6 +1276,7 @@ Timer tmSerial vis b8,0 vis b9,0 vis b10,0 + vis b11,0 vis tCode,0 } //flashing status diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index 2b45a0aa..37ecd05b 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -26,10 +26,6 @@ popupShutter 20 Component(s) 248 Line(s) of event code 141 Unique line(s) of event code -cardAlarm - 40 Component(s) - 385 Line(s) of event code - 235 Unique line(s) of event code cardMedia 33 Component(s) 349 Line(s) of event code @@ -38,6 +34,10 @@ pageStartup 19 Component(s) 157 Line(s) of event code 117 Unique line(s) of event code +cardAlarm + 40 Component(s) + 387 Line(s) of event code + 237 Unique line(s) of event code cardGrid 42 Component(s) 439 Line(s) of event code @@ -58,5 +58,5 @@ cardEntities Total 13 Page(s) 406 Component(s) - 4507 Line(s) of event code - 1186 Unique line(s) of event code + 4509 Line(s) of event code + 1188 Unique line(s) of event code diff --git a/HMI/n2t-out/cardAlarm.txt b/HMI/n2t-out/cardAlarm.txt index 57f6e110..c265c131 100644 --- a/HMI/n2t-out/cardAlarm.txt +++ b/HMI/n2t-out/cardAlarm.txt @@ -679,6 +679,7 @@ Timer tmSerial vis b8,1 vis b9,1 vis b10,1 + vis b11,1 vis tCode,1 }else { @@ -693,6 +694,7 @@ Timer tmSerial vis b8,0 vis b9,0 vis b10,0 + vis b11,0 vis tCode,0 } //flashing status From 35ab536eb7e9bc406ba0360269c701ccf10e0b6c Mon Sep 17 00:00:00 2001 From: joBr99 <29555657+joBr99@users.noreply.github.com> Date: Tue, 31 May 2022 17:16:59 +0200 Subject: [PATCH 5/5] Update apps-simple.yaml --- appdaemon/apps-simple.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/appdaemon/apps-simple.yaml b/appdaemon/apps-simple.yaml index 0ba92351..bb61f3b1 100644 --- a/appdaemon/apps-simple.yaml +++ b/appdaemon/apps-simple.yaml @@ -8,10 +8,6 @@ nspanel-1: updateMode: "auto-notify" sleepTimeout: 20 #sleepBrightness: 10 - sleepTracking: device_tracker.amihome - sleepOverride: - entity: sensor.isthelighton - brightness: 99 sleepBrightness: - time: "7:00:00" value: 10