From 32aa35d9c33e2013fa7525d457827d669cb61304 Mon Sep 17 00:00:00 2001 From: joBr99 Date: Mon, 21 Mar 2022 14:44:50 +0000 Subject: [PATCH 1/3] Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui (add nextion2text) --- HMI/n2t-out/nspanel_Stats.txt | 8 ++++---- HMI/n2t-out/pageStartup.txt | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/HMI/n2t-out/nspanel_Stats.txt b/HMI/n2t-out/nspanel_Stats.txt index 9329d8854..c177e290f 100644 --- a/HMI/n2t-out/nspanel_Stats.txt +++ b/HMI/n2t-out/nspanel_Stats.txt @@ -18,6 +18,10 @@ popupNotify 17 Component(s) 179 Line(s) of event code 118 Unique line(s) of event code +pageStartup + 19 Component(s) + 146 Line(s) of event code + 111 Unique line(s) of event code pageSwipeTest 18 Component(s) 62 Line(s) of event code @@ -30,10 +34,6 @@ pageTest 14 Component(s) 14 Line(s) of event code 14 Unique line(s) of event code -pageStartup - 19 Component(s) - 146 Line(s) of event code - 111 Unique line(s) of event code popupShutter 19 Component(s) 194 Line(s) of event code diff --git a/HMI/n2t-out/pageStartup.txt b/HMI/n2t-out/pageStartup.txt index e34027b66..a0af3aa7c 100644 --- a/HMI/n2t-out/pageStartup.txt +++ b/HMI/n2t-out/pageStartup.txt @@ -402,7 +402,7 @@ Text tVersion Horizontal Alignment : center Vertical Alignment : center Input Type : character - Text : 13 + Text : 14 Max. Text Size : 10 Word wrap : disabled Horizontal Spacing : 0 From 5903239456b0c7b4b7435ec2c3097f71751a4269 Mon Sep 17 00:00:00 2001 From: Johannes Date: Mon, 21 Mar 2022 15:46:04 +0100 Subject: [PATCH 2/3] Update nspanel-lovelace-ui.py --- apps/nspanel-lovelace-ui/nspanel-lovelace-ui.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/nspanel-lovelace-ui/nspanel-lovelace-ui.py b/apps/nspanel-lovelace-ui/nspanel-lovelace-ui.py index 85d3b0446..1cfbc1a5a 100644 --- a/apps/nspanel-lovelace-ui/nspanel-lovelace-ui.py +++ b/apps/nspanel-lovelace-ui/nspanel-lovelace-ui.py @@ -18,8 +18,8 @@ def initialize(self): class Updater: def __init__(self, nsplui, mode): - self.desired_display_firmware_version = 13 - self.desired_display_firmware_url = "http://nspanel.pky.eu/lovelace-ui/github/nspanel-e780bf3.tft" + self.desired_display_firmware_version = 14 + self.desired_display_firmware_url = "http://nspanel.pky.eu/lovelace-ui/github/nspanel-bb0108d.tft" self.desired_tasmota_driver_version = 3 self.desired_tasmota_driver_url = "https://raw.githubusercontent.com/joBr99/nspanel-lovelace-ui/main/tasmota/autoexec.be" @@ -681,4 +681,4 @@ def generate_detail_page(self, page_type, entity): def send_message_page(self, id, heading, msg, b1, b2): self.send_mqtt_msg(f"pageType,popupNotify") self.send_mqtt_msg(f"entityUpdateDetail,|{id}|{heading}|65535|{b1}|65535|{b2}|65535|{msg}|65535|0") - \ No newline at end of file + From 7996393afb2a843cbb23007bf56b97919e3655f9 Mon Sep 17 00:00:00 2001 From: Johannes Date: Mon, 21 Mar 2022 16:48:13 +0100 Subject: [PATCH 3/3] fix version tag --- apps/nspanel-lovelace-ui/nspanel-lovelace-ui.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/nspanel-lovelace-ui/nspanel-lovelace-ui.py b/apps/nspanel-lovelace-ui/nspanel-lovelace-ui.py index 1cfbc1a5a..d85f5b265 100644 --- a/apps/nspanel-lovelace-ui/nspanel-lovelace-ui.py +++ b/apps/nspanel-lovelace-ui/nspanel-lovelace-ui.py @@ -19,7 +19,7 @@ def initialize(self): class Updater: def __init__(self, nsplui, mode): self.desired_display_firmware_version = 14 - self.desired_display_firmware_url = "http://nspanel.pky.eu/lovelace-ui/github/nspanel-bb0108d.tft" + self.desired_display_firmware_url = "http://nspanel.pky.eu/lovelace-ui/github/nspanel-5903239.tft" self.desired_tasmota_driver_version = 3 self.desired_tasmota_driver_url = "https://raw.githubusercontent.com/joBr99/nspanel-lovelace-ui/main/tasmota/autoexec.be"