diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index e514e3c2..416ec265 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-21 14:27:14.739536696 +0000 -+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-21 14:27:15.731231871 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-21 14:30:06.481412328 +0000 ++++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-21 14:30:07.333409902 +0000 @@ -11,6 +11,4 @@ // dim value int dimValue=40 @@ -8,212 +8,9 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt - // fix touch offset - lcd_dev fffb 0002 0000 0020 page pageStartup -diff -bur HMI/n2t-out/cardQR.txt HMI/US/landscape/n2t-out/cardQR.txt ---- HMI/n2t-out/cardQR.txt 2022-05-21 14:27:14.739536696 +0000 -+++ HMI/US/landscape/n2t-out/cardQR.txt 2022-05-21 14:27:15.731231871 +0000 -@@ -19,16 +19,6 @@ - vis tId,0 - vis bPrev,0 - vis bNext,0 -- //ui e1 -- vis btOnOff1,0 -- vis tIcon1,0 -- vis tEntity1,0 -- vis bText1,0 -- //ui e2 -- vis btOnOff2,0 -- vis tIcon2,0 -- vis tEntity2,0 -- vis bText2,0 - - Variable (string) strCommand - Attributes -@@ -78,18 +68,6 @@ - Text : - Max. Text Size: 80 - --Variable (string) type1 -- Attributes -- Scope : local -- Text : -- Max. Text Size: 10 -- --Variable (string) type2 -- Attributes -- Scope : local -- Text : -- Max. Text Size: 10 -- - Text tEntity1 - Attributes - Scope : local -@@ -137,7 +115,7 @@ - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none -- Text : -+ Text : testHeading - Max. Text Size : 40 - - Picture p0 -@@ -153,7 +131,7 @@ - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled -- Text : -+ Text : WIFI:S:SSID;T:WPA;P:PASSWORD;; - Max. Text Size : 105 - - Button bNext -@@ -454,9 +432,8 @@ - spstr strCommand.txt,tInstruction.txt,"~",0 - if(tInstruction.txt=="entityUpd") - { -- // command format: entityUpd,heading,navigation,textQR[,type,internalName,iconId,displayName,optionalValue]x2 -- //tHeading -- spstr strCommand.txt,tHeading.txt,"~",1 -+ //entn -+ spstr strCommand.txt,entn.txt,"~",1 - // navigation icons - spstr strCommand.txt,tId.txt,"~",2 - spstr tId.txt,tTmp.txt,"|",0 -@@ -484,130 +461,10 @@ - vis bNext,1 - bNext.txt="" - } -+ //text heading -+ spstr strCommand.txt,tHeading.txt,"~",3 - //text qrcode -- spstr strCommand.txt,qr0.txt,"~",3 -- // get Type -- spstr strCommand.txt,type1.txt,"~",4 -- // get internal name -- spstr strCommand.txt,entn1.txt,"~",5 -- if(type1.txt=="delete"||type1.txt=="") -- { -- vis btOnOff1,0 -- vis tEntity1,0 -- vis tIcon1,0 -- vis bText1,0 -- }else -- { -- // change icon -- spstr strCommand.txt,tIcon1.txt,"~",6 -- vis tIcon1,1 -- // change icon color -- spstr strCommand.txt,tTmp.txt,"~",7 -- covx tTmp.txt,sys0,0,0 -- tIcon1.pco=sys0 -- // set name -- spstr strCommand.txt,tEntity1.txt,"~",8 -- vis tEntity1,1 -- } -- if(type1.txt=="light") -- { -- vis btOnOff1,1 -- vis bText1,0 -- // get Button State (optional Value) -- spstr strCommand.txt,tTmp.txt,"~",9 -- covx tTmp.txt,sys0,0,0 -- btOnOff1.val=sys0 -- } -- if(type1.txt=="switch") -- { -- vis btOnOff1,1 -- vis bText1,0 -- // get Button State (optional Value) -- spstr strCommand.txt,tTmp.txt,"~",9 -- covx tTmp.txt,sys0,0,0 -- btOnOff1.val=sys0 -- } -- if(type1.txt=="text") -- { -- vis btOnOff1,0 -- vis bText1,1 -- tsw bText1,0 -- bText1.pco=65535 -- bText1.pco2=65535 -- // get Text (optional Value) -- spstr strCommand.txt,bText1.txt,"~",9 -- } -- if(type1.txt=="button") -- { -- vis btOnOff1,0 -- vis bText1,1 -- tsw bText1,1 -- bText1.pco=1374 -- bText1.pco2=1374 -- // get Text (optional Value) -- spstr strCommand.txt,bText1.txt,"~",9 -- } -- // get Type -- spstr strCommand.txt,type2.txt,"~",10 -- // get internal name -- spstr strCommand.txt,entn2.txt,"~",11 -- if(type2.txt=="delete"||type2.txt=="") -- { -- vis btOnOff2,0 -- vis tEntity2,0 -- vis tIcon2,0 -- vis bText2,0 -- }else -- { -- // change icon -- spstr strCommand.txt,tIcon2.txt,"~",12 -- vis tIcon2,1 -- // change icon color -- spstr strCommand.txt,tTmp.txt,"~",13 -- covx tTmp.txt,sys0,0,0 -- tIcon2.pco=sys0 -- // set name -- spstr strCommand.txt,tEntity2.txt,"~",14 -- vis tEntity2,1 -- } -- if(type2.txt=="light") -- { -- vis btOnOff2,1 -- vis bText2,0 -- // get Button State (optional Value) -- spstr strCommand.txt,tTmp.txt,"~",15 -- covx tTmp.txt,sys0,0,0 -- btOnOff2.val=sys0 -- } -- if(type2.txt=="switch") -- { -- vis btOnOff2,1 -- vis bText2,0 -- // get Button State (optional Value) -- spstr strCommand.txt,tTmp.txt,"~",15 -- covx tTmp.txt,sys0,0,0 -- btOnOff2.val=sys0 -- } -- if(type2.txt=="text") -- { -- vis btOnOff2,0 -- vis bText2,1 -- tsw bText2,0 -- bText2.pco=65535 -- bText2.pco2=65535 -- // get Text (optional Value) -- spstr strCommand.txt,bText2.txt,"~",15 -- } -- if(type2.txt=="button") -- { -- vis btOnOff2,0 -- vis bText2,1 -- tsw bText2,1 -- bText2.pco=1374 -- bText2.pco2=1374 -- // get Text (optional Value) -- spstr strCommand.txt,bText2.txt,"~",15 -- } -+ spstr strCommand.txt,qr0.txt,"~",4 - } - if(tInstruction.txt=="time") - { diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-05-21 14:27:14.739536696 +0000 -+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-21 14:27:15.731231871 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-21 14:30:06.481412328 +0000 ++++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-21 14:30:07.337409891 +0000 @@ -177,7 +177,7 @@ recmod=1 bauds=115200 diff --git a/HMI/US/landscape/n2t-out-visual/cardQR.txt b/HMI/US/landscape/n2t-out-visual/cardQR.txt index b3e2a0f7..56cc825e 100644 --- a/HMI/US/landscape/n2t-out-visual/cardQR.txt +++ b/HMI/US/landscape/n2t-out-visual/cardQR.txt @@ -27,6 +27,16 @@ Page cardQR vis tId,0 vis bPrev,0 vis bNext,0 + //ui e1 + vis btOnOff1,0 + vis tIcon1,0 + vis tEntity1,0 + vis bText1,0 + //ui e2 + vis btOnOff2,0 + vis tIcon2,0 + vis tEntity2,0 + vis bText2,0 Variable (string) strCommand Attributes @@ -84,6 +94,20 @@ Variable (string) entn2 Text : Max. Text Size: 80 +Variable (string) type1 + Attributes + ID : 28 + Scope : local + Text : + Max. Text Size: 10 + +Variable (string) type2 + Attributes + ID : 29 + Scope : local + Text : + Max. Text Size: 10 + Text tEntity1 Attributes ID : 18 @@ -228,7 +252,7 @@ Text tHeading Horizontal Alignment : center Vertical Alignment : center Input Type : character - Text : testHeading + Text : Max. Text Size : 40 Word wrap : disabled Horizontal Spacing : 0 @@ -267,7 +291,7 @@ QR Code qr0 Effect Priority : 0 Effect Time : 300 Logo overlay : no - Text : WIFI:S:SSID;T:WPA;P:PASSWORD;; + Text : Max. Text Size : 105 Button bNext @@ -720,8 +744,9 @@ Timer tmSerial spstr strCommand.txt,tInstruction.txt,"~",0 if(tInstruction.txt=="entityUpd") { - //entn - spstr strCommand.txt,entn.txt,"~",1 + // command format: entityUpd,heading,navigation,textQR[,type,internalName,iconId,displayName,optionalValue]x2 + //tHeading + spstr strCommand.txt,tHeading.txt,"~",1 // navigation icons spstr strCommand.txt,tId.txt,"~",2 spstr tId.txt,tTmp.txt,"|",0 @@ -749,10 +774,130 @@ Timer tmSerial vis bNext,1 bNext.txt="" } - //text heading - spstr strCommand.txt,tHeading.txt,"~",3 //text qrcode - spstr strCommand.txt,qr0.txt,"~",4 + spstr strCommand.txt,qr0.txt,"~",3 + // get Type + spstr strCommand.txt,type1.txt,"~",4 + // get internal name + spstr strCommand.txt,entn1.txt,"~",5 + if(type1.txt=="delete"||type1.txt=="") + { + vis btOnOff1,0 + vis tEntity1,0 + vis tIcon1,0 + vis bText1,0 + }else + { + // change icon + spstr strCommand.txt,tIcon1.txt,"~",6 + vis tIcon1,1 + // change icon color + spstr strCommand.txt,tTmp.txt,"~",7 + covx tTmp.txt,sys0,0,0 + tIcon1.pco=sys0 + // set name + spstr strCommand.txt,tEntity1.txt,"~",8 + vis tEntity1,1 + } + if(type1.txt=="light") + { + vis btOnOff1,1 + vis bText1,0 + // get Button State (optional Value) + spstr strCommand.txt,tTmp.txt,"~",9 + covx tTmp.txt,sys0,0,0 + btOnOff1.val=sys0 + } + if(type1.txt=="switch") + { + vis btOnOff1,1 + vis bText1,0 + // get Button State (optional Value) + spstr strCommand.txt,tTmp.txt,"~",9 + covx tTmp.txt,sys0,0,0 + btOnOff1.val=sys0 + } + if(type1.txt=="text") + { + vis btOnOff1,0 + vis bText1,1 + tsw bText1,0 + bText1.pco=65535 + bText1.pco2=65535 + // get Text (optional Value) + spstr strCommand.txt,bText1.txt,"~",9 + } + if(type1.txt=="button") + { + vis btOnOff1,0 + vis bText1,1 + tsw bText1,1 + bText1.pco=1374 + bText1.pco2=1374 + // get Text (optional Value) + spstr strCommand.txt,bText1.txt,"~",9 + } + // get Type + spstr strCommand.txt,type2.txt,"~",10 + // get internal name + spstr strCommand.txt,entn2.txt,"~",11 + if(type2.txt=="delete"||type2.txt=="") + { + vis btOnOff2,0 + vis tEntity2,0 + vis tIcon2,0 + vis bText2,0 + }else + { + // change icon + spstr strCommand.txt,tIcon2.txt,"~",12 + vis tIcon2,1 + // change icon color + spstr strCommand.txt,tTmp.txt,"~",13 + covx tTmp.txt,sys0,0,0 + tIcon2.pco=sys0 + // set name + spstr strCommand.txt,tEntity2.txt,"~",14 + vis tEntity2,1 + } + if(type2.txt=="light") + { + vis btOnOff2,1 + vis bText2,0 + // get Button State (optional Value) + spstr strCommand.txt,tTmp.txt,"~",15 + covx tTmp.txt,sys0,0,0 + btOnOff2.val=sys0 + } + if(type2.txt=="switch") + { + vis btOnOff2,1 + vis bText2,0 + // get Button State (optional Value) + spstr strCommand.txt,tTmp.txt,"~",15 + covx tTmp.txt,sys0,0,0 + btOnOff2.val=sys0 + } + if(type2.txt=="text") + { + vis btOnOff2,0 + vis bText2,1 + tsw bText2,0 + bText2.pco=65535 + bText2.pco2=65535 + // get Text (optional Value) + spstr strCommand.txt,bText2.txt,"~",15 + } + if(type2.txt=="button") + { + vis btOnOff2,0 + vis bText2,1 + tsw bText2,1 + bText2.pco=1374 + bText2.pco2=1374 + // get Text (optional Value) + spstr strCommand.txt,bText2.txt,"~",15 + } } if(tInstruction.txt=="time") { 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 a3db79dc..81209d8e 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 @@ -47,9 +47,9 @@ cardGrid 439 Line(s) of event code 254 Unique line(s) of event code cardQR - 28 Component(s) - 252 Line(s) of event code - 140 Unique line(s) of event code + 30 Component(s) + 363 Line(s) of event code + 205 Unique line(s) of event code cardEntities 65 Component(s) 1069 Line(s) of event code @@ -57,6 +57,6 @@ cardEntities Total 13 Page(s) - 400 Component(s) - 4236 Line(s) of event code - 1105 Unique line(s) of event code + 402 Component(s) + 4347 Line(s) of event code + 1117 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 92dbd9e6..bb7d2918 100644 --- a/HMI/US/landscape/n2t-out/cardQR.txt +++ b/HMI/US/landscape/n2t-out/cardQR.txt @@ -19,6 +19,16 @@ Page cardQR vis tId,0 vis bPrev,0 vis bNext,0 + //ui e1 + vis btOnOff1,0 + vis tIcon1,0 + vis tEntity1,0 + vis bText1,0 + //ui e2 + vis btOnOff2,0 + vis tIcon2,0 + vis tEntity2,0 + vis bText2,0 Variable (string) strCommand Attributes @@ -68,6 +78,18 @@ Variable (string) entn2 Text : Max. Text Size: 80 +Variable (string) type1 + Attributes + Scope : local + Text : + Max. Text Size: 10 + +Variable (string) type2 + Attributes + Scope : local + Text : + Max. Text Size: 10 + Text tEntity1 Attributes Scope : local @@ -115,7 +137,7 @@ Text tHeading Disable release event after dragging: 0 Send Component ID : disabled Associated Keyboard : none - Text : testHeading + Text : Max. Text Size : 40 Picture p0 @@ -131,7 +153,7 @@ QR Code qr0 Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled - Text : WIFI:S:SSID;T:WPA;P:PASSWORD;; + Text : Max. Text Size : 105 Button bNext @@ -432,8 +454,9 @@ Timer tmSerial spstr strCommand.txt,tInstruction.txt,"~",0 if(tInstruction.txt=="entityUpd") { - //entn - spstr strCommand.txt,entn.txt,"~",1 + // command format: entityUpd,heading,navigation,textQR[,type,internalName,iconId,displayName,optionalValue]x2 + //tHeading + spstr strCommand.txt,tHeading.txt,"~",1 // navigation icons spstr strCommand.txt,tId.txt,"~",2 spstr tId.txt,tTmp.txt,"|",0 @@ -461,10 +484,130 @@ Timer tmSerial vis bNext,1 bNext.txt="" } - //text heading - spstr strCommand.txt,tHeading.txt,"~",3 //text qrcode - spstr strCommand.txt,qr0.txt,"~",4 + spstr strCommand.txt,qr0.txt,"~",3 + // get Type + spstr strCommand.txt,type1.txt,"~",4 + // get internal name + spstr strCommand.txt,entn1.txt,"~",5 + if(type1.txt=="delete"||type1.txt=="") + { + vis btOnOff1,0 + vis tEntity1,0 + vis tIcon1,0 + vis bText1,0 + }else + { + // change icon + spstr strCommand.txt,tIcon1.txt,"~",6 + vis tIcon1,1 + // change icon color + spstr strCommand.txt,tTmp.txt,"~",7 + covx tTmp.txt,sys0,0,0 + tIcon1.pco=sys0 + // set name + spstr strCommand.txt,tEntity1.txt,"~",8 + vis tEntity1,1 + } + if(type1.txt=="light") + { + vis btOnOff1,1 + vis bText1,0 + // get Button State (optional Value) + spstr strCommand.txt,tTmp.txt,"~",9 + covx tTmp.txt,sys0,0,0 + btOnOff1.val=sys0 + } + if(type1.txt=="switch") + { + vis btOnOff1,1 + vis bText1,0 + // get Button State (optional Value) + spstr strCommand.txt,tTmp.txt,"~",9 + covx tTmp.txt,sys0,0,0 + btOnOff1.val=sys0 + } + if(type1.txt=="text") + { + vis btOnOff1,0 + vis bText1,1 + tsw bText1,0 + bText1.pco=65535 + bText1.pco2=65535 + // get Text (optional Value) + spstr strCommand.txt,bText1.txt,"~",9 + } + if(type1.txt=="button") + { + vis btOnOff1,0 + vis bText1,1 + tsw bText1,1 + bText1.pco=1374 + bText1.pco2=1374 + // get Text (optional Value) + spstr strCommand.txt,bText1.txt,"~",9 + } + // get Type + spstr strCommand.txt,type2.txt,"~",10 + // get internal name + spstr strCommand.txt,entn2.txt,"~",11 + if(type2.txt=="delete"||type2.txt=="") + { + vis btOnOff2,0 + vis tEntity2,0 + vis tIcon2,0 + vis bText2,0 + }else + { + // change icon + spstr strCommand.txt,tIcon2.txt,"~",12 + vis tIcon2,1 + // change icon color + spstr strCommand.txt,tTmp.txt,"~",13 + covx tTmp.txt,sys0,0,0 + tIcon2.pco=sys0 + // set name + spstr strCommand.txt,tEntity2.txt,"~",14 + vis tEntity2,1 + } + if(type2.txt=="light") + { + vis btOnOff2,1 + vis bText2,0 + // get Button State (optional Value) + spstr strCommand.txt,tTmp.txt,"~",15 + covx tTmp.txt,sys0,0,0 + btOnOff2.val=sys0 + } + if(type2.txt=="switch") + { + vis btOnOff2,1 + vis bText2,0 + // get Button State (optional Value) + spstr strCommand.txt,tTmp.txt,"~",15 + covx tTmp.txt,sys0,0,0 + btOnOff2.val=sys0 + } + if(type2.txt=="text") + { + vis btOnOff2,0 + vis bText2,1 + tsw bText2,0 + bText2.pco=65535 + bText2.pco2=65535 + // get Text (optional Value) + spstr strCommand.txt,bText2.txt,"~",15 + } + if(type2.txt=="button") + { + vis btOnOff2,0 + vis bText2,1 + tsw bText2,1 + bText2.pco=1374 + bText2.pco2=1374 + // get Text (optional Value) + spstr strCommand.txt,bText2.txt,"~",15 + } } if(tInstruction.txt=="time") { diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index 1be729a5..96e4e956 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-21 14:27:14.739536696 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-21 14:27:15.215443403 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-21 14:30:06.481412328 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-21 14:30:06.897411144 +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/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt ---- HMI/n2t-out/cardAlarm.txt 2022-05-21 14:27:14.739536696 +0000 -+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-21 14:27:15.215443403 +0000 +--- HMI/n2t-out/cardAlarm.txt 2022-05-21 14:30:06.481412328 +0000 ++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-21 14:30:06.897411144 +0000 @@ -788,10 +788,6 @@ { page cardAlarm @@ -25,8 +25,8 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt // end of user code udelete payloadLength-1 diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt ---- HMI/n2t-out/cardEntities.txt 2022-05-21 14:27:14.739536696 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-21 14:27:15.215443403 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-05-21 14:30:06.485412317 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-21 14:30:06.901411132 +0000 @@ -62,6 +62,16 @@ vis bText4,0 vis hSlider4,0 @@ -568,8 +568,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt if(tInstruction.txt=="time") { diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt ---- HMI/n2t-out/cardGrid.txt 2022-05-21 14:27:14.739536696 +0000 -+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-21 14:27:15.215443403 +0000 +--- HMI/n2t-out/cardGrid.txt 2022-05-21 14:30:06.481412328 +0000 ++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-21 14:30:06.897411144 +0000 @@ -869,10 +869,6 @@ { page cardAlarm @@ -582,8 +582,8 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt if(tInstruction.txt=="time") { diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt ---- HMI/n2t-out/cardMedia.txt 2022-05-21 14:27:14.739536696 +0000 -+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-05-21 14:27:15.215443403 +0000 +--- HMI/n2t-out/cardMedia.txt 2022-05-21 14:30:06.481412328 +0000 ++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-05-21 14:30:06.897411144 +0000 @@ -740,10 +740,6 @@ { page cardAlarm @@ -596,8 +596,8 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt // end of user code udelete payloadLength-1 diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt ---- HMI/n2t-out/cardQR.txt 2022-05-21 14:27:14.739536696 +0000 -+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-21 14:27:15.215443403 +0000 +--- HMI/n2t-out/cardQR.txt 2022-05-21 14:30:06.481412328 +0000 ++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-21 14:30:06.897411144 +0000 @@ -19,16 +19,6 @@ vis tId,0 vis bPrev,0 @@ -805,8 +805,8 @@ diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt // end of user code udelete payloadLength-1 diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt ---- HMI/n2t-out/cardThermo.txt 2022-05-21 14:27:14.739536696 +0000 -+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-21 14:27:15.215443403 +0000 +--- HMI/n2t-out/cardThermo.txt 2022-05-21 14:30:06.481412328 +0000 ++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-21 14:30:06.897411144 +0000 @@ -1192,10 +1192,6 @@ { page cardAlarm @@ -819,8 +819,8 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.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-21 14:27:14.739536696 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-21 14:27:15.215443403 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-21 14:30:06.481412328 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-21 14:30:06.897411144 +0000 @@ -142,7 +142,7 @@ Disable release event after dragging: 0 Send Component ID : disabled @@ -860,8 +860,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt // end of user code udelete payloadLength-1 diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt ---- HMI/n2t-out/popupLight.txt 2022-05-21 14:27:14.739536696 +0000 -+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-21 14:27:15.215443403 +0000 +--- HMI/n2t-out/popupLight.txt 2022-05-21 14:30:06.481412328 +0000 ++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-21 14:30:06.901411132 +0000 @@ -618,10 +618,6 @@ { page cardAlarm @@ -874,8 +874,8 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt // end of user code udelete payloadLength-1 diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt ---- HMI/n2t-out/popupNotify.txt 2022-05-21 14:27:14.739536696 +0000 -+++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-05-21 14:27:15.215443403 +0000 +--- HMI/n2t-out/popupNotify.txt 2022-05-21 14:30:06.481412328 +0000 ++++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-05-21 14:30:06.897411144 +0000 @@ -381,10 +381,6 @@ { page cardAlarm @@ -888,8 +888,8 @@ diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt // end of user code udelete payloadLength-1 diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt ---- HMI/n2t-out/popupShutter.txt 2022-05-21 14:27:14.739536696 +0000 -+++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-05-21 14:27:15.215443403 +0000 +--- HMI/n2t-out/popupShutter.txt 2022-05-21 14:30:06.481412328 +0000 ++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-05-21 14:30:06.897411144 +0000 @@ -422,10 +422,6 @@ { page cardAlarm @@ -902,8 +902,8 @@ diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt // end of user code udelete payloadLength-1 diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt ---- HMI/n2t-out/screensaver.txt 2022-05-21 14:27:14.739536696 +0000 -+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-21 14:27:15.215443403 +0000 +--- HMI/n2t-out/screensaver.txt 2022-05-21 14:30:06.481412328 +0000 ++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-21 14:30:06.897411144 +0000 @@ -607,10 +607,6 @@ { page cardAlarm diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index 4dde65bb..8a011e23 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,9 +1,9 @@ -+++ HMI/US/portrait/diff-eu-version.txt 2022-05-21 14:27:15.231436844 +0000 -+--- HMI/n2t-out/Program.s.txt 2022-05-21 14:27:14.739536696 +0000 -++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-21 14:27:15.215443403 +0000 ++++ HMI/US/portrait/diff-eu-version.txt 2022-05-21 14:30:06.913411098 +0000 ++--- HMI/n2t-out/Program.s.txt 2022-05-21 14:30:06.481412328 +0000 +++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-21 14:30:06.897411144 +0000 +diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt -+--- HMI/n2t-out/cardAlarm.txt 2022-05-21 14:27:14.739536696 +0000 -++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-21 14:27:15.215443403 +0000 ++--- HMI/n2t-out/cardAlarm.txt 2022-05-21 14:30:06.481412328 +0000 +++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-21 14:30:06.897411144 +0000 +@@ -788,10 +788,6 @@ + { + page cardAlarm @@ -15,8 +15,8 @@ + } + // end of user code + udelete payloadLength-1 -+--- HMI/n2t-out/cardEntities.txt 2022-05-21 14:27:14.739536696 +0000 -++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-21 14:27:15.215443403 +0000 ++--- HMI/n2t-out/cardEntities.txt 2022-05-21 14:30:06.485412317 +0000 +++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-21 14:30:06.901411132 +0000 + Hotspot mSwipeNext + Scope : local +@@ -1277,28 +1505,6 @@ @@ -148,8 +148,8 @@ + if(tInstruction.txt=="time") + { +diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt -+--- HMI/n2t-out/cardGrid.txt 2022-05-21 14:27:14.739536696 +0000 -++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-21 14:27:15.215443403 +0000 ++--- HMI/n2t-out/cardGrid.txt 2022-05-21 14:30:06.481412328 +0000 +++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-21 14:30:06.897411144 +0000 +@@ -869,10 +869,6 @@ + { + page cardAlarm @@ -162,8 +162,8 @@ + if(tInstruction.txt=="time") + { +diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt -+--- HMI/n2t-out/cardMedia.txt 2022-05-21 14:27:14.739536696 +0000 -++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-05-21 14:27:15.215443403 +0000 ++--- HMI/n2t-out/cardMedia.txt 2022-05-21 14:30:06.481412328 +0000 +++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-05-21 14:30:06.897411144 +0000 +@@ -740,10 +740,6 @@ + { + page cardAlarm @@ -176,8 +176,8 @@ + // end of user code + udelete payloadLength-1 +diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt -+--- HMI/n2t-out/cardQR.txt 2022-05-21 14:27:14.739536696 +0000 -++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-21 14:27:15.215443403 +0000 ++--- HMI/n2t-out/cardQR.txt 2022-05-21 14:30:06.481412328 +0000 +++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-21 14:30:06.897411144 +0000 +@@ -19,16 +19,6 @@ + vis tId,0 + vis bPrev,0 @@ -385,8 +385,8 @@ + // end of user code + udelete payloadLength-1 +diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt -+--- HMI/n2t-out/cardThermo.txt 2022-05-21 14:27:14.739536696 +0000 -++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-21 14:27:15.215443403 +0000 ++--- HMI/n2t-out/cardThermo.txt 2022-05-21 14:30:06.481412328 +0000 +++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-21 14:30:06.897411144 +0000 +@@ -1192,10 +1192,6 @@ + { + page cardAlarm @@ -398,8 +398,8 @@ + } + if(tInstruction.txt=="time") + { -+--- HMI/n2t-out/pageStartup.txt 2022-05-21 14:27:14.739536696 +0000 -++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-21 14:27:15.215443403 +0000 ++--- HMI/n2t-out/pageStartup.txt 2022-05-21 14:30:06.481412328 +0000 +++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-21 14:30:06.897411144 +0000 +@@ -152,7 +152,7 @@ + Disable release event after dragging: 0 + Send Component ID : disabled @@ -421,8 +421,8 @@ + // end of user code + udelete payloadLength-1 +diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt -+--- HMI/n2t-out/popupLight.txt 2022-05-21 14:27:14.739536696 +0000 -++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-21 14:27:15.215443403 +0000 ++--- HMI/n2t-out/popupLight.txt 2022-05-21 14:30:06.481412328 +0000 +++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-21 14:30:06.901411132 +0000 +@@ -618,10 +618,6 @@ + { + page cardAlarm @@ -435,8 +435,8 @@ + // end of user code + udelete payloadLength-1 +diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt -+--- HMI/n2t-out/popupNotify.txt 2022-05-21 14:27:14.739536696 +0000 -++++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-05-21 14:27:15.215443403 +0000 ++--- HMI/n2t-out/popupNotify.txt 2022-05-21 14:30:06.481412328 +0000 +++++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-05-21 14:30:06.897411144 +0000 +@@ -381,10 +381,6 @@ + { + page cardAlarm @@ -449,8 +449,8 @@ + // end of user code + udelete payloadLength-1 +diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt -+--- HMI/n2t-out/popupShutter.txt 2022-05-21 14:27:14.739536696 +0000 -++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-05-21 14:27:15.215443403 +0000 ++--- HMI/n2t-out/popupShutter.txt 2022-05-21 14:30:06.481412328 +0000 +++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-05-21 14:30:06.897411144 +0000 +@@ -422,10 +422,6 @@ + { + page cardAlarm @@ -463,8 +463,8 @@ + // end of user code + udelete payloadLength-1 +diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt -+--- HMI/n2t-out/screensaver.txt 2022-05-21 14:27:14.739536696 +0000 -++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-21 14:27:15.215443403 +0000 ++--- HMI/n2t-out/screensaver.txt 2022-05-21 14:30:06.481412328 +0000 +++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-21 14:30:06.897411144 +0000 +@@ -607,10 +607,6 @@ + { + page cardAlarm