diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 3ebd2f6c..10d4e89d 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-05-31 16:49:35.031556338 +0000 -+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-31 16:49:35.915562207 +0000 +--- HMI/n2t-out/Program.s.txt 2022-06-01 14:51:15.788988952 +0000 ++++ HMI/US/landscape/n2t-out/Program.s.txt 2022-06-01 14:51:16.805072637 +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/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt ---- HMI/n2t-out/cardEntities.txt 2022-05-31 16:49:35.031556338 +0000 -+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-05-31 16:49:35.919562233 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-06-01 14:51:15.788988952 +0000 ++++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-06-01 14:51:16.805072637 +0000 @@ -1925,10 +1925,6 @@ // get value spstr strCommand.txt,tTmp.txt,"~",1 @@ -23,8 +23,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt if(tInstruction.txt=="timeout") { diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt ---- HMI/n2t-out/cardGrid.txt 2022-05-31 16:49:35.031556338 +0000 -+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-05-31 16:49:35.915562207 +0000 +--- HMI/n2t-out/cardGrid.txt 2022-06-01 14:51:15.788988952 +0000 ++++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-06-01 14:51:16.805072637 +0000 @@ -846,10 +846,6 @@ // get value spstr strCommand.txt,tTmp.txt,"~",1 @@ -37,8 +37,8 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt if(tInstruction.txt=="timeout") { diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt ---- HMI/n2t-out/cardMedia.txt 2022-05-31 16:49:35.031556338 +0000 -+++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-05-31 16:49:35.915562207 +0000 +--- HMI/n2t-out/cardMedia.txt 2022-06-01 14:51:15.788988952 +0000 ++++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-06-01 14:51:16.805072637 +0000 @@ -636,10 +636,7 @@ // get value spstr strCommand.txt,tTmp.txt,"~",1 @@ -52,108 +52,20 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt if(tInstruction.txt=="timeout") { diff -bur HMI/n2t-out/cardQR.txt HMI/US/landscape/n2t-out/cardQR.txt ---- HMI/n2t-out/cardQR.txt 2022-05-31 16:49:35.031556338 +0000 -+++ HMI/US/landscape/n2t-out/cardQR.txt 2022-05-31 16:49:35.915562207 +0000 -@@ -30,8 +30,6 @@ - vis tIcon2,0 - vis tEntity2,0 - vis bText2,0 -- tsw m0,0 -- tsw m1,0 - - Variable (string) strCommand +--- HMI/n2t-out/cardQR.txt 2022-06-01 14:51:15.788988952 +0000 ++++ HMI/US/landscape/n2t-out/cardQR.txt 2022-06-01 14:51:16.805072637 +0000 +@@ -97,7 +97,7 @@ Attributes -@@ -93,12 +91,6 @@ + Scope : local Text : - Max. Text Size: 10 - --Variable (string) vaQR -- Attributes -- Scope : local -- Text : - Max. Text Size: 100 -- ++ Max. Text Size: 80 + Text tEntity1 Attributes - Scope : local -@@ -156,6 +148,15 @@ - Disable release event after dragging: 0 - Send Component ID : disabled - -+QR Code qr0 -+ Attributes -+ Scope : local -+ Dragging : 0 -+ Disable release event after dragging: 0 -+ Send Component ID : disabled -+ Text : -+ Max. Text Size : 100 -+ - Button bNext - Attributes - Scope : local -@@ -350,20 +351,6 @@ - Touch Press Event - click bPrev,1 - --Hotspot m0 -- Attributes -- Scope : local -- Dragging : 0 -- Disable release event after dragging: 0 -- Send Component ID : disabled -- --Hotspot m1 -- Attributes -- Scope : local -- Dragging : 0 -- Disable release event after dragging: 0 -- Send Component ID : disabled -- - Timer tmSerial - Attributes - Scope : local -@@ -456,7 +443,7 @@ - bNext.txt="" - } - //text qrcode -- spstr strCommand.txt,vaQR.txt,"~",3 -+ spstr strCommand.txt,qr0.txt,"~",3 - // get Type - spstr strCommand.txt,type1.txt,"~",4 - // get internal name -@@ -579,16 +566,6 @@ - // get Text (optional Value) - spstr strCommand.txt,bText2.txt,"~",15 - } -- if(type2.txt=="delete"||type2.txt=="") -- { -- if(type1.txt=="delete"||type1.txt=="") -- { -- qrcode m1.x,m1.y,200,6371,65535,-1,vaQR.txt -- } -- }else -- { -- qrcode m0.x,m0.y,200,6371,65535,-1,vaQR.txt -- } - } - if(tInstruction.txt=="time") - { -@@ -605,10 +582,7 @@ - // get value - spstr strCommand.txt,tTmp.txt,"~",1 - covx tTmp.txt,dimValue,0,0 -- // get value normal -- spstr strCommand.txt,tTmp.txt,"~",2 -- covx tTmp.txt,dimValueNormal,0,0 -- dim=dimValueNormal -+ dim=dimValue - } - if(tInstruction.txt=="timeout") - { diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt ---- HMI/n2t-out/cardThermo.txt 2022-05-31 16:49:35.031556338 +0000 -+++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-05-31 16:49:35.919562233 +0000 +--- HMI/n2t-out/cardThermo.txt 2022-06-01 14:51:15.788988952 +0000 ++++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-06-01 14:51:16.805072637 +0000 @@ -1170,10 +1170,6 @@ // get value spstr strCommand.txt,tTmp.txt,"~",1 @@ -166,8 +78,8 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt if(tInstruction.txt=="timeout") { diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-05-31 16:49:35.031556338 +0000 -+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-31 16:49:35.915562207 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-06-01 14:51:15.788988952 +0000 ++++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-06-01 14:51:16.805072637 +0000 @@ -177,7 +177,7 @@ recmod=1 bauds=115200 @@ -189,8 +101,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt if(tInstruction.txt=="timeout") { diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt ---- HMI/n2t-out/popupLight.txt 2022-05-31 16:49:35.031556338 +0000 -+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-05-31 16:49:35.915562207 +0000 +--- HMI/n2t-out/popupLight.txt 2022-06-01 14:51:15.788988952 +0000 ++++ HMI/US/landscape/n2t-out/popupLight.txt 2022-06-01 14:51:16.805072637 +0000 @@ -561,10 +561,6 @@ // get value spstr strCommand.txt,tTmp.txt,"~",1 @@ -203,8 +115,8 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt if(tInstruction.txt=="timeout") { diff -bur HMI/n2t-out/popupNotify.txt HMI/US/landscape/n2t-out/popupNotify.txt ---- HMI/n2t-out/popupNotify.txt 2022-05-31 16:49:35.031556338 +0000 -+++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-05-31 16:49:35.915562207 +0000 +--- HMI/n2t-out/popupNotify.txt 2022-06-01 14:51:15.788988952 +0000 ++++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-06-01 14:51:16.805072637 +0000 @@ -311,10 +311,6 @@ // get value spstr strCommand.txt,tTmp.txt,"~",1 @@ -217,8 +129,8 @@ diff -bur HMI/n2t-out/popupNotify.txt HMI/US/landscape/n2t-out/popupNotify.txt if(tInstruction.txt=="timeout") { diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt ---- HMI/n2t-out/popupShutter.txt 2022-05-31 16:49:35.031556338 +0000 -+++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-05-31 16:49:35.915562207 +0000 +--- HMI/n2t-out/popupShutter.txt 2022-06-01 14:51:15.788988952 +0000 ++++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-06-01 14:51:16.805072637 +0000 @@ -406,10 +406,6 @@ // get value spstr strCommand.txt,tTmp.txt,"~",1 @@ -231,8 +143,8 @@ diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt if(tInstruction.txt=="time") { diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt ---- HMI/n2t-out/screensaver.txt 2022-05-31 16:49:35.031556338 +0000 -+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-05-31 16:49:35.919562233 +0000 +--- HMI/n2t-out/screensaver.txt 2022-06-01 14:51:15.788988952 +0000 ++++ HMI/US/landscape/n2t-out/screensaver.txt 2022-06-01 14:51:16.809072966 +0000 @@ -397,9 +397,6 @@ spstr strCommand.txt,tTmp.txt,"~",1 covx tTmp.txt,dimValue,0,0 diff --git a/HMI/US/landscape/n2t-out-visual/cardQR.txt b/HMI/US/landscape/n2t-out-visual/cardQR.txt index 05112b77..ddf06b42 100644 --- a/HMI/US/landscape/n2t-out-visual/cardQR.txt +++ b/HMI/US/landscape/n2t-out-visual/cardQR.txt @@ -38,6 +38,8 @@ Page cardQR vis tIcon2,0 vis tEntity2,0 vis bText2,0 + tsw m0,0 + tsw m1,0 Variable (string) strCommand Attributes @@ -83,35 +85,42 @@ Variable (string) tInstruction Variable (string) entn1 Attributes - ID : 26 + ID : 25 Scope : local Text : Max. Text Size: 80 Variable (string) entn2 Attributes - ID : 27 + ID : 26 Scope : local Text : Max. Text Size: 80 Variable (string) type1 Attributes - ID : 28 + ID : 27 Scope : local Text : Max. Text Size: 10 Variable (string) type2 Attributes - ID : 29 + ID : 28 Scope : local Text : Max. Text Size: 10 +Variable (string) vaQR + Attributes + ID : 31 + Scope : local + Text : + Max. Text Size: 80 + Text tEntity1 Attributes - ID : 18 + ID : 17 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -127,7 +136,7 @@ Text tEntity1 Fill : solid color Style : flat Associated Keyboard : none - Font ID : 0 + Font ID : 6 Back. Color : 6371 Font Color : 65535 Horizontal Alignment : left @@ -141,7 +150,7 @@ Text tEntity1 Text tIcon1 Attributes - ID : 19 + ID : 18 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -171,7 +180,7 @@ Text tIcon1 Text tEntity2 Attributes - ID : 22 + ID : 21 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -187,7 +196,7 @@ Text tEntity2 Fill : solid color Style : flat Associated Keyboard : none - Font ID : 0 + Font ID : 6 Back. Color : 6371 Font Color : 65535 Horizontal Alignment : left @@ -201,7 +210,7 @@ Text tEntity2 Text tIcon2 Attributes - ID : 23 + ID : 22 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -231,7 +240,7 @@ Text tIcon2 Text tHeading Attributes - ID : 25 + ID : 24 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -247,7 +256,7 @@ Text tHeading Fill : solid color Style : flat Associated Keyboard : none - Font ID : 2 + Font ID : 1 Back. Color : 6371 Font Color : 65535 Horizontal Alignment : center @@ -269,32 +278,13 @@ Picture p0 Opacity : 127 x coordinate : 0 y coordinate : 0 - Width : 480 - Height : 320 + Width : 479 + Height : 319 Effect : load Effect Priority : 0 Effect Time : 300 Picture ID : 0 -QR Code qr0 - Attributes - ID : 17 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 28 - y coordinate : 91 - Width : 200 - Height : 200 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Logo overlay : no - Text : - Max. Text Size : 100 - Button bNext Attributes ID : 3 @@ -398,7 +388,7 @@ Button bPrev Button bText1 Attributes - ID : 20 + ID : 19 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -413,7 +403,7 @@ Button bText1 Effect Time : 300 Fill : solid color Style : flat - Font ID : 0 + Font ID : 6 Back. Color : 6371 Back. Picture ID (Pressed) : 65535 Back. Color (Pressed) : 14823 @@ -445,7 +435,7 @@ Button bText1 Button bText2 Attributes - ID : 24 + ID : 23 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -460,7 +450,7 @@ Button bText2 Effect Time : 300 Fill : solid color Style : flat - Font ID : 0 + Font ID : 6 Back. Color : 6371 Back. Picture ID (Pressed) : 65535 Back. Color (Pressed) : 14823 @@ -506,7 +496,7 @@ Dual-state Button btOnOff1 Effect Priority : 0 Effect Time : 300 Fill : image - Font ID : 0 + Font ID : 6 Background Picture ID (Unpressed) : 1 Back. Picture ID (Pressed) : 2 Horizontal Alignment : center @@ -537,7 +527,7 @@ Dual-state Button btOnOff1 Dual-state Button btOnOff2 Attributes - ID : 21 + ID : 20 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -551,7 +541,7 @@ Dual-state Button btOnOff2 Effect Priority : 0 Effect Time : 300 Fill : image - Font ID : 0 + Font ID : 6 Background Picture ID (Unpressed) : 1 Back. Picture ID (Pressed) : 2 Horizontal Alignment : center @@ -610,7 +600,7 @@ Hotspot mSwipeUp Opacity : 127 x coordinate : 12 y coordinate : 0 - Width : 454 + Width : 450 Height : 9 Effect : load Effect Priority : 0 @@ -640,6 +630,38 @@ Hotspot mSwipePrev Touch Press Event click bPrev,1 +Hotspot m0 + Attributes + ID : 29 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 28 + y coordinate : 91 + Width : 200 + Height : 200 + Effect : load + Effect Priority : 0 + Effect Time : 300 + +Hotspot m1 + Attributes + ID : 30 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 143 + y coordinate : 91 + Width : 200 + Height : 200 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Timer tmSerial Attributes ID : 5 @@ -733,7 +755,7 @@ Timer tmSerial bNext.txt="" } //text qrcode - spstr strCommand.txt,qr0.txt,"~",3 + spstr strCommand.txt,vaQR.txt,"~",3 // get Type spstr strCommand.txt,type1.txt,"~",4 // get internal name @@ -856,6 +878,16 @@ Timer tmSerial // get Text (optional Value) spstr strCommand.txt,bText2.txt,"~",15 } + if(type2.txt=="delete"||type2.txt=="") + { + if(type1.txt=="delete"||type1.txt=="") + { + qrcode m1.x,m1.y,200,6371,65535,-1,vaQR.txt + } + }else + { + qrcode m0.x,m0.y,200,6371,65535,-1,vaQR.txt + } } if(tInstruction.txt=="time") { @@ -872,7 +904,10 @@ Timer tmSerial // get value spstr strCommand.txt,tTmp.txt,"~",1 covx tTmp.txt,dimValue,0,0 - dim=dimValue + // get value normal + spstr strCommand.txt,tTmp.txt,"~",2 + covx tTmp.txt,dimValueNormal,0,0 + dim=dimValueNormal } if(tInstruction.txt=="timeout") { 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 bde71504..7da78200 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 @@ -27,9 +27,9 @@ cardMedia 347 Line(s) of event code 182 Unique line(s) of event code cardQR - 30 Component(s) - 360 Line(s) of event code - 210 Unique line(s) of event code + 32 Component(s) + 374 Line(s) of event code + 218 Unique line(s) of event code cardGrid 42 Component(s) 436 Line(s) of event code @@ -57,6 +57,6 @@ screensaver Total 13 Page(s) - 406 Component(s) - 4481 Line(s) of event code - 1187 Unique line(s) of event code + 408 Component(s) + 4495 Line(s) of event code + 1192 Unique line(s) of event code diff --git a/HMI/US/landscape/n2t-out/cardQR.txt b/HMI/US/landscape/n2t-out/cardQR.txt index d818ad74..22c20e9a 100644 --- a/HMI/US/landscape/n2t-out/cardQR.txt +++ b/HMI/US/landscape/n2t-out/cardQR.txt @@ -30,6 +30,8 @@ Page cardQR vis tIcon2,0 vis tEntity2,0 vis bText2,0 + tsw m0,0 + tsw m1,0 Variable (string) strCommand Attributes @@ -91,6 +93,12 @@ Variable (string) type2 Text : Max. Text Size: 10 +Variable (string) vaQR + Attributes + Scope : local + Text : + Max. Text Size: 80 + Text tEntity1 Attributes Scope : local @@ -148,15 +156,6 @@ Picture p0 Disable release event after dragging: 0 Send Component ID : disabled -QR Code qr0 - Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Text : - Max. Text Size : 100 - Button bNext Attributes Scope : local @@ -351,6 +350,20 @@ Hotspot mSwipePrev Touch Press Event click bPrev,1 +Hotspot m0 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + +Hotspot m1 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Timer tmSerial Attributes Scope : local @@ -443,7 +456,7 @@ Timer tmSerial bNext.txt="" } //text qrcode - spstr strCommand.txt,qr0.txt,"~",3 + spstr strCommand.txt,vaQR.txt,"~",3 // get Type spstr strCommand.txt,type1.txt,"~",4 // get internal name @@ -566,6 +579,16 @@ Timer tmSerial // get Text (optional Value) spstr strCommand.txt,bText2.txt,"~",15 } + if(type2.txt=="delete"||type2.txt=="") + { + if(type1.txt=="delete"||type1.txt=="") + { + qrcode m1.x,m1.y,200,6371,65535,-1,vaQR.txt + } + }else + { + qrcode m0.x,m0.y,200,6371,65535,-1,vaQR.txt + } } if(tInstruction.txt=="time") { @@ -582,7 +605,10 @@ Timer tmSerial // get value spstr strCommand.txt,tTmp.txt,"~",1 covx tTmp.txt,dimValue,0,0 - dim=dimValue + // get value normal + spstr strCommand.txt,tTmp.txt,"~",2 + covx tTmp.txt,dimValueNormal,0,0 + dim=dimValueNormal } if(tInstruction.txt=="timeout") { diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index e046b941..dfc98a9e 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-05-31 16:49:35.031556338 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-31 16:49:35.459559179 +0000 +--- HMI/n2t-out/Program.s.txt 2022-06-01 14:51:15.788988952 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-01 14:51:16.285029806 +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-05-31 16:49:35.031556338 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-31 16:49:35.459559179 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-06-01 14:51:15.788988952 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-01 14:51:16.285029806 +0000 @@ -63,6 +63,16 @@ vis bText4,0 vis hSlider4,0 @@ -468,103 +468,20 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt if(tInstruction.txt=="pageType") { diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt ---- HMI/n2t-out/cardQR.txt 2022-05-31 16:49:35.031556338 +0000 -+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-31 16:49:35.459559179 +0000 -@@ -30,14 +30,12 @@ - vis tIcon2,0 - vis tEntity2,0 - vis bText2,0 -- tsw m0,0 -- tsw m1,0 - - Variable (string) strCommand +--- HMI/n2t-out/cardQR.txt 2022-06-01 14:51:15.788988952 +0000 ++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-06-01 14:51:16.285029806 +0000 +@@ -97,7 +97,7 @@ Attributes Scope : local Text : -- Max. Text Size: 275 -+ Max. Text Size: 270 - - Variable (string) entn - Attributes -@@ -93,12 +91,6 @@ - Text : - Max. Text Size: 10 - --Variable (string) vaQR -- Attributes -- Scope : local -- Text : - Max. Text Size: 100 -- ++ Max. Text Size: 80 + Text tEntity1 Attributes - Scope : local -@@ -156,6 +148,15 @@ - Disable release event after dragging: 0 - Send Component ID : disabled - -+QR Code qr0 -+ Attributes -+ Scope : local -+ Dragging : 0 -+ Disable release event after dragging: 0 -+ Send Component ID : disabled -+ Text : -+ Max. Text Size : 100 -+ - Button bNext - Attributes - Scope : local -@@ -350,20 +351,6 @@ - Touch Press Event - click bPrev,1 - --Hotspot m0 -- Attributes -- Scope : local -- Dragging : 0 -- Disable release event after dragging: 0 -- Send Component ID : disabled -- --Hotspot m1 -- Attributes -- Scope : local -- Dragging : 0 -- Disable release event after dragging: 0 -- Send Component ID : disabled -- - Timer tmSerial - Attributes - Scope : local -@@ -456,7 +443,7 @@ - bNext.txt="" - } - //text qrcode -- spstr strCommand.txt,vaQR.txt,"~",3 -+ spstr strCommand.txt,qr0.txt,"~",3 - // get Type - spstr strCommand.txt,type1.txt,"~",4 - // get internal name -@@ -579,16 +566,6 @@ - // get Text (optional Value) - spstr strCommand.txt,bText2.txt,"~",15 - } -- if(type2.txt=="delete"||type2.txt=="") -- { -- if(type1.txt=="delete"||type1.txt=="") -- { -- qrcode m1.x,m1.y,200,6371,65535,-1,vaQR.txt -- } -- }else -- { -- qrcode m0.x,m0.y,200,6371,65535,-1,vaQR.txt -- } - } - if(tInstruction.txt=="time") - { diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-05-31 16:49:35.031556338 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-31 16:49:35.463559206 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-06-01 14:51:15.788988952 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-01 14:51:16.285029806 +0000 @@ -142,7 +142,7 @@ Disable release event after dragging: 0 Send Component ID : disabled @@ -584,8 +501,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt ---- HMI/n2t-out/screensaver.txt 2022-05-31 16:49:35.031556338 +0000 -+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-31 16:49:35.463559206 +0000 +--- HMI/n2t-out/screensaver.txt 2022-06-01 14:51:15.788988952 +0000 ++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-06-01 14:51:16.285029806 +0000 @@ -474,22 +474,6 @@ vis tMainIconAlt,1 vis tMRIcon,1 diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index c532d290..1a8a82da 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-05-31 16:49:35.475559286 +0000 -+--- HMI/n2t-out/Program.s.txt 2022-05-31 16:49:35.031556338 +0000 -++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-31 16:49:35.459559179 +0000 -+--- HMI/n2t-out/cardEntities.txt 2022-05-31 16:49:35.031556338 +0000 -++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-31 16:49:35.459559179 +0000 ++++ HMI/US/portrait/diff-eu-version.txt 2022-06-01 14:51:16.309031783 +0000 ++--- HMI/n2t-out/Program.s.txt 2022-06-01 14:51:15.788988952 +0000 +++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-01 14:51:16.285029806 +0000 ++--- HMI/n2t-out/cardEntities.txt 2022-06-01 14:51:15.788988952 +0000 +++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-01 14:51:16.285029806 +0000 +@@ -63,6 +63,16 @@ +@@ -120,6 +130,18 @@ +@@ -156,6 +178,15 @@ @@ -12,94 +12,14 @@ +@@ -970,6 +1149,33 @@ +@@ -1075,6 +1281,28 @@ +@@ -1850,6 +2078,169 @@ -+--- HMI/n2t-out/cardQR.txt 2022-05-31 16:49:35.031556338 +0000 -++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-31 16:49:35.459559179 +0000 -+@@ -30,14 +30,12 @@ -+ vis tIcon2,0 -+ vis tEntity2,0 -+ vis bText2,0 -+- tsw m0,0 -+- tsw m1,0 -+ -+ Variable (string) strCommand -+@@ -93,12 +91,6 @@ -+ Text : -+ Max. Text Size: 10 -+ -+-Variable (string) vaQR -+- Attributes -+- Scope : local -+- Text : ++--- HMI/n2t-out/cardQR.txt 2022-06-01 14:51:15.788988952 +0000 +++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-06-01 14:51:16.285029806 +0000 ++@@ -97,7 +97,7 @@ +- Max. Text Size: 100 -+- +++ Max. Text Size: 80 + Text tEntity1 -+ Attributes -+ Scope : local -+@@ -156,6 +148,15 @@ -+ Disable release event after dragging: 0 -+ Send Component ID : disabled -+ -++QR Code qr0 -++ Attributes -++ Scope : local -++ Dragging : 0 -++ Disable release event after dragging: 0 -++ Send Component ID : disabled -++ Text : -++ Max. Text Size : 100 -++ -+ Button bNext -+ Attributes -+ Scope : local -+@@ -350,20 +351,6 @@ -+ Touch Press Event -+ click bPrev,1 -+ -+-Hotspot m0 -+- Attributes -+- Scope : local -+- Dragging : 0 -+- Disable release event after dragging: 0 -+- Send Component ID : disabled -+- -+-Hotspot m1 -+- Attributes -+- Scope : local -+- Dragging : 0 -+- Disable release event after dragging: 0 -+- Send Component ID : disabled -+- -+ Timer tmSerial -+ Attributes -+ Scope : local -+@@ -456,7 +443,7 @@ -+ bNext.txt="" -+ } -+ //text qrcode -+- spstr strCommand.txt,vaQR.txt,"~",3 -++ spstr strCommand.txt,qr0.txt,"~",3 -+ // get Type -+ spstr strCommand.txt,type1.txt,"~",4 -+ // get internal name -+@@ -579,16 +566,6 @@ -+ // get Text (optional Value) -+ spstr strCommand.txt,bText2.txt,"~",15 -+ } -+- if(type2.txt=="delete"||type2.txt=="") -+- { -+- if(type1.txt=="delete"||type1.txt=="") -+- { -+- qrcode m1.x,m1.y,200,6371,65535,-1,vaQR.txt -+- } -+- }else -+- { -+- qrcode m0.x,m0.y,200,6371,65535,-1,vaQR.txt -+- } -+ } -+ if(tInstruction.txt=="time") -+ { -+--- HMI/n2t-out/pageStartup.txt 2022-05-31 16:49:35.031556338 +0000 -++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-31 16:49:35.463559206 +0000 -+--- HMI/n2t-out/screensaver.txt 2022-05-31 16:49:35.031556338 +0000 -++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-31 16:49:35.463559206 +0000 ++--- HMI/n2t-out/pageStartup.txt 2022-06-01 14:51:15.788988952 +0000 +++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-01 14:51:16.285029806 +0000 ++--- HMI/n2t-out/screensaver.txt 2022-06-01 14:51:15.788988952 +0000 +++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-06-01 14:51:16.285029806 +0000 +@@ -474,22 +474,6 @@ diff --git a/HMI/US/portrait/n2t-out-visual/cardQR.txt b/HMI/US/portrait/n2t-out-visual/cardQR.txt index 815594b4..909c978e 100644 --- a/HMI/US/portrait/n2t-out-visual/cardQR.txt +++ b/HMI/US/portrait/n2t-out-visual/cardQR.txt @@ -38,13 +38,15 @@ Page cardQR vis tIcon2,0 vis tEntity2,0 vis bText2,0 + tsw m0,0 + tsw m1,0 Variable (string) strCommand Attributes ID : 6 Scope : local Text : - Max. Text Size: 270 + Max. Text Size: 275 Variable (string) entn Attributes @@ -62,64 +64,71 @@ Variable (string) tSend Variable (string) tTmp Attributes - ID : 11 + ID : 14 Scope : local Text : Max. Text Size: 10 Variable (string) tId Attributes - ID : 12 + ID : 15 Scope : local Text : Max. Text Size: 20 Variable (string) tInstruction Attributes - ID : 13 + ID : 16 Scope : local Text : Max. Text Size: 20 Variable (string) entn1 Attributes - ID : 23 + ID : 25 Scope : local Text : Max. Text Size: 80 Variable (string) entn2 Attributes - ID : 24 + ID : 26 Scope : local Text : Max. Text Size: 80 Variable (string) type1 Attributes - ID : 28 + ID : 27 Scope : local Text : Max. Text Size: 10 Variable (string) type2 Attributes - ID : 29 + ID : 28 Scope : local Text : Max. Text Size: 10 +Variable (string) vaQR + Attributes + ID : 30 + Scope : local + Text : + Max. Text Size: 80 + Text tEntity1 Attributes - ID : 15 + ID : 17 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 112 - y coordinate : 292 - Width : 170 + x coordinate : 82 + y coordinate : 295 + Width : 163 Height : 30 Effect : load Effect Priority : 0 @@ -141,14 +150,14 @@ Text tEntity1 Text tIcon1 Attributes - ID : 16 + ID : 18 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 60 - y coordinate : 291 + x coordinate : 25 + y coordinate : 294 Width : 45 Height : 30 Effect : load @@ -171,15 +180,15 @@ Text tIcon1 Text tEntity2 Attributes - ID : 19 + ID : 21 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 113 - y coordinate : 388 - Width : 170 + x coordinate : 83 + y coordinate : 394 + Width : 165 Height : 30 Effect : load Effect Priority : 0 @@ -201,14 +210,14 @@ Text tEntity2 Text tIcon2 Attributes - ID : 20 + ID : 22 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 61 - y coordinate : 387 + x coordinate : 26 + y coordinate : 393 Width : 45 Height : 30 Effect : load @@ -231,7 +240,7 @@ Text tIcon2 Text tHeading Attributes - ID : 22 + ID : 24 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -239,7 +248,7 @@ Text tHeading Opacity : 127 x coordinate : 66 y coordinate : 26 - Width : 189 + Width : 184 Height : 30 Effect : load Effect Priority : 0 @@ -247,7 +256,7 @@ Text tHeading Fill : solid color Style : flat Associated Keyboard : none - Font ID : 2 + Font ID : 1 Back. Color : 6371 Font Color : 65535 Horizontal Alignment : center @@ -276,25 +285,6 @@ Picture p0 Effect Time : 300 Picture ID : 0 -QR Code qr0 - Attributes - ID : 14 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 68 - y coordinate : 78 - Width : 200 - Height : 200 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Logo overlay : no - Text : - Max. Text Size : 100 - Button bNext Attributes ID : 3 @@ -398,15 +388,15 @@ Button bPrev Button bText1 Attributes - ID : 17 + ID : 19 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 61 - y coordinate : 339 - Width : 214 + x coordinate : 84 + y coordinate : 342 + Width : 212 Height : 30 Effect : load Effect Priority : 0 @@ -445,14 +435,14 @@ Button bText1 Button bText2 Attributes - ID : 21 + ID : 23 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 63 - y coordinate : 434 + x coordinate : 80 + y coordinate : 439 Width : 213 Height : 30 Effect : load @@ -498,8 +488,8 @@ Dual-state Button btOnOff1 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 225 - y coordinate : 330 + x coordinate : 249 + y coordinate : 285 Width : 50 Height : 50 Effect : load @@ -537,14 +527,14 @@ Dual-state Button btOnOff1 Dual-state Button btOnOff2 Attributes - ID : 18 + ID : 20 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 226 - y coordinate : 425 + x coordinate : 251 + y coordinate : 382 Width : 50 Height : 50 Effect : load @@ -582,7 +572,7 @@ Dual-state Button btOnOff2 Hotspot mSwipeNext Attributes - ID : 25 + ID : 11 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -591,7 +581,7 @@ Hotspot mSwipeNext x coordinate : 311 y coordinate : 5 Width : 9 - Height : 470 + Height : 475 Effect : load Effect Priority : 0 Effect Time : 300 @@ -602,16 +592,16 @@ Hotspot mSwipeNext Hotspot mSwipeUp Attributes - ID : 26 + ID : 12 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 10 + x coordinate : 12 y coordinate : 0 - Width : 300 - Height : 9 + Width : 295 + Height : 10 Effect : load Effect Priority : 0 Effect Time : 300 @@ -622,7 +612,7 @@ Hotspot mSwipeUp Hotspot mSwipePrev Attributes - ID : 27 + ID : 13 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -631,7 +621,7 @@ Hotspot mSwipePrev x coordinate : 0 y coordinate : 5 Width : 9 - Height : 470 + Height : 475 Effect : load Effect Priority : 0 Effect Time : 300 @@ -640,6 +630,38 @@ Hotspot mSwipePrev Touch Press Event click bPrev,1 +Hotspot m0 + Attributes + ID : 29 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 57 + y coordinate : 77 + Width : 200 + Height : 200 + Effect : load + Effect Priority : 0 + Effect Time : 300 + +Hotspot m1 + Attributes + ID : 31 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 57 + y coordinate : 144 + Width : 200 + Height : 200 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Timer tmSerial Attributes ID : 5 @@ -733,7 +755,7 @@ Timer tmSerial bNext.txt="" } //text qrcode - spstr strCommand.txt,qr0.txt,"~",3 + spstr strCommand.txt,vaQR.txt,"~",3 // get Type spstr strCommand.txt,type1.txt,"~",4 // get internal name @@ -856,6 +878,16 @@ Timer tmSerial // get Text (optional Value) spstr strCommand.txt,bText2.txt,"~",15 } + if(type2.txt=="delete"||type2.txt=="") + { + if(type1.txt=="delete"||type1.txt=="") + { + qrcode m1.x,m1.y,200,6371,65535,-1,vaQR.txt + } + }else + { + qrcode m0.x,m0.y,200,6371,65535,-1,vaQR.txt + } } 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 62aee09d..7c600c21 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 @@ -2,10 +2,6 @@ Program.s 0 Component(s) 10 Line(s) of event code 10 Unique line(s) of event code -cardQR - 30 Component(s) - 362 Line(s) of event code - 211 Unique line(s) of event code pageIcons 6 Component(s) 0 Line(s) of event code @@ -18,6 +14,10 @@ popupLight 27 Component(s) 352 Line(s) of event code 191 Unique line(s) of event code +cardQR + 32 Component(s) + 374 Line(s) of event code + 218 Unique line(s) of event code popupShutter 20 Component(s) 248 Line(s) of event code @@ -57,6 +57,6 @@ screensaver Total 13 Page(s) - 418 Component(s) - 4723 Line(s) of event code - 1244 Unique line(s) of event code + 420 Component(s) + 4735 Line(s) of event code + 1249 Unique line(s) of event code diff --git a/HMI/US/portrait/n2t-out/cardQR.txt b/HMI/US/portrait/n2t-out/cardQR.txt index 212c8e9e..22c20e9a 100644 --- a/HMI/US/portrait/n2t-out/cardQR.txt +++ b/HMI/US/portrait/n2t-out/cardQR.txt @@ -30,12 +30,14 @@ Page cardQR vis tIcon2,0 vis tEntity2,0 vis bText2,0 + tsw m0,0 + tsw m1,0 Variable (string) strCommand Attributes Scope : local Text : - Max. Text Size: 270 + Max. Text Size: 275 Variable (string) entn Attributes @@ -91,6 +93,12 @@ Variable (string) type2 Text : Max. Text Size: 10 +Variable (string) vaQR + Attributes + Scope : local + Text : + Max. Text Size: 80 + Text tEntity1 Attributes Scope : local @@ -148,15 +156,6 @@ Picture p0 Disable release event after dragging: 0 Send Component ID : disabled -QR Code qr0 - Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Text : - Max. Text Size : 100 - Button bNext Attributes Scope : local @@ -351,6 +350,20 @@ Hotspot mSwipePrev Touch Press Event click bPrev,1 +Hotspot m0 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + +Hotspot m1 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Timer tmSerial Attributes Scope : local @@ -443,7 +456,7 @@ Timer tmSerial bNext.txt="" } //text qrcode - spstr strCommand.txt,qr0.txt,"~",3 + spstr strCommand.txt,vaQR.txt,"~",3 // get Type spstr strCommand.txt,type1.txt,"~",4 // get internal name @@ -566,6 +579,16 @@ Timer tmSerial // get Text (optional Value) spstr strCommand.txt,bText2.txt,"~",15 } + if(type2.txt=="delete"||type2.txt=="") + { + if(type1.txt=="delete"||type1.txt=="") + { + qrcode m1.x,m1.y,200,6371,65535,-1,vaQR.txt + } + }else + { + qrcode m0.x,m0.y,200,6371,65535,-1,vaQR.txt + } } if(tInstruction.txt=="time") {