diff --git a/HMI/US/landscape/n2t-out-visual/cardLChart.txt b/HMI/US/landscape/n2t-out-visual/cardLChart.txt index d42cb2a6..01150a56 100644 --- a/HMI/US/landscape/n2t-out-visual/cardLChart.txt +++ b/HMI/US/landscape/n2t-out-visual/cardLChart.txt @@ -267,14 +267,7 @@ Button bNext Events Touch Press Event - tSend.txt="event,buttonPress2,cardChart," - if(bPrev.txt=="") - { - tSend.txt+="bHome" - }else - { - tSend.txt+="bNext" - } + tSend.txt="event,buttonPress2,"+nent2.txt+",button" //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -321,14 +314,7 @@ Button bPrev Events Touch Press Event - tSend.txt="event,buttonPress2,cardChart," - if(bPrev.txt=="") - { - tSend.txt+="bUp" - }else - { - tSend.txt+="bPrev" - } + tSend.txt="event,buttonPress2,"+nent1.txt+",button" //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 5f8eec66..a811ce64 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 @@ -18,10 +18,6 @@ cardChart 33 Component(s) 429 Line(s) of event code 292 Unique line(s) of event code -cardLChart - 33 Component(s) - 408 Line(s) of event code - 268 Unique line(s) of event code popupInSel 34 Component(s) 617 Line(s) of event code @@ -42,6 +38,10 @@ cardQR 34 Component(s) 402 Line(s) of event code 234 Unique line(s) of event code +cardLChart + 33 Component(s) + 394 Line(s) of event code + 262 Unique line(s) of event code pageStartup 20 Component(s) 185 Line(s) of event code @@ -86,5 +86,5 @@ screensaver Total 20 Page(s) 736 Component(s) - 8814 Line(s) of event code - 2263 Unique line(s) of event code + 8800 Line(s) of event code + 2256 Unique line(s) of event code diff --git a/HMI/US/landscape/n2t-out/cardLChart.txt b/HMI/US/landscape/n2t-out/cardLChart.txt index 951d7614..a445407e 100644 --- a/HMI/US/landscape/n2t-out/cardLChart.txt +++ b/HMI/US/landscape/n2t-out/cardLChart.txt @@ -186,14 +186,7 @@ Button bNext Events Touch Press Event - tSend.txt="event,buttonPress2,cardChart," - if(bPrev.txt=="") - { - tSend.txt+="bHome" - }else - { - tSend.txt+="bNext" - } + tSend.txt="event,buttonPress2,"+nent2.txt+",button" //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -218,14 +211,7 @@ Button bPrev Events Touch Press Event - tSend.txt="event,buttonPress2,cardChart," - if(bPrev.txt=="") - { - tSend.txt+="bUp" - }else - { - tSend.txt+="bPrev" - } + tSend.txt="event,buttonPress2,"+nent1.txt+",button" //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 2297887a..01bd7f91 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,4 +1,4 @@ -+++ /dev/fd/62 2023-01-24 18:23:47.994140804 +0000 ++++ /dev/fd/62 2023-01-24 21:09:29.347966042 +0000 +I/n2t-out/Program.s.txt ++ HMI/US/portrait/n2t-out/Program.s.txt +I/n2t-out/cardEntities.txt diff --git a/HMI/US/portrait/n2t-out-visual/cardLChart.txt b/HMI/US/portrait/n2t-out-visual/cardLChart.txt index 05d6d273..b46bb6f7 100644 --- a/HMI/US/portrait/n2t-out-visual/cardLChart.txt +++ b/HMI/US/portrait/n2t-out-visual/cardLChart.txt @@ -267,14 +267,7 @@ Button bNext Events Touch Press Event - tSend.txt="event,buttonPress2,cardChart," - if(bPrev.txt=="") - { - tSend.txt+="bHome" - }else - { - tSend.txt+="bNext" - } + tSend.txt="event,buttonPress2,"+nent2.txt+",button" //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -321,14 +314,7 @@ Button bPrev Events Touch Press Event - tSend.txt="event,buttonPress2,cardChart," - if(bPrev.txt=="") - { - tSend.txt+="bUp" - }else - { - tSend.txt+="bPrev" - } + tSend.txt="event,buttonPress2,"+nent1.txt+",button" //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC diff --git a/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt b/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt index 5e50319d..cfa7deab 100644 --- a/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt +++ b/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt @@ -22,6 +22,10 @@ popupFan 27 Component(s) 351 Line(s) of event code 204 Unique line(s) of event code +cardLChart + 33 Component(s) + 394 Line(s) of event code + 262 Unique line(s) of event code pageStartup 19 Component(s) 185 Line(s) of event code @@ -54,10 +58,6 @@ cardChart 33 Component(s) 429 Line(s) of event code 292 Unique line(s) of event code -cardLChart - 33 Component(s) - 408 Line(s) of event code - 268 Unique line(s) of event code screensaver 46 Component(s) 418 Line(s) of event code @@ -86,5 +86,5 @@ cardEntities Total 20 Page(s) 747 Component(s) - 9219 Line(s) of event code - 2390 Unique line(s) of event code + 9205 Line(s) of event code + 2383 Unique line(s) of event code diff --git a/HMI/US/portrait/n2t-out/cardLChart.txt b/HMI/US/portrait/n2t-out/cardLChart.txt index 951d7614..a445407e 100644 --- a/HMI/US/portrait/n2t-out/cardLChart.txt +++ b/HMI/US/portrait/n2t-out/cardLChart.txt @@ -186,14 +186,7 @@ Button bNext Events Touch Press Event - tSend.txt="event,buttonPress2,cardChart," - if(bPrev.txt=="") - { - tSend.txt+="bHome" - }else - { - tSend.txt+="bNext" - } + tSend.txt="event,buttonPress2,"+nent2.txt+",button" //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -218,14 +211,7 @@ Button bPrev Events Touch Press Event - tSend.txt="event,buttonPress2,cardChart," - if(bPrev.txt=="") - { - tSend.txt+="bUp" - }else - { - tSend.txt+="bPrev" - } + tSend.txt="event,buttonPress2,"+nent1.txt+",button" //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC diff --git a/HMI/n2t-out-visual/cardLChart.txt b/HMI/n2t-out-visual/cardLChart.txt index 26238893..fb621733 100644 --- a/HMI/n2t-out-visual/cardLChart.txt +++ b/HMI/n2t-out-visual/cardLChart.txt @@ -267,14 +267,7 @@ Button bNext Events Touch Press Event - tSend.txt="event,buttonPress2,cardChart," - if(bPrev.txt=="") - { - tSend.txt+="bHome" - }else - { - tSend.txt+="bNext" - } + tSend.txt="event,buttonPress2,"+nent2.txt+",button" //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -321,14 +314,7 @@ Button bPrev Events Touch Press Event - tSend.txt="event,buttonPress2,cardChart," - if(bPrev.txt=="") - { - tSend.txt+="bUp" - }else - { - tSend.txt+="bPrev" - } + tSend.txt="event,buttonPress2,"+nent1.txt+",button" //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index 5a3417ca..1c1963f9 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -26,10 +26,6 @@ cardChart 33 Component(s) 429 Line(s) of event code 292 Unique line(s) of event code -cardLChart - 33 Component(s) - 408 Line(s) of event code - 268 Unique line(s) of event code pageTest 26 Component(s) 68 Line(s) of event code @@ -46,6 +42,10 @@ cardAlarm 43 Component(s) 492 Line(s) of event code 269 Unique line(s) of event code +cardLChart + 33 Component(s) + 394 Line(s) of event code + 262 Unique line(s) of event code screensaver 47 Component(s) 428 Line(s) of event code @@ -86,5 +86,5 @@ cardEntities Total 20 Page(s) 737 Component(s) - 8824 Line(s) of event code - 2271 Unique line(s) of event code + 8810 Line(s) of event code + 2264 Unique line(s) of event code diff --git a/HMI/n2t-out/cardLChart.txt b/HMI/n2t-out/cardLChart.txt index 951d7614..a445407e 100644 --- a/HMI/n2t-out/cardLChart.txt +++ b/HMI/n2t-out/cardLChart.txt @@ -186,14 +186,7 @@ Button bNext Events Touch Press Event - tSend.txt="event,buttonPress2,cardChart," - if(bPrev.txt=="") - { - tSend.txt+="bHome" - }else - { - tSend.txt+="bNext" - } + tSend.txt="event,buttonPress2,"+nent2.txt+",button" //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -218,14 +211,7 @@ Button bPrev Events Touch Press Event - tSend.txt="event,buttonPress2,cardChart," - if(bPrev.txt=="") - { - tSend.txt+="bUp" - }else - { - tSend.txt+="bPrev" - } + tSend.txt="event,buttonPress2,"+nent1.txt+",button" //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC