diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 803e20b3..290d004a 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 16:25:26.256271726 +0000 -+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-06 16:25:27.036283029 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-06 19:28:27.798491086 +0000 ++++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-06 19:28:28.586503617 +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-06 16:25:26.256271726 +0000 -+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-06 16:25:27.036283029 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-06 19:28:27.798491086 +0000 ++++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-06 19:28:28.586503617 +0000 @@ -177,7 +177,7 @@ recmod=1 bauds=115200 @@ -21,8 +21,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt ---- HMI/n2t-out/popupLight.txt 2022-05-06 16:25:26.256271726 +0000 -+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-05-06 16:25:27.036283029 +0000 +--- HMI/n2t-out/popupLight.txt 2022-05-06 19:28:27.798491086 +0000 ++++ HMI/US/landscape/n2t-out/popupLight.txt 2022-05-06 19:28:28.586503617 +0000 @@ -535,12 +535,6 @@ vis pColorWheel,1 } @@ -37,8 +37,8 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt if(tInstruction.txt=="time") { diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt ---- HMI/n2t-out/popupShutter.txt 2022-05-06 16:25:26.256271726 +0000 -+++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-05-06 16:25:27.036283029 +0000 +--- HMI/n2t-out/popupShutter.txt 2022-05-06 19:28:27.798491086 +0000 ++++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-05-06 19:28:28.586503617 +0000 @@ -109,7 +109,7 @@ Text : Max. Text Size : 20 diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index ed2bb64b..fdf0a6f6 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 16:25:26.256271726 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-06 16:25:26.636277233 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-06 19:28:27.798491086 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-06 19:28:28.182497193 +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-06 16:25:26.256271726 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-06 16:25:26.636277233 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-05-06 19:28:27.798491086 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-06 19:28:28.186497256 +0000 @@ -62,6 +62,16 @@ vis bText4,0 vis hSlider4,0 @@ -223,7 +223,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb -+ crcputs sys0,1 ++ crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb @@ -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-06 16:25:26.256271726 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-06 16:25:26.636277233 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-06 19:28:27.798491086 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-06 19:28:28.182497193 +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 22e6c300..6c732b84 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-05-06 16:25:26.648277407 +0000 -+--- HMI/n2t-out/Program.s.txt 2022-05-06 16:25:26.256271726 +0000 -++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-06 16:25:26.636277233 +0000 -+--- HMI/n2t-out/cardEntities.txt 2022-05-06 16:25:26.256271726 +0000 -++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-06 16:25:26.636277233 +0000 ++++ HMI/US/portrait/diff-eu-version.txt 2022-05-06 19:28:28.194497383 +0000 ++--- HMI/n2t-out/Program.s.txt 2022-05-06 19:28:27.798491086 +0000 +++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-06 19:28:28.182497193 +0000 ++--- HMI/n2t-out/cardEntities.txt 2022-05-06 19:28:27.798491086 +0000 +++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-06 19:28:28.186497256 +0000 +@@ -62,6 +62,16 @@ + vis bPrev,0 + vis bNext,0 @@ -17,6 +17,7 @@ ++ crcputs sys0,2 ++ crcputs sys0,2 ++ crcputs sys0,2 +++ crcputs sys0,2 +@@ -969,6 +1148,33 @@ ++ crcputs sys0,2 +@@ -1074,6 +1280,28 @@ @@ -24,5 +25,5 @@ + } + if(tInstruction.txt=="pageType") + { -+--- HMI/n2t-out/pageStartup.txt 2022-05-06 16:25:26.256271726 +0000 -++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-06 16:25:26.636277233 +0000 ++--- HMI/n2t-out/pageStartup.txt 2022-05-06 19:28:27.798491086 +0000 +++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-06 19:28:28.182497193 +0000 diff --git a/HMI/US/portrait/n2t-out-visual/cardEntities.txt b/HMI/US/portrait/n2t-out-visual/cardEntities.txt index b3e46e95..8d4d7158 100644 --- a/HMI/US/portrait/n2t-out-visual/cardEntities.txt +++ b/HMI/US/portrait/n2t-out-visual/cardEntities.txt @@ -2025,7 +2025,7 @@ Button bText5 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb 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 b257e345..7c9d0d04 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 @@ -49,10 +49,10 @@ cardThermo cardEntities 74 Component(s) 1159 Line(s) of event code - 482 Unique line(s) of event code + 481 Unique line(s) of event code Total 12 Page(s) 356 Component(s) 3894 Line(s) of event code - 1081 Unique line(s) of event code + 1080 Unique line(s) of event code diff --git a/HMI/US/portrait/n2t-out/cardEntities.txt b/HMI/US/portrait/n2t-out/cardEntities.txt index 9599fe9d..9a17912f 100644 --- a/HMI/US/portrait/n2t-out/cardEntities.txt +++ b/HMI/US/portrait/n2t-out/cardEntities.txt @@ -1032,7 +1032,7 @@ Button bText5 btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC crcputh 55 bb - crcputs sys0,1 + crcputs sys0,2 crcputs tSend.txt,0 //send cmd printh 55 bb