sync (add nextion2text)

This commit is contained in:
joBr99
2022-07-23 09:17:43 +00:00
committed by github-actions[bot]
parent 3357e07337
commit 4a99e1efbb
8 changed files with 89 additions and 210 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:12:24.801739561 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-07-23 09:12:25.449738425 +0000
--- 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
@@ -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:12:24.805739554 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-07-23 09:12:25.449738425 +0000
--- 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
@@ -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:12:24.805739554 +0000
+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-07-23 09:12:25.449738425 +0000
--- 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
@@ -932,10 +932,6 @@
{
page popupLight
@@ -315,53 +315,9 @@ 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: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
- dim=dimValueNormal
- vis p0,0
- vis tSend,0
- vis tInstruction,0
- vis tTmp,0
- vis tId,0
- vis t5,0
- vis bPrev,0
- vis bNext,0
- cardMedia.bco=defaultBcoColor
- for(sys0=0;sys0<34;sys0++)
- {
- if(b[sys0].type==98||b[sys0].type==116)
+ for(sys0=0;sys0<40;sys0++)
{
b[sys0].bco=defaultBcoColor
b[sys0].pco=defaultFontColor
}
- }
if(defaultBcoColor==0)
{
hVolume.pic=14
hVolume.pic1=13
hVolume.pic2=15
}
+ dim=dimValueNormal
+ vis p0,0
+ vis tSend,0
+ vis tInstruction,0
+ vis tTmp,0
+ vis tId,0
+ vis t5,0
+ vis bPrev,0
+ vis bNext,0
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:12:24.805739554 +0000
+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-07-23 09:12:25.449738425 +0000
--- 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
@@ -389,8 +345,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:12:24.801739561 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-07-23 09:12:25.449738425 +0000
--- 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
@@ -142,7 +142,7 @@
Disable release event after dragging: 0
Send Component ID : disabled
@@ -409,24 +365,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/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt
--- 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
Text : Position
- Max. Text Size : 30
+ Max. Text Size : 15
Text tInfo1
Attributes
@@ -163,7 +163,7 @@
Send Component ID : disabled
Associated Keyboard : none
Text :
- Max. Text Size : 30
+ Max. Text Size : 15
Picture p0
Attributes