diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index cbe22191..3be5048f 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-22 18:46:01.356130319 +0000 -+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-22 18:46:02.352144025 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-22 19:32:14.502677064 +0000 ++++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-22 19:32:15.366674234 +0000 @@ -11,6 +11,4 @@ // dim value int dimValue=40 @@ -8,9 +8,21 @@ 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-22 19:32:14.502677064 +0000 ++++ HMI/US/landscape/n2t-out/cardQR.txt 2022-05-22 19:32:15.366674234 +0000 +@@ -34,7 +34,7 @@ + Attributes + Scope : local + Text : +- Max. Text Size: 275 ++ Max. Text Size: 270 + + Variable (string) entn + Attributes diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-05-22 18:46:01.356130319 +0000 -+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-22 18:46:02.352144025 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-22 19:32:14.502677064 +0000 ++++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-22 19:32:15.366674234 +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 8f64c15d..b0eb93c1 100644 --- a/HMI/US/landscape/n2t-out-visual/cardQR.txt +++ b/HMI/US/landscape/n2t-out-visual/cardQR.txt @@ -292,7 +292,7 @@ QR Code qr0 Effect Time : 300 Logo overlay : no Text : - Max. Text Size : 105 + Max. Text Size : 100 Button bNext Attributes @@ -564,8 +564,8 @@ Dual-state Button btOnOff2 Events Touch Press Event - tSend.txt="event,buttonPress2,"+entn1.txt+",OnOff," - covx btOnOff1.val,tTmp.txt,0,0 + tSend.txt="event,buttonPress2,"+entn2.txt+",OnOff," + covx btOnOff2.val,tTmp.txt,0,0 tSend.txt+=tTmp.txt //send calc crc btlen tSend.txt,sys0 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 36680d20..5c0fc908 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 @@ -49,7 +49,7 @@ cardMedia cardQR 30 Component(s) 363 Line(s) of event code - 205 Unique line(s) of event code + 207 Unique line(s) of event code cardEntities 65 Component(s) 1133 Line(s) of event code diff --git a/HMI/US/landscape/n2t-out/cardQR.txt b/HMI/US/landscape/n2t-out/cardQR.txt index 77fcb805..50ada2f8 100644 --- a/HMI/US/landscape/n2t-out/cardQR.txt +++ b/HMI/US/landscape/n2t-out/cardQR.txt @@ -154,7 +154,7 @@ QR Code qr0 Disable release event after dragging: 0 Send Component ID : disabled Text : - Max. Text Size : 105 + Max. Text Size : 100 Button bNext Attributes @@ -302,8 +302,8 @@ Dual-state Button btOnOff2 Events Touch Press Event - tSend.txt="event,buttonPress2,"+entn1.txt+",OnOff," - covx btOnOff1.val,tTmp.txt,0,0 + tSend.txt="event,buttonPress2,"+entn2.txt+",OnOff," + covx btOnOff2.val,tTmp.txt,0,0 tSend.txt+=tTmp.txt //send calc crc btlen tSend.txt,sys0 diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index b76fc3ff..96b37033 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-22 18:46:01.356130319 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-22 18:46:01.836136925 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-22 19:32:14.502677064 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-22 19:32:14.926675675 +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-22 18:46:01.360130374 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-22 18:46:01.836136925 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-05-22 19:32:14.502677064 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-22 19:32:14.926675675 +0000 @@ -62,6 +62,16 @@ vis bText4,0 vis hSlider4,0 @@ -467,9 +467,21 @@ 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-22 19:32:14.502677064 +0000 ++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-22 19:32:14.926675675 +0000 +@@ -34,7 +34,7 @@ + Attributes + Scope : local + Text : +- Max. Text Size: 275 ++ Max. Text Size: 270 + + Variable (string) entn + Attributes diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-05-22 18:46:01.356130319 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-22 18:46:01.836136925 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-22 19:32:14.502677064 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-22 19:32:14.926675675 +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 1dd1c7b9..589d9468 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-22 18:46:01.852137145 +0000 -+--- HMI/n2t-out/Program.s.txt 2022-05-22 18:46:01.356130319 +0000 -++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-22 18:46:01.836136925 +0000 -+--- HMI/n2t-out/cardEntities.txt 2022-05-22 18:46:01.360130374 +0000 -++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-22 18:46:01.836136925 +0000 ++++ HMI/US/portrait/diff-eu-version.txt 2022-05-22 19:32:14.938675636 +0000 ++--- HMI/n2t-out/Program.s.txt 2022-05-22 19:32:14.502677064 +0000 +++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-22 19:32:14.926675675 +0000 ++--- HMI/n2t-out/cardEntities.txt 2022-05-22 19:32:14.502677064 +0000 +++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-22 19:32:14.926675675 +0000 + Hotspot mSwipeNext + Scope : local +@@ -1892,6 +2120,169 @@ @@ -31,5 +31,17 @@ ++ spstr tId.txt,bDown5.txt,"|",2 ++ }else if(tTmp.txt=="enable") ++ spstr tId.txt,bDown5.txt,"|",2 -+--- HMI/n2t-out/pageStartup.txt 2022-05-22 18:46:01.356130319 +0000 -++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-22 18:46:01.836136925 +0000 ++diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt ++--- HMI/n2t-out/cardQR.txt 2022-05-22 19:32:14.502677064 +0000 +++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-22 19:32:14.926675675 +0000 ++@@ -34,7 +34,7 @@ ++ Attributes ++ Scope : local ++ Text : ++- Max. Text Size: 275 +++ Max. Text Size: 270 ++ ++ Variable (string) entn ++ Attributes ++--- HMI/n2t-out/pageStartup.txt 2022-05-22 19:32:14.502677064 +0000 +++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-22 19:32:14.926675675 +0000 diff --git a/HMI/US/portrait/n2t-out-visual/cardQR.txt b/HMI/US/portrait/n2t-out-visual/cardQR.txt index 1cb78c89..0ede21e2 100644 --- a/HMI/US/portrait/n2t-out-visual/cardQR.txt +++ b/HMI/US/portrait/n2t-out-visual/cardQR.txt @@ -292,7 +292,7 @@ QR Code qr0 Effect Time : 300 Logo overlay : no Text : - Max. Text Size : 105 + Max. Text Size : 100 Button bNext Attributes @@ -564,8 +564,8 @@ Dual-state Button btOnOff2 Events Touch Press Event - tSend.txt="event,buttonPress2,"+entn1.txt+",OnOff," - covx btOnOff1.val,tTmp.txt,0,0 + tSend.txt="event,buttonPress2,"+entn2.txt+",OnOff," + covx btOnOff2.val,tTmp.txt,0,0 tSend.txt+=tTmp.txt //send calc crc btlen tSend.txt,sys0 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 18686e8d..04503939 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 @@ -29,7 +29,7 @@ popupLight cardQR 30 Component(s) 363 Line(s) of event code - 205 Unique line(s) of event code + 207 Unique line(s) of event code cardThermo 56 Component(s) 546 Line(s) of event code diff --git a/HMI/US/portrait/n2t-out/cardQR.txt b/HMI/US/portrait/n2t-out/cardQR.txt index 77fcb805..50ada2f8 100644 --- a/HMI/US/portrait/n2t-out/cardQR.txt +++ b/HMI/US/portrait/n2t-out/cardQR.txt @@ -154,7 +154,7 @@ QR Code qr0 Disable release event after dragging: 0 Send Component ID : disabled Text : - Max. Text Size : 105 + Max. Text Size : 100 Button bNext Attributes @@ -302,8 +302,8 @@ Dual-state Button btOnOff2 Events Touch Press Event - tSend.txt="event,buttonPress2,"+entn1.txt+",OnOff," - covx btOnOff1.val,tTmp.txt,0,0 + tSend.txt="event,buttonPress2,"+entn2.txt+",OnOff," + covx btOnOff2.val,tTmp.txt,0,0 tSend.txt+=tTmp.txt //send calc crc btlen tSend.txt,sys0 diff --git a/HMI/n2t-out-visual/cardQR.txt b/HMI/n2t-out-visual/cardQR.txt index 78e2b9a6..2c97a278 100644 --- a/HMI/n2t-out-visual/cardQR.txt +++ b/HMI/n2t-out-visual/cardQR.txt @@ -43,7 +43,7 @@ Variable (string) strCommand ID : 6 Scope : local Text : - Max. Text Size: 270 + Max. Text Size: 275 Variable (string) entn Attributes @@ -292,7 +292,7 @@ QR Code qr0 Effect Time : 300 Logo overlay : no Text : - Max. Text Size : 105 + Max. Text Size : 100 Button bNext Attributes @@ -564,8 +564,8 @@ Dual-state Button btOnOff2 Events Touch Press Event - tSend.txt="event,buttonPress2,"+entn1.txt+",OnOff," - covx btOnOff1.val,tTmp.txt,0,0 + tSend.txt="event,buttonPress2,"+entn2.txt+",OnOff," + covx btOnOff2.val,tTmp.txt,0,0 tSend.txt+=tTmp.txt //send calc crc btlen tSend.txt,sys0 diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index 5ee0781c..722f3d98 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -33,7 +33,7 @@ popupLight cardQR 30 Component(s) 363 Line(s) of event code - 205 Unique line(s) of event code + 207 Unique line(s) of event code popupShutter 20 Component(s) 244 Line(s) of event code diff --git a/HMI/n2t-out/cardQR.txt b/HMI/n2t-out/cardQR.txt index 77fcb805..7f60a8ea 100644 --- a/HMI/n2t-out/cardQR.txt +++ b/HMI/n2t-out/cardQR.txt @@ -34,7 +34,7 @@ Variable (string) strCommand Attributes Scope : local Text : - Max. Text Size: 270 + Max. Text Size: 275 Variable (string) entn Attributes @@ -154,7 +154,7 @@ QR Code qr0 Disable release event after dragging: 0 Send Component ID : disabled Text : - Max. Text Size : 105 + Max. Text Size : 100 Button bNext Attributes @@ -302,8 +302,8 @@ Dual-state Button btOnOff2 Events Touch Press Event - tSend.txt="event,buttonPress2,"+entn1.txt+",OnOff," - covx btOnOff1.val,tTmp.txt,0,0 + tSend.txt="event,buttonPress2,"+entn2.txt+",OnOff," + covx btOnOff2.val,tTmp.txt,0,0 tSend.txt+=tTmp.txt //send calc crc btlen tSend.txt,sys0