From 3e8b5d1f2769c6df9389d2307373353a4f17c721 Mon Sep 17 00:00:00 2001 From: joBr99 Date: Sat, 7 May 2022 15:37:53 +0000 Subject: [PATCH 1/2] Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui (add nextion2text) --- HMI/US/landscape/diff-eu-version.txt | 8 +++---- .../n2t-out-visual/nspanel_US_L_Stats.txt | 8 +++---- .../landscape/n2t-out-visual/popupLight.txt | 18 +++++++-------- HMI/US/landscape/n2t-out/popupLight.txt | 6 ++--- HMI/US/portrait/diff-eu-version.txt | 12 +++++----- HMI/US/portrait/diff-filtered.txt | 14 ++++++------ HMI/US/portrait/n2t-out-visual/popupLight.txt | 22 +++++++++---------- HMI/US/portrait/n2t-out/popupLight.txt | 6 ++--- HMI/n2t-out-visual/popupLight.txt | 18 +++++++-------- HMI/n2t-out/popupLight.txt | 6 ++--- 10 files changed, 59 insertions(+), 59 deletions(-) diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 15f9d51c..2b84c180 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-07 15:22:54.832432189 +0000 -+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-07 15:22:55.672426594 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-07 15:37:51.728763344 +0000 ++++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-07 15:37:52.500817194 +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/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-05-07 15:22:54.832432189 +0000 -+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-07 15:22:55.672426594 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-07 15:37:51.728763344 +0000 ++++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-07 15:37:52.500817194 +0000 @@ -177,7 +177,7 @@ recmod=1 bauds=115200 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 064c2189..45608993 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 @@ -10,14 +10,14 @@ pageTest 13 Component(s) 13 Line(s) of event code 13 Unique line(s) of event code -popupShutter - 20 Component(s) - 193 Line(s) of event code - 109 Unique line(s) of event code popupLight 27 Component(s) 341 Line(s) of event code 185 Unique line(s) of event code +popupShutter + 20 Component(s) + 193 Line(s) of event code + 109 Unique line(s) of event code popupNotify 17 Component(s) 196 Line(s) of event code diff --git a/HMI/US/landscape/n2t-out-visual/popupLight.txt b/HMI/US/landscape/n2t-out-visual/popupLight.txt index ce7afa1c..61ace9ce 100644 --- a/HMI/US/landscape/n2t-out-visual/popupLight.txt +++ b/HMI/US/landscape/n2t-out-visual/popupLight.txt @@ -154,7 +154,7 @@ Text t1 Opacity : 127 x coordinate : 25 y coordinate : 226 - Width : 100 + Width : 229 Height : 30 Effect : load Effect Priority : 0 @@ -165,11 +165,11 @@ Text t1 Font ID : 0 Back. Color : 6371 Font Color : 65535 - Horizontal Alignment : center + Horizontal Alignment : left Vertical Alignment : center Input Type : character Text : Brightness - Max. Text Size : 15 + Max. Text Size : 50 Word wrap : disabled Horizontal Spacing : 0 Vertical Spacing : 0 @@ -244,7 +244,7 @@ Text t4 Opacity : 127 x coordinate : 24 y coordinate : 143 - Width : 116 + Width : 229 Height : 30 Effect : load Effect Priority : 0 @@ -255,11 +255,11 @@ Text t4 Font ID : 0 Back. Color : 6371 Font Color : 65535 - Horizontal Alignment : center + Horizontal Alignment : left Vertical Alignment : center Input Type : character Text : Temperature - Max. Text Size : 15 + Max. Text Size : 50 Word wrap : disabled Horizontal Spacing : 0 Vertical Spacing : 0 @@ -405,11 +405,11 @@ Text t0 Font ID : 0 Back. Color : 6371 Font Color : 65535 - Horizontal Alignment : center + Horizontal Alignment : left Vertical Alignment : center Input Type : character Text : Color - Max. Text Size : 15 + Max. Text Size : 50 Word wrap : disabled Horizontal Spacing : 0 Vertical Spacing : 0 @@ -618,7 +618,7 @@ Button bColor Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 104 + x coordinate : 108 y coordinate : 68 Width : 50 Height : 50 diff --git a/HMI/US/landscape/n2t-out/popupLight.txt b/HMI/US/landscape/n2t-out/popupLight.txt index 9c38997e..5e24181f 100644 --- a/HMI/US/landscape/n2t-out/popupLight.txt +++ b/HMI/US/landscape/n2t-out/popupLight.txt @@ -100,7 +100,7 @@ Text t1 Send Component ID : disabled Associated Keyboard : none Text : Brightness - Max. Text Size : 15 + Max. Text Size : 50 Text t2 Attributes @@ -130,7 +130,7 @@ Text t4 Send Component ID : disabled Associated Keyboard : none Text : Temperature - Max. Text Size : 15 + Max. Text Size : 50 Text tSend Attributes @@ -180,7 +180,7 @@ Text t0 Send Component ID : disabled Associated Keyboard : none Text : Color - Max. Text Size : 15 + Max. Text Size : 50 Picture p0 Attributes diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index 27e930a7..06fa1b07 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-07 15:22:54.832432189 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-07 15:22:55.220427870 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-07 15:37:51.728763344 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-07 15:37:52.104789571 +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-05-07 15:22:54.836432145 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-07 15:22:55.224427825 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-05-07 15:37:51.728763344 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-07 15:37:52.104789571 +0000 @@ -62,6 +62,16 @@ vis bText4,0 vis hSlider4,0 @@ -427,8 +427,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-05-07 15:22:54.832432189 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-07 15:22:55.224427825 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-07 15:37:51.728763344 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-07 15:37:52.104789571 +0000 @@ -142,7 +142,7 @@ Disable release event after dragging: 0 Send Component ID : disabled diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index 1daa3142..609d099c 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,7 +1,7 @@ -+++ HMI/US/portrait/diff-eu-version.txt 2022-05-07 15:22:55.272427291 +0000 -+--- HMI/n2t-out/Program.s.txt 2022-05-07 15:22:54.832432189 +0000 -++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-07 15:22:55.220427870 +0000 -+--- HMI/n2t-out/cardEntities.txt 2022-05-07 15:22:54.836432145 +0000 -++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-07 15:22:55.224427825 +0000 -+--- HMI/n2t-out/pageStartup.txt 2022-05-07 15:22:54.832432189 +0000 -++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-07 15:22:55.224427825 +0000 ++++ HMI/US/portrait/diff-eu-version.txt 2022-05-07 15:37:52.120790687 +0000 ++--- HMI/n2t-out/Program.s.txt 2022-05-07 15:37:51.728763344 +0000 +++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-07 15:37:52.104789571 +0000 ++--- HMI/n2t-out/cardEntities.txt 2022-05-07 15:37:51.728763344 +0000 +++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-07 15:37:52.104789571 +0000 ++--- HMI/n2t-out/pageStartup.txt 2022-05-07 15:37:51.728763344 +0000 +++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-07 15:37:52.104789571 +0000 diff --git a/HMI/US/portrait/n2t-out-visual/popupLight.txt b/HMI/US/portrait/n2t-out-visual/popupLight.txt index f8e454f7..6f319541 100644 --- a/HMI/US/portrait/n2t-out-visual/popupLight.txt +++ b/HMI/US/portrait/n2t-out-visual/popupLight.txt @@ -154,7 +154,7 @@ Text t1 Opacity : 127 x coordinate : 10 y coordinate : 319 - Width : 100 + Width : 240 Height : 30 Effect : load Effect Priority : 0 @@ -165,11 +165,11 @@ Text t1 Font ID : 0 Back. Color : 6371 Font Color : 65535 - Horizontal Alignment : center + Horizontal Alignment : left Vertical Alignment : center Input Type : character Text : Brightness - Max. Text Size : 15 + Max. Text Size : 50 Word wrap : disabled Horizontal Spacing : 0 Vertical Spacing : 0 @@ -244,7 +244,7 @@ Text t4 Opacity : 127 x coordinate : 9 y coordinate : 234 - Width : 116 + Width : 242 Height : 30 Effect : load Effect Priority : 0 @@ -255,11 +255,11 @@ Text t4 Font ID : 0 Back. Color : 6371 Font Color : 65535 - Horizontal Alignment : center + Horizontal Alignment : left Vertical Alignment : center Input Type : character Text : Temperature - Max. Text Size : 15 + Max. Text Size : 50 Word wrap : disabled Horizontal Spacing : 0 Vertical Spacing : 0 @@ -394,7 +394,7 @@ Text t0 Opacity : 127 x coordinate : 12 y coordinate : 57 - Width : 64 + Width : 141 Height : 30 Effect : load Effect Priority : 0 @@ -405,11 +405,11 @@ Text t0 Font ID : 0 Back. Color : 6371 Font Color : 65535 - Horizontal Alignment : center + Horizontal Alignment : left Vertical Alignment : center Input Type : character Text : Color - Max. Text Size : 15 + Max. Text Size : 50 Word wrap : disabled Horizontal Spacing : 0 Vertical Spacing : 0 @@ -618,8 +618,8 @@ Button bColor Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 83 - y coordinate : 57 + x coordinate : 12 + y coordinate : 89 Width : 50 Height : 50 Effect : load diff --git a/HMI/US/portrait/n2t-out/popupLight.txt b/HMI/US/portrait/n2t-out/popupLight.txt index 9c38997e..5e24181f 100644 --- a/HMI/US/portrait/n2t-out/popupLight.txt +++ b/HMI/US/portrait/n2t-out/popupLight.txt @@ -100,7 +100,7 @@ Text t1 Send Component ID : disabled Associated Keyboard : none Text : Brightness - Max. Text Size : 15 + Max. Text Size : 50 Text t2 Attributes @@ -130,7 +130,7 @@ Text t4 Send Component ID : disabled Associated Keyboard : none Text : Temperature - Max. Text Size : 15 + Max. Text Size : 50 Text tSend Attributes @@ -180,7 +180,7 @@ Text t0 Send Component ID : disabled Associated Keyboard : none Text : Color - Max. Text Size : 15 + Max. Text Size : 50 Picture p0 Attributes diff --git a/HMI/n2t-out-visual/popupLight.txt b/HMI/n2t-out-visual/popupLight.txt index 019d9509..6d59086e 100644 --- a/HMI/n2t-out-visual/popupLight.txt +++ b/HMI/n2t-out-visual/popupLight.txt @@ -154,7 +154,7 @@ Text t1 Opacity : 127 x coordinate : 10 y coordinate : 226 - Width : 100 + Width : 244 Height : 30 Effect : load Effect Priority : 0 @@ -165,11 +165,11 @@ Text t1 Font ID : 0 Back. Color : 6371 Font Color : 65535 - Horizontal Alignment : center + Horizontal Alignment : left Vertical Alignment : center Input Type : character Text : Brightness - Max. Text Size : 15 + Max. Text Size : 50 Word wrap : disabled Horizontal Spacing : 0 Vertical Spacing : 0 @@ -244,7 +244,7 @@ Text t4 Opacity : 127 x coordinate : 9 y coordinate : 143 - Width : 116 + Width : 242 Height : 30 Effect : load Effect Priority : 0 @@ -255,11 +255,11 @@ Text t4 Font ID : 0 Back. Color : 6371 Font Color : 65535 - Horizontal Alignment : center + Horizontal Alignment : left Vertical Alignment : center Input Type : character Text : Temperature - Max. Text Size : 15 + Max. Text Size : 50 Word wrap : disabled Horizontal Spacing : 0 Vertical Spacing : 0 @@ -405,11 +405,11 @@ Text t0 Font ID : 0 Back. Color : 6371 Font Color : 65535 - Horizontal Alignment : center + Horizontal Alignment : left Vertical Alignment : center Input Type : character Text : Color - Max. Text Size : 15 + Max. Text Size : 50 Word wrap : disabled Horizontal Spacing : 0 Vertical Spacing : 0 @@ -618,7 +618,7 @@ Button bColor Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 89 + x coordinate : 93 y coordinate : 68 Width : 50 Height : 50 diff --git a/HMI/n2t-out/popupLight.txt b/HMI/n2t-out/popupLight.txt index 9c38997e..5e24181f 100644 --- a/HMI/n2t-out/popupLight.txt +++ b/HMI/n2t-out/popupLight.txt @@ -100,7 +100,7 @@ Text t1 Send Component ID : disabled Associated Keyboard : none Text : Brightness - Max. Text Size : 15 + Max. Text Size : 50 Text t2 Attributes @@ -130,7 +130,7 @@ Text t4 Send Component ID : disabled Associated Keyboard : none Text : Temperature - Max. Text Size : 15 + Max. Text Size : 50 Text tSend Attributes @@ -180,7 +180,7 @@ Text t0 Send Component ID : disabled Associated Keyboard : none Text : Color - Max. Text Size : 15 + Max. Text Size : 50 Picture p0 Attributes From a6594e0f4ae97cc9fd9638520a23e4beaa7d9a30 Mon Sep 17 00:00:00 2001 From: Johannes Date: Sat, 7 May 2022 17:37:58 +0200 Subject: [PATCH 2/2] Update nspanel-lovelace-ui.py --- apps/nspanel-lovelace-ui/nspanel-lovelace-ui.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/nspanel-lovelace-ui/nspanel-lovelace-ui.py b/apps/nspanel-lovelace-ui/nspanel-lovelace-ui.py index 2a04534c..586c121d 100644 --- a/apps/nspanel-lovelace-ui/nspanel-lovelace-ui.py +++ b/apps/nspanel-lovelace-ui/nspanel-lovelace-ui.py @@ -24,8 +24,8 @@ class NsPanelLovelaceUIManager(hass.Hass): controller = LuiController(self, cfg, send_mqtt_msg) - desired_display_firmware_version = 33 - version = "v2.8.0" + desired_display_firmware_version = 34 + version = "v2.8.1" model = cfg.get("model") if model == "us-l":