From ca4a7b200dc1dc8a5f04b799b903c83793666945 Mon Sep 17 00:00:00 2001 From: joBr99 Date: Mon, 6 Jun 2022 20:41:17 +0000 Subject: [PATCH] sync (add nextion2text) --- HMI/US/landscape/diff-eu-version.txt | 88 ++----------------- HMI/US/landscape/n2t-out-visual/cardMedia.txt | 32 ++++++- .../landscape/n2t-out-visual/cardThermo.txt | 4 + .../n2t-out-visual/nspanel_US_L_Stats.txt | 22 ++--- HMI/US/landscape/n2t-out/cardMedia.txt | 31 ++++++- HMI/US/landscape/n2t-out/cardThermo.txt | 4 + HMI/US/portrait/diff-eu-version.txt | 16 ++-- HMI/US/portrait/diff-filtered.txt | 18 ++-- 8 files changed, 103 insertions(+), 112 deletions(-) diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index a5f5877b..bb5988cc 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-06 20:37:23.366287644 +0000 -+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-06-06 20:37:24.258297598 +0000 +--- HMI/n2t-out/Program.s.txt 2022-06-06 20:41:13.393750277 +0000 ++++ HMI/US/landscape/n2t-out/Program.s.txt 2022-06-06 20:41:14.285762803 +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/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt ---- HMI/n2t-out/cardGrid.txt 2022-06-06 20:37:23.366287644 +0000 -+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-06-06 20:37:24.258297598 +0000 +--- HMI/n2t-out/cardGrid.txt 2022-06-06 20:41:13.397750333 +0000 ++++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-06-06 20:41:14.285762803 +0000 @@ -846,10 +846,6 @@ // get value spstr strCommand.txt,tTmp.txt,"~",1 @@ -18,89 +18,13 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt - // get value normal - spstr strCommand.txt,tTmp.txt,"~",2 - covx tTmp.txt,dimValueNormal,0,0 -- dim=dimValueNormal - } - if(tInstruction.txt=="timeout") - { -diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt ---- HMI/n2t-out/cardMedia.txt 2022-06-06 20:37:23.366287644 +0000 -+++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-06-06 20:37:24.258297598 +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") - { -@@ -662,10 +636,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-06-06 20:37:23.366287644 +0000 -+++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-06-06 20:37:24.258297598 +0000 -@@ -1152,10 +1152,6 @@ - // 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 } if(tInstruction.txt=="timeout") { diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-06-06 20:37:23.366287644 +0000 -+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-06-06 20:37:24.258297598 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-06-06 20:41:13.393750277 +0000 ++++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-06-06 20:41:14.285762803 +0000 @@ -177,7 +177,7 @@ recmod=1 bauds=115200 diff --git a/HMI/US/landscape/n2t-out-visual/cardMedia.txt b/HMI/US/landscape/n2t-out-visual/cardMedia.txt index 643fa04b..6fa87ead 100644 --- a/HMI/US/landscape/n2t-out-visual/cardMedia.txt +++ b/HMI/US/landscape/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 : 22 @@ -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") { @@ -1085,7 +1112,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/cardThermo.txt b/HMI/US/landscape/n2t-out-visual/cardThermo.txt index 36f95ffc..0eb43ee5 100644 --- a/HMI/US/landscape/n2t-out-visual/cardThermo.txt +++ b/HMI/US/landscape/n2t-out-visual/cardThermo.txt @@ -1870,6 +1870,10 @@ Timer tmSerial // 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 } 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 fc4297da..982c1d7d 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 @@ -10,14 +10,14 @@ pageTest 14 Component(s) 14 Line(s) of event code 14 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 - 33 Component(s) - 347 Line(s) of event code - 182 Unique line(s) of event code cardQR 32 Component(s) 374 Line(s) of event code @@ -34,10 +34,6 @@ popupShutter 25 Component(s) 330 Line(s) of event code 162 Unique line(s) of event code -cardThermo - 53 Component(s) - 552 Line(s) of event code - 290 Unique line(s) of event code screensaver 38 Component(s) 319 Line(s) of event code @@ -50,6 +46,10 @@ popupLight 27 Component(s) 352 Line(s) of event code 191 Unique line(s) of event code +cardThermo + 53 Component(s) + 555 Line(s) of event code + 292 Unique line(s) of event code cardAlarm 40 Component(s) 392 Line(s) of event code @@ -57,6 +57,6 @@ cardAlarm Total 13 Page(s) - 411 Component(s) - 4620 Line(s) of event code - 1220 Unique line(s) of event code + 412 Component(s) + 4639 Line(s) of event code + 1232 Unique line(s) of event code diff --git a/HMI/US/landscape/n2t-out/cardMedia.txt b/HMI/US/landscape/n2t-out/cardMedia.txt index ad020c44..78c331ce 100644 --- a/HMI/US/landscape/n2t-out/cardMedia.txt +++ b/HMI/US/landscape/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") { @@ -636,7 +662,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/cardThermo.txt b/HMI/US/landscape/n2t-out/cardThermo.txt index 827bb378..49596016 100644 --- a/HMI/US/landscape/n2t-out/cardThermo.txt +++ b/HMI/US/landscape/n2t-out/cardThermo.txt @@ -1152,6 +1152,10 @@ Timer tmSerial // 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 } if(tInstruction.txt=="timeout") { diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index 574a53e8..b164affa 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-06 20:37:23.366287644 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-06 20:37:23.798292465 +0000 +--- HMI/n2t-out/Program.s.txt 2022-06-06 20:41:13.393750277 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-06 20:41:13.825756343 +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-06 20:37:23.366287644 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-06 20:37:23.802292510 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-06-06 20:41:13.397750333 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-06 20:41:13.829756399 +0000 @@ -63,6 +63,16 @@ vis bText4,0 vis hSlider4,0 @@ -468,8 +468,8 @@ 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-06 20:37:23.366287644 +0000 -+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-06-06 20:37:23.802292510 +0000 +--- HMI/n2t-out/cardMedia.txt 2022-06-06 20:41:13.393750277 +0000 ++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-06-06 20:41:13.829756399 +0000 @@ -45,12 +45,6 @@ Scope: local Value: 0 @@ -518,8 +518,8 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.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-06-06 20:37:23.366287644 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-06 20:37:23.802292510 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-06-06 20:41:13.393750277 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-06 20:41:13.829756399 +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 eed56204..72d8e4a5 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-06 20:37:23.814292644 +0000 -+--- HMI/n2t-out/Program.s.txt 2022-06-06 20:37:23.366287644 +0000 -++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-06 20:37:23.798292465 +0000 -+--- HMI/n2t-out/cardEntities.txt 2022-06-06 20:37:23.366287644 +0000 -++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-06 20:37:23.802292510 +0000 ++++ HMI/US/portrait/diff-eu-version.txt 2022-06-06 20:41:13.841756568 +0000 ++--- HMI/n2t-out/Program.s.txt 2022-06-06 20:41:13.393750277 +0000 +++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-06 20:41:13.825756343 +0000 ++--- HMI/n2t-out/cardEntities.txt 2022-06-06 20:41:13.397750333 +0000 +++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-06 20:41:13.829756399 +0000 +@@ -63,6 +63,16 @@ +@@ -120,6 +130,18 @@ +@@ -156,6 +178,15 @@ @@ -13,8 +13,8 @@ +@@ -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-06 20:37:23.366287644 +0000 -++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-06-06 20:37:23.802292510 +0000 ++--- HMI/n2t-out/cardMedia.txt 2022-06-06 20:41:13.393750277 +0000 +++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-06-06 20:41:13.829756399 +0000 +@@ -45,12 +45,6 @@ + Scope: local + Value: 0 @@ -59,5 +59,5 @@ + } + if(tInstruction.txt=="time") + { -+--- HMI/n2t-out/pageStartup.txt 2022-06-06 20:37:23.366287644 +0000 -++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-06 20:37:23.802292510 +0000 ++--- HMI/n2t-out/pageStartup.txt 2022-06-06 20:41:13.393750277 +0000 +++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-06 20:41:13.829756399 +0000