Synced US-P (#178)

* synced us-p version

* synced us-p version (add nextion2text)

Co-authored-by: jmbinette <jmbinette@users.noreply.github.com>
This commit is contained in:
jmbinette
2022-05-06 10:59:42 -04:00
committed by GitHub
parent 71de35f32d
commit 10ca0c2ca3
26 changed files with 339 additions and 686 deletions

View File

@@ -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 14:02:52.542818972 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-06 14:02:52.922820303 +0000
--- HMI/n2t-out/Program.s.txt 2022-05-06 14:54:01.361609612 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-06 14:54:01.817644997 +0000
@@ -11,6 +11,6 @@
// dim value
int dimValue=40
@@ -11,18 +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/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
--- HMI/n2t-out/cardAlarm.txt 2022-05-06 14:02:52.546818986 +0000
+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-06 14:02:52.926820317 +0000
@@ -33,8 +33,6 @@
vis b9,0
vis b10,0
vis tCode,0
- vis bPrev,0
- vis bNext,0
Variable (string) strCommand
Attributes
@@ -46,7 +44,7 @@
--- HMI/n2t-out/cardAlarm.txt 2022-05-06 14:54:01.365609923 +0000
+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-06 14:54:01.817644997 +0000
@@ -46,7 +46,7 @@
Attributes
Scope : local
Text :
@@ -31,7 +22,7 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
Variable (string) tSend
Attributes
@@ -152,7 +150,7 @@
@@ -152,7 +152,7 @@
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
@@ -40,7 +31,7 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
crcputs tSend.txt,0
//send cmd
printh 55 bb
@@ -184,7 +182,7 @@
@@ -184,7 +184,7 @@
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
@@ -49,7 +40,7 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
crcputs tSend.txt,0
//send cmd
printh 55 bb
@@ -367,7 +365,7 @@
@@ -367,7 +367,7 @@
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
@@ -58,7 +49,7 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
crcputs tSend.txt,0
//send cmd
printh 55 bb
@@ -397,7 +395,7 @@
@@ -397,7 +397,7 @@
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
@@ -67,7 +58,7 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
crcputs tSend.txt,0
//send cmd
printh 55 bb
@@ -427,7 +425,7 @@
@@ -427,7 +427,7 @@
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
@@ -76,7 +67,7 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
crcputs tSend.txt,0
//send cmd
printh 55 bb
@@ -457,7 +455,7 @@
@@ -457,7 +457,7 @@
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
@@ -85,24 +76,13 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
crcputs tSend.txt,0
//send cmd
printh 55 bb
@@ -737,7 +735,7 @@
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
- crcputs sys0,2
+ crcputs sys0,1
crcputs tSend.txt,0
//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 14:02:52.546818986 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-06 14:02:52.926820317 +0000
@@ -62,8 +62,16 @@
--- HMI/n2t-out/cardEntities.txt 2022-05-06 14:54:01.365609923 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-06 14:54:01.817644997 +0000
@@ -62,6 +62,16 @@
vis bText4,0
vis hSlider4,0
vis nNum4,0
- vis bPrev,0
- vis bNext,0
+ //ui e5
+ vis btOnOff5,0
+ vis bUp5,0
@@ -113,10 +93,10 @@ 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
@@ -119,6 +127,18 @@
@@ -119,6 +129,18 @@
Text :
Max. Text Size: 80
@@ -135,7 +115,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
Number nNum1
Attributes
Scope : local
@@ -155,6 +175,15 @@
@@ -155,6 +177,15 @@
Associated Keyboard : none
Value : 0
@@ -151,7 +131,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
Text tHeading
Attributes
Scope : local
@@ -285,6 +314,26 @@
@@ -285,6 +316,26 @@
Text :
Max. Text Size : 50
@@ -178,7 +158,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
Picture p0
Attributes
Scope : local
@@ -404,6 +453,34 @@
@@ -404,6 +455,34 @@
prints tSend.txt,0
prints crcval,2
@@ -213,7 +193,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
Button bDown1
Attributes
Scope : local
@@ -861,6 +938,106 @@
@@ -861,6 +940,106 @@
prints tSend.txt,0
prints crcval,2
@@ -320,7 +300,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
Dual-state Button btOnOff1
Attributes
Scope : local
@@ -969,6 +1146,33 @@
@@ -969,6 +1148,33 @@
prints tSend.txt,0
prints crcval,2
@@ -354,7 +334,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
Hotspot mSpecial
Attributes
Scope : local
@@ -1074,6 +1278,28 @@
@@ -1074,6 +1280,28 @@
page popupLight
}
@@ -383,7 +363,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
Timer tmSerial
Attributes
Scope : local
@@ -1644,6 +1870,128 @@
@@ -1644,6 +1872,128 @@
covx tTmp.txt,sys0,0,0
hSlider4.maxval=sys0
}
@@ -513,18 +493,9 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
if(tInstruction.txt=="pageType")
{
diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt
--- HMI/n2t-out/cardGrid.txt 2022-05-06 14:02:52.546818986 +0000
+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-06 14:02:52.926820317 +0000
@@ -34,8 +34,6 @@
vis tEntity4,0
vis tEntity5,0
vis tEntity6,0
- vis bPrev,0
- vis bNext,0
Variable (string) strCommand
Attributes
@@ -71,25 +69,25 @@
--- HMI/n2t-out/cardGrid.txt 2022-05-06 14:54:01.361609612 +0000
+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-06 14:54:01.817644997 +0000
@@ -71,25 +71,25 @@
Attributes
Scope : local
Text :
@@ -554,7 +525,7 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt
Variable (string) type5
Attributes
@@ -107,13 +105,13 @@
@@ -107,13 +107,13 @@
Attributes
Scope : local
Text :
@@ -570,27 +541,10 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt
Text tHeading
Attributes
@@ -840,7 +838,7 @@
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
- crcputs sys0,2
+ crcputs sys0,1
crcputs tSend.txt,0
//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 14:02:52.542818972 +0000
+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-05-06 14:02:52.926820317 +0000
@@ -18,26 +18,25 @@
vis tTmp,0
vis tId,0
vis t5,0
- vis bPrev,0
- vis bNext,0
+ //vis nPageDisp,0
Variable (string) strCommand
--- HMI/n2t-out/cardMedia.txt 2022-05-06 14:54:01.361609612 +0000
+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-05-06 14:54:01.817644997 +0000
@@ -25,19 +25,19 @@
Attributes
Scope : local
Text :
@@ -613,7 +567,7 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
Variable (int32) vaSpeakerPos
Attributes
@@ -135,7 +134,7 @@
@@ -135,7 +135,7 @@
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
@@ -622,7 +576,7 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
crcputs tSend.txt,0
//send cmd
printh 55 bb
@@ -164,7 +163,7 @@
@@ -164,7 +164,7 @@
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
@@ -631,7 +585,7 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
crcputs tSend.txt,0
//send cmd
printh 55 bb
@@ -193,7 +192,7 @@
@@ -193,7 +193,7 @@
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
@@ -640,7 +594,7 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
crcputs tSend.txt,0
//send cmd
printh 55 bb
@@ -233,7 +232,7 @@
@@ -233,7 +233,7 @@
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
@@ -649,7 +603,7 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
crcputs tSend.txt,0
//send cmd
printh 55 bb
@@ -263,7 +262,7 @@
@@ -263,7 +263,7 @@
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
@@ -658,7 +612,7 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
crcputs tSend.txt,0
//send cmd
printh 55 bb
@@ -302,7 +301,7 @@
@@ -302,7 +302,7 @@
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
@@ -667,7 +621,7 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
crcputs tSend.txt,0
//send cmd
printh 55 bb
@@ -353,7 +352,7 @@
@@ -353,7 +353,7 @@
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
@@ -676,7 +630,7 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
crcputs tSend.txt,0
//send cmd
printh 55 bb
@@ -391,7 +390,7 @@
@@ -391,7 +391,7 @@
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
@@ -685,7 +639,7 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
crcputs tSend.txt,0
//send cmd
printh 55 bb
@@ -416,7 +415,7 @@
@@ -416,7 +416,7 @@
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
@@ -694,7 +648,7 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
crcputs tSend.txt,0
//send cmd
printh 55 bb
@@ -448,7 +447,7 @@
@@ -448,7 +448,7 @@
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
@@ -703,28 +657,10 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
crcputs tSend.txt,0
//send cmd
printh 55 bb
@@ -698,7 +697,7 @@
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
- crcputs sys0,2
+ crcputs sys0,1
crcputs tSend.txt,0
//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 14:02:52.546818986 +0000
+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-06 14:02:52.926820317 +0000
@@ -31,8 +31,6 @@
vis bt6,0
vis bt7,0
vis bt8,0
- vis bPrev,0
- vis bNext,0
Variable (string) strCommand
Attributes
@@ -44,7 +42,7 @@
--- HMI/n2t-out/cardThermo.txt 2022-05-06 14:54:01.365609923 +0000
+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-06 14:54:01.817644997 +0000
@@ -44,7 +44,7 @@
Attributes
Scope : local
Text :
@@ -733,7 +669,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
Variable (string) va0
Attributes
@@ -239,7 +237,7 @@
@@ -239,7 +239,7 @@
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
@@ -742,7 +678,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
crcputs tSend.txt,0
//send cmd
printh 55 bb
@@ -275,7 +273,7 @@
@@ -275,7 +275,7 @@
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
@@ -751,7 +687,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
crcputs tSend.txt,0
//send cmd
printh 55 bb
@@ -311,7 +309,7 @@
@@ -311,7 +311,7 @@
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
@@ -760,7 +696,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
crcputs tSend.txt,0
//send cmd
printh 55 bb
@@ -343,7 +341,7 @@
@@ -343,7 +343,7 @@
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
@@ -769,7 +705,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
crcputs tSend.txt,0
//send cmd
printh 55 bb
@@ -370,7 +368,7 @@
@@ -370,7 +370,7 @@
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
@@ -778,7 +714,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
crcputs tSend.txt,0
//send cmd
printh 55 bb
@@ -397,7 +395,7 @@
@@ -397,7 +397,7 @@
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
@@ -787,7 +723,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
crcputs tSend.txt,0
//send cmd
printh 55 bb
@@ -424,7 +422,7 @@
@@ -424,7 +424,7 @@
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
@@ -796,7 +732,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
crcputs tSend.txt,0
//send cmd
printh 55 bb
@@ -451,7 +449,7 @@
@@ -451,7 +451,7 @@
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
@@ -805,7 +741,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
crcputs tSend.txt,0
//send cmd
printh 55 bb
@@ -478,7 +476,7 @@
@@ -478,7 +478,7 @@
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
@@ -814,7 +750,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
crcputs tSend.txt,0
//send cmd
printh 55 bb
@@ -505,7 +503,7 @@
@@ -505,7 +505,7 @@
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
@@ -823,7 +759,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
crcputs tSend.txt,0
//send cmd
printh 55 bb
@@ -532,7 +530,7 @@
@@ -532,7 +532,7 @@
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
@@ -832,7 +768,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
crcputs tSend.txt,0
//send cmd
printh 55 bb
@@ -559,7 +557,7 @@
@@ -559,7 +559,7 @@
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
@@ -841,7 +777,7 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
crcputs tSend.txt,0
//send cmd
printh 55 bb
@@ -586,7 +584,7 @@
@@ -586,7 +586,7 @@
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
@@ -850,18 +786,9 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
crcputs tSend.txt,0
//send cmd
printh 55 bb
@@ -950,7 +948,7 @@
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
- crcputs sys0,2
+ crcputs sys0,1
crcputs tSend.txt,0
//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 14:02:52.542818972 +0000
+++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-05-06 14:02:52.922820303 +0000
--- HMI/n2t-out/pageIcons.txt 2022-05-06 14:54:01.361609612 +0000
+++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-05-06 14:54:01.817644997 +0000
@@ -30,7 +30,7 @@
Send Component ID : disabled
Associated Keyboard : none
@@ -881,8 +808,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 14:02:52.546818986 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-06 14:02:52.922820303 +0000
--- HMI/n2t-out/pageStartup.txt 2022-05-06 14:54:01.361609612 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-06 14:54:01.817644997 +0000
@@ -142,7 +142,7 @@
Disable release event after dragging: 0
Send Component ID : disabled
@@ -892,7 +819,7 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
Max. Text Size : 100
Text tVersion
@@ -177,12 +177,12 @@
@@ -177,7 +177,7 @@
recmod=1
bauds=115200
// startup event
@@ -901,24 +828,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
crcputh 55 bb
- crcputs sys0,2
+ crcputs sys0,1
crcputs tSend.txt,0
//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 14:02:52.546818986 +0000
+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-06 14:02:52.926820317 +0000
@@ -29,7 +29,7 @@
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
- crcputs sys0,2
+ crcputs sys0,1
crcputs tSend.txt,0
//send cmd
printh 55 bb
--- HMI/n2t-out/popupLight.txt 2022-05-06 14:54:01.365609923 +0000
+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-06 14:54:01.817644997 +0000
@@ -59,8 +59,8 @@
Variable (string) entn
Attributes
@@ -930,48 +842,9 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
Variable (int32) mode
Attributes
diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt
--- HMI/n2t-out/popupNotify.txt 2022-05-06 14:02:52.546818986 +0000
+++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-05-06 14:02:52.922820303 +0000
@@ -120,7 +120,7 @@
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
- crcputs sys0,2
+ crcputs sys0,1
crcputs tSend.txt,0
//send cmd
printh 55 bb
@@ -147,7 +147,7 @@
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
- crcputs sys0,2
+ crcputs sys0,1
crcputs tSend.txt,0
//send cmd
printh 55 bb
@@ -174,7 +174,7 @@
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
- crcputs sys0,2
+ crcputs sys0,1
crcputs tSend.txt,0
//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 14:02:52.546818986 +0000
+++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-05-06 14:02:52.922820303 +0000
@@ -29,7 +29,7 @@
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
- crcputs sys0,2
+ crcputs sys0,1
crcputs tSend.txt,0
//send cmd
printh 55 bb
--- HMI/n2t-out/popupShutter.txt 2022-05-06 14:54:01.365609923 +0000
+++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-05-06 14:54:01.817644997 +0000
@@ -46,8 +46,8 @@
Variable (string) entn
Attributes
@@ -992,125 +865,3 @@ diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt
crcputs tSend.txt,0
//send cmd
printh 55 bb
@@ -172,7 +172,7 @@
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
- crcputs sys0,2
+ crcputs sys0,1
crcputs tSend.txt,0
//send cmd
printh 55 bb
@@ -197,7 +197,7 @@
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
- crcputs sys0,2
+ crcputs sys0,1
crcputs tSend.txt,0
//send cmd
printh 55 bb
@@ -222,7 +222,7 @@
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
- crcputs sys0,2
+ crcputs sys0,1
crcputs tSend.txt,0
//send cmd
printh 55 bb
@@ -247,7 +247,7 @@
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
- crcputs sys0,2
+ crcputs sys0,1
crcputs tSend.txt,0
//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 14:02:52.546818986 +0000
+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-06 14:02:52.926820317 +0000
@@ -17,8 +17,6 @@
vis tInstruction,0
vis tTmp,0
vis p0,0
- vis tNotifyHead,0
- vis tNotifyText,0
//load gloabl time string from pageIcons
//tTime.txt=vaTime.txt
spstr pageIcons.vaTime.txt,tTime.txt,"?",0
@@ -292,26 +290,6 @@
Text :
Max. Text Size : 10
-Text tNotifyHead
- Attributes
- Scope : local
- Dragging : 0
- Disable release event after dragging: 0
- Send Component ID : disabled
- Associated Keyboard : none
- Text :
- Max. Text Size : 35
-
-Text tNotifyText
- Attributes
- Scope : local
- Dragging : 0
- Disable release event after dragging: 0
- Send Component ID : disabled
- Associated Keyboard : none
- Text :
- Max. Text Size : 35
-
Picture p0
Attributes
Scope : local
@@ -543,20 +521,6 @@
spstr strCommand.txt,tTmp.txt,"~",23
covx tTmp.txt,tMR.pco,0,0
}
- if(tInstruction.txt=="notify")
- {
- spstr strCommand.txt,tNotifyHead.txt,"~",1
- spstr strCommand.txt,tNotifyText.txt,"~",2
- if(tNotifyHead.txt!=""||tNotifyText.txt!="")
- {
- vis tNotifyHead,1
- vis tNotifyText,1
- }else
- {
- vis tNotifyHead,0
- vis tNotifyText,0
- }
- }
if(tInstruction.txt=="pageType")
{
dim=100
@@ -646,16 +610,6 @@
Events
Touch Press Event
- if(tNotifyHead.txt!=""||tNotifyText.txt!="")
- {
- if(dim!=0)
- {
- tNotifyHead.txt=""
- tNotifyText.txt=""
- vis tNotifyHead,0
- vis tNotifyText,0
- }
- }
dim=dimValueNormal
vaTap.val+=1
covx vaTap.val,tTmp.txt,0,0
@@ -664,7 +618,7 @@
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
- crcputs sys0,2
+ crcputs sys0,1
crcputs tSend.txt,0
//send cmd
printh 55 bb