diff --git a/HMI/US/portrait/diff-eu-version-known-good.txt b/HMI/US/portrait/diff-eu-version-known-good.txt index 22626804..fdf0a6f6 100644 --- a/HMI/US/portrait/diff-eu-version-known-good.txt +++ b/HMI/US/portrait/diff-eu-version-known-good.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-04-01 04:54:12.884151859 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-01 04:54:13.372185922 +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,9 +11,9 @@ 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-04-01 04:54:12.888152138 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-01 04:54:13.372185922 +0000 -@@ -62,6 +62,26 @@ +--- 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 vis nNum4,0 @@ -27,20 +27,18 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt + vis bText5,0 + vis hSlider5,0 + vis nNum5,0 - + vis bPrev,0 + vis bNext,0 - Variable (string) strCommand - Attributes -@@ -117,6 +137,30 @@ +@@ -119,6 +129,18 @@ Text : - Max. Text Size: 70 + Max. Text Size: 80 +Variable (string) entn5 + Attributes + Scope : local + Text : -+ Max. Text Size: 70 -+ ++ Max. Text Size: 80 + +Variable (string) type5 + Attributes @@ -51,7 +49,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt Number nNum1 Attributes Scope : local -@@ -153,6 +197,24 @@ +@@ -155,6 +177,15 @@ Associated Keyboard : none Value : 0 @@ -64,11 +62,10 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt + Associated Keyboard : none + Value : 0 + - Text tHeading Attributes Scope : local -@@ -283,6 +345,46 @@ +@@ -285,6 +316,26 @@ Text : Max. Text Size : 50 @@ -92,11 +89,10 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt + Text :  + Max. Text Size : 5 + - Picture p0 Attributes Scope : local -@@ -402,6 +504,62 @@ +@@ -404,6 +455,34 @@ prints tSend.txt,0 prints crcval,2 @@ -120,7 +116,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 @@ -128,11 +124,10 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt + prints tSend.txt,0 + prints crcval,2 + - Button bDown1 Attributes Scope : local -@@ -857,6 +1015,206 @@ +@@ -861,6 +940,106 @@ prints tSend.txt,0 prints crcval,2 @@ -153,7 +148,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 @@ -178,7 +173,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 @@ -203,7 +198,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 @@ -228,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 @@ -236,11 +231,10 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt + prints tSend.txt,0 + prints crcval,2 + - Dual-state Button btOnOff1 Attributes Scope : local -@@ -965,6 +1323,60 @@ +@@ -969,6 +1148,33 @@ prints tSend.txt,0 prints crcval,2 @@ -263,7 +257,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 @@ -271,11 +265,10 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt + prints tSend.txt,0 + prints crcval,2 + - Hotspot mSpecial Attributes Scope : local -@@ -1070,6 +1482,50 @@ +@@ -1074,6 +1280,28 @@ page popupLight } @@ -301,11 +294,10 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt + page popupLight + } + - Timer tmSerial Attributes Scope : local -@@ -1642,6 +2098,250 @@ +@@ -1644,6 +1872,128 @@ covx tTmp.txt,sys0,0,0 hSlider4.maxval=sys0 } @@ -431,10 +423,12 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt + covx tTmp.txt,sys0,0,0 + hSlider5.maxval=sys0 + } - + } + if(tInstruction.txt=="pageType") + { diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-04-01 04:54:12.884151859 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-01 04:54:13.372185922 +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