sync (add nextion2text)

This commit is contained in:
joBr99
2022-07-23 09:12:30 +00:00
committed by github-actions[bot]
parent 1896b6a3e3
commit 9fbfc64966
6 changed files with 79 additions and 127 deletions

View File

@@ -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-07-23 09:07:58.768116691 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-07-23 09:07:59.704136032 +0000
--- HMI/n2t-out/Program.s.txt 2022-07-23 09:12:24.801739561 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-07-23 09:12:26.089737302 +0000
@@ -11,9 +11,4 @@
// dim value
int dimValue=40
@@ -12,8 +12,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/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt
--- HMI/n2t-out/cardAlarm.txt 2022-07-23 09:07:58.768116691 +0000
+++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-07-23 09:07:59.708136115 +0000
--- HMI/n2t-out/cardAlarm.txt 2022-07-23 09:12:24.805739554 +0000
+++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-07-23 09:12:26.089737302 +0000
@@ -37,25 +37,6 @@
vis tCode,0
vis bPrev,0
@@ -60,8 +60,8 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt
if(tInstruction.txt=="timeout")
{
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt
--- HMI/n2t-out/cardEntities.txt 2022-07-23 09:07:58.768116691 +0000
+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-07-23 09:07:59.704136032 +0000
--- HMI/n2t-out/cardEntities.txt 2022-07-23 09:12:24.805739554 +0000
+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-07-23 09:12:26.089737302 +0000
@@ -65,26 +65,6 @@
vis nNum4,0
vis bPrev,0
@@ -153,8 +153,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-07-23 09:07:58.768116691 +0000
+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-07-23 09:07:59.704136032 +0000
--- HMI/n2t-out/cardGrid.txt 2022-07-23 09:12:24.805739554 +0000
+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-07-23 09:12:26.089737302 +0000
@@ -36,15 +36,6 @@
vis tEntity6,0
vis bPrev,0
@@ -202,8 +202,8 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt
TouchCap tc0
Attributes
diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt
--- HMI/n2t-out/cardMedia.txt 2022-07-23 09:07:58.768116691 +0000
+++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-07-23 09:07:59.704136032 +0000
--- HMI/n2t-out/cardMedia.txt 2022-07-23 09:12:24.805739554 +0000
+++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-07-23 09:12:26.089737302 +0000
@@ -21,21 +21,6 @@
vis t5,0
vis bPrev,0
@@ -246,8 +246,8 @@ 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-07-23 09:07:58.768116691 +0000
+++ HMI/US/landscape/n2t-out/cardQR.txt 2022-07-23 09:07:59.704136032 +0000
--- HMI/n2t-out/cardQR.txt 2022-07-23 09:12:24.805739554 +0000
+++ HMI/US/landscape/n2t-out/cardQR.txt 2022-07-23 09:12:26.089737302 +0000
@@ -32,25 +32,6 @@
vis bText2,0
tsw m0,0
@@ -294,8 +294,8 @@ diff -bur HMI/n2t-out/cardQR.txt HMI/US/landscape/n2t-out/cardQR.txt
if(tInstruction.txt=="timeout")
{
diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
--- HMI/n2t-out/cardThermo.txt 2022-07-23 09:07:58.768116691 +0000
+++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-07-23 09:07:59.708136115 +0000
--- HMI/n2t-out/cardThermo.txt 2022-07-23 09:12:24.805739554 +0000
+++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-07-23 09:12:26.089737302 +0000
@@ -41,21 +41,6 @@
vis xTempDest1,0
vis bPrev,0
@@ -338,8 +338,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-07-23 09:07:58.768116691 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-07-23 09:07:59.704136032 +0000
--- HMI/n2t-out/pageStartup.txt 2022-07-23 09:12:24.801739561 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-07-23 09:12:26.089737302 +0000
@@ -177,7 +177,7 @@
recmod=1
bauds=115200
@@ -370,8 +370,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
{
Only in HMI/n2t-out: popupFan.txt
diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt
--- HMI/n2t-out/popupLight.txt 2022-07-23 09:07:58.768116691 +0000
+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-07-23 09:07:59.704136032 +0000
--- HMI/n2t-out/popupLight.txt 2022-07-23 09:12:24.805739554 +0000
+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-07-23 09:12:26.089737302 +0000
@@ -50,29 +50,6 @@
vis t0,0
vis pColorWheel,0
@@ -422,8 +422,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-07-23 09:07:58.768116691 +0000
+++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-07-23 09:07:59.704136032 +0000
--- HMI/n2t-out/popupNotify.txt 2022-07-23 09:12:24.805739554 +0000
+++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-07-23 09:12:26.089737302 +0000
@@ -12,24 +12,12 @@
Events
@@ -469,8 +469,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-07-23 09:07:58.768116691 +0000
+++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-07-23 09:07:59.704136032 +0000
--- HMI/n2t-out/popupShutter.txt 2022-07-23 09:12:24.801739561 +0000
+++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-07-23 09:12:26.089737302 +0000
@@ -40,40 +40,6 @@
prints sys0,2
prints tSend.txt,0
@@ -638,8 +638,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-07-23 09:07:58.768116691 +0000
+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-07-23 09:07:59.704136032 +0000
--- HMI/n2t-out/screensaver.txt 2022-07-23 09:12:24.805739554 +0000
+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-07-23 09:12:26.089737302 +0000
@@ -406,22 +406,10 @@
// get value
spstr strCommand.txt,tTmp.txt,"~",1

View File

@@ -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-07-23 09:07:58.768116691 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-07-23 09:07:59.236126361 +0000
--- HMI/n2t-out/Program.s.txt 2022-07-23 09:12:24.801739561 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-07-23 09:12:25.449738425 +0000
@@ -14,6 +14,6 @@
//color vars
int defaultFontColor=65535
@@ -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-07-23 09:07:58.768116691 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-07-23 09:07:59.236126361 +0000
--- HMI/n2t-out/cardEntities.txt 2022-07-23 09:12:24.805739554 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-07-23 09:12:25.449738425 +0000
@@ -65,6 +65,16 @@
vis nNum4,0
vis bPrev,0
@@ -302,37 +302,9 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
Hotspot mSwipeNext
Attributes
diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt
--- HMI/n2t-out/cardGrid.txt 2022-07-23 09:07:58.768116691 +0000
+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-07-23 09:07:59.236126361 +0000
@@ -12,6 +12,11 @@
Events
Preinitialize Event
+ for(sys0=0;sys0<40;sys0++)
+ {
+ b[sys0].bco=defaultBcoColor
+ b[sys0].pco=defaultFontColor
+ }
dim=dimValueNormal
//remove background & activate reparse mode
vis p0,0
@@ -36,15 +41,6 @@
vis tEntity6,0
vis bPrev,0
vis bNext,0
- cardGrid.bco=defaultBcoColor
- for(sys0=0;sys0<42;sys0++)
- {
- if(b[sys0].type==98||b[sys0].type==116)
- {
- b[sys0].bco=defaultBcoColor
- b[sys0].pco=defaultFontColor
- }
- }
Variable (string) strCommand
Attributes
@@ -932,10 +928,6 @@
--- HMI/n2t-out/cardGrid.txt 2022-07-23 09:12:24.805739554 +0000
+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-07-23 09:12:25.449738425 +0000
@@ -932,10 +932,6 @@
{
page popupLight
}
@@ -344,8 +316,8 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt
TouchCap tc0
Attributes
diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
--- HMI/n2t-out/cardMedia.txt 2022-07-23 09:07:58.768116691 +0000
+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-07-23 09:07:59.236126361 +0000
--- HMI/n2t-out/cardMedia.txt 2022-07-23 09:12:24.805739554 +0000
+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-07-23 09:12:25.449738425 +0000
@@ -12,30 +12,26 @@
Events
@@ -388,8 +360,8 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
Variable (string) strCommand
Attributes
diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt
--- HMI/n2t-out/cardQR.txt 2022-07-23 09:07:58.768116691 +0000
+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-07-23 09:07:59.236126361 +0000
--- HMI/n2t-out/cardQR.txt 2022-07-23 09:12:24.805739554 +0000
+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-07-23 09:12:25.449738425 +0000
@@ -32,25 +32,6 @@
vis bText2,0
tsw m0,0
@@ -417,8 +389,8 @@ diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt
Variable (string) strCommand
Attributes
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-07-23 09:07:58.768116691 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-07-23 09:07:59.236126361 +0000
--- HMI/n2t-out/pageStartup.txt 2022-07-23 09:12:24.801739561 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-07-23 09:12:25.449738425 +0000
@@ -142,7 +142,7 @@
Disable release event after dragging: 0
Send Component ID : disabled
@@ -438,8 +410,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/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt
--- HMI/n2t-out/popupShutter.txt 2022-07-23 09:07:58.768116691 +0000
+++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-07-23 09:07:59.236126361 +0000
--- HMI/n2t-out/popupShutter.txt 2022-07-23 09:12:24.801739561 +0000
+++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-07-23 09:12:25.449738425 +0000
@@ -143,7 +143,7 @@
Send Component ID : disabled
Associated Keyboard : none

View File

@@ -1,12 +1,12 @@
+++ HMI/US/portrait/diff-eu-version.txt 2022-07-23 09:07:59.252126692 +0000
+--- HMI/n2t-out/Program.s.txt 2022-07-23 09:07:58.768116691 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-07-23 09:07:59.236126361 +0000
+++ HMI/US/portrait/diff-eu-version.txt 2022-07-23 09:12:25.465738397 +0000
+--- HMI/n2t-out/Program.s.txt 2022-07-23 09:12:24.801739561 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-07-23 09:12:25.449738425 +0000
+@@ -14,6 +14,6 @@
+ //color vars
+ int defaultFontColor=65535
+ int defaultBcoColor=6371
+--- HMI/n2t-out/cardEntities.txt 2022-07-23 09:07:58.768116691 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-07-23 09:07:59.236126361 +0000
+--- HMI/n2t-out/cardEntities.txt 2022-07-23 09:12:24.805739554 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-07-23 09:12:25.449738425 +0000
+@@ -65,6 +65,16 @@
+ vis bPrev,0
+ vis bNext,0
@@ -31,36 +31,9 @@
++ }
+
+diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt
+--- HMI/n2t-out/cardGrid.txt 2022-07-23 09:07:58.768116691 +0000
++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-07-23 09:07:59.236126361 +0000
+@@ -12,6 +12,11 @@
+
+ Events
+ Preinitialize Event
++ for(sys0=0;sys0<40;sys0++)
++ {
++ b[sys0].bco=defaultBcoColor
++ b[sys0].pco=defaultFontColor
++ }
+ dim=dimValueNormal
+ //remove background & activate reparse mode
+ vis p0,0
+@@ -36,15 +41,6 @@
+ vis tEntity6,0
+ vis bPrev,0
+ vis bNext,0
+- cardGrid.bco=defaultBcoColor
+- for(sys0=0;sys0<42;sys0++)
+- {
+- if(b[sys0].type==98||b[sys0].type==116)
+- {
+- b[sys0].bco=defaultBcoColor
+- b[sys0].pco=defaultFontColor
+- }
+- }
+
+ Variable (string) strCommand
+@@ -932,10 +928,6 @@
+--- HMI/n2t-out/cardGrid.txt 2022-07-23 09:12:24.805739554 +0000
++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-07-23 09:12:25.449738425 +0000
+@@ -932,10 +932,6 @@
+ {
+ page popupLight
+ }
@@ -70,10 +43,9 @@
+- }
+
+ TouchCap tc0
+ Attributes
+diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
+--- HMI/n2t-out/cardMedia.txt 2022-07-23 09:07:58.768116691 +0000
++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-07-23 09:07:59.236126361 +0000
+--- HMI/n2t-out/cardMedia.txt 2022-07-23 09:12:24.805739554 +0000
++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-07-23 09:12:25.449738425 +0000
+@@ -12,30 +12,26 @@
+ Events
+ Preinitialize Event
@@ -115,8 +87,8 @@
+ Variable (string) strCommand
+ Attributes
+diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt
+--- HMI/n2t-out/cardQR.txt 2022-07-23 09:07:58.768116691 +0000
++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-07-23 09:07:59.236126361 +0000
+--- HMI/n2t-out/cardQR.txt 2022-07-23 09:12:24.805739554 +0000
++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-07-23 09:12:25.449738425 +0000
+@@ -32,25 +32,6 @@
+ vis bText2,0
+ tsw m0,0
@@ -142,11 +114,11 @@
+- }
+
+ Variable (string) strCommand
+--- HMI/n2t-out/pageStartup.txt 2022-07-23 09:07:58.768116691 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-07-23 09:07:59.236126361 +0000
+--- HMI/n2t-out/pageStartup.txt 2022-07-23 09:12:24.801739561 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-07-23 09:12:25.449738425 +0000
+diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt
+--- HMI/n2t-out/popupShutter.txt 2022-07-23 09:07:58.768116691 +0000
++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-07-23 09:07:59.236126361 +0000
+--- HMI/n2t-out/popupShutter.txt 2022-07-23 09:12:24.801739561 +0000
++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-07-23 09:12:25.449738425 +0000
+@@ -143,7 +143,7 @@
+ Send Component ID : disabled
+ Associated Keyboard : none

View File

@@ -20,11 +20,6 @@ Page cardGrid
Events
Preinitialize Event
for(sys0=0;sys0<40;sys0++)
{
b[sys0].bco=defaultBcoColor
b[sys0].pco=defaultFontColor
}
dim=dimValueNormal
//remove background & activate reparse mode
vis p0,0
@@ -49,6 +44,15 @@ Page cardGrid
vis tEntity6,0
vis bPrev,0
vis bNext,0
cardGrid.bco=defaultBcoColor
for(sys0=0;sys0<42;sys0++)
{
if(b[sys0].type==98||b[sys0].type==116)
{
b[sys0].bco=defaultBcoColor
b[sys0].pco=defaultFontColor
}
}
Variable (string) strCommand
Attributes

View File

@@ -26,6 +26,10 @@ cardQR
32 Component(s)
384 Line(s) of event code
223 Unique line(s) of event code
cardGrid
42 Component(s)
458 Line(s) of event code
269 Unique line(s) of event code
popupFan
20 Component(s)
234 Line(s) of event code
@@ -42,10 +46,6 @@ screensaver
38 Component(s)
332 Line(s) of event code
257 Unique line(s) of event code
cardGrid
42 Component(s)
454 Line(s) of event code
267 Unique line(s) of event code
cardAlarm
40 Component(s)
421 Line(s) of event code
@@ -62,5 +62,5 @@ cardThermo
Total
14 Page(s)
444 Component(s)
5249 Line(s) of event code
1361 Unique line(s) of event code
5253 Line(s) of event code
1363 Unique line(s) of event code

View File

@@ -12,11 +12,6 @@ Page cardGrid
Events
Preinitialize Event
for(sys0=0;sys0<40;sys0++)
{
b[sys0].bco=defaultBcoColor
b[sys0].pco=defaultFontColor
}
dim=dimValueNormal
//remove background & activate reparse mode
vis p0,0
@@ -41,6 +36,15 @@ Page cardGrid
vis tEntity6,0
vis bPrev,0
vis bNext,0
cardGrid.bco=defaultBcoColor
for(sys0=0;sys0<42;sys0++)
{
if(b[sys0].type==98||b[sys0].type==116)
{
b[sys0].bco=defaultBcoColor
b[sys0].pco=defaultFontColor
}
}
Variable (string) strCommand
Attributes