diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index ba19c01f..d33c599a 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-04-12 16:30:13.108641053 +0000 -+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-04-12 16:30:14.224656021 +0000 +--- HMI/n2t-out/Program.s.txt 2022-04-12 16:33:01.294111694 +0000 ++++ HMI/US/landscape/n2t-out/Program.s.txt 2022-04-12 16:33:02.242117899 +0000 @@ -11,6 +11,6 @@ // dim value int dimValue=40 @@ -11,8 +11,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/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-04-12 16:30:13.108641053 +0000 -+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-04-12 16:30:14.224656021 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-04-12 16:33:01.294111694 +0000 ++++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-04-12 16:33:02.242117899 +0000 @@ -177,7 +177,7 @@ recmod=1 bauds=115200 diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index 8b13d0d6..0d549ba5 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-04-12 16:30:13.108641053 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-12 16:30:13.624647974 +0000 +--- HMI/n2t-out/Program.s.txt 2022-04-12 16:33:01.294111694 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-12 16:33:01.762114752 +0000 @@ -11,6 +11,6 @@ // dim value int dimValue=40 @@ -11,8 +11,8 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt + //lcd_dev fffb 0002 0000 0020 page pageStartup diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt ---- HMI/n2t-out/cardEntities.txt 2022-04-12 16:30:13.108641053 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-12 16:30:13.624647974 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-04-12 16:33:01.294111694 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-12 16:33:01.762114752 +0000 @@ -62,6 +62,16 @@ vis bText4,0 vis hSlider4,0 @@ -463,8 +463,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt if(tInstruction.txt=="pageType") { diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-04-12 16:30:13.108641053 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-12 16:30:13.624647974 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-04-12 16:33:01.294111694 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-12 16:33:01.762114752 +0000 @@ -142,7 +142,7 @@ Disable release event after dragging: 0 Send Component ID : disabled @@ -474,15 +474,6 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt Max. Text Size : 100 Text tVersion -@@ -152,7 +152,7 @@ - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none -- Text : 31 -+ Text : 30 - Max. Text Size : 10 - - Picture p0 @@ -177,7 +177,7 @@ recmod=1 bauds=115200 @@ -493,8 +484,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-04-12 16:30:13.108641053 +0000 -+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-12 16:30:13.624647974 +0000 +--- HMI/n2t-out/screensaver.txt 2022-04-12 16:33:01.294111694 +0000 ++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-12 16:33:01.762114752 +0000 @@ -48,6 +48,26 @@ Scope: local Value: 0 diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index 7bcb2dea..7e2f0d6f 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,8 +1,8 @@ -+++ HMI/US/portrait/diff-eu-version.txt 2022-04-12 16:30:13.640648189 +0000 -+--- HMI/n2t-out/Program.s.txt 2022-04-12 16:30:13.108641053 +0000 -++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-12 16:30:13.624647974 +0000 -+--- HMI/n2t-out/cardEntities.txt 2022-04-12 16:30:13.108641053 +0000 -++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-12 16:30:13.624647974 +0000 ++++ HMI/US/portrait/diff-eu-version.txt 2022-04-12 16:33:01.782114883 +0000 ++--- HMI/n2t-out/Program.s.txt 2022-04-12 16:33:01.294111694 +0000 +++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-12 16:33:01.762114752 +0000 ++--- HMI/n2t-out/cardEntities.txt 2022-04-12 16:33:01.294111694 +0000 +++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-12 16:33:01.762114752 +0000 +@@ -62,6 +62,16 @@ +@@ -117,6 +127,18 @@ +@@ -153,6 +175,15 @@ @@ -49,20 +49,11 @@ +@@ -967,6 +1146,33 @@ +@@ -1072,6 +1278,28 @@ +@@ -1642,6 +1870,128 @@ -+--- HMI/n2t-out/pageStartup.txt 2022-04-12 16:30:13.108641053 +0000 -++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-12 16:30:13.624647974 +0000 -+@@ -152,7 +152,7 @@ -+ Disable release event after dragging: 0 -+ Send Component ID : disabled -+ Associated Keyboard : none -+- Text : 31 -++ Text : 30 -+ Max. Text Size : 10 -+ -+ Picture p0 ++--- HMI/n2t-out/pageStartup.txt 2022-04-12 16:33:01.294111694 +0000 +++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-12 16:33:01.762114752 +0000 +diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt -+--- HMI/n2t-out/screensaver.txt 2022-04-12 16:30:13.108641053 +0000 -++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-12 16:30:13.624647974 +0000 ++--- HMI/n2t-out/screensaver.txt 2022-04-12 16:33:01.294111694 +0000 +++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-12 16:33:01.762114752 +0000 +@@ -48,6 +48,26 @@ + Scope: local + Value: 0 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 8b021ef2..83e31c76 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 @@ -10,14 +10,14 @@ pageIcons 6 Component(s) 0 Line(s) of event code 0 Unique line(s) of event code -pageStartup - 19 Component(s) - 150 Line(s) of event code - 113 Unique line(s) of event code popupNotify 17 Component(s) 178 Line(s) of event code 117 Unique line(s) of event code +pageStartup + 19 Component(s) + 150 Line(s) of event code + 113 Unique line(s) of event code screensaver 33 Component(s) 195 Line(s) of event code diff --git a/HMI/US/portrait/n2t-out-visual/pageStartup.txt b/HMI/US/portrait/n2t-out-visual/pageStartup.txt index ae467018..481fddc1 100644 --- a/HMI/US/portrait/n2t-out-visual/pageStartup.txt +++ b/HMI/US/portrait/n2t-out-visual/pageStartup.txt @@ -402,7 +402,7 @@ Text tVersion Horizontal Alignment : center Vertical Alignment : center Input Type : character - Text : 30 + Text : 31 Max. Text Size : 10 Word wrap : disabled Horizontal Spacing : 0 diff --git a/HMI/US/portrait/n2t-out/pageStartup.txt b/HMI/US/portrait/n2t-out/pageStartup.txt index 36732d4e..c6aeb067 100644 --- a/HMI/US/portrait/n2t-out/pageStartup.txt +++ b/HMI/US/portrait/n2t-out/pageStartup.txt @@ -152,7 +152,7 @@ Text tVersion Disable release event after dragging: 0 Send Component ID : disabled Associated Keyboard : none - Text : 30 + Text : 31 Max. Text Size : 10 Picture p0 diff --git a/apps/nspanel-lovelace-ui/nspanel-lovelace-ui.py b/apps/nspanel-lovelace-ui/nspanel-lovelace-ui.py index 4778a439..69775157 100644 --- a/apps/nspanel-lovelace-ui/nspanel-lovelace-ui.py +++ b/apps/nspanel-lovelace-ui/nspanel-lovelace-ui.py @@ -64,7 +64,7 @@ class NsPanelLovelaceUIManager(hass.Hass): controller = LuiController(self, cfg, send_mqtt_msg) desired_display_firmware_version = 30 - version = "v2.6.0" + version = "v2.7.0" model = cfg.get("model") if model == "us-l":