From 5abc6ffa4e381981c32b834212ce2a2103a2fd25 Mon Sep 17 00:00:00 2001 From: joBr99 <29555657+joBr99@users.noreply.github.com> Date: Sat, 2 Apr 2022 17:52:31 +0000 Subject: [PATCH] sync changes and bump version (add nextion2text) --- HMI/US/landscape/diff-eu-version.txt | 8 ++-- HMI/US/landscape/n2t-out-visual/cardAlarm.txt | 4 +- .../landscape/n2t-out-visual/cardEntities.txt | 4 +- HMI/US/landscape/n2t-out-visual/cardGrid.txt | 4 +- HMI/US/landscape/n2t-out-visual/cardMedia.txt | 4 +- .../landscape/n2t-out-visual/cardThermo.txt | 4 +- .../n2t-out-visual/nspanel_US_L_Stats.txt | 36 ++++++++-------- .../landscape/n2t-out-visual/pageStartup.txt | 2 +- HMI/US/landscape/n2t-out/cardAlarm.txt | 4 +- HMI/US/landscape/n2t-out/cardEntities.txt | 4 +- HMI/US/landscape/n2t-out/cardGrid.txt | 4 +- HMI/US/landscape/n2t-out/cardMedia.txt | 4 +- HMI/US/landscape/n2t-out/cardThermo.txt | 4 +- HMI/US/landscape/n2t-out/pageStartup.txt | 2 +- HMI/US/portrait/diff-eu-version.txt | 20 ++++----- HMI/US/portrait/n2t-out-visual/cardAlarm.txt | 4 +- .../portrait/n2t-out-visual/cardEntities.txt | 4 +- HMI/US/portrait/n2t-out-visual/cardGrid.txt | 4 +- HMI/US/portrait/n2t-out-visual/cardMedia.txt | 4 +- HMI/US/portrait/n2t-out-visual/cardThermo.txt | 4 +- .../n2t-out-visual/nspanel_US_P_Stats.txt | 42 +++++++++---------- .../portrait/n2t-out-visual/pageStartup.txt | 2 +- HMI/US/portrait/n2t-out/cardAlarm.txt | 4 +- HMI/US/portrait/n2t-out/cardEntities.txt | 4 +- HMI/US/portrait/n2t-out/cardGrid.txt | 4 +- HMI/US/portrait/n2t-out/cardMedia.txt | 4 +- HMI/US/portrait/n2t-out/cardThermo.txt | 4 +- HMI/US/portrait/n2t-out/pageStartup.txt | 2 +- HMI/n2t-out-visual/cardAlarm.txt | 4 +- HMI/n2t-out-visual/cardEntities.txt | 4 +- HMI/n2t-out-visual/cardGrid.txt | 4 +- HMI/n2t-out-visual/cardMedia.txt | 4 +- HMI/n2t-out-visual/cardThermo.txt | 4 +- HMI/n2t-out-visual/nspanel_Stats.txt | 34 +++++++-------- HMI/n2t-out-visual/pageStartup.txt | 2 +- HMI/n2t-out/cardAlarm.txt | 4 +- HMI/n2t-out/cardEntities.txt | 4 +- HMI/n2t-out/cardGrid.txt | 4 +- HMI/n2t-out/cardMedia.txt | 4 +- HMI/n2t-out/cardThermo.txt | 4 +- HMI/n2t-out/pageStartup.txt | 2 +- 41 files changed, 166 insertions(+), 106 deletions(-) diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 514367e8..86a7601e 100644 --- a/HMI/US/landscape/diff-eu-version.txt +++ b/HMI/US/landscape/diff-eu-version.txt @@ -1,6 +1,6 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt ---- HMI/n2t-out/Program.s.txt 2022-04-01 18:14:32.819231663 +0000 -+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-04-01 18:14:33.747246705 +0000 +--- HMI/n2t-out/Program.s.txt 2022-04-02 17:52:28.361158189 +0000 ++++ HMI/US/landscape/n2t-out/Program.s.txt 2022-04-02 17:52:29.069163241 +0000 @@ -11,6 +11,6 @@ // dim value int dimValue=40 @@ -11,8 +11,8 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt + //lcd_dev fffb 0002 0000 0020 page pageStartup diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-04-01 18:14:32.819231663 +0000 -+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-04-01 18:14:33.747246705 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-04-02 17:52:28.361158189 +0000 ++++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-04-02 17:52:29.069163241 +0000 @@ -177,7 +177,7 @@ recmod=1 bauds=115200 diff --git a/HMI/US/landscape/n2t-out-visual/cardAlarm.txt b/HMI/US/landscape/n2t-out-visual/cardAlarm.txt index 3385487b..4fe6baa0 100644 --- a/HMI/US/landscape/n2t-out-visual/cardAlarm.txt +++ b/HMI/US/landscape/n2t-out-visual/cardAlarm.txt @@ -343,8 +343,10 @@ Button bPrev if(bPrev.txt=="") { tSend.txt+="bUp" + }else + { + tSend.txt+="bPrev" } - tSend.txt+="bPrev" //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC diff --git a/HMI/US/landscape/n2t-out-visual/cardEntities.txt b/HMI/US/landscape/n2t-out-visual/cardEntities.txt index 1326e69a..09d9531f 100644 --- a/HMI/US/landscape/n2t-out-visual/cardEntities.txt +++ b/HMI/US/landscape/n2t-out-visual/cardEntities.txt @@ -1435,8 +1435,10 @@ Button bPrev if(bPrev.txt=="") { tSend.txt+="bUp" + }else + { + tSend.txt+="bPrev" } - tSend.txt+="bPrev" //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC diff --git a/HMI/US/landscape/n2t-out-visual/cardGrid.txt b/HMI/US/landscape/n2t-out-visual/cardGrid.txt index 90650ff4..53b14852 100644 --- a/HMI/US/landscape/n2t-out-visual/cardGrid.txt +++ b/HMI/US/landscape/n2t-out-visual/cardGrid.txt @@ -519,8 +519,10 @@ Button bPrev if(bPrev.txt=="") { tSend.txt+="bUp" + }else + { + tSend.txt+="bPrev" } - tSend.txt+="bPrev" //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC diff --git a/HMI/US/landscape/n2t-out-visual/cardMedia.txt b/HMI/US/landscape/n2t-out-visual/cardMedia.txt index e469313a..96d751a3 100644 --- a/HMI/US/landscape/n2t-out-visual/cardMedia.txt +++ b/HMI/US/landscape/n2t-out-visual/cardMedia.txt @@ -860,8 +860,10 @@ Button bPrev if(bPrev.txt=="") { tSend.txt+="bUp" + }else + { + tSend.txt+="bPrev" } - tSend.txt+="bPrev" //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC diff --git a/HMI/US/landscape/n2t-out-visual/cardThermo.txt b/HMI/US/landscape/n2t-out-visual/cardThermo.txt index de7d8d9d..930e6cab 100644 --- a/HMI/US/landscape/n2t-out-visual/cardThermo.txt +++ b/HMI/US/landscape/n2t-out-visual/cardThermo.txt @@ -687,8 +687,10 @@ Button bPrev if(bPrev.txt=="") { tSend.txt+="bUp" + }else + { + tSend.txt+="bPrev" } - tSend.txt+="bPrev" //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 18125ee3..84d13934 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 @@ -22,10 +22,18 @@ pageStartup 19 Component(s) 150 Line(s) of event code 113 Unique line(s) of event code +cardMedia + 30 Component(s) + 333 Line(s) of event code + 170 Unique line(s) of event code popupShutter 19 Component(s) 178 Line(s) of event code 101 Unique line(s) of event code +cardGrid + 39 Component(s) + 430 Line(s) of event code + 249 Unique line(s) of event code popupLight 27 Component(s) 322 Line(s) of event code @@ -34,29 +42,21 @@ screensaver 33 Component(s) 207 Line(s) of event code 158 Unique line(s) of event code -cardEntities - 62 Component(s) - 970 Line(s) of event code - 412 Unique line(s) of event code -cardThermo - 41 Component(s) - 458 Line(s) of event code - 283 Unique line(s) of event code -cardMedia - 30 Component(s) - 331 Line(s) of event code - 169 Unique line(s) of event code -cardGrid - 39 Component(s) - 428 Line(s) of event code - 248 Unique line(s) of event code cardAlarm 35 Component(s) - 343 Line(s) of event code + 345 Line(s) of event code 214 Unique line(s) of event code +cardThermo + 41 Component(s) + 460 Line(s) of event code + 284 Unique line(s) of event code +cardEntities + 62 Component(s) + 972 Line(s) of event code + 413 Unique line(s) of event code Total 13 Page(s) 355 Component(s) - 3636 Line(s) of event code + 3646 Line(s) of event code 1045 Unique line(s) of event code diff --git a/HMI/US/landscape/n2t-out-visual/pageStartup.txt b/HMI/US/landscape/n2t-out-visual/pageStartup.txt index b7f0c982..66d54548 100644 --- a/HMI/US/landscape/n2t-out-visual/pageStartup.txt +++ b/HMI/US/landscape/n2t-out-visual/pageStartup.txt @@ -402,7 +402,7 @@ Text tVersion Horizontal Alignment : center Vertical Alignment : center Input Type : character - Text : 26 + Text : 27 Max. Text Size : 10 Word wrap : disabled Horizontal Spacing : 0 diff --git a/HMI/US/landscape/n2t-out/cardAlarm.txt b/HMI/US/landscape/n2t-out/cardAlarm.txt index 8b5083f4..9caa104f 100644 --- a/HMI/US/landscape/n2t-out/cardAlarm.txt +++ b/HMI/US/landscape/n2t-out/cardAlarm.txt @@ -174,8 +174,10 @@ Button bPrev if(bPrev.txt=="") { tSend.txt+="bUp" + }else + { + tSend.txt+="bPrev" } - tSend.txt+="bPrev" //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC diff --git a/HMI/US/landscape/n2t-out/cardEntities.txt b/HMI/US/landscape/n2t-out/cardEntities.txt index 886381ad..c183d073 100644 --- a/HMI/US/landscape/n2t-out/cardEntities.txt +++ b/HMI/US/landscape/n2t-out/cardEntities.txt @@ -718,8 +718,10 @@ Button bPrev if(bPrev.txt=="") { tSend.txt+="bUp" + }else + { + tSend.txt+="bPrev" } - tSend.txt+="bPrev" //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC diff --git a/HMI/US/landscape/n2t-out/cardGrid.txt b/HMI/US/landscape/n2t-out/cardGrid.txt index 523fd3f0..fb584291 100644 --- a/HMI/US/landscape/n2t-out/cardGrid.txt +++ b/HMI/US/landscape/n2t-out/cardGrid.txt @@ -246,8 +246,10 @@ Button bPrev if(bPrev.txt=="") { tSend.txt+="bUp" + }else + { + tSend.txt+="bPrev" } - tSend.txt+="bPrev" //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC diff --git a/HMI/US/landscape/n2t-out/cardMedia.txt b/HMI/US/landscape/n2t-out/cardMedia.txt index 39b5a16f..94a12685 100644 --- a/HMI/US/landscape/n2t-out/cardMedia.txt +++ b/HMI/US/landscape/n2t-out/cardMedia.txt @@ -439,8 +439,10 @@ Button bPrev if(bPrev.txt=="") { tSend.txt+="bUp" + }else + { + tSend.txt+="bPrev" } - tSend.txt+="bPrev" //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC diff --git a/HMI/US/landscape/n2t-out/cardThermo.txt b/HMI/US/landscape/n2t-out/cardThermo.txt index 89912833..a3838cfe 100644 --- a/HMI/US/landscape/n2t-out/cardThermo.txt +++ b/HMI/US/landscape/n2t-out/cardThermo.txt @@ -333,8 +333,10 @@ Button bPrev if(bPrev.txt=="") { tSend.txt+="bUp" + }else + { + tSend.txt+="bPrev" } - tSend.txt+="bPrev" //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC diff --git a/HMI/US/landscape/n2t-out/pageStartup.txt b/HMI/US/landscape/n2t-out/pageStartup.txt index 8fb1634d..a1f4b23c 100644 --- a/HMI/US/landscape/n2t-out/pageStartup.txt +++ b/HMI/US/landscape/n2t-out/pageStartup.txt @@ -152,7 +152,7 @@ Text tVersion Disable release event after dragging: 0 Send Component ID : disabled Associated Keyboard : none - Text : 26 + Text : 27 Max. Text Size : 10 Picture p0 diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index 8d74f031..f16e508d 100644 --- a/HMI/US/portrait/diff-eu-version.txt +++ b/HMI/US/portrait/diff-eu-version.txt @@ -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-04-01 18:14:32.819231663 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-01 18:14:33.291239313 +0000 +--- HMI/n2t-out/Program.s.txt 2022-04-02 17:52:28.361158189 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-02 17:52:28.717160730 +0000 @@ -11,6 +11,6 @@ // dim value int dimValue=40 @@ -11,8 +11,8 @@ 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/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt ---- HMI/n2t-out/cardEntities.txt 2022-04-01 18:14:32.819231663 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-01 18:14:33.291239313 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-04-02 17:52:28.361158189 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-02 17:52:28.721160758 +0000 @@ -62,6 +62,26 @@ vis bText4,0 vis hSlider4,0 @@ -206,7 +206,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt Button bDown1 Attributes Scope : local -@@ -857,6 +1015,206 @@ +@@ -859,6 +1017,206 @@ prints tSend.txt,0 prints crcval,2 @@ -413,7 +413,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt Dual-state Button btOnOff1 Attributes Scope : local -@@ -965,6 +1323,60 @@ +@@ -967,6 +1325,60 @@ prints tSend.txt,0 prints crcval,2 @@ -474,7 +474,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt Hotspot mSpecial Attributes Scope : local -@@ -1070,6 +1482,50 @@ +@@ -1072,6 +1484,50 @@ page popupLight } @@ -525,7 +525,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt Timer tmSerial Attributes Scope : local -@@ -1648,6 +2104,254 @@ +@@ -1650,6 +2106,254 @@ covx tTmp.txt,sys0,0,0 hSlider4.maxval=sys0 } @@ -781,8 +781,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt if(tInstruction.txt=="pageType") { diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-04-01 18:14:32.819231663 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-01 18:14:33.291239313 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-04-02 17:52:28.361158189 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-02 17:52:28.717160730 +0000 @@ -142,7 +142,7 @@ Disable release event after dragging: 0 Send Component ID : disabled diff --git a/HMI/US/portrait/n2t-out-visual/cardAlarm.txt b/HMI/US/portrait/n2t-out-visual/cardAlarm.txt index c421a4f5..697fe099 100644 --- a/HMI/US/portrait/n2t-out-visual/cardAlarm.txt +++ b/HMI/US/portrait/n2t-out-visual/cardAlarm.txt @@ -343,8 +343,10 @@ Button bPrev if(bPrev.txt=="") { tSend.txt+="bUp" + }else + { + tSend.txt+="bPrev" } - tSend.txt+="bPrev" //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC diff --git a/HMI/US/portrait/n2t-out-visual/cardEntities.txt b/HMI/US/portrait/n2t-out-visual/cardEntities.txt index d9f4e408..440a8e06 100644 --- a/HMI/US/portrait/n2t-out-visual/cardEntities.txt +++ b/HMI/US/portrait/n2t-out-visual/cardEntities.txt @@ -1749,8 +1749,10 @@ Button bPrev if(bPrev.txt=="") { tSend.txt+="bUp" + }else + { + tSend.txt+="bPrev" } - tSend.txt+="bPrev" //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC diff --git a/HMI/US/portrait/n2t-out-visual/cardGrid.txt b/HMI/US/portrait/n2t-out-visual/cardGrid.txt index 593dfa9b..66cc2249 100644 --- a/HMI/US/portrait/n2t-out-visual/cardGrid.txt +++ b/HMI/US/portrait/n2t-out-visual/cardGrid.txt @@ -519,8 +519,10 @@ Button bPrev if(bPrev.txt=="") { tSend.txt+="bUp" + }else + { + tSend.txt+="bPrev" } - tSend.txt+="bPrev" //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC diff --git a/HMI/US/portrait/n2t-out-visual/cardMedia.txt b/HMI/US/portrait/n2t-out-visual/cardMedia.txt index f0858920..86701249 100644 --- a/HMI/US/portrait/n2t-out-visual/cardMedia.txt +++ b/HMI/US/portrait/n2t-out-visual/cardMedia.txt @@ -860,8 +860,10 @@ Button bPrev if(bPrev.txt=="") { tSend.txt+="bUp" + }else + { + tSend.txt+="bPrev" } - tSend.txt+="bPrev" //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC diff --git a/HMI/US/portrait/n2t-out-visual/cardThermo.txt b/HMI/US/portrait/n2t-out-visual/cardThermo.txt index d1a13df6..38305cd8 100644 --- a/HMI/US/portrait/n2t-out-visual/cardThermo.txt +++ b/HMI/US/portrait/n2t-out-visual/cardThermo.txt @@ -687,8 +687,10 @@ Button bPrev if(bPrev.txt=="") { tSend.txt+="bUp" + }else + { + tSend.txt+="bPrev" } - tSend.txt+="bPrev" //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 f46c0e2f..50b220af 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 @@ -6,18 +6,18 @@ pageSerialTest 13 Component(s) 48 Line(s) of event code 43 Unique line(s) of event code -pageIcons - 7 Component(s) - 0 Line(s) of event code - 0 Unique line(s) of event code pageStartup 19 Component(s) 150 Line(s) of event code 113 Unique line(s) of event code -cardAlarm - 35 Component(s) - 343 Line(s) of event code - 214 Unique line(s) of event code +pageIcons + 7 Component(s) + 0 Line(s) of event code + 0 Unique line(s) of event code +cardMedia + 30 Component(s) + 333 Line(s) of event code + 170 Unique line(s) of event code popupNotify 17 Component(s) 178 Line(s) of event code @@ -34,29 +34,29 @@ screensaver 33 Component(s) 207 Line(s) of event code 158 Unique line(s) of event code -cardGrid - 39 Component(s) - 428 Line(s) of event code - 248 Unique line(s) of event code popupShutter 19 Component(s) 178 Line(s) of event code 101 Unique line(s) of event code +cardAlarm + 35 Component(s) + 345 Line(s) of event code + 214 Unique line(s) of event code +cardGrid + 39 Component(s) + 430 Line(s) of event code + 249 Unique line(s) of event code cardThermo 41 Component(s) - 458 Line(s) of event code - 283 Unique line(s) of event code + 460 Line(s) of event code + 284 Unique line(s) of event code cardEntities 86 Component(s) - 1360 Line(s) of event code - 552 Unique line(s) of event code -cardMedia - 30 Component(s) - 331 Line(s) of event code - 169 Unique line(s) of event code + 1362 Line(s) of event code + 553 Unique line(s) of event code Total 13 Page(s) 379 Component(s) - 4026 Line(s) of event code + 4036 Line(s) of event code 1159 Unique line(s) of event code diff --git a/HMI/US/portrait/n2t-out-visual/pageStartup.txt b/HMI/US/portrait/n2t-out-visual/pageStartup.txt index e140ccf8..27619e85 100644 --- a/HMI/US/portrait/n2t-out-visual/pageStartup.txt +++ b/HMI/US/portrait/n2t-out-visual/pageStartup.txt @@ -402,7 +402,7 @@ Text tVersion Horizontal Alignment : center Vertical Alignment : center Input Type : character - Text : 26 + Text : 27 Max. Text Size : 10 Word wrap : disabled Horizontal Spacing : 0 diff --git a/HMI/US/portrait/n2t-out/cardAlarm.txt b/HMI/US/portrait/n2t-out/cardAlarm.txt index 8b5083f4..9caa104f 100644 --- a/HMI/US/portrait/n2t-out/cardAlarm.txt +++ b/HMI/US/portrait/n2t-out/cardAlarm.txt @@ -174,8 +174,10 @@ Button bPrev if(bPrev.txt=="") { tSend.txt+="bUp" + }else + { + tSend.txt+="bPrev" } - tSend.txt+="bPrev" //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC diff --git a/HMI/US/portrait/n2t-out/cardEntities.txt b/HMI/US/portrait/n2t-out/cardEntities.txt index 32da68c7..e96578bd 100644 --- a/HMI/US/portrait/n2t-out/cardEntities.txt +++ b/HMI/US/portrait/n2t-out/cardEntities.txt @@ -876,8 +876,10 @@ Button bPrev if(bPrev.txt=="") { tSend.txt+="bUp" + }else + { + tSend.txt+="bPrev" } - tSend.txt+="bPrev" //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC diff --git a/HMI/US/portrait/n2t-out/cardGrid.txt b/HMI/US/portrait/n2t-out/cardGrid.txt index 523fd3f0..fb584291 100644 --- a/HMI/US/portrait/n2t-out/cardGrid.txt +++ b/HMI/US/portrait/n2t-out/cardGrid.txt @@ -246,8 +246,10 @@ Button bPrev if(bPrev.txt=="") { tSend.txt+="bUp" + }else + { + tSend.txt+="bPrev" } - tSend.txt+="bPrev" //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC diff --git a/HMI/US/portrait/n2t-out/cardMedia.txt b/HMI/US/portrait/n2t-out/cardMedia.txt index 39b5a16f..94a12685 100644 --- a/HMI/US/portrait/n2t-out/cardMedia.txt +++ b/HMI/US/portrait/n2t-out/cardMedia.txt @@ -439,8 +439,10 @@ Button bPrev if(bPrev.txt=="") { tSend.txt+="bUp" + }else + { + tSend.txt+="bPrev" } - tSend.txt+="bPrev" //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC diff --git a/HMI/US/portrait/n2t-out/cardThermo.txt b/HMI/US/portrait/n2t-out/cardThermo.txt index 89912833..a3838cfe 100644 --- a/HMI/US/portrait/n2t-out/cardThermo.txt +++ b/HMI/US/portrait/n2t-out/cardThermo.txt @@ -333,8 +333,10 @@ Button bPrev if(bPrev.txt=="") { tSend.txt+="bUp" + }else + { + tSend.txt+="bPrev" } - tSend.txt+="bPrev" //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC diff --git a/HMI/US/portrait/n2t-out/pageStartup.txt b/HMI/US/portrait/n2t-out/pageStartup.txt index 132b3fdf..0acaef73 100644 --- a/HMI/US/portrait/n2t-out/pageStartup.txt +++ b/HMI/US/portrait/n2t-out/pageStartup.txt @@ -152,7 +152,7 @@ Text tVersion Disable release event after dragging: 0 Send Component ID : disabled Associated Keyboard : none - Text : 26 + Text : 27 Max. Text Size : 10 Picture p0 diff --git a/HMI/n2t-out-visual/cardAlarm.txt b/HMI/n2t-out-visual/cardAlarm.txt index 032343f0..cf938228 100644 --- a/HMI/n2t-out-visual/cardAlarm.txt +++ b/HMI/n2t-out-visual/cardAlarm.txt @@ -343,8 +343,10 @@ Button bPrev if(bPrev.txt=="") { tSend.txt+="bUp" + }else + { + tSend.txt+="bPrev" } - tSend.txt+="bPrev" //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC diff --git a/HMI/n2t-out-visual/cardEntities.txt b/HMI/n2t-out-visual/cardEntities.txt index abbdb336..60d2ed61 100644 --- a/HMI/n2t-out-visual/cardEntities.txt +++ b/HMI/n2t-out-visual/cardEntities.txt @@ -1435,8 +1435,10 @@ Button bPrev if(bPrev.txt=="") { tSend.txt+="bUp" + }else + { + tSend.txt+="bPrev" } - tSend.txt+="bPrev" //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC diff --git a/HMI/n2t-out-visual/cardGrid.txt b/HMI/n2t-out-visual/cardGrid.txt index 60685bb3..d52ad720 100644 --- a/HMI/n2t-out-visual/cardGrid.txt +++ b/HMI/n2t-out-visual/cardGrid.txt @@ -519,8 +519,10 @@ Button bPrev if(bPrev.txt=="") { tSend.txt+="bUp" + }else + { + tSend.txt+="bPrev" } - tSend.txt+="bPrev" //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC diff --git a/HMI/n2t-out-visual/cardMedia.txt b/HMI/n2t-out-visual/cardMedia.txt index 5732e2ff..583ae606 100644 --- a/HMI/n2t-out-visual/cardMedia.txt +++ b/HMI/n2t-out-visual/cardMedia.txt @@ -860,8 +860,10 @@ Button bPrev if(bPrev.txt=="") { tSend.txt+="bUp" + }else + { + tSend.txt+="bPrev" } - tSend.txt+="bPrev" //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC diff --git a/HMI/n2t-out-visual/cardThermo.txt b/HMI/n2t-out-visual/cardThermo.txt index cdd9d74e..d16525a9 100644 --- a/HMI/n2t-out-visual/cardThermo.txt +++ b/HMI/n2t-out-visual/cardThermo.txt @@ -687,8 +687,10 @@ Button bPrev if(bPrev.txt=="") { tSend.txt+="bUp" + }else + { + tSend.txt+="bPrev" } - tSend.txt+="bPrev" //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 3d53381e..1399de04 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -22,10 +22,10 @@ popupShutter 19 Component(s) 178 Line(s) of event code 101 Unique line(s) of event code -cardAlarm - 35 Component(s) - 343 Line(s) of event code - 214 Unique line(s) of event code +cardMedia + 30 Component(s) + 333 Line(s) of event code + 170 Unique line(s) of event code popupLight 27 Component(s) 322 Line(s) of event code @@ -34,29 +34,29 @@ pageStartup 19 Component(s) 150 Line(s) of event code 113 Unique line(s) of event code -cardMedia - 30 Component(s) - 331 Line(s) of event code - 169 Unique line(s) of event code +cardThermo + 41 Component(s) + 460 Line(s) of event code + 284 Unique line(s) of event code screensaver 33 Component(s) 207 Line(s) of event code 158 Unique line(s) of event code +cardAlarm + 35 Component(s) + 345 Line(s) of event code + 214 Unique line(s) of event code cardGrid 39 Component(s) - 428 Line(s) of event code - 248 Unique line(s) of event code -cardThermo - 41 Component(s) - 458 Line(s) of event code - 283 Unique line(s) of event code + 430 Line(s) of event code + 249 Unique line(s) of event code cardEntities 62 Component(s) - 970 Line(s) of event code - 412 Unique line(s) of event code + 972 Line(s) of event code + 413 Unique line(s) of event code Total 13 Page(s) 355 Component(s) - 3637 Line(s) of event code + 3647 Line(s) of event code 1046 Unique line(s) of event code diff --git a/HMI/n2t-out-visual/pageStartup.txt b/HMI/n2t-out-visual/pageStartup.txt index 15e4469c..e36da13a 100644 --- a/HMI/n2t-out-visual/pageStartup.txt +++ b/HMI/n2t-out-visual/pageStartup.txt @@ -402,7 +402,7 @@ Text tVersion Horizontal Alignment : center Vertical Alignment : center Input Type : character - Text : 26 + Text : 27 Max. Text Size : 10 Word wrap : disabled Horizontal Spacing : 0 diff --git a/HMI/n2t-out/cardAlarm.txt b/HMI/n2t-out/cardAlarm.txt index 8b5083f4..9caa104f 100644 --- a/HMI/n2t-out/cardAlarm.txt +++ b/HMI/n2t-out/cardAlarm.txt @@ -174,8 +174,10 @@ Button bPrev if(bPrev.txt=="") { tSend.txt+="bUp" + }else + { + tSend.txt+="bPrev" } - tSend.txt+="bPrev" //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC diff --git a/HMI/n2t-out/cardEntities.txt b/HMI/n2t-out/cardEntities.txt index 886381ad..c183d073 100644 --- a/HMI/n2t-out/cardEntities.txt +++ b/HMI/n2t-out/cardEntities.txt @@ -718,8 +718,10 @@ Button bPrev if(bPrev.txt=="") { tSend.txt+="bUp" + }else + { + tSend.txt+="bPrev" } - tSend.txt+="bPrev" //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC diff --git a/HMI/n2t-out/cardGrid.txt b/HMI/n2t-out/cardGrid.txt index 523fd3f0..fb584291 100644 --- a/HMI/n2t-out/cardGrid.txt +++ b/HMI/n2t-out/cardGrid.txt @@ -246,8 +246,10 @@ Button bPrev if(bPrev.txt=="") { tSend.txt+="bUp" + }else + { + tSend.txt+="bPrev" } - tSend.txt+="bPrev" //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC diff --git a/HMI/n2t-out/cardMedia.txt b/HMI/n2t-out/cardMedia.txt index 39b5a16f..94a12685 100644 --- a/HMI/n2t-out/cardMedia.txt +++ b/HMI/n2t-out/cardMedia.txt @@ -439,8 +439,10 @@ Button bPrev if(bPrev.txt=="") { tSend.txt+="bUp" + }else + { + tSend.txt+="bPrev" } - tSend.txt+="bPrev" //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC diff --git a/HMI/n2t-out/cardThermo.txt b/HMI/n2t-out/cardThermo.txt index 89912833..a3838cfe 100644 --- a/HMI/n2t-out/cardThermo.txt +++ b/HMI/n2t-out/cardThermo.txt @@ -333,8 +333,10 @@ Button bPrev if(bPrev.txt=="") { tSend.txt+="bUp" + }else + { + tSend.txt+="bPrev" } - tSend.txt+="bPrev" //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC diff --git a/HMI/n2t-out/pageStartup.txt b/HMI/n2t-out/pageStartup.txt index 6339035e..6e0dff88 100644 --- a/HMI/n2t-out/pageStartup.txt +++ b/HMI/n2t-out/pageStartup.txt @@ -152,7 +152,7 @@ Text tVersion Disable release event after dragging: 0 Send Component ID : disabled Associated Keyboard : none - Text : 26 + Text : 27 Max. Text Size : 10 Picture p0