diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 3d544abd..9d813405 100644 --- a/HMI/US/landscape/diff-eu-version.txt +++ b/HMI/US/landscape/diff-eu-version.txt @@ -336,7 +336,7 @@ │ Value: 0 │ │ Variable (int32) xc1 -│ @@ -370,160 +336,50 @@ +│ @@ -370,165 +336,50 @@ │ Scope : local │ Dragging : 0 │ Send Component ID : disabled @@ -347,20 +347,21 @@ │ - Events │ - Touch Press Event │ - tSend.txt="event,buttonPress2,"+entn1.txt+",button" -│ - if(entn1.txt!="") +│ - if(entn1.txt=="") │ - { -│ - //send calc crc -│ - btlen tSend.txt,sys0 -│ - crcrest 1,0xffff // reset CRC -│ - crcputh 55 bb -│ - crcputs sys0,2 -│ - crcputs tSend.txt,0 -│ - //send cmd -│ - printh 55 bb -│ - prints sys0,2 -│ - prints tSend.txt,0 -│ - prints crcval,2 +│ - tSend.txt="event,buttonPress2,screensaver,bExit,"+tTmp.txt │ - } +│ - //send calc crc +│ - btlen tSend.txt,sys0 +│ - crcrest 1,0xffff // reset CRC +│ - crcputh 55 bb +│ - crcputs sys0,2 +│ - crcputs tSend.txt,0 +│ - //send cmd +│ - printh 55 bb +│ - prints sys0,2 +│ - prints tSend.txt,0 +│ - prints crcval,2 │ - │ Text f2Icon │ Attributes @@ -374,20 +375,21 @@ │ - Events │ - Touch Press Event │ - tSend.txt="event,buttonPress2,"+entn2.txt+",button" -│ - if(entn2.txt!="") +│ - if(entn2.txt=="") │ - { -│ - //send calc crc -│ - btlen tSend.txt,sys0 -│ - crcrest 1,0xffff // reset CRC -│ - crcputh 55 bb -│ - crcputs sys0,2 -│ - crcputs tSend.txt,0 -│ - //send cmd -│ - printh 55 bb -│ - prints sys0,2 -│ - prints tSend.txt,0 -│ - prints crcval,2 +│ - tSend.txt="event,buttonPress2,screensaver,bExit,"+tTmp.txt │ - } +│ - //send calc crc +│ - btlen tSend.txt,sys0 +│ - crcrest 1,0xffff // reset CRC +│ - crcputh 55 bb +│ - crcputs sys0,2 +│ - crcputs tSend.txt,0 +│ - //send cmd +│ - printh 55 bb +│ - prints sys0,2 +│ - prints tSend.txt,0 +│ - prints crcval,2 │ - │ Text f3Icon │ Attributes @@ -401,20 +403,21 @@ │ - Events │ - Touch Press Event │ - tSend.txt="event,buttonPress2,"+entn3.txt+",button" -│ - if(entn3.txt!="") +│ - if(entn3.txt=="") │ - { -│ - //send calc crc -│ - btlen tSend.txt,sys0 -│ - crcrest 1,0xffff // reset CRC -│ - crcputh 55 bb -│ - crcputs sys0,2 -│ - crcputs tSend.txt,0 -│ - //send cmd -│ - printh 55 bb -│ - prints sys0,2 -│ - prints tSend.txt,0 -│ - prints crcval,2 +│ - tSend.txt="event,buttonPress2,screensaver,bExit,"+tTmp.txt │ - } +│ - //send calc crc +│ - btlen tSend.txt,sys0 +│ - crcrest 1,0xffff // reset CRC +│ - crcputh 55 bb +│ - crcputs sys0,2 +│ - crcputs tSend.txt,0 +│ - //send cmd +│ - printh 55 bb +│ - prints sys0,2 +│ - prints tSend.txt,0 +│ - prints crcval,2 │ - │ Text f4Icon │ Attributes @@ -428,20 +431,21 @@ │ - Events │ - Touch Press Event │ - tSend.txt="event,buttonPress2,"+entn4.txt+",button" -│ - if(entn4.txt!="") +│ - if(entn4.txt=="") │ - { -│ - //send calc crc -│ - btlen tSend.txt,sys0 -│ - crcrest 1,0xffff // reset CRC -│ - crcputh 55 bb -│ - crcputs sys0,2 -│ - crcputs tSend.txt,0 -│ - //send cmd -│ - printh 55 bb -│ - prints sys0,2 -│ - prints tSend.txt,0 -│ - prints crcval,2 +│ - tSend.txt="event,buttonPress2,screensaver,bExit,"+tTmp.txt │ - } +│ - //send calc crc +│ - btlen tSend.txt,sys0 +│ - crcrest 1,0xffff // reset CRC +│ - crcputh 55 bb +│ - crcputs sys0,2 +│ - crcputs tSend.txt,0 +│ - //send cmd +│ - printh 55 bb +│ - prints sys0,2 +│ - prints tSend.txt,0 +│ - prints crcval,2 │ - │ Text f5Icon │ Attributes @@ -455,20 +459,21 @@ │ - Events │ - Touch Press Event │ - tSend.txt="event,buttonPress2,"+entn5.txt+",button" -│ - if(entn5.txt!="") +│ - if(entn5.txt=="") │ - { -│ - //send calc crc -│ - btlen tSend.txt,sys0 -│ - crcrest 1,0xffff // reset CRC -│ - crcputh 55 bb -│ - crcputs sys0,2 -│ - crcputs tSend.txt,0 -│ - //send cmd -│ - printh 55 bb -│ - prints sys0,2 -│ - prints tSend.txt,0 -│ - prints crcval,2 +│ - tSend.txt="event,buttonPress2,screensaver,bExit,"+tTmp.txt │ - } +│ - //send calc crc +│ - btlen tSend.txt,sys0 +│ - crcrest 1,0xffff // reset CRC +│ - crcputh 55 bb +│ - crcputs sys0,2 +│ - crcputs tSend.txt,0 +│ - //send cmd +│ - printh 55 bb +│ - prints sys0,2 +│ - prints tSend.txt,0 +│ - prints crcval,2 │ - │ -Text m0 │ - Attributes @@ -497,7 +502,7 @@ │ Send Component ID : disabled │ Associated Keyboard: none │ Text : PM -│ @@ -705,15 +561,14 @@ +│ @@ -710,15 +561,14 @@ │ if(tTmp.txt!="") │ { │ covx tTmp.txt,defaultFontColor,0,0 @@ -513,7 +518,7 @@ │ if(tAMPM.txt=="") │ { │ vis tAMPM,0 -│ @@ -834,44 +689,34 @@ +│ @@ -839,44 +689,34 @@ │ //e6Val │ spstr strCommand.txt,e6Val.txt,"~",60 │ //f1Icon diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index 38574b04..8625f24c 100644 --- a/HMI/US/portrait/diff-eu-version.txt +++ b/HMI/US/portrait/diff-eu-version.txt @@ -2279,7 +2279,7 @@ │ Value: 0 │ │ Variable (int32) xc1 -│ @@ -370,160 +324,50 @@ +│ @@ -370,165 +324,50 @@ │ Scope : local │ Dragging : 0 │ Send Component ID : disabled @@ -2290,20 +2290,21 @@ │ - Events │ - Touch Press Event │ - tSend.txt="event,buttonPress2,"+entn1.txt+",button" -│ - if(entn1.txt!="") +│ - if(entn1.txt=="") │ - { -│ - //send calc crc -│ - btlen tSend.txt,sys0 -│ - crcrest 1,0xffff // reset CRC -│ - crcputh 55 bb -│ - crcputs sys0,2 -│ - crcputs tSend.txt,0 -│ - //send cmd -│ - printh 55 bb -│ - prints sys0,2 -│ - prints tSend.txt,0 -│ - prints crcval,2 +│ - tSend.txt="event,buttonPress2,screensaver,bExit,"+tTmp.txt │ - } +│ - //send calc crc +│ - btlen tSend.txt,sys0 +│ - crcrest 1,0xffff // reset CRC +│ - crcputh 55 bb +│ - crcputs sys0,2 +│ - crcputs tSend.txt,0 +│ - //send cmd +│ - printh 55 bb +│ - prints sys0,2 +│ - prints tSend.txt,0 +│ - prints crcval,2 │ - │ Text f2Icon │ Attributes @@ -2317,20 +2318,21 @@ │ - Events │ - Touch Press Event │ - tSend.txt="event,buttonPress2,"+entn2.txt+",button" -│ - if(entn2.txt!="") +│ - if(entn2.txt=="") │ - { -│ - //send calc crc -│ - btlen tSend.txt,sys0 -│ - crcrest 1,0xffff // reset CRC -│ - crcputh 55 bb -│ - crcputs sys0,2 -│ - crcputs tSend.txt,0 -│ - //send cmd -│ - printh 55 bb -│ - prints sys0,2 -│ - prints tSend.txt,0 -│ - prints crcval,2 +│ - tSend.txt="event,buttonPress2,screensaver,bExit,"+tTmp.txt │ - } +│ - //send calc crc +│ - btlen tSend.txt,sys0 +│ - crcrest 1,0xffff // reset CRC +│ - crcputh 55 bb +│ - crcputs sys0,2 +│ - crcputs tSend.txt,0 +│ - //send cmd +│ - printh 55 bb +│ - prints sys0,2 +│ - prints tSend.txt,0 +│ - prints crcval,2 │ - │ Text f3Icon │ Attributes @@ -2344,20 +2346,21 @@ │ - Events │ - Touch Press Event │ - tSend.txt="event,buttonPress2,"+entn3.txt+",button" -│ - if(entn3.txt!="") +│ - if(entn3.txt=="") │ - { -│ - //send calc crc -│ - btlen tSend.txt,sys0 -│ - crcrest 1,0xffff // reset CRC -│ - crcputh 55 bb -│ - crcputs sys0,2 -│ - crcputs tSend.txt,0 -│ - //send cmd -│ - printh 55 bb -│ - prints sys0,2 -│ - prints tSend.txt,0 -│ - prints crcval,2 +│ - tSend.txt="event,buttonPress2,screensaver,bExit,"+tTmp.txt │ - } +│ - //send calc crc +│ - btlen tSend.txt,sys0 +│ - crcrest 1,0xffff // reset CRC +│ - crcputh 55 bb +│ - crcputs sys0,2 +│ - crcputs tSend.txt,0 +│ - //send cmd +│ - printh 55 bb +│ - prints sys0,2 +│ - prints tSend.txt,0 +│ - prints crcval,2 │ - │ Text f4Icon │ Attributes @@ -2371,20 +2374,21 @@ │ - Events │ - Touch Press Event │ - tSend.txt="event,buttonPress2,"+entn4.txt+",button" -│ - if(entn4.txt!="") +│ - if(entn4.txt=="") │ - { -│ - //send calc crc -│ - btlen tSend.txt,sys0 -│ - crcrest 1,0xffff // reset CRC -│ - crcputh 55 bb -│ - crcputs sys0,2 -│ - crcputs tSend.txt,0 -│ - //send cmd -│ - printh 55 bb -│ - prints sys0,2 -│ - prints tSend.txt,0 -│ - prints crcval,2 +│ - tSend.txt="event,buttonPress2,screensaver,bExit,"+tTmp.txt │ - } +│ - //send calc crc +│ - btlen tSend.txt,sys0 +│ - crcrest 1,0xffff // reset CRC +│ - crcputh 55 bb +│ - crcputs sys0,2 +│ - crcputs tSend.txt,0 +│ - //send cmd +│ - printh 55 bb +│ - prints sys0,2 +│ - prints tSend.txt,0 +│ - prints crcval,2 │ - │ Text f5Icon │ Attributes @@ -2398,20 +2402,21 @@ │ - Events │ - Touch Press Event │ - tSend.txt="event,buttonPress2,"+entn5.txt+",button" -│ - if(entn5.txt!="") +│ - if(entn5.txt=="") │ - { -│ - //send calc crc -│ - btlen tSend.txt,sys0 -│ - crcrest 1,0xffff // reset CRC -│ - crcputh 55 bb -│ - crcputs sys0,2 -│ - crcputs tSend.txt,0 -│ - //send cmd -│ - printh 55 bb -│ - prints sys0,2 -│ - prints tSend.txt,0 -│ - prints crcval,2 +│ - tSend.txt="event,buttonPress2,screensaver,bExit,"+tTmp.txt │ - } +│ - //send calc crc +│ - btlen tSend.txt,sys0 +│ - crcrest 1,0xffff // reset CRC +│ - crcputh 55 bb +│ - crcputs sys0,2 +│ - crcputs tSend.txt,0 +│ - //send cmd +│ - printh 55 bb +│ - prints sys0,2 +│ - prints tSend.txt,0 +│ - prints crcval,2 │ - │ -Text m0 │ - Attributes @@ -2440,7 +2445,7 @@ │ Send Component ID : disabled │ Associated Keyboard: none │ Text : PM -│ @@ -705,15 +549,14 @@ +│ @@ -710,15 +549,14 @@ │ if(tTmp.txt!="") │ { │ covx tTmp.txt,defaultFontColor,0,0 @@ -2456,7 +2461,7 @@ │ if(tAMPM.txt=="") │ { │ vis tAMPM,0 -│ @@ -834,44 +677,34 @@ +│ @@ -839,44 +677,34 @@ │ //e6Val │ spstr strCommand.txt,e6Val.txt,"~",60 │ //f1Icon diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index f84410e6..ae7b9f6f 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,4 +1,4 @@ -+++ /dev/fd/62 2024-11-21 19:35:42.871078761 +0000 ++++ /dev/fd/62 2024-11-22 20:00:11.734673876 +0000 +I/n2t-out/Program.s.txt ++ HMI/US/portrait/n2t-out/Program.s.txt +1 +12,11 @@ @@ -686,6 +686,13 @@ + covx tTmp.txt,sys0,0,0 + hSlider6.maxval=sys0 + } ++ } ++ if(tInstruction.txt=="pageType") ++ { ++ sleepValue=0 ++ //command format pageType,specialPageName ++ //write name of speical page to tId ++ spstr strCommand.txt,tId.txt,"~",1 +I/n2t-out/cardGrid.txt ++ HMI/US/portrait/n2t-out/cardGrid.txt + +7,14 @@ @@ -939,13 +946,6 @@ + spstr strCommand.txt,tEntity9.txt,"~",66 + vis tEntity9,1 + } -+ } -+ if(tInstruction.txt=="pageType") -+ { -+ sleepValue=0 -+ //command format pageType,specialPageName -+ //write name of speical page to tId -+ spstr strCommand.txt,tId.txt,"~",1 +I/n2t-out/cardLChart.txt ++ HMI/US/portrait/n2t-out/cardLChart.txt + +7,14 @@ @@ -1821,7 +1821,7 @@ + Value: 0 + +e (int32) xc1 -+160 +324,50 @@ ++165 +324,50 @@ + Scope : local + Dragging : 0 + Send Component ID : disabled @@ -1832,20 +1832,21 @@ +nts + Touch Press Event + tSend.txt="event,buttonPress2,"+entn1.txt+",button" -+ if(entn1.txt!="") ++ if(entn1.txt=="") + { -+ //send calc crc -+ btlen tSend.txt,sys0 -+ crcrest 1,0xffff // reset CRC -+ crcputh 55 bb -+ crcputs sys0,2 -+ crcputs tSend.txt,0 -+ //send cmd -+ printh 55 bb -+ prints sys0,2 -+ prints tSend.txt,0 -+ prints crcval,2 ++ tSend.txt="event,buttonPress2,screensaver,bExit,"+tTmp.txt + } ++ //send calc crc ++ btlen tSend.txt,sys0 ++ crcrest 1,0xffff // reset CRC ++ crcputh 55 bb ++ crcputs sys0,2 ++ crcputs tSend.txt,0 ++ //send cmd ++ printh 55 bb ++ prints sys0,2 ++ prints tSend.txt,0 ++ prints crcval,2 + +Icon +ributes @@ -1859,20 +1860,21 @@ +nts + Touch Press Event + tSend.txt="event,buttonPress2,"+entn2.txt+",button" -+ if(entn2.txt!="") ++ if(entn2.txt=="") + { -+ //send calc crc -+ btlen tSend.txt,sys0 -+ crcrest 1,0xffff // reset CRC -+ crcputh 55 bb -+ crcputs sys0,2 -+ crcputs tSend.txt,0 -+ //send cmd -+ printh 55 bb -+ prints sys0,2 -+ prints tSend.txt,0 -+ prints crcval,2 ++ tSend.txt="event,buttonPress2,screensaver,bExit,"+tTmp.txt + } ++ //send calc crc ++ btlen tSend.txt,sys0 ++ crcrest 1,0xffff // reset CRC ++ crcputh 55 bb ++ crcputs sys0,2 ++ crcputs tSend.txt,0 ++ //send cmd ++ printh 55 bb ++ prints sys0,2 ++ prints tSend.txt,0 ++ prints crcval,2 + +Icon +ributes @@ -1886,20 +1888,21 @@ +nts + Touch Press Event + tSend.txt="event,buttonPress2,"+entn3.txt+",button" -+ if(entn3.txt!="") ++ if(entn3.txt=="") + { -+ //send calc crc -+ btlen tSend.txt,sys0 -+ crcrest 1,0xffff // reset CRC -+ crcputh 55 bb -+ crcputs sys0,2 -+ crcputs tSend.txt,0 -+ //send cmd -+ printh 55 bb -+ prints sys0,2 -+ prints tSend.txt,0 -+ prints crcval,2 ++ tSend.txt="event,buttonPress2,screensaver,bExit,"+tTmp.txt + } ++ //send calc crc ++ btlen tSend.txt,sys0 ++ crcrest 1,0xffff // reset CRC ++ crcputh 55 bb ++ crcputs sys0,2 ++ crcputs tSend.txt,0 ++ //send cmd ++ printh 55 bb ++ prints sys0,2 ++ prints tSend.txt,0 ++ prints crcval,2 + +Icon +ributes @@ -1913,20 +1916,21 @@ +nts + Touch Press Event + tSend.txt="event,buttonPress2,"+entn4.txt+",button" -+ if(entn4.txt!="") ++ if(entn4.txt=="") + { -+ //send calc crc -+ btlen tSend.txt,sys0 -+ crcrest 1,0xffff // reset CRC -+ crcputh 55 bb -+ crcputs sys0,2 -+ crcputs tSend.txt,0 -+ //send cmd -+ printh 55 bb -+ prints sys0,2 -+ prints tSend.txt,0 -+ prints crcval,2 ++ tSend.txt="event,buttonPress2,screensaver,bExit,"+tTmp.txt + } ++ //send calc crc ++ btlen tSend.txt,sys0 ++ crcrest 1,0xffff // reset CRC ++ crcputh 55 bb ++ crcputs sys0,2 ++ crcputs tSend.txt,0 ++ //send cmd ++ printh 55 bb ++ prints sys0,2 ++ prints tSend.txt,0 ++ prints crcval,2 + +Icon +ributes @@ -1940,20 +1944,21 @@ +nts + Touch Press Event + tSend.txt="event,buttonPress2,"+entn5.txt+",button" -+ if(entn5.txt!="") ++ if(entn5.txt=="") + { -+ //send calc crc -+ btlen tSend.txt,sys0 -+ crcrest 1,0xffff // reset CRC -+ crcputh 55 bb -+ crcputs sys0,2 -+ crcputs tSend.txt,0 -+ //send cmd -+ printh 55 bb -+ prints sys0,2 -+ prints tSend.txt,0 -+ prints crcval,2 ++ tSend.txt="event,buttonPress2,screensaver,bExit,"+tTmp.txt + } ++ //send calc crc ++ btlen tSend.txt,sys0 ++ crcrest 1,0xffff // reset CRC ++ crcputh 55 bb ++ crcputs sys0,2 ++ crcputs tSend.txt,0 ++ //send cmd ++ printh 55 bb ++ prints sys0,2 ++ prints tSend.txt,0 ++ prints crcval,2 + + +ributes diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index 5786a924..fd3c1733 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -88,8 +88,8 @@ popupThermo 276 Unique line(s) of event code screensaver2 64 Component(s) - 443 Line(s) of event code - 280 Unique line(s) of event code + 448 Line(s) of event code + 272 Unique line(s) of event code cardEntities 67 Component(s) 1205 Line(s) of event code @@ -98,5 +98,5 @@ cardEntities Total 23 Page(s) 881 Component(s) - 10793 Line(s) of event code - 2471 Unique line(s) of event code + 10798 Line(s) of event code + 2472 Unique line(s) of event code diff --git a/HMI/n2t-out-visual/screensaver2.txt b/HMI/n2t-out-visual/screensaver2.txt index 4a36f500..923b937e 100644 --- a/HMI/n2t-out-visual/screensaver2.txt +++ b/HMI/n2t-out-visual/screensaver2.txt @@ -903,20 +903,21 @@ Text f1Icon Events Touch Press Event tSend.txt="event,buttonPress2,"+entn1.txt+",button" - if(entn1.txt!="") + if(entn1.txt=="") { - //send calc crc - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC - crcputh 55 bb - crcputs sys0,2 - crcputs tSend.txt,0 - //send cmd - printh 55 bb - prints sys0,2 - prints tSend.txt,0 - prints crcval,2 + tSend.txt="event,buttonPress2,screensaver,bExit,"+tTmp.txt } + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 Text f2Icon Attributes @@ -950,20 +951,21 @@ Text f2Icon Events Touch Press Event tSend.txt="event,buttonPress2,"+entn2.txt+",button" - if(entn2.txt!="") + if(entn2.txt=="") { - //send calc crc - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC - crcputh 55 bb - crcputs sys0,2 - crcputs tSend.txt,0 - //send cmd - printh 55 bb - prints sys0,2 - prints tSend.txt,0 - prints crcval,2 + tSend.txt="event,buttonPress2,screensaver,bExit,"+tTmp.txt } + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 Text f3Icon Attributes @@ -997,20 +999,21 @@ Text f3Icon Events Touch Press Event tSend.txt="event,buttonPress2,"+entn3.txt+",button" - if(entn3.txt!="") + if(entn3.txt=="") { - //send calc crc - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC - crcputh 55 bb - crcputs sys0,2 - crcputs tSend.txt,0 - //send cmd - printh 55 bb - prints sys0,2 - prints tSend.txt,0 - prints crcval,2 + tSend.txt="event,buttonPress2,screensaver,bExit,"+tTmp.txt } + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 Text f4Icon Attributes @@ -1044,20 +1047,21 @@ Text f4Icon Events Touch Press Event tSend.txt="event,buttonPress2,"+entn4.txt+",button" - if(entn4.txt!="") + if(entn4.txt=="") { - //send calc crc - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC - crcputh 55 bb - crcputs sys0,2 - crcputs tSend.txt,0 - //send cmd - printh 55 bb - prints sys0,2 - prints tSend.txt,0 - prints crcval,2 + tSend.txt="event,buttonPress2,screensaver,bExit,"+tTmp.txt } + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 Text f5Icon Attributes @@ -1091,20 +1095,21 @@ Text f5Icon Events Touch Press Event tSend.txt="event,buttonPress2,"+entn5.txt+",button" - if(entn5.txt!="") + if(entn5.txt=="") { - //send calc crc - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC - crcputh 55 bb - crcputs sys0,2 - crcputs tSend.txt,0 - //send cmd - printh 55 bb - prints sys0,2 - prints tSend.txt,0 - prints crcval,2 + tSend.txt="event,buttonPress2,screensaver,bExit,"+tTmp.txt } + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 Text m0 Attributes diff --git a/HMI/n2t-out/screensaver2.txt b/HMI/n2t-out/screensaver2.txt index 190a58fa..f75fd4c0 100644 --- a/HMI/n2t-out/screensaver2.txt +++ b/HMI/n2t-out/screensaver2.txt @@ -377,20 +377,21 @@ Text f1Icon Events Touch Press Event tSend.txt="event,buttonPress2,"+entn1.txt+",button" - if(entn1.txt!="") + if(entn1.txt=="") { - //send calc crc - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC - crcputh 55 bb - crcputs sys0,2 - crcputs tSend.txt,0 - //send cmd - printh 55 bb - prints sys0,2 - prints tSend.txt,0 - prints crcval,2 + tSend.txt="event,buttonPress2,screensaver,bExit,"+tTmp.txt } + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 Text f2Icon Attributes @@ -404,20 +405,21 @@ Text f2Icon Events Touch Press Event tSend.txt="event,buttonPress2,"+entn2.txt+",button" - if(entn2.txt!="") + if(entn2.txt=="") { - //send calc crc - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC - crcputh 55 bb - crcputs sys0,2 - crcputs tSend.txt,0 - //send cmd - printh 55 bb - prints sys0,2 - prints tSend.txt,0 - prints crcval,2 + tSend.txt="event,buttonPress2,screensaver,bExit,"+tTmp.txt } + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 Text f3Icon Attributes @@ -431,20 +433,21 @@ Text f3Icon Events Touch Press Event tSend.txt="event,buttonPress2,"+entn3.txt+",button" - if(entn3.txt!="") + if(entn3.txt=="") { - //send calc crc - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC - crcputh 55 bb - crcputs sys0,2 - crcputs tSend.txt,0 - //send cmd - printh 55 bb - prints sys0,2 - prints tSend.txt,0 - prints crcval,2 + tSend.txt="event,buttonPress2,screensaver,bExit,"+tTmp.txt } + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 Text f4Icon Attributes @@ -458,20 +461,21 @@ Text f4Icon Events Touch Press Event tSend.txt="event,buttonPress2,"+entn4.txt+",button" - if(entn4.txt!="") + if(entn4.txt=="") { - //send calc crc - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC - crcputh 55 bb - crcputs sys0,2 - crcputs tSend.txt,0 - //send cmd - printh 55 bb - prints sys0,2 - prints tSend.txt,0 - prints crcval,2 + tSend.txt="event,buttonPress2,screensaver,bExit,"+tTmp.txt } + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 Text f5Icon Attributes @@ -485,20 +489,21 @@ Text f5Icon Events Touch Press Event tSend.txt="event,buttonPress2,"+entn5.txt+",button" - if(entn5.txt!="") + if(entn5.txt=="") { - //send calc crc - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC - crcputh 55 bb - crcputs sys0,2 - crcputs tSend.txt,0 - //send cmd - printh 55 bb - prints sys0,2 - prints tSend.txt,0 - prints crcval,2 + tSend.txt="event,buttonPress2,screensaver,bExit,"+tTmp.txt } + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 Text m0 Attributes