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/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