diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 56c7a94a..0a4356b9 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-06-11 16:39:28.495786817 +0000 -+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-06-11 16:39:29.571843283 +0000 +--- HMI/n2t-out/Program.s.txt 2022-06-12 12:21:18.432756347 +0000 ++++ HMI/US/landscape/n2t-out/Program.s.txt 2022-06-12 12:21:19.348768343 +0000 @@ -11,6 +11,4 @@ // dim value int dimValue=40 @@ -9,8 +9,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-06-11 16:39:28.495786817 +0000 -+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-06-11 16:39:29.571843283 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-06-12 12:21:18.432756347 +0000 ++++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-06-12 12:21:19.348768343 +0000 @@ -177,7 +177,7 @@ recmod=1 bauds=115200 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 bdba6347..b8d4ed65 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,10 +14,6 @@ cardMedia 34 Component(s) 363 Line(s) of event code 195 Unique line(s) of event code -pageStartup - 19 Component(s) - 157 Line(s) of event code - 117 Unique line(s) of event code cardGrid 42 Component(s) 439 Line(s) of event code @@ -26,6 +22,10 @@ cardQR 32 Component(s) 374 Line(s) of event code 218 Unique line(s) of event code +pageStartup + 19 Component(s) + 157 Line(s) of event code + 117 Unique line(s) of event code popupNotify 17 Component(s) 204 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 3d4fb838..6de25d7e 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 : 36 + Text : 37 Max. Text Size : 10 Word wrap : disabled Horizontal Spacing : 0 diff --git a/HMI/US/landscape/n2t-out/pageStartup.txt b/HMI/US/landscape/n2t-out/pageStartup.txt index dd50a033..fdf5af14 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 : 36 + Text : 37 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 28ea4187..6012039e 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-06-11 16:39:28.495786817 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-11 16:39:29.003813476 +0000 +--- HMI/n2t-out/Program.s.txt 2022-06-12 12:21:18.432756347 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-12 12:21:18.872762109 +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-06-11 16:39:28.495786817 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-11 16:39:29.003813476 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-06-12 12:21:18.436756399 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-12 12:21:18.876762161 +0000 @@ -63,6 +63,16 @@ vis bText4,0 vis hSlider4,0 @@ -467,59 +467,9 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt } if(tInstruction.txt=="pageType") { -diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt ---- HMI/n2t-out/cardMedia.txt 2022-06-11 16:39:28.495786817 +0000 -+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-06-11 16:39:29.003813476 +0000 -@@ -45,12 +45,6 @@ - Scope: local - Value: 0 - --Variable (string) vaMenu -- Attributes -- Scope : local -- Text : -- Max. Text Size: 50 -- - Text tSend - Attributes - Scope : local -@@ -218,24 +212,6 @@ - Text : - Max. Text Size : 10 - -- Events -- Touch Release Event -- if(vaMenu.txt!="") -- { -- tSend.txt="event,buttonPress2,"+vaMenu.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 t1 - Attributes - Scope : local -@@ -644,8 +620,6 @@ - vis t5,1 - covx tTmp.txt,t5.pco,0,0 - } -- //tIconBtnEntityName -- spstr strCommand.txt,vaMenu.txt,"~",12 - } - if(tInstruction.txt=="time") - { diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-06-11 16:39:28.495786817 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-11 16:39:29.003813476 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-06-12 12:21:18.432756347 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-12 12:21:18.872762109 +0000 @@ -142,7 +142,7 @@ Disable release event after dragging: 0 Send Component ID : disabled diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index 21a7b219..decaa5c4 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,8 +1,8 @@ -+++ HMI/US/portrait/diff-eu-version.txt 2022-06-11 16:39:29.019814315 +0000 -+--- HMI/n2t-out/Program.s.txt 2022-06-11 16:39:28.495786817 +0000 -++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-11 16:39:29.003813476 +0000 -+--- HMI/n2t-out/cardEntities.txt 2022-06-11 16:39:28.495786817 +0000 -++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-11 16:39:29.003813476 +0000 ++++ HMI/US/portrait/diff-eu-version.txt 2022-06-12 12:21:18.904762528 +0000 ++--- HMI/n2t-out/Program.s.txt 2022-06-12 12:21:18.432756347 +0000 +++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-12 12:21:18.872762109 +0000 ++--- HMI/n2t-out/cardEntities.txt 2022-06-12 12:21:18.436756399 +0000 +++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-12 12:21:18.876762161 +0000 +@@ -63,6 +63,16 @@ +@@ -120,6 +130,18 @@ +@@ -156,6 +178,15 @@ @@ -12,52 +12,5 @@ +@@ -970,6 +1149,33 @@ +@@ -1075,6 +1281,28 @@ +@@ -1850,6 +2078,169 @@ -+diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt -+--- HMI/n2t-out/cardMedia.txt 2022-06-11 16:39:28.495786817 +0000 -++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-06-11 16:39:29.003813476 +0000 -+@@ -45,12 +45,6 @@ -+ Scope: local -+ Value: 0 -+ -+-Variable (string) vaMenu -+- Attributes -+- Scope : local -+- Text : -+- Max. Text Size: 50 -+- -+ Text tSend -+ Scope : local -+@@ -218,24 +212,6 @@ -+ Text : -+ Max. Text Size : 10 -+- Events -+- Touch Release Event -+- if(vaMenu.txt!="") -+- { -+- tSend.txt="event,buttonPress2,"+vaMenu.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 t1 -+ Scope : local -+@@ -644,8 +620,6 @@ -+ vis t5,1 -+ covx tTmp.txt,t5.pco,0,0 -+ } -+- //tIconBtnEntityName -+- spstr strCommand.txt,vaMenu.txt,"~",12 -+ } -+ if(tInstruction.txt=="time") -+ { -+--- HMI/n2t-out/pageStartup.txt 2022-06-11 16:39:28.495786817 +0000 -++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-11 16:39:29.003813476 +0000 ++--- HMI/n2t-out/pageStartup.txt 2022-06-12 12:21:18.432756347 +0000 +++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-12 12:21:18.872762109 +0000 diff --git a/HMI/US/portrait/n2t-out-visual/cardMedia.txt b/HMI/US/portrait/n2t-out-visual/cardMedia.txt index eaac00ca..1b973cb5 100644 --- a/HMI/US/portrait/n2t-out-visual/cardMedia.txt +++ b/HMI/US/portrait/n2t-out-visual/cardMedia.txt @@ -57,6 +57,13 @@ Variable (int32) vaSpeakerPos Scope: local Value: 0 +Variable (string) vaMenu + Attributes + ID : 33 + Scope : local + Text : + Max. Text Size: 50 + Text tSend Attributes ID : 2 @@ -444,6 +451,24 @@ Text tIcon Horizontal Spacing : 0 Vertical Spacing : 0 + Events + Touch Release Event + if(vaMenu.txt!="") + { + tSend.txt="event,buttonPress2,"+vaMenu.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 t1 Attributes ID : 21 @@ -1069,6 +1094,8 @@ Timer tmSerial vis t5,1 covx tTmp.txt,t5.pco,0,0 } + //tIconBtnEntityName + spstr strCommand.txt,vaMenu.txt,"~",12 } if(tInstruction.txt=="time") { 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 855b7e49..af51356a 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 @@ cardQR 32 Component(s) 374 Line(s) of event code 218 Unique line(s) of event code +pageStartup + 19 Component(s) + 157 Line(s) of event code + 117 Unique line(s) of event code popupNotify 17 Component(s) 204 Line(s) of event code @@ -30,6 +34,10 @@ cardThermo 53 Component(s) 555 Line(s) of event code 292 Unique line(s) of event code +cardMedia + 34 Component(s) + 363 Line(s) of event code + 195 Unique line(s) of event code screensaver 38 Component(s) 319 Line(s) of event code @@ -42,21 +50,13 @@ cardGrid 42 Component(s) 439 Line(s) of event code 259 Unique line(s) of event code -cardMedia - 33 Component(s) - 349 Line(s) of event code - 183 Unique line(s) of event code cardAlarm 40 Component(s) 392 Line(s) of event code 239 Unique line(s) of event code -pageStartup - 19 Component(s) - 157 Line(s) of event code - 117 Unique line(s) of event code Total 13 Page(s) - 423 Component(s) - 4858 Line(s) of event code - 1292 Unique line(s) of event code + 424 Component(s) + 4872 Line(s) of event code + 1304 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 451f5906..c1d829a8 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 : 36 + Text : 37 Max. Text Size : 10 Word wrap : disabled Horizontal Spacing : 0 diff --git a/HMI/US/portrait/n2t-out/cardMedia.txt b/HMI/US/portrait/n2t-out/cardMedia.txt index 030e57ad..78c331ce 100644 --- a/HMI/US/portrait/n2t-out/cardMedia.txt +++ b/HMI/US/portrait/n2t-out/cardMedia.txt @@ -45,6 +45,12 @@ Variable (int32) vaSpeakerPos Scope: local Value: 0 +Variable (string) vaMenu + Attributes + Scope : local + Text : + Max. Text Size: 50 + Text tSend Attributes Scope : local @@ -212,6 +218,24 @@ Text tIcon Text : Max. Text Size : 10 + Events + Touch Release Event + if(vaMenu.txt!="") + { + tSend.txt="event,buttonPress2,"+vaMenu.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 t1 Attributes Scope : local @@ -620,6 +644,8 @@ Timer tmSerial vis t5,1 covx tTmp.txt,t5.pco,0,0 } + //tIconBtnEntityName + spstr strCommand.txt,vaMenu.txt,"~",12 } if(tInstruction.txt=="time") { diff --git a/HMI/US/portrait/n2t-out/pageStartup.txt b/HMI/US/portrait/n2t-out/pageStartup.txt index 9a56e0bb..34d7a509 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 : 36 + Text : 37 Max. Text Size : 10 Picture p0 diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index 977e968f..5ce7d797 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -22,14 +22,14 @@ popupLight 27 Component(s) 352 Line(s) of event code 191 Unique line(s) of event code -cardMedia - 34 Component(s) - 363 Line(s) of event code - 195 Unique line(s) of event code pageStartup 19 Component(s) 157 Line(s) of event code 117 Unique line(s) of event code +cardMedia + 34 Component(s) + 363 Line(s) of event code + 195 Unique line(s) of event code popupShutter 25 Component(s) 330 Line(s) of event code diff --git a/HMI/n2t-out-visual/pageStartup.txt b/HMI/n2t-out-visual/pageStartup.txt index 68701029..1f9ade57 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 : 36 + Text : 37 Max. Text Size : 10 Word wrap : disabled Horizontal Spacing : 0 diff --git a/HMI/n2t-out/pageStartup.txt b/HMI/n2t-out/pageStartup.txt index ba2760d4..4652fa52 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 : 36 + Text : 37 Max. Text Size : 10 Picture p0