sync (add nextion2text)

This commit is contained in:
joBr99
2022-05-06 16:25:27 +00:00
committed by github-actions[bot]
parent 57f25cada2
commit 0b660e96b1
6 changed files with 24 additions and 48 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-05-06 16:21:34.354244093 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-06 16:21:35.210254454 +0000
--- HMI/n2t-out/Program.s.txt 2022-05-06 16:25:26.256271726 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-06 16:25:27.036283029 +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/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-05-06 16:21:34.358244142 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-06 16:21:35.214254503 +0000
--- HMI/n2t-out/pageStartup.txt 2022-05-06 16:25:26.256271726 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-06 16:25:27.036283029 +0000
@@ -177,7 +177,7 @@
recmod=1
bauds=115200
@@ -21,8 +21,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt
--- HMI/n2t-out/popupLight.txt 2022-05-06 16:21:34.358244142 +0000
+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-05-06 16:21:35.214254503 +0000
--- HMI/n2t-out/popupLight.txt 2022-05-06 16:25:26.256271726 +0000
+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-05-06 16:25:27.036283029 +0000
@@ -535,12 +535,6 @@
vis pColorWheel,1
}
@@ -37,8 +37,8 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt
if(tInstruction.txt=="time")
{
diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt
--- HMI/n2t-out/popupShutter.txt 2022-05-06 16:21:34.358244142 +0000
+++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-05-06 16:21:35.214254503 +0000
--- HMI/n2t-out/popupShutter.txt 2022-05-06 16:25:26.256271726 +0000
+++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-05-06 16:25:27.036283029 +0000
@@ -109,7 +109,7 @@
Text :
Max. Text Size : 20

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-05-06 16:21:34.354244093 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-06 16:21:34.738248741 +0000
--- HMI/n2t-out/Program.s.txt 2022-05-06 16:25:26.256271726 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-06 16:25:26.636277233 +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-05-06 16:21:34.358244142 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-06 16:21:34.742248790 +0000
--- HMI/n2t-out/cardEntities.txt 2022-05-06 16:25:26.256271726 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-06 16:25:26.636277233 +0000
@@ -62,6 +62,16 @@
vis bText4,0
vis hSlider4,0
@@ -427,8 +427,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
if(tInstruction.txt=="pageType")
{
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-05-06 16:21:34.358244142 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-06 16:21:34.742248790 +0000
--- HMI/n2t-out/pageStartup.txt 2022-05-06 16:25:26.256271726 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-06 16:25:26.636277233 +0000
@@ -142,7 +142,7 @@
Disable release event after dragging: 0
Send Component ID : disabled
@@ -447,15 +447,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-05-06 16:21:34.358244142 +0000
+++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-05-06 16:21:34.738248741 +0000
@@ -157,7 +157,7 @@
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
- crcputs sys0,2
+ crcputs sys0,1
crcputs tSend.txt,0
//send cmd
printh 55 bb

View File

@@ -1,8 +1,8 @@
+++ HMI/US/portrait/diff-eu-version.txt 2022-05-06 16:21:34.826249806 +0000
+--- HMI/n2t-out/Program.s.txt 2022-05-06 16:21:34.354244093 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-06 16:21:34.738248741 +0000
+--- HMI/n2t-out/cardEntities.txt 2022-05-06 16:21:34.358244142 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-06 16:21:34.742248790 +0000
+++ HMI/US/portrait/diff-eu-version.txt 2022-05-06 16:25:26.648277407 +0000
+--- HMI/n2t-out/Program.s.txt 2022-05-06 16:25:26.256271726 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-06 16:25:26.636277233 +0000
+--- HMI/n2t-out/cardEntities.txt 2022-05-06 16:25:26.256271726 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-06 16:25:26.636277233 +0000
+@@ -62,6 +62,16 @@
+ vis bPrev,0
+ vis bNext,0
@@ -24,17 +24,5 @@
+ }
+ if(tInstruction.txt=="pageType")
+ {
+--- HMI/n2t-out/pageStartup.txt 2022-05-06 16:21:34.358244142 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-06 16:21:34.742248790 +0000
+diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt
+--- HMI/n2t-out/popupShutter.txt 2022-05-06 16:21:34.358244142 +0000
++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-05-06 16:21:34.738248741 +0000
+@@ -157,7 +157,7 @@
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC
+ crcputh 55 bb
+- crcputs sys0,2
++ crcputs sys0,1
+ crcputs tSend.txt,0
+ //send cmd
+ printh 55 bb
+--- HMI/n2t-out/pageStartup.txt 2022-05-06 16:25:26.256271726 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-06 16:25:26.636277233 +0000

View File

@@ -17,7 +17,7 @@ popupNotify
popupShutter
20 Component(s)
193 Line(s) of event code
110 Unique line(s) of event code
109 Unique line(s) of event code
cardGrid
39 Component(s)
420 Line(s) of event code

View File

@@ -352,7 +352,7 @@ Slider hPosition
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,1
crcputs sys0,2
crcputs tSend.txt,0
//send cmd
printh 55 bb

View File

@@ -157,7 +157,7 @@ Slider hPosition
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,1
crcputs sys0,2
crcputs tSend.txt,0
//send cmd
printh 55 bb