diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 83d75f08..40e718f8 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-28 19:31:24.471828653 +0000 -+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-28 19:31:25.423829253 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-28 19:37:52.047161395 +0000 ++++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-28 19:37:52.963174145 +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-28 19:31:24.471828653 +0000 -+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-28 19:31:25.423829253 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-28 19:37:52.051161450 +0000 ++++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-28 19:37:52.963174145 +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 a09b4d08..f7eedd57 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-28 19:31:24.471828653 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-28 19:31:24.907828928 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-28 19:37:52.047161395 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-28 19:37:52.503167742 +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-28 19:31:24.471828653 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-28 19:31:24.911828931 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-05-28 19:37:52.051161450 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-28 19:37:52.503167742 +0000 @@ -62,6 +62,16 @@ vis bText4,0 vis hSlider4,0 @@ -468,8 +468,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt if(tInstruction.txt=="pageType") { diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt ---- HMI/n2t-out/cardQR.txt 2022-05-28 19:31:24.471828653 +0000 -+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-28 19:31:24.911828931 +0000 +--- HMI/n2t-out/cardQR.txt 2022-05-28 19:37:52.051161450 +0000 ++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-28 19:37:52.503167742 +0000 @@ -34,7 +34,7 @@ Attributes Scope : local @@ -480,8 +480,8 @@ diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt Variable (string) entn Attributes diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-05-28 19:31:24.471828653 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-28 19:31:24.911828931 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-28 19:37:52.051161450 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-28 19:37:52.503167742 +0000 @@ -142,7 +142,7 @@ Disable release event after dragging: 0 Send Component ID : disabled @@ -500,22 +500,9 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC -diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt ---- HMI/n2t-out/popupLight.txt 2022-05-28 19:31:24.471828653 +0000 -+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-28 19:31:24.911828931 +0000 -@@ -209,9 +209,6 @@ - sys0=sys0-pColorWheel.y - covx sys0,tTmp.txt,0,0 - tSend.txt+=tTmp.txt -- tSend.txt+="|" -- covx pColorWheel.h,tTmp.txt,0,0 -- tSend.txt+=tTmp.txt - //send calc crc - 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-05-28 19:31:24.471828653 +0000 -+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-28 19:31:24.911828931 +0000 +--- HMI/n2t-out/screensaver.txt 2022-05-28 19:37:52.051161450 +0000 ++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-28 19:37:52.503167742 +0000 @@ -471,22 +471,6 @@ vis tMainIconAlt,1 vis tMRIcon,1 diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index 4862425c..0d4c3710 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,25 +1,12 @@ -+++ HMI/US/portrait/diff-eu-version.txt 2022-05-28 19:31:24.959828961 +0000 -+--- HMI/n2t-out/Program.s.txt 2022-05-28 19:31:24.471828653 +0000 -++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-28 19:31:24.907828928 +0000 -+--- HMI/n2t-out/cardEntities.txt 2022-05-28 19:31:24.471828653 +0000 -++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-28 19:31:24.911828931 +0000 -+--- HMI/n2t-out/cardQR.txt 2022-05-28 19:31:24.471828653 +0000 -++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-28 19:31:24.911828931 +0000 -+--- HMI/n2t-out/pageStartup.txt 2022-05-28 19:31:24.471828653 +0000 -++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-28 19:31:24.911828931 +0000 -+diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt -+--- HMI/n2t-out/popupLight.txt 2022-05-28 19:31:24.471828653 +0000 -++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-28 19:31:24.911828931 +0000 -+@@ -209,9 +209,6 @@ -+ sys0=sys0-pColorWheel.y -+ covx sys0,tTmp.txt,0,0 -+ tSend.txt+=tTmp.txt -+- tSend.txt+="|" -+- covx pColorWheel.h,tTmp.txt,0,0 -+- tSend.txt+=tTmp.txt -+ //send calc crc -+ btlen tSend.txt,sys0 -+ crcrest 1,0xffff // reset CRC -+--- HMI/n2t-out/screensaver.txt 2022-05-28 19:31:24.471828653 +0000 -++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-28 19:31:24.911828931 +0000 ++++ HMI/US/portrait/diff-eu-version.txt 2022-05-28 19:37:52.515167909 +0000 ++--- HMI/n2t-out/Program.s.txt 2022-05-28 19:37:52.047161395 +0000 +++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-28 19:37:52.503167742 +0000 ++--- HMI/n2t-out/cardEntities.txt 2022-05-28 19:37:52.051161450 +0000 +++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-28 19:37:52.503167742 +0000 ++--- HMI/n2t-out/cardQR.txt 2022-05-28 19:37:52.051161450 +0000 +++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-28 19:37:52.503167742 +0000 ++--- HMI/n2t-out/pageStartup.txt 2022-05-28 19:37:52.051161450 +0000 +++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-28 19:37:52.503167742 +0000 ++--- HMI/n2t-out/screensaver.txt 2022-05-28 19:37:52.051161450 +0000 +++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-28 19:37:52.503167742 +0000 +@@ -471,22 +471,6 @@ 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 00519624..6be912f6 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 @@ -18,10 +18,6 @@ cardGrid 42 Component(s) 439 Line(s) of event code 254 Unique line(s) of event code -popupLight - 27 Component(s) - 345 Line(s) of event code - 187 Unique line(s) of event code cardQR 30 Component(s) 363 Line(s) of event code @@ -38,6 +34,10 @@ cardMedia 33 Component(s) 350 Line(s) of event code 179 Unique line(s) of event code +popupLight + 27 Component(s) + 348 Line(s) of event code + 188 Unique line(s) of event code pageStartup 19 Component(s) 154 Line(s) of event code @@ -58,5 +58,5 @@ cardEntities Total 13 Page(s) 416 Component(s) - 4682 Line(s) of event code - 1231 Unique line(s) of event code + 4685 Line(s) of event code + 1232 Unique line(s) of event code diff --git a/HMI/US/portrait/n2t-out-visual/popupLight.txt b/HMI/US/portrait/n2t-out-visual/popupLight.txt index 3d5b2156..a059a705 100644 --- a/HMI/US/portrait/n2t-out-visual/popupLight.txt +++ b/HMI/US/portrait/n2t-out-visual/popupLight.txt @@ -461,6 +461,9 @@ Picture pColorWheel sys0=sys0-pColorWheel.y covx sys0,tTmp.txt,0,0 tSend.txt+=tTmp.txt + tSend.txt+="|" + covx pColorWheel.h,tTmp.txt,0,0 + tSend.txt+=tTmp.txt //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC diff --git a/HMI/US/portrait/n2t-out/popupLight.txt b/HMI/US/portrait/n2t-out/popupLight.txt index 3e3da25b..4c4b5703 100644 --- a/HMI/US/portrait/n2t-out/popupLight.txt +++ b/HMI/US/portrait/n2t-out/popupLight.txt @@ -209,6 +209,9 @@ Picture pColorWheel sys0=sys0-pColorWheel.y covx sys0,tTmp.txt,0,0 tSend.txt+=tTmp.txt + tSend.txt+="|" + covx pColorWheel.h,tTmp.txt,0,0 + tSend.txt+=tTmp.txt //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC