From 945ce8fe1e047218ec8655262f5ac23778818be7 Mon Sep 17 00:00:00 2001 From: joBr99 Date: Wed, 8 Feb 2023 21:45:42 +0000 Subject: [PATCH 1/2] , (add nextion2text) --- HMI/US/portrait/diff-filtered.txt | 2 +- HMI/n2t-out-visual/screensaver2.txt | 50 ++++++++++++++--------------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index 2ce97efa..08ca73a0 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,4 +1,4 @@ -+++ /dev/fd/62 2023-02-04 16:55:42.887439874 +0000 ++++ /dev/fd/62 2023-02-08 21:45:33.503663885 +0000 +le list + +14,8 @@ +n.txt diff --git a/HMI/n2t-out-visual/screensaver2.txt b/HMI/n2t-out-visual/screensaver2.txt index 544a9fc1..74b15096 100644 --- a/HMI/n2t-out-visual/screensaver2.txt +++ b/HMI/n2t-out-visual/screensaver2.txt @@ -347,9 +347,9 @@ Text e1Name Send Component ID : disabled Opacity : 127 x coordinate : 5 - y coordinate : 198 + y coordinate : 195 Width : 70 - Height : 20 + Height : 25 Effect : load Effect Priority : 0 Effect Time : 300 @@ -377,9 +377,9 @@ Text e1Val Send Component ID : disabled Opacity : 127 x coordinate : 5 - y coordinate : 254 + y coordinate : 252 Width : 70 - Height : 20 + Height : 25 Effect : load Effect Priority : 0 Effect Time : 300 @@ -437,9 +437,9 @@ Text e2Name Send Component ID : disabled Opacity : 127 x coordinate : 78 - y coordinate : 198 + y coordinate : 195 Width : 70 - Height : 20 + Height : 25 Effect : load Effect Priority : 0 Effect Time : 300 @@ -467,9 +467,9 @@ Text e2Val Send Component ID : disabled Opacity : 127 x coordinate : 79 - y coordinate : 254 + y coordinate : 252 Width : 70 - Height : 20 + Height : 25 Effect : load Effect Priority : 0 Effect Time : 300 @@ -527,9 +527,9 @@ Text e3Name Send Component ID : disabled Opacity : 127 x coordinate : 153 - y coordinate : 198 + y coordinate : 195 Width : 70 - Height : 20 + Height : 25 Effect : load Effect Priority : 0 Effect Time : 300 @@ -557,9 +557,9 @@ Text e3Val Send Component ID : disabled Opacity : 127 x coordinate : 153 - y coordinate : 254 + y coordinate : 252 Width : 70 - Height : 20 + Height : 25 Effect : load Effect Priority : 0 Effect Time : 300 @@ -617,9 +617,9 @@ Text e4Name Send Component ID : disabled Opacity : 127 x coordinate : 230 - y coordinate : 198 + y coordinate : 195 Width : 70 - Height : 20 + Height : 25 Effect : load Effect Priority : 0 Effect Time : 300 @@ -647,9 +647,9 @@ Text e4Val Send Component ID : disabled Opacity : 127 x coordinate : 230 - y coordinate : 254 + y coordinate : 252 Width : 70 - Height : 20 + Height : 25 Effect : load Effect Priority : 0 Effect Time : 300 @@ -707,9 +707,9 @@ Text e5Name Send Component ID : disabled Opacity : 127 x coordinate : 304 - y coordinate : 198 + y coordinate : 195 Width : 70 - Height : 20 + Height : 25 Effect : load Effect Priority : 0 Effect Time : 300 @@ -737,9 +737,9 @@ Text e5Val Send Component ID : disabled Opacity : 127 x coordinate : 304 - y coordinate : 254 + y coordinate : 252 Width : 70 - Height : 20 + Height : 25 Effect : load Effect Priority : 0 Effect Time : 300 @@ -797,9 +797,9 @@ Text e6Name Send Component ID : disabled Opacity : 127 x coordinate : 377 - y coordinate : 198 + y coordinate : 195 Width : 70 - Height : 20 + Height : 25 Effect : load Effect Priority : 0 Effect Time : 300 @@ -827,9 +827,9 @@ Text e6Val Send Component ID : disabled Opacity : 127 x coordinate : 377 - y coordinate : 254 + y coordinate : 252 Width : 70 - Height : 20 + Height : 25 Effect : load Effect Priority : 0 Effect Time : 300 @@ -1258,7 +1258,7 @@ Text tNotifyText Send Component ID : disabled Opacity : 127 x coordinate : 0 - y coordinate : 220 + y coordinate : 221 Width : 448 Height : 58 Effect : load From ffb917f538124d25e512b2ff712f9ef931dbabec Mon Sep 17 00:00:00 2001 From: Johannes <29555657+joBr99@users.noreply.github.com> Date: Thu, 9 Feb 2023 20:31:32 +0100 Subject: [PATCH 2/2] Update controller.py --- apps/nspanel-lovelace-ui/luibackend/controller.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/apps/nspanel-lovelace-ui/luibackend/controller.py b/apps/nspanel-lovelace-ui/luibackend/controller.py index 8d397a73..f4e2c1f8 100644 --- a/apps/nspanel-lovelace-ui/luibackend/controller.py +++ b/apps/nspanel-lovelace-ui/luibackend/controller.py @@ -194,9 +194,6 @@ class LuiController(object): def button_press(self, entity_id, button_type, value): apis.ha_api.log(f"Button Press Event; entity_id: {entity_id}; button_type: {button_type}; value: {value} ") - if entity_id.startswith('uuid'): - entity_config = self._config._config_entites_table.get(entity_id) - entity_id = entity_config.entityId # internal buttons if entity_id == "screensaver" and button_type == "bExit": # get default card if there is one @@ -270,6 +267,10 @@ class LuiController(object): if button_type == "button": + if entity_id.startswith('uuid'): + entity_config = self._config._config_entites_table.get(entity_id) + entity_id = entity_config.entityId + if entity_id.startswith('navigate'): # internal navigation for next/prev if entity_id.startswith('navigate.uuid'):