diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 09da4b2f..7c050052 100644 --- a/HMI/US/landscape/diff-eu-version.txt +++ b/HMI/US/landscape/diff-eu-version.txt @@ -314,7 +314,7 @@ │ Value: 0 │ │ Variable (int32) xc1 -│ @@ -370,159 +336,50 @@ +│ @@ -370,145 +336,50 @@ │ Scope : local │ Dragging : 0 │ Send Component ID : disabled @@ -361,20 +361,6 @@ │ - prints tSend.txt,0 │ - prints crcval,2 │ - -│ - Touch Release Event -│ - tSend.txt="event,buttonPress2,"+entn1.txt+",button" -│ - //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 │ Scope : local @@ -474,7 +460,7 @@ │ Send Component ID : disabled │ Associated Keyboard: none │ Text : PM -│ @@ -704,15 +561,14 @@ +│ @@ -690,15 +561,14 @@ │ if(tTmp.txt!="") │ { │ covx tTmp.txt,defaultFontColor,0,0 @@ -490,7 +476,7 @@ │ if(tAMPM.txt=="") │ { │ vis tAMPM,0 -│ @@ -833,44 +689,34 @@ +│ @@ -819,44 +689,34 @@ │ //e6Val │ spstr strCommand.txt,e6Val.txt,"~",60 │ //f1Icon @@ -535,7 +521,7 @@ │ spstr strCommand.txt,tNotifyText.txt,"~",2 │ if(tNotifyHead.txt!=""||tNotifyText.txt!="") │ { -│ @@ -966,14 +812,18 @@ +│ @@ -952,14 +812,18 @@ │ { │ page cardPower │ } diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index 6f3685d9..99be6093 100644 --- a/HMI/US/portrait/diff-eu-version.txt +++ b/HMI/US/portrait/diff-eu-version.txt @@ -2259,7 +2259,7 @@ │ Value: 0 │ │ Variable (int32) xc1 -│ @@ -370,159 +324,50 @@ +│ @@ -370,145 +324,50 @@ │ Scope : local │ Dragging : 0 │ Send Component ID : disabled @@ -2306,20 +2306,6 @@ │ - prints tSend.txt,0 │ - prints crcval,2 │ - -│ - Touch Release Event -│ - tSend.txt="event,buttonPress2,"+entn1.txt+",button" -│ - //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 │ Scope : local @@ -2419,7 +2405,7 @@ │ Send Component ID : disabled │ Associated Keyboard: none │ Text : PM -│ @@ -704,15 +549,14 @@ +│ @@ -690,15 +549,14 @@ │ if(tTmp.txt!="") │ { │ covx tTmp.txt,defaultFontColor,0,0 @@ -2435,7 +2421,7 @@ │ if(tAMPM.txt=="") │ { │ vis tAMPM,0 -│ @@ -833,44 +677,34 @@ +│ @@ -819,44 +677,34 @@ │ //e6Val │ spstr strCommand.txt,e6Val.txt,"~",60 │ //f1Icon @@ -2480,7 +2466,7 @@ │ spstr strCommand.txt,tNotifyText.txt,"~",2 │ if(tNotifyHead.txt!=""||tNotifyText.txt!="") │ { -│ @@ -966,14 +800,18 @@ +│ @@ -952,14 +800,18 @@ │ { │ page cardPower │ } diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index bb3b2d1f..1f3c4e88 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,4 +1,4 @@ -+++ /dev/fd/62 2024-01-19 22:12:27.279807389 +0000 ++++ /dev/fd/62 2024-01-20 19:56:08.135834636 +0000 +I/n2t-out/Program.s.txt ++ HMI/US/portrait/n2t-out/Program.s.txt +1 +12,11 @@ @@ -1801,7 +1801,7 @@ + Value: 0 + +e (int32) xc1 -+159 +324,50 @@ ++145 +324,50 @@ + Scope : local + Dragging : 0 + Send Component ID : disabled @@ -1848,20 +1848,6 @@ + prints tSend.txt,0 + prints crcval,2 + -+ Touch Release Event -+ tSend.txt="event,buttonPress2,"+entn1.txt+",button" -+ //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 + Scope : local diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index 9ef1c698..67fe25b5 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -66,6 +66,10 @@ cardThermo 57 Component(s) 550 Line(s) of event code 320 Unique line(s) of event code +screensaver2 + 64 Component(s) + 424 Line(s) of event code + 264 Unique line(s) of event code popupInSel 34 Component(s) 621 Line(s) of event code @@ -86,10 +90,6 @@ popupThermo 44 Component(s) 523 Line(s) of event code 276 Unique line(s) of event code -screensaver2 - 64 Component(s) - 434 Line(s) of event code - 264 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) - 10779 Line(s) of event code + 10769 Line(s) of event code 2466 Unique line(s) of event code diff --git a/HMI/n2t-out-visual/screensaver2.txt b/HMI/n2t-out-visual/screensaver2.txt index 37e593ee..f555bdb2 100644 --- a/HMI/n2t-out-visual/screensaver2.txt +++ b/HMI/n2t-out-visual/screensaver2.txt @@ -959,20 +959,6 @@ Text f2Icon prints tSend.txt,0 prints crcval,2 - Touch Release Event - tSend.txt="event,buttonPress2,"+entn1.txt+",button" - //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 ID : 55 diff --git a/HMI/n2t-out/screensaver2.txt b/HMI/n2t-out/screensaver2.txt index 669287b2..c4105037 100644 --- a/HMI/n2t-out/screensaver2.txt +++ b/HMI/n2t-out/screensaver2.txt @@ -413,20 +413,6 @@ Text f2Icon prints tSend.txt,0 prints crcval,2 - Touch Release Event - tSend.txt="event,buttonPress2,"+entn1.txt+",button" - //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 Scope : local