sync (add nextion2text)

This commit is contained in:
joBr99
2022-07-23 09:22:28 +00:00
committed by github-actions[bot]
parent 80bf18382d
commit b867694966
6 changed files with 85 additions and 104 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:17:38.939933095 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-07-23 09:17:39.403938674 +0000
--- HMI/n2t-out/Program.s.txt 2022-07-23 09:22:23.835446505 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-07-23 09:22:24.299452515 +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:17:38.939933095 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-07-23 09:17:39.403938674 +0000
--- HMI/n2t-out/cardEntities.txt 2022-07-23 09:22:23.839446557 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-07-23 09:22:24.299452515 +0000
@@ -65,6 +65,16 @@
vis nNum4,0
vis bPrev,0
@@ -302,8 +302,8 @@ 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:17:38.939933095 +0000
+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-07-23 09:17:39.403938674 +0000
--- HMI/n2t-out/cardGrid.txt 2022-07-23 09:22:23.835446505 +0000
+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-07-23 09:22:24.299452515 +0000
@@ -932,10 +932,6 @@
{
page popupLight
@@ -315,38 +315,9 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt
TouchCap tc0
Attributes
diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt
--- HMI/n2t-out/cardQR.txt 2022-07-23 09:17:38.939933095 +0000
+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-07-23 09:17:39.403938674 +0000
@@ -32,25 +32,6 @@
vis bText2,0
tsw m0,0
tsw m1,0
- cardQR.bco=defaultBcoColor
- for(sys0=0;sys0<32;sys0++)
- {
- if(b[sys0].type==98||b[sys0].type==116)
- {
- b[sys0].bco=defaultBcoColor
- b[sys0].pco=defaultFontColor
- }
- if(b[sys0].type==53&&defaultBcoColor==6371)
- {
- b[sys0].pic=1
- b[sys0].pic2=2
- }
- if(b[sys0].type==53&&defaultBcoColor==0)
- {
- b[sys0].pic=10
- b[sys0].pic2=11
- }
- }
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:17:38.939933095 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-07-23 09:17:39.403938674 +0000
--- HMI/n2t-out/pageStartup.txt 2022-07-23 09:22:23.835446505 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-07-23 09:22:24.299452515 +0000
@@ -142,7 +142,7 @@
Disable release event after dragging: 0
Send Component ID : disabled