diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 8d1003bf..87b69208 100644 --- a/HMI/US/landscape/diff-eu-version.txt +++ b/HMI/US/landscape/diff-eu-version.txt @@ -13,31 +13,7 @@ │ - lcd_dev fffb 0002 0000 0020 │ - page pageStartup ├── arm1.txt -│ @@ -478,22 +478,15 @@ -│ Send Component ID : disabled -│ State : unpressed -│ Text :  -│ Max. Text Size : 10 -│ -│ Events -│ Touch Press Event -│ - tSend.txt="event,buttonPress2,cardAlarm," -│ - if(bPrev.txt=="") -│ - { -│ - tSend.txt+="bHome" -│ - }else -│ - { -│ - tSend.txt+="bNext" -│ - } -│ + tSend.txt="event,buttonPress2,cardAlarm,bNext" -│ //send calc crc -│ btlen tSend.txt,sys0 -│ crcrest 1,0xffff // reset CRC -│ crcputh 55 bb -│ crcputs sys0,2 -│ crcputs tSend.txt,0 -│ //send cmd -│ @@ -671,19 +664,14 @@ +│ @@ -671,19 +671,14 @@ │ } │ if(tTmp.txt=="1") │ { @@ -58,31 +34,7 @@ │ } │ //id arm1 ├── bDown1.txt -│ @@ -529,22 +529,15 @@ -│ Send Component ID : disabled -│ State : unpressed -│ Text :  -│ Max. Text Size : 10 -│ -│ Events -│ Touch Press Event -│ - tSend.txt="event,buttonPress2,cardEntities," -│ - if(bPrev.txt=="") -│ - { -│ - tSend.txt+="bHome" -│ - }else -│ - { -│ - tSend.txt+="bNext" -│ - } -│ + tSend.txt="event,buttonPress2,cardEntities,bNext" -│ //send calc crc -│ btlen tSend.txt,sys0 -│ crcrest 1,0xffff // reset CRC -│ crcputh 55 bb -│ crcputs sys0,2 -│ crcputs tSend.txt,0 -│ //send cmd -│ @@ -1253,19 +1246,14 @@ +│ @@ -1253,19 +1253,14 @@ │ } │ if(tTmp.txt=="1") │ { @@ -103,31 +55,7 @@ │ { │ vis bUp1,0 ├── bDown2.txt -│ @@ -290,22 +290,15 @@ -│ Send Component ID : disabled -│ State : unpressed -│ Text :  -│ Max. Text Size : 10 -│ -│ Events -│ Touch Press Event -│ - tSend.txt="event,buttonPress2,cardThermo," -│ - if(bPrev.txt=="") -│ - { -│ - tSend.txt+="bHome" -│ - }else -│ - { -│ - tSend.txt+="bNext" -│ - } -│ + tSend.txt="event,buttonPress2,cardThermo,bNext" -│ //send calc crc -│ btlen tSend.txt,sys0 -│ crcrest 1,0xffff // reset CRC -│ crcputh 55 bb -│ crcputs sys0,2 -│ crcputs tSend.txt,0 -│ //send cmd -│ @@ -925,19 +918,14 @@ +│ @@ -925,19 +925,14 @@ │ } │ if(tTmp.txt=="1") │ { @@ -148,31 +76,7 @@ │ spstr strCommand.txt,tTmp.txt,"~",5 │ covx tTmp.txt,xTempDest1.val,0,0 ├── bEntity1.txt -│ @@ -467,22 +467,15 @@ -│ Send Component ID : disabled -│ State : unpressed -│ Text :  -│ Max. Text Size : 10 -│ -│ Events -│ Touch Press Event -│ - tSend.txt="event,buttonPress2,cardGrid," -│ - if(bPrev.txt=="") -│ - { -│ - tSend.txt+="bHome" -│ - }else -│ - { -│ - tSend.txt+="bNext" -│ - } -│ + tSend.txt="event,buttonPress2,cardGrid,bNext" -│ //send calc crc -│ btlen tSend.txt,sys0 -│ crcrest 1,0xffff // reset CRC -│ crcputh 55 bb -│ crcputs sys0,2 -│ crcputs tSend.txt,0 -│ //send cmd -│ @@ -680,19 +673,14 @@ +│ @@ -680,19 +680,14 @@ │ } │ if(tTmp.txt=="1") │ { @@ -203,7 +107,7 @@ │ Send Component ID : disabled │ Locked : no │ Swide up page ID : disabled -│ @@ -14,451 +14,343 @@ +│ @@ -14,444 +14,343 @@ │ Preinitialize Event │ dim=dimValueNormal │ vis p0,0 @@ -794,22 +698,15 @@ │ Events │ Touch Press Event │ - tSend.txt="event,buttonPress2,cardMedia," -│ - if(bPrev.txt=="") -│ - { -│ - tSend.txt+="bHome" -│ - }else -│ - { -│ - tSend.txt+="bNext" -│ - } -│ + tSend.txt="event,buttonPress2,cardAlarm,bNext" -│ //send calc crc -│ btlen tSend.txt,sys0 -│ crcrest 1,0xffff // reset CRC -│ crcputh 55 bb -│ crcputs sys0,2 -│ crcputs tSend.txt,0 -│ //send cmd -│ @@ -475,15 +367,15 @@ +│ + tSend.txt="event,buttonPress2,cardPower," +│ if(bPrev.txt=="") +│ { +│ tSend.txt+="bHome" +│ }else +│ { +│ tSend.txt+="bNext" +│ } +│ @@ -475,15 +374,15 @@ │ Send Component ID : disabled │ State : unpressed │ Text :  @@ -826,7 +723,7 @@ │ { │ tSend.txt+="bPrev" │ } -│ @@ -528,23 +420,82 @@ +│ @@ -528,23 +427,82 @@ │ Disable release event after dragging: 0 │ Send Component ID : disabled │ @@ -912,7 +809,7 @@ │ Period (ms): 50 │ Enabled : yes │ -│ @@ -591,15 +542,15 @@ +│ @@ -591,15 +549,15 @@ │ // here is the location where acual code should be │ // write command to variable strCommand │ ucopy strCommand.txt,4,payloadLength-5,0 @@ -929,7 +826,7 @@ │ if(tTmp.txt=="0") │ { │ vis bPrev,0 -│ @@ -628,100 +579,148 @@ +│ @@ -628,100 +586,148 @@ │ } │ if(tTmp.txt=="1") │ { @@ -1154,7 +1051,7 @@ │ //write name of speical page to tId │ spstr strCommand.txt,tId.txt,"~",1 │ //save second arg if there's one -│ @@ -779,33 +778,62 @@ +│ @@ -779,33 +785,62 @@ │ page cardQR │ } │ if(tId.txt=="cardPower") @@ -1226,7 +1123,7 @@ │ Scope : local │ Period (ms): 1000 │ Enabled : yes -│ @@ -815,15 +843,15 @@ +│ @@ -815,15 +850,15 @@ │ if(sleepTimeout!=0&&dimValue!=dim) │ { │ sleepValue+=1 diff --git a/HMI/US/landscape/n2t-out-visual/arm1.txt b/HMI/US/landscape/n2t-out-visual/arm1.txt index 442e80a1..19861f9a 100644 --- a/HMI/US/landscape/n2t-out-visual/arm1.txt +++ b/HMI/US/landscape/n2t-out-visual/arm1.txt @@ -1014,7 +1014,14 @@ Button bNext Events Touch Press Event - tSend.txt="event,buttonPress2,cardAlarm,bNext" + tSend.txt="event,buttonPress2,cardAlarm," + if(bPrev.txt=="") + { + tSend.txt+="bHome" + }else + { + tSend.txt+="bNext" + } //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC diff --git a/HMI/US/landscape/n2t-out-visual/bDown1.txt b/HMI/US/landscape/n2t-out-visual/bDown1.txt index b5ac11a2..45125c1a 100644 --- a/HMI/US/landscape/n2t-out-visual/bDown1.txt +++ b/HMI/US/landscape/n2t-out-visual/bDown1.txt @@ -1055,7 +1055,14 @@ Button bNext Events Touch Press Event - tSend.txt="event,buttonPress2,cardEntities,bNext" + tSend.txt="event,buttonPress2,cardEntities," + if(bPrev.txt=="") + { + tSend.txt+="bHome" + }else + { + tSend.txt+="bNext" + } //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC diff --git a/HMI/US/landscape/n2t-out-visual/bDown2.txt b/HMI/US/landscape/n2t-out-visual/bDown2.txt index 5fcef332..1ad2f70c 100644 --- a/HMI/US/landscape/n2t-out-visual/bDown2.txt +++ b/HMI/US/landscape/n2t-out-visual/bDown2.txt @@ -634,7 +634,14 @@ Button bNext Events Touch Press Event - tSend.txt="event,buttonPress2,cardThermo,bNext" + tSend.txt="event,buttonPress2,cardThermo," + if(bPrev.txt=="") + { + tSend.txt+="bHome" + }else + { + tSend.txt+="bNext" + } //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC diff --git a/HMI/US/landscape/n2t-out-visual/bEntity1.txt b/HMI/US/landscape/n2t-out-visual/bEntity1.txt index a0e6eec9..f4822cf1 100644 --- a/HMI/US/landscape/n2t-out-visual/bEntity1.txt +++ b/HMI/US/landscape/n2t-out-visual/bEntity1.txt @@ -857,7 +857,14 @@ Button bNext Events Touch Press Event - tSend.txt="event,buttonPress2,cardGrid,bNext" + tSend.txt="event,buttonPress2,cardGrid," + if(bPrev.txt=="") + { + tSend.txt+="bHome" + }else + { + tSend.txt+="bNext" + } //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC diff --git a/HMI/US/landscape/n2t-out-visual/bNext.txt b/HMI/US/landscape/n2t-out-visual/bNext.txt index 7e5158e6..f16b58c8 100644 --- a/HMI/US/landscape/n2t-out-visual/bNext.txt +++ b/HMI/US/landscape/n2t-out-visual/bNext.txt @@ -801,7 +801,14 @@ Button bNext Events Touch Press Event - tSend.txt="event,buttonPress2,cardAlarm,bNext" + tSend.txt="event,buttonPress2,cardPower," + if(bPrev.txt=="") + { + tSend.txt+="bHome" + }else + { + tSend.txt+="bNext" + } //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC diff --git a/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt b/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt index f6d75112..c4a3e74e 100644 --- a/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt +++ b/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt @@ -14,29 +14,29 @@ b0 44 Component(s) 515 Line(s) of event code 272 Unique line(s) of event code -bNext - 43 Component(s) - 423 Line(s) of event code - 293 Unique line(s) of event code -bEntity1 - 42 Component(s) - 478 Line(s) of event code - 283 Unique line(s) of event code arm1 40 Component(s) - 427 Line(s) of event code - 258 Unique line(s) of event code + 434 Line(s) of event code + 260 Unique line(s) of event code +bNext + 43 Component(s) + 430 Line(s) of event code + 296 Unique line(s) of event code +bEntity1 + 42 Component(s) + 485 Line(s) of event code + 285 Unique line(s) of event code bDown2 53 Component(s) - 596 Line(s) of event code - 313 Unique line(s) of event code + 603 Line(s) of event code + 315 Unique line(s) of event code bDown1 65 Component(s) - 1153 Line(s) of event code - 527 Unique line(s) of event code + 1160 Line(s) of event code + 529 Unique line(s) of event code Total 17 Page(s) 351 Component(s) - 4164 Line(s) of event code + 4199 Line(s) of event code 1374 Unique line(s) of event code diff --git a/HMI/US/landscape/n2t-out/arm1.txt b/HMI/US/landscape/n2t-out/arm1.txt index a0666aa5..31de7a2c 100644 --- a/HMI/US/landscape/n2t-out/arm1.txt +++ b/HMI/US/landscape/n2t-out/arm1.txt @@ -482,7 +482,14 @@ Button bNext Events Touch Press Event - tSend.txt="event,buttonPress2,cardAlarm,bNext" + tSend.txt="event,buttonPress2,cardAlarm," + if(bPrev.txt=="") + { + tSend.txt+="bHome" + }else + { + tSend.txt+="bNext" + } //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC diff --git a/HMI/US/landscape/n2t-out/bDown1.txt b/HMI/US/landscape/n2t-out/bDown1.txt index bf5ac5dc..ebb2cd0e 100644 --- a/HMI/US/landscape/n2t-out/bDown1.txt +++ b/HMI/US/landscape/n2t-out/bDown1.txt @@ -533,7 +533,14 @@ Button bNext Events Touch Press Event - tSend.txt="event,buttonPress2,cardEntities,bNext" + tSend.txt="event,buttonPress2,cardEntities," + if(bPrev.txt=="") + { + tSend.txt+="bHome" + }else + { + tSend.txt+="bNext" + } //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC diff --git a/HMI/US/landscape/n2t-out/bDown2.txt b/HMI/US/landscape/n2t-out/bDown2.txt index b3197c5b..bec1d0dd 100644 --- a/HMI/US/landscape/n2t-out/bDown2.txt +++ b/HMI/US/landscape/n2t-out/bDown2.txt @@ -294,7 +294,14 @@ Button bNext Events Touch Press Event - tSend.txt="event,buttonPress2,cardThermo,bNext" + tSend.txt="event,buttonPress2,cardThermo," + if(bPrev.txt=="") + { + tSend.txt+="bHome" + }else + { + tSend.txt+="bNext" + } //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC diff --git a/HMI/US/landscape/n2t-out/bEntity1.txt b/HMI/US/landscape/n2t-out/bEntity1.txt index f1b4f83c..f9e19531 100644 --- a/HMI/US/landscape/n2t-out/bEntity1.txt +++ b/HMI/US/landscape/n2t-out/bEntity1.txt @@ -471,7 +471,14 @@ Button bNext Events Touch Press Event - tSend.txt="event,buttonPress2,cardGrid,bNext" + tSend.txt="event,buttonPress2,cardGrid," + if(bPrev.txt=="") + { + tSend.txt+="bHome" + }else + { + tSend.txt+="bNext" + } //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC diff --git a/HMI/US/landscape/n2t-out/bNext.txt b/HMI/US/landscape/n2t-out/bNext.txt index 98a51690..528f57d6 100644 --- a/HMI/US/landscape/n2t-out/bNext.txt +++ b/HMI/US/landscape/n2t-out/bNext.txt @@ -346,7 +346,14 @@ Button bNext Events Touch Press Event - tSend.txt="event,buttonPress2,cardAlarm,bNext" + tSend.txt="event,buttonPress2,cardPower," + if(bPrev.txt=="") + { + tSend.txt+="bHome" + }else + { + tSend.txt+="bNext" + } //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index 25827641..0a27823e 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,4 +1,4 @@ -+++ /dev/fd/62 2022-11-03 16:54:51.903301723 +0000 ++++ /dev/fd/62 2022-11-03 17:05:36.052771693 +0000 +m1.txt +22 +478,15 @@ + Send Component ID : disabled