From 5019c95f9e428e4f18f7248a6d7f7c619cee1c3b Mon Sep 17 00:00:00 2001 From: joBr99 <29555657+joBr99@users.noreply.github.com> Date: Sat, 23 Jul 2022 09:31:12 +0000 Subject: [PATCH] Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui (add nextion2text) --- HMI/US/landscape/diff-eu-version.txt | 48 +++++++++---------- HMI/US/portrait/diff-eu-version.txt | 26 +++------- HMI/US/portrait/diff-filtered.txt | 27 +++-------- HMI/US/portrait/n2t-out-visual/cardGrid.txt | 4 ++ .../n2t-out-visual/nspanel_US_P_Stats.txt | 12 ++--- HMI/US/portrait/n2t-out/cardGrid.txt | 4 ++ 6 files changed, 51 insertions(+), 70 deletions(-) diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 28af713f..d96fbc12 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-07-23 09:22:23.835446505 +0000 -+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-07-23 09:22:24.763458526 +0000 +--- HMI/n2t-out/Program.s.txt 2022-07-23 09:31:08.214976414 +0000 ++++ HMI/US/landscape/n2t-out/Program.s.txt 2022-07-23 09:31:09.130973744 +0000 @@ -11,9 +11,4 @@ // dim value int dimValue=40 @@ -12,8 +12,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/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt ---- HMI/n2t-out/cardAlarm.txt 2022-07-23 09:22:23.835446505 +0000 -+++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-07-23 09:22:24.767458577 +0000 +--- HMI/n2t-out/cardAlarm.txt 2022-07-23 09:31:08.214976414 +0000 ++++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-07-23 09:31:09.130973744 +0000 @@ -37,25 +37,6 @@ vis tCode,0 vis bPrev,0 @@ -60,8 +60,8 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt if(tInstruction.txt=="timeout") { diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt ---- HMI/n2t-out/cardEntities.txt 2022-07-23 09:22:23.839446557 +0000 -+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-07-23 09:22:24.767458577 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-07-23 09:31:08.214976414 +0000 ++++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-07-23 09:31:09.130973744 +0000 @@ -65,26 +65,6 @@ vis nNum4,0 vis bPrev,0 @@ -153,8 +153,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-07-23 09:22:23.835446505 +0000 -+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-07-23 09:22:24.767458577 +0000 +--- HMI/n2t-out/cardGrid.txt 2022-07-23 09:31:08.214976414 +0000 ++++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-07-23 09:31:09.130973744 +0000 @@ -36,15 +36,6 @@ vis tEntity6,0 vis bPrev,0 @@ -202,8 +202,8 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt TouchCap tc0 Attributes diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt ---- HMI/n2t-out/cardMedia.txt 2022-07-23 09:22:23.835446505 +0000 -+++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-07-23 09:22:24.763458526 +0000 +--- HMI/n2t-out/cardMedia.txt 2022-07-23 09:31:08.214976414 +0000 ++++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-07-23 09:31:09.130973744 +0000 @@ -21,21 +21,6 @@ vis t5,0 vis bPrev,0 @@ -246,8 +246,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-07-23 09:22:23.835446505 +0000 -+++ HMI/US/landscape/n2t-out/cardQR.txt 2022-07-23 09:22:24.767458577 +0000 +--- HMI/n2t-out/cardQR.txt 2022-07-23 09:31:08.214976414 +0000 ++++ HMI/US/landscape/n2t-out/cardQR.txt 2022-07-23 09:31:09.130973744 +0000 @@ -32,25 +32,6 @@ vis bText2,0 tsw m0,0 @@ -294,8 +294,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-07-23 09:22:23.835446505 +0000 -+++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-07-23 09:22:24.767458577 +0000 +--- HMI/n2t-out/cardThermo.txt 2022-07-23 09:31:08.214976414 +0000 ++++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-07-23 09:31:09.130973744 +0000 @@ -41,21 +41,6 @@ vis xTempDest1,0 vis bPrev,0 @@ -338,8 +338,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-07-23 09:22:23.835446505 +0000 -+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-07-23 09:22:24.767458577 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-07-23 09:31:08.214976414 +0000 ++++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-07-23 09:31:09.130973744 +0000 @@ -177,7 +177,7 @@ recmod=1 bauds=115200 @@ -370,8 +370,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt { Only in HMI/n2t-out: popupFan.txt diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt ---- HMI/n2t-out/popupLight.txt 2022-07-23 09:22:23.835446505 +0000 -+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-07-23 09:22:24.767458577 +0000 +--- HMI/n2t-out/popupLight.txt 2022-07-23 09:31:08.214976414 +0000 ++++ HMI/US/landscape/n2t-out/popupLight.txt 2022-07-23 09:31:09.130973744 +0000 @@ -50,29 +50,6 @@ vis t0,0 vis pColorWheel,0 @@ -422,8 +422,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-07-23 09:22:23.835446505 +0000 -+++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-07-23 09:22:24.767458577 +0000 +--- HMI/n2t-out/popupNotify.txt 2022-07-23 09:31:08.214976414 +0000 ++++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-07-23 09:31:09.130973744 +0000 @@ -12,24 +12,12 @@ Events @@ -469,8 +469,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-07-23 09:22:23.835446505 +0000 -+++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-07-23 09:22:24.767458577 +0000 +--- HMI/n2t-out/popupShutter.txt 2022-07-23 09:31:08.214976414 +0000 ++++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-07-23 09:31:09.130973744 +0000 @@ -40,40 +40,6 @@ prints sys0,2 prints tSend.txt,0 @@ -638,8 +638,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-07-23 09:22:23.835446505 +0000 -+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-07-23 09:22:24.767458577 +0000 +--- HMI/n2t-out/screensaver.txt 2022-07-23 09:31:08.214976414 +0000 ++++ HMI/US/landscape/n2t-out/screensaver.txt 2022-07-23 09:31:09.130973744 +0000 @@ -406,22 +406,10 @@ // get value spstr strCommand.txt,tTmp.txt,"~",1 diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index a2eb8618..4d84f638 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-07-23 09:22:23.835446505 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-07-23 09:22:24.299452515 +0000 +--- HMI/n2t-out/Program.s.txt 2022-07-23 09:31:08.214976414 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-07-23 09:31:08.670975085 +0000 @@ -14,6 +14,6 @@ //color vars int defaultFontColor=65535 @@ -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-07-23 09:22:23.839446557 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-07-23 09:22:24.299452515 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-07-23 09:31:08.214976414 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-07-23 09:31:08.674975073 +0000 @@ -65,6 +65,16 @@ vis nNum4,0 vis bPrev,0 @@ -301,23 +301,9 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt Hotspot mSwipeNext Attributes -diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt ---- HMI/n2t-out/cardGrid.txt 2022-07-23 09:22:23.835446505 +0000 -+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-07-23 09:22:24.299452515 +0000 -@@ -932,10 +932,6 @@ - { - page popupLight - } -- if(tTmp.txt=="fan") -- { -- page popupFan -- } - - TouchCap tc0 - Attributes diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-07-23 09:22:23.835446505 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-07-23 09:22:24.299452515 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-07-23 09:31:08.214976414 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-07-23 09:31:08.670975085 +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 d735bfb5..5cd296bc 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,12 +1,12 @@ -+++ HMI/US/portrait/diff-eu-version.txt 2022-07-23 09:22:24.315452723 +0000 -+--- HMI/n2t-out/Program.s.txt 2022-07-23 09:22:23.835446505 +0000 -++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-07-23 09:22:24.299452515 +0000 ++++ HMI/US/portrait/diff-eu-version.txt 2022-07-23 09:31:08.682975050 +0000 ++--- HMI/n2t-out/Program.s.txt 2022-07-23 09:31:08.214976414 +0000 +++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-07-23 09:31:08.670975085 +0000 +@@ -14,6 +14,6 @@ + //color vars + int defaultFontColor=65535 + int defaultBcoColor=6371 -+--- HMI/n2t-out/cardEntities.txt 2022-07-23 09:22:23.839446557 +0000 -++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-07-23 09:22:24.299452515 +0000 ++--- HMI/n2t-out/cardEntities.txt 2022-07-23 09:31:08.214976414 +0000 +++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-07-23 09:31:08.674975073 +0000 +@@ -65,6 +65,16 @@ + vis bPrev,0 + vis bNext,0 @@ -30,18 +30,5 @@ ++ page popupFan ++ } + -+diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt -+--- HMI/n2t-out/cardGrid.txt 2022-07-23 09:22:23.835446505 +0000 -++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-07-23 09:22:24.299452515 +0000 -+@@ -932,10 +932,6 @@ -+ { -+ page popupLight -+ } -+- if(tTmp.txt=="fan") -+- { -+- page popupFan -+- } -+ -+ TouchCap tc0 -+--- HMI/n2t-out/pageStartup.txt 2022-07-23 09:22:23.835446505 +0000 -++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-07-23 09:22:24.299452515 +0000 ++--- HMI/n2t-out/pageStartup.txt 2022-07-23 09:31:08.214976414 +0000 +++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-07-23 09:31:08.670975085 +0000 diff --git a/HMI/US/portrait/n2t-out-visual/cardGrid.txt b/HMI/US/portrait/n2t-out-visual/cardGrid.txt index 02947979..34ad3d1c 100644 --- a/HMI/US/portrait/n2t-out-visual/cardGrid.txt +++ b/HMI/US/portrait/n2t-out-visual/cardGrid.txt @@ -1398,6 +1398,10 @@ Timer tmLP { page popupLight } + if(tTmp.txt=="fan") + { + page popupFan + } TouchCap tc0 Attributes 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 cd61ee26..65f3c1a9 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 @@ -22,10 +22,6 @@ cardMedia 34 Component(s) 388 Line(s) of event code 209 Unique line(s) of event code -cardGrid - 42 Component(s) - 458 Line(s) of event code - 269 Unique line(s) of event code popupFan 20 Component(s) 234 Line(s) of event code @@ -46,6 +42,10 @@ screensaver 38 Component(s) 332 Line(s) of event code 257 Unique line(s) of event code +cardGrid + 42 Component(s) + 462 Line(s) of event code + 271 Unique line(s) of event code cardAlarm 40 Component(s) 421 Line(s) of event code @@ -62,5 +62,5 @@ cardThermo Total 14 Page(s) 444 Component(s) - 5276 Line(s) of event code - 1368 Unique line(s) of event code + 5280 Line(s) of event code + 1369 Unique line(s) of event code diff --git a/HMI/US/portrait/n2t-out/cardGrid.txt b/HMI/US/portrait/n2t-out/cardGrid.txt index ef4e2813..cb8a8847 100644 --- a/HMI/US/portrait/n2t-out/cardGrid.txt +++ b/HMI/US/portrait/n2t-out/cardGrid.txt @@ -932,6 +932,10 @@ Timer tmLP { page popupLight } + if(tTmp.txt=="fan") + { + page popupFan + } TouchCap tc0 Attributes