diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 83158d07..27a9eda5 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 06:19:25.833549791 +0000 -+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-21 06:19:26.669564883 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-21 09:32:12.542424222 +0000 ++++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-21 09:32:13.426433721 +0000 @@ -11,6 +11,3 @@ // dim value int dimValue=40 @@ -10,8 +10,8 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt - page pageStartup Only in HMI/n2t-out: cardQR.txt diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-05-21 06:19:25.833549791 +0000 -+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-21 06:19:26.669564883 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-21 09:32:12.546424265 +0000 ++++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-21 09:32:13.426433721 +0000 @@ -177,7 +177,7 @@ recmod=1 bauds=115200 @@ -22,8 +22,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC diff -bur HMI/n2t-out/pageTest.txt HMI/US/landscape/n2t-out/pageTest.txt ---- HMI/n2t-out/pageTest.txt 2022-05-21 06:19:25.833549791 +0000 -+++ HMI/US/landscape/n2t-out/pageTest.txt 2022-05-21 06:19:26.669564883 +0000 +--- HMI/n2t-out/pageTest.txt 2022-05-21 09:32:12.542424222 +0000 ++++ HMI/US/landscape/n2t-out/pageTest.txt 2022-05-21 09:32:13.426433721 +0000 @@ -176,17 +176,3 @@ Touch Press Event bauds=115200 diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index 10b1c105..bbdde362 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 06:19:25.833549791 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-21 06:19:26.257557445 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-21 09:32:12.542424222 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-21 09:32:12.970428821 +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 06:19:25.833549791 +0000 -+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-21 06:19:26.261557518 +0000 +--- HMI/n2t-out/cardAlarm.txt 2022-05-21 09:32:12.546424265 +0000 ++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-21 09:32:12.970428821 +0000 @@ -466,7 +466,7 @@ prints crcval,2 tCode.txt="" @@ -77,8 +77,8 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt click bPrev,1 } diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt ---- HMI/n2t-out/cardEntities.txt 2022-05-21 06:19:25.833549791 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-21 06:19:26.261557518 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-05-21 09:32:12.546424265 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-21 09:32:12.974428864 +0000 @@ -62,6 +62,16 @@ vis bText4,0 vis hSlider4,0 @@ -493,26 +493,8 @@ 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-21 06:19:25.833549791 +0000 -+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-21 06:19:26.261557518 +0000 -@@ -198,7 +198,7 @@ - Disable release event after dragging: 0 - Send Component ID : disabled - State : unpressed -- Text : newtxt -+ Text : - Max. Text Size : 10 - - Events -@@ -223,7 +223,7 @@ - Disable release event after dragging: 0 - Send Component ID : disabled - State : unpressed -- Text : newtxt -+ Text : - Max. Text Size : 10 - - Events +--- HMI/n2t-out/cardQR.txt 2022-05-21 09:32:12.546424265 +0000 ++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-21 09:32:12.970428821 +0000 @@ -295,7 +295,7 @@ prints tSend.txt,0 prints crcval,2 @@ -561,8 +543,8 @@ diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt Hotspot mSwipePrev diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt ---- HMI/n2t-out/cardThermo.txt 2022-05-21 06:19:25.833549791 +0000 -+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-21 06:19:26.261557518 +0000 +--- HMI/n2t-out/cardThermo.txt 2022-05-21 09:32:12.546424265 +0000 ++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-21 09:32:12.974428864 +0000 @@ -795,7 +795,7 @@ prints tSend.txt,0 prints crcval,2 @@ -611,8 +593,8 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt Hotspot mSwipePrev diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-05-21 06:19:25.833549791 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-21 06:19:26.261557518 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-21 09:32:12.546424265 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-21 09:32:12.970428821 +0000 @@ -142,7 +142,7 @@ Disable release event after dragging: 0 Send Component ID : disabled @@ -631,24 +613,3 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC -diff -bur HMI/n2t-out/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt ---- HMI/n2t-out/pageTest.txt 2022-05-21 06:19:25.833549791 +0000 -+++ HMI/US/portrait/n2t-out/pageTest.txt 2022-05-21 06:19:26.261557518 +0000 -@@ -176,17 +176,3 @@ - Touch Press Event - bauds=115200 - --Button b2 -- Attributes -- Scope : local -- Dragging : 0 -- Disable release event after dragging: 0 -- Send Component ID : disabled -- State : unpressed -- Text : qr -- Max. Text Size : 10 -- -- Events -- Touch Press Event -- page cardQR -- diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index fbdd187d..4f9009dc 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 06:19:26.297558167 +0000 -+--- HMI/n2t-out/Program.s.txt 2022-05-21 06:19:25.833549791 +0000 -++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-21 06:19:26.257557445 +0000 ++++ HMI/US/portrait/diff-eu-version.txt 2022-05-21 09:32:13.014429294 +0000 ++--- HMI/n2t-out/Program.s.txt 2022-05-21 09:32:12.542424222 +0000 +++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-21 09:32:12.970428821 +0000 +diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt -+--- HMI/n2t-out/cardAlarm.txt 2022-05-21 06:19:25.833549791 +0000 -++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-21 06:19:26.261557518 +0000 ++--- HMI/n2t-out/cardAlarm.txt 2022-05-21 09:32:12.546424265 +0000 +++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-21 09:32:12.970428821 +0000 +@@ -466,7 +466,7 @@ + prints crcval,2 + tCode.txt="" @@ -67,32 +67,14 @@ + { + click bPrev,1 + } -+--- HMI/n2t-out/cardEntities.txt 2022-05-21 06:19:25.833549791 +0000 -++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-21 06:19:26.261557518 +0000 ++--- HMI/n2t-out/cardEntities.txt 2022-05-21 09:32:12.546424265 +0000 +++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-21 09:32:12.974428864 +0000 + Hotspot mSwipeNext + Scope : local +@@ -1728,6 +1956,128 @@ +diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt -+--- HMI/n2t-out/cardQR.txt 2022-05-21 06:19:25.833549791 +0000 -++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-21 06:19:26.261557518 +0000 -+@@ -198,7 +198,7 @@ -+ Disable release event after dragging: 0 -+ Send Component ID : disabled -+ State : unpressed -+- Text : newtxt -++ Text : -+ Max. Text Size : 10 -+ -+ Events -+@@ -223,7 +223,7 @@ -+ Disable release event after dragging: 0 -+ Send Component ID : disabled -+ State : unpressed -+- Text : newtxt -++ Text : -+ Max. Text Size : 10 -+ -+ Events ++--- HMI/n2t-out/cardQR.txt 2022-05-21 09:32:12.546424265 +0000 +++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-21 09:32:12.970428821 +0000 +@@ -295,7 +295,7 @@ + prints tSend.txt,0 + prints crcval,2 @@ -141,8 +123,8 @@ + + Hotspot mSwipePrev +diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt -+--- HMI/n2t-out/cardThermo.txt 2022-05-21 06:19:25.833549791 +0000 -++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-21 06:19:26.261557518 +0000 ++--- HMI/n2t-out/cardThermo.txt 2022-05-21 09:32:12.546424265 +0000 +++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-21 09:32:12.974428864 +0000 +@@ -795,7 +795,7 @@ + prints tSend.txt,0 + prints crcval,2 @@ -190,26 +172,5 @@ + } + + Hotspot mSwipePrev -+--- HMI/n2t-out/pageStartup.txt 2022-05-21 06:19:25.833549791 +0000 -++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-21 06:19:26.261557518 +0000 -+diff -bur HMI/n2t-out/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt -+--- HMI/n2t-out/pageTest.txt 2022-05-21 06:19:25.833549791 +0000 -++++ HMI/US/portrait/n2t-out/pageTest.txt 2022-05-21 06:19:26.261557518 +0000 -+@@ -176,17 +176,3 @@ -+ Touch Press Event -+ bauds=115200 -+ -+-Button b2 -+- Attributes -+- Scope : local -+- Dragging : 0 -+- Disable release event after dragging: 0 -+- Send Component ID : disabled -+- State : unpressed -+- Text : qr -+- Max. Text Size : 10 -+- -+- Events -+- Touch Press Event -+- page cardQR -+- ++--- HMI/n2t-out/pageStartup.txt 2022-05-21 09:32:12.546424265 +0000 +++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-21 09:32:12.970428821 +0000 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 e2364b49..2693e889 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,14 +2,14 @@ Program.s 0 Component(s) 10 Line(s) of event code 10 Unique line(s) of event code -pageTest - 13 Component(s) - 13 Line(s) of event code - 13 Unique line(s) of event code pageIcons 6 Component(s) 0 Line(s) of event code 0 Unique line(s) of event code +pageTest + 14 Component(s) + 14 Line(s) of event code + 14 Unique line(s) of event code pageStartup 19 Component(s) 150 Line(s) of event code @@ -57,6 +57,6 @@ cardEntities Total 13 Page(s) - 411 Component(s) - 4299 Line(s) of event code - 1117 Unique line(s) of event code + 412 Component(s) + 4300 Line(s) of event code + 1118 Unique line(s) of event code diff --git a/HMI/US/portrait/n2t-out-visual/pageTest.txt b/HMI/US/portrait/n2t-out-visual/pageTest.txt index 43982705..95767d06 100644 --- a/HMI/US/portrait/n2t-out-visual/pageTest.txt +++ b/HMI/US/portrait/n2t-out-visual/pageTest.txt @@ -436,3 +436,39 @@ Button b1 Touch Press Event bauds=115200 +Button b2 + Attributes + ID : 13 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 38 + y coordinate : 317 + Width : 100 + Height : 50 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : 3D auto + Font ID : 3 + Back. Color : 50712 + Back. Picture ID (Pressed) : 65535 + Back. Color (Pressed) : 1024 + Font Color (Unpressed) : 0 + Font Color (Pressed) : 65535 + Horizontal Alignment : center + Vertical Alignment : center + State : unpressed + Text : qr + Max. Text Size : 10 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + + Events + Touch Press Event + page cardQR + diff --git a/HMI/US/portrait/n2t-out/pageTest.txt b/HMI/US/portrait/n2t-out/pageTest.txt index efade5e5..03a79fd7 100644 --- a/HMI/US/portrait/n2t-out/pageTest.txt +++ b/HMI/US/portrait/n2t-out/pageTest.txt @@ -176,3 +176,17 @@ Button b1 Touch Press Event bauds=115200 +Button b2 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + State : unpressed + Text : qr + Max. Text Size : 10 + + Events + Touch Press Event + page cardQR + diff --git a/HMI/n2t-out-visual/cardQR.txt b/HMI/n2t-out-visual/cardQR.txt index 2e975ef8..e28a7eb8 100644 --- a/HMI/n2t-out-visual/cardQR.txt +++ b/HMI/n2t-out-visual/cardQR.txt @@ -397,7 +397,7 @@ Button bText1 Horizontal Alignment : center Vertical Alignment : center State : unpressed - Text : newtxt + Text : Max. Text Size : 10 Word wrap : disabled Horizontal Spacing : 0 @@ -444,7 +444,7 @@ Button bText2 Horizontal Alignment : center Vertical Alignment : center State : unpressed - Text : newtxt + Text : Max. Text Size : 10 Word wrap : disabled Horizontal Spacing : 0 diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index d190cfff..ad64daa5 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -18,6 +18,10 @@ pageStartup 19 Component(s) 150 Line(s) of event code 113 Unique line(s) of event code +cardQR + 28 Component(s) + 247 Line(s) of event code + 137 Unique line(s) of event code cardMedia 33 Component(s) 346 Line(s) of event code @@ -42,10 +46,6 @@ cardGrid 42 Component(s) 435 Line(s) of event code 252 Unique line(s) of event code -cardQR - 28 Component(s) - 247 Line(s) of event code - 137 Unique line(s) of event code cardAlarm 38 Component(s) 360 Line(s) of event code diff --git a/HMI/n2t-out/cardQR.txt b/HMI/n2t-out/cardQR.txt index 30e18e80..72b222c2 100644 --- a/HMI/n2t-out/cardQR.txt +++ b/HMI/n2t-out/cardQR.txt @@ -198,7 +198,7 @@ Button bText1 Disable release event after dragging: 0 Send Component ID : disabled State : unpressed - Text : newtxt + Text : Max. Text Size : 10 Events @@ -223,7 +223,7 @@ Button bText2 Disable release event after dragging: 0 Send Component ID : disabled State : unpressed - Text : newtxt + Text : Max. Text Size : 10 Events