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