From e1aaf5f15719c408a07b680fee0d15f92eb2b6ac Mon Sep 17 00:00:00 2001 From: joBr99 <29555657+joBr99@users.noreply.github.com> Date: Fri, 6 May 2022 06:41:01 +0000 Subject: [PATCH] Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui (add nextion2text) --- HMI/US/landscape/diff-eu-version.txt | 69 ++----------------- HMI/US/landscape/n2t-out-visual/cardAlarm.txt | 2 + .../landscape/n2t-out-visual/cardEntities.txt | 2 + HMI/US/landscape/n2t-out-visual/cardGrid.txt | 2 + HMI/US/landscape/n2t-out-visual/cardMedia.txt | 3 +- .../landscape/n2t-out-visual/cardThermo.txt | 2 + .../n2t-out-visual/nspanel_US_L_Stats.txt | 40 +++++------ HMI/US/landscape/n2t-out/cardAlarm.txt | 2 + HMI/US/landscape/n2t-out/cardEntities.txt | 2 + HMI/US/landscape/n2t-out/cardGrid.txt | 2 + HMI/US/landscape/n2t-out/cardMedia.txt | 3 +- HMI/US/landscape/n2t-out/cardThermo.txt | 2 + HMI/US/portrait/diff-eu-version.txt | 48 ++++++------- HMI/US/portrait/diff-filtered.txt | 50 +++++++------- 14 files changed, 93 insertions(+), 136 deletions(-) diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 883ef38a..85dfb846 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-06 06:39:15.430478097 +0000 -+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-06 06:39:16.218485517 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-06 06:40:59.685379956 +0000 ++++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-06 06:41:00.601384867 +0000 @@ -11,6 +11,4 @@ // dim value int dimValue=40 @@ -8,70 +8,9 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt - // fix touch offset - 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-05-06 06:39:15.430478097 +0000 -+++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-05-06 06:39:16.218485517 +0000 -@@ -33,8 +33,6 @@ - vis b9,0 - vis b10,0 - vis tCode,0 -- vis bPrev,0 -- vis bNext,0 - - Variable (string) strCommand - Attributes -diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt ---- HMI/n2t-out/cardEntities.txt 2022-05-06 06:39:15.434478135 +0000 -+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-05-06 06:39:16.222485554 +0000 -@@ -62,8 +62,6 @@ - vis bText4,0 - vis hSlider4,0 - vis nNum4,0 -- vis bPrev,0 -- vis bNext,0 - - Variable (string) strCommand - Attributes -diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt ---- HMI/n2t-out/cardGrid.txt 2022-05-06 06:39:15.430478097 +0000 -+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-05-06 06:39:16.218485517 +0000 -@@ -34,8 +34,6 @@ - vis tEntity4,0 - vis tEntity5,0 - vis tEntity6,0 -- vis bPrev,0 -- vis bNext,0 - - Variable (string) strCommand - Attributes -diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt ---- HMI/n2t-out/cardMedia.txt 2022-05-06 06:39:15.430478097 +0000 -+++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-05-06 06:39:16.218485517 +0000 -@@ -18,8 +18,7 @@ - vis tTmp,0 - vis tId,0 - vis t5,0 -- vis bPrev,0 -- vis bNext,0 -+ //vis nPageDisp,0 - - Variable (string) strCommand - Attributes -diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt ---- HMI/n2t-out/cardThermo.txt 2022-05-06 06:39:15.434478135 +0000 -+++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-05-06 06:39:16.218485517 +0000 -@@ -31,8 +31,6 @@ - vis bt6,0 - vis bt7,0 - vis bt8,0 -- vis bPrev,0 -- vis bNext,0 - - Variable (string) strCommand - Attributes diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-05-06 06:39:15.430478097 +0000 -+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-06 06:39:16.218485517 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-06 06:40:59.685379956 +0000 ++++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-06 06:41:00.601384867 +0000 @@ -177,7 +177,7 @@ recmod=1 bauds=115200 diff --git a/HMI/US/landscape/n2t-out-visual/cardAlarm.txt b/HMI/US/landscape/n2t-out-visual/cardAlarm.txt index 61a4f9bc..fc701937 100644 --- a/HMI/US/landscape/n2t-out-visual/cardAlarm.txt +++ b/HMI/US/landscape/n2t-out-visual/cardAlarm.txt @@ -41,6 +41,8 @@ Page cardAlarm vis b9,0 vis b10,0 vis tCode,0 + vis bPrev,0 + vis bNext,0 Variable (string) strCommand Attributes diff --git a/HMI/US/landscape/n2t-out-visual/cardEntities.txt b/HMI/US/landscape/n2t-out-visual/cardEntities.txt index a9820204..b5d38aa0 100644 --- a/HMI/US/landscape/n2t-out-visual/cardEntities.txt +++ b/HMI/US/landscape/n2t-out-visual/cardEntities.txt @@ -70,6 +70,8 @@ Page cardEntities vis bText4,0 vis hSlider4,0 vis nNum4,0 + vis bPrev,0 + vis bNext,0 Variable (string) strCommand Attributes diff --git a/HMI/US/landscape/n2t-out-visual/cardGrid.txt b/HMI/US/landscape/n2t-out-visual/cardGrid.txt index 07e64468..58543f86 100644 --- a/HMI/US/landscape/n2t-out-visual/cardGrid.txt +++ b/HMI/US/landscape/n2t-out-visual/cardGrid.txt @@ -42,6 +42,8 @@ Page cardGrid vis tEntity4,0 vis tEntity5,0 vis tEntity6,0 + vis bPrev,0 + vis bNext,0 Variable (string) strCommand Attributes diff --git a/HMI/US/landscape/n2t-out-visual/cardMedia.txt b/HMI/US/landscape/n2t-out-visual/cardMedia.txt index ea47097d..2bc18c40 100644 --- a/HMI/US/landscape/n2t-out-visual/cardMedia.txt +++ b/HMI/US/landscape/n2t-out-visual/cardMedia.txt @@ -26,7 +26,8 @@ Page cardMedia vis tTmp,0 vis tId,0 vis t5,0 - //vis nPageDisp,0 + vis bPrev,0 + vis bNext,0 Variable (string) strCommand Attributes diff --git a/HMI/US/landscape/n2t-out-visual/cardThermo.txt b/HMI/US/landscape/n2t-out-visual/cardThermo.txt index 9fa4fd5d..b4ce3d7c 100644 --- a/HMI/US/landscape/n2t-out-visual/cardThermo.txt +++ b/HMI/US/landscape/n2t-out-visual/cardThermo.txt @@ -39,6 +39,8 @@ Page cardThermo vis bt6,0 vis bt7,0 vis bt8,0 + vis bPrev,0 + vis bNext,0 Variable (string) strCommand Attributes 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 43f6668c..840f762d 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 @@ -22,37 +22,37 @@ pageStartup 19 Component(s) 150 Line(s) of event code 113 Unique line(s) of event code +cardGrid + 39 Component(s) + 420 Line(s) of event code + 246 Unique line(s) of event code +cardMedia + 30 Component(s) + 331 Line(s) of event code + 171 Unique line(s) of event code +cardAlarm + 35 Component(s) + 345 Line(s) of event code + 216 Unique line(s) of event code +cardEntities + 62 Component(s) + 966 Line(s) of event code + 412 Unique line(s) of event code popupNotify 17 Component(s) 196 Line(s) of event code 123 Unique line(s) of event code cardThermo 41 Component(s) - 442 Line(s) of event code - 247 Unique line(s) of event code -cardMedia - 30 Component(s) - 329 Line(s) of event code - 169 Unique line(s) of event code -cardAlarm - 35 Component(s) - 343 Line(s) of event code - 214 Unique line(s) of event code -cardGrid - 39 Component(s) - 418 Line(s) of event code - 244 Unique line(s) of event code + 444 Line(s) of event code + 249 Unique line(s) of event code screensaver 35 Component(s) 292 Line(s) of event code 235 Unique line(s) of event code -cardEntities - 62 Component(s) - 964 Line(s) of event code - 410 Unique line(s) of event code Total 12 Page(s) 343 Component(s) - 3686 Line(s) of event code - 1017 Unique line(s) of event code + 3696 Line(s) of event code + 1019 Unique line(s) of event code diff --git a/HMI/US/landscape/n2t-out/cardAlarm.txt b/HMI/US/landscape/n2t-out/cardAlarm.txt index 7f0ccd5c..a147c095 100644 --- a/HMI/US/landscape/n2t-out/cardAlarm.txt +++ b/HMI/US/landscape/n2t-out/cardAlarm.txt @@ -33,6 +33,8 @@ Page cardAlarm vis b9,0 vis b10,0 vis tCode,0 + vis bPrev,0 + vis bNext,0 Variable (string) strCommand Attributes diff --git a/HMI/US/landscape/n2t-out/cardEntities.txt b/HMI/US/landscape/n2t-out/cardEntities.txt index ebed5804..db0622ec 100644 --- a/HMI/US/landscape/n2t-out/cardEntities.txt +++ b/HMI/US/landscape/n2t-out/cardEntities.txt @@ -62,6 +62,8 @@ Page cardEntities vis bText4,0 vis hSlider4,0 vis nNum4,0 + vis bPrev,0 + vis bNext,0 Variable (string) strCommand Attributes diff --git a/HMI/US/landscape/n2t-out/cardGrid.txt b/HMI/US/landscape/n2t-out/cardGrid.txt index b73dd476..75c6d368 100644 --- a/HMI/US/landscape/n2t-out/cardGrid.txt +++ b/HMI/US/landscape/n2t-out/cardGrid.txt @@ -34,6 +34,8 @@ Page cardGrid vis tEntity4,0 vis tEntity5,0 vis tEntity6,0 + vis bPrev,0 + vis bNext,0 Variable (string) strCommand Attributes diff --git a/HMI/US/landscape/n2t-out/cardMedia.txt b/HMI/US/landscape/n2t-out/cardMedia.txt index c5514cbc..7494bc84 100644 --- a/HMI/US/landscape/n2t-out/cardMedia.txt +++ b/HMI/US/landscape/n2t-out/cardMedia.txt @@ -18,7 +18,8 @@ Page cardMedia vis tTmp,0 vis tId,0 vis t5,0 - //vis nPageDisp,0 + vis bPrev,0 + vis bNext,0 Variable (string) strCommand Attributes diff --git a/HMI/US/landscape/n2t-out/cardThermo.txt b/HMI/US/landscape/n2t-out/cardThermo.txt index ed4ebcee..b43c969e 100644 --- a/HMI/US/landscape/n2t-out/cardThermo.txt +++ b/HMI/US/landscape/n2t-out/cardThermo.txt @@ -31,6 +31,8 @@ Page cardThermo vis bt6,0 vis bt7,0 vis bt8,0 + vis bPrev,0 + vis bNext,0 Variable (string) strCommand Attributes diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index 7ea97b31..e7ae83e8 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-06 06:39:15.430478097 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-06 06:39:15.814481713 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-06 06:40:59.685379956 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-06 06:41:00.069382015 +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/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt ---- HMI/n2t-out/cardAlarm.txt 2022-05-06 06:39:15.430478097 +0000 -+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-06 06:39:15.814481713 +0000 +--- HMI/n2t-out/cardAlarm.txt 2022-05-06 06:40:59.685379956 +0000 ++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-06 06:41:00.069382015 +0000 @@ -33,8 +33,6 @@ vis b9,0 vis b10,0 @@ -95,8 +95,8 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt //send cmd printh 55 bb diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt ---- HMI/n2t-out/cardEntities.txt 2022-05-06 06:39:15.434478135 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-06 06:39:15.814481713 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-05-06 06:40:59.685379956 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-06 06:41:00.069382015 +0000 @@ -62,8 +62,16 @@ vis bText4,0 vis hSlider4,0 @@ -758,8 +758,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt //send cmd printh 55 bb diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt ---- HMI/n2t-out/cardGrid.txt 2022-05-06 06:39:15.430478097 +0000 -+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-06 06:39:15.814481713 +0000 +--- HMI/n2t-out/cardGrid.txt 2022-05-06 06:40:59.685379956 +0000 ++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-06 06:41:00.069382015 +0000 @@ -34,8 +34,6 @@ vis tEntity4,0 vis tEntity5,0 @@ -897,8 +897,8 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt //send cmd printh 55 bb diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt ---- HMI/n2t-out/cardMedia.txt 2022-05-06 06:39:15.430478097 +0000 -+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-05-06 06:39:15.814481713 +0000 +--- HMI/n2t-out/cardMedia.txt 2022-05-06 06:40:59.685379956 +0000 ++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-05-06 06:41:00.069382015 +0000 @@ -18,26 +18,25 @@ vis tTmp,0 vis tId,0 @@ -1030,8 +1030,8 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt //send cmd printh 55 bb diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt ---- HMI/n2t-out/cardThermo.txt 2022-05-06 06:39:15.434478135 +0000 -+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-06 06:39:15.814481713 +0000 +--- HMI/n2t-out/cardThermo.txt 2022-05-06 06:40:59.685379956 +0000 ++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-06 06:41:00.069382015 +0000 @@ -31,8 +31,6 @@ vis bt6,0 vis bt7,0 @@ -1177,8 +1177,8 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt //send cmd printh 55 bb diff -bur HMI/n2t-out/pageIcons.txt HMI/US/portrait/n2t-out/pageIcons.txt ---- HMI/n2t-out/pageIcons.txt 2022-05-06 06:39:15.430478097 +0000 -+++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-05-06 06:39:15.814481713 +0000 +--- HMI/n2t-out/pageIcons.txt 2022-05-06 06:40:59.685379956 +0000 ++++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-05-06 06:41:00.069382015 +0000 @@ -30,7 +30,7 @@ Send Component ID : disabled Associated Keyboard : none @@ -1198,8 +1198,8 @@ diff -bur HMI/n2t-out/pageIcons.txt HMI/US/portrait/n2t-out/pageIcons.txt Picture p0 Attributes diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-05-06 06:39:15.430478097 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-06 06:39:15.814481713 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-06 06:40:59.685379956 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-06 06:41:00.069382015 +0000 @@ -142,7 +142,7 @@ Disable release event after dragging: 0 Send Component ID : disabled @@ -1225,8 +1225,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt //send cmd printh 55 bb diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt ---- HMI/n2t-out/popupLight.txt 2022-05-06 06:39:15.430478097 +0000 -+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-06 06:39:15.814481713 +0000 +--- HMI/n2t-out/popupLight.txt 2022-05-06 06:40:59.685379956 +0000 ++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-06 06:41:00.069382015 +0000 @@ -29,7 +29,7 @@ btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -1293,8 +1293,8 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt //send cmd printh 55 bb diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt ---- HMI/n2t-out/popupNotify.txt 2022-05-06 06:39:15.430478097 +0000 -+++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-05-06 06:39:15.814481713 +0000 +--- HMI/n2t-out/popupNotify.txt 2022-05-06 06:40:59.685379956 +0000 ++++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-05-06 06:41:00.069382015 +0000 @@ -120,7 +120,7 @@ btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -1323,8 +1323,8 @@ diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt //send cmd printh 55 bb diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt ---- HMI/n2t-out/popupShutter.txt 2022-05-06 06:39:15.430478097 +0000 -+++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-05-06 06:39:15.814481713 +0000 +--- HMI/n2t-out/popupShutter.txt 2022-05-06 06:40:59.685379956 +0000 ++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-05-06 06:41:00.069382015 +0000 @@ -29,7 +29,7 @@ btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -1391,8 +1391,8 @@ diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt //send cmd printh 55 bb diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt ---- HMI/n2t-out/screensaver.txt 2022-05-06 06:39:15.430478097 +0000 -+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-06 06:39:15.814481713 +0000 +--- HMI/n2t-out/screensaver.txt 2022-05-06 06:40:59.685379956 +0000 ++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-06 06:41:00.069382015 +0000 @@ -17,8 +17,6 @@ vis tInstruction,0 vis tTmp,0 diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index cbd08ba6..cf6e7366 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,9 +1,9 @@ -+++ HMI/US/portrait/diff-eu-version.txt 2022-05-06 06:39:15.826481826 +0000 -+--- HMI/n2t-out/Program.s.txt 2022-05-06 06:39:15.430478097 +0000 -++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-06 06:39:15.814481713 +0000 ++++ HMI/US/portrait/diff-eu-version.txt 2022-05-06 06:41:00.209382765 +0000 ++--- HMI/n2t-out/Program.s.txt 2022-05-06 06:40:59.685379956 +0000 +++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-06 06:41:00.069382015 +0000 +diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt -+--- HMI/n2t-out/cardAlarm.txt 2022-05-06 06:39:15.430478097 +0000 -++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-06 06:39:15.814481713 +0000 ++--- HMI/n2t-out/cardAlarm.txt 2022-05-06 06:40:59.685379956 +0000 +++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-06 06:41:00.069382015 +0000 +@@ -33,8 +33,6 @@ + vis b9,0 + vis b10,0 @@ -85,8 +85,8 @@ + crcputs tSend.txt,0 + //send cmd + printh 55 bb -+--- HMI/n2t-out/cardEntities.txt 2022-05-06 06:39:15.434478135 +0000 -++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-06 06:39:15.814481713 +0000 ++--- HMI/n2t-out/cardEntities.txt 2022-05-06 06:40:59.685379956 +0000 +++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-06 06:41:00.069382015 +0000 +@@ -62,8 +62,16 @@ +- vis bPrev,0 +- vis bNext,0 @@ -375,8 +375,8 @@ + //send cmd + printh 55 bb +diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt -+--- HMI/n2t-out/cardGrid.txt 2022-05-06 06:39:15.430478097 +0000 -++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-06 06:39:15.814481713 +0000 ++--- HMI/n2t-out/cardGrid.txt 2022-05-06 06:40:59.685379956 +0000 +++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-06 06:41:00.069382015 +0000 +@@ -34,8 +34,6 @@ + vis tEntity4,0 + vis tEntity5,0 @@ -514,8 +514,8 @@ + //send cmd + printh 55 bb +diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt -+--- HMI/n2t-out/cardMedia.txt 2022-05-06 06:39:15.430478097 +0000 -++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-05-06 06:39:15.814481713 +0000 ++--- HMI/n2t-out/cardMedia.txt 2022-05-06 06:40:59.685379956 +0000 +++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-05-06 06:41:00.069382015 +0000 +@@ -18,26 +18,25 @@ + vis tTmp,0 + vis tId,0 @@ -647,8 +647,8 @@ + //send cmd + printh 55 bb +diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt -+--- HMI/n2t-out/cardThermo.txt 2022-05-06 06:39:15.434478135 +0000 -++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-06 06:39:15.814481713 +0000 ++--- HMI/n2t-out/cardThermo.txt 2022-05-06 06:40:59.685379956 +0000 +++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-06 06:41:00.069382015 +0000 +@@ -31,8 +31,6 @@ + vis bt6,0 + vis bt7,0 @@ -794,8 +794,8 @@ + //send cmd + printh 55 bb +diff -bur HMI/n2t-out/pageIcons.txt HMI/US/portrait/n2t-out/pageIcons.txt -+--- HMI/n2t-out/pageIcons.txt 2022-05-06 06:39:15.430478097 +0000 -++++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-05-06 06:39:15.814481713 +0000 ++--- HMI/n2t-out/pageIcons.txt 2022-05-06 06:40:59.685379956 +0000 +++++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-05-06 06:41:00.069382015 +0000 +@@ -30,7 +30,7 @@ + Send Component ID : disabled + Associated Keyboard : none @@ -814,8 +814,8 @@ + + Picture p0 + Attributes -+--- HMI/n2t-out/pageStartup.txt 2022-05-06 06:39:15.430478097 +0000 -++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-06 06:39:15.814481713 +0000 ++--- HMI/n2t-out/pageStartup.txt 2022-05-06 06:40:59.685379956 +0000 +++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-06 06:41:00.069382015 +0000 +@@ -177,12 +177,12 @@ + crcputh 55 bb +- crcputs sys0,2 @@ -824,8 +824,8 @@ + //send cmd + printh 55 bb +diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt -+--- HMI/n2t-out/popupLight.txt 2022-05-06 06:39:15.430478097 +0000 -++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-06 06:39:15.814481713 +0000 ++--- HMI/n2t-out/popupLight.txt 2022-05-06 06:40:59.685379956 +0000 +++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-06 06:41:00.069382015 +0000 +@@ -29,7 +29,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC @@ -892,8 +892,8 @@ + //send cmd + printh 55 bb +diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt -+--- HMI/n2t-out/popupNotify.txt 2022-05-06 06:39:15.430478097 +0000 -++++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-05-06 06:39:15.814481713 +0000 ++--- HMI/n2t-out/popupNotify.txt 2022-05-06 06:40:59.685379956 +0000 +++++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-05-06 06:41:00.069382015 +0000 +@@ -120,7 +120,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC @@ -922,8 +922,8 @@ + //send cmd + printh 55 bb +diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt -+--- HMI/n2t-out/popupShutter.txt 2022-05-06 06:39:15.430478097 +0000 -++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-05-06 06:39:15.814481713 +0000 ++--- HMI/n2t-out/popupShutter.txt 2022-05-06 06:40:59.685379956 +0000 +++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-05-06 06:41:00.069382015 +0000 +@@ -29,7 +29,7 @@ + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC @@ -990,8 +990,8 @@ + //send cmd + printh 55 bb +diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt -+--- HMI/n2t-out/screensaver.txt 2022-05-06 06:39:15.430478097 +0000 -++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-06 06:39:15.814481713 +0000 ++--- HMI/n2t-out/screensaver.txt 2022-05-06 06:40:59.685379956 +0000 +++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-06 06:41:00.069382015 +0000 +@@ -17,8 +17,6 @@ + vis tInstruction,0 + vis tTmp,0