sync us-p (add nextion2text)

This commit is contained in:
joBr99
2022-05-28 19:37:53 +00:00
committed by github-actions[bot]
parent 1b8c3240ed
commit d5acd72424
6 changed files with 37 additions and 57 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-28 19:31:24.471828653 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-28 19:31:24.907828928 +0000
--- HMI/n2t-out/Program.s.txt 2022-05-28 19:37:52.047161395 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-28 19:37:52.503167742 +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-28 19:31:24.471828653 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-28 19:31:24.911828931 +0000
--- HMI/n2t-out/cardEntities.txt 2022-05-28 19:37:52.051161450 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-28 19:37:52.503167742 +0000
@@ -62,6 +62,16 @@
vis bText4,0
vis hSlider4,0
@@ -468,8 +468,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
if(tInstruction.txt=="pageType")
{
diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt
--- HMI/n2t-out/cardQR.txt 2022-05-28 19:31:24.471828653 +0000
+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-28 19:31:24.911828931 +0000
--- HMI/n2t-out/cardQR.txt 2022-05-28 19:37:52.051161450 +0000
+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-28 19:37:52.503167742 +0000
@@ -34,7 +34,7 @@
Attributes
Scope : local
@@ -480,8 +480,8 @@ diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt
Variable (string) entn
Attributes
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-05-28 19:31:24.471828653 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-28 19:31:24.911828931 +0000
--- HMI/n2t-out/pageStartup.txt 2022-05-28 19:37:52.051161450 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-28 19:37:52.503167742 +0000
@@ -142,7 +142,7 @@
Disable release event after dragging: 0
Send Component ID : disabled
@@ -500,22 +500,9 @@ 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/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
--- HMI/n2t-out/popupLight.txt 2022-05-28 19:31:24.471828653 +0000
+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-28 19:31:24.911828931 +0000
@@ -209,9 +209,6 @@
sys0=sys0-pColorWheel.y
covx sys0,tTmp.txt,0,0
tSend.txt+=tTmp.txt
- tSend.txt+="|"
- covx pColorWheel.h,tTmp.txt,0,0
- tSend.txt+=tTmp.txt
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt
--- HMI/n2t-out/screensaver.txt 2022-05-28 19:31:24.471828653 +0000
+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-28 19:31:24.911828931 +0000
--- HMI/n2t-out/screensaver.txt 2022-05-28 19:37:52.051161450 +0000
+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-28 19:37:52.503167742 +0000
@@ -471,22 +471,6 @@
vis tMainIconAlt,1
vis tMRIcon,1