sync (add nextion2text)

This commit is contained in:
joBr99
2022-06-25 19:33:04 +00:00
committed by github-actions[bot]
parent 148178f13c
commit 69a5bd426e
6 changed files with 127 additions and 77 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-06-23 21:11:30.566513919 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-23 21:11:31.002513703 +0000
--- HMI/n2t-out/Program.s.txt 2022-06-25 19:33:02.213732211 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-25 19:33:02.625729111 +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/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
--- HMI/n2t-out/cardAlarm.txt 2022-06-23 21:11:30.570513917 +0000
+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-06-23 21:11:31.002513703 +0000
--- HMI/n2t-out/cardAlarm.txt 2022-06-25 19:33:02.213732211 +0000
+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-06-25 19:33:02.625729111 +0000
@@ -138,7 +138,7 @@
Disable release event after dragging: 0
Send Component ID : disabled
@@ -23,9 +23,28 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
Text tIcon
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
--- HMI/n2t-out/cardEntities.txt 2022-06-23 21:11:30.570513917 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-23 21:11:31.002513703 +0000
@@ -136,6 +136,18 @@
--- HMI/n2t-out/cardEntities.txt 2022-06-25 19:33:02.217732181 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-25 19:33:02.629729081 +0000
@@ -81,6 +81,18 @@
vis nNum4,0
vis bPrev,0
vis bNext,0
+ //ui e5
+ vis btOnOff5,0
+ vis bUp5,0
+ vis bStop5,0
+ vis bDown5,0
+ vis tIcon5,0
+ vis tEntity5,0
+ vis bText5,0
+ vis hSlider5,0
+ vis nNum5,0
+ vis bPrev,0
+ vis bNext,0
Variable (string) strCommand
Attributes
@@ -136,6 +148,18 @@
Text :
Max. Text Size: 80
@@ -44,7 +63,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
Number nNum1
Attributes
Scope : local
@@ -172,6 +184,15 @@
@@ -172,6 +196,15 @@
Associated Keyboard : none
Value : 0
@@ -60,7 +79,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
Text tHeading
Attributes
Scope : local
@@ -302,6 +323,26 @@
@@ -302,6 +335,26 @@
Text :
Max. Text Size : 50
@@ -87,7 +106,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
Picture p0
Attributes
Scope : local
@@ -421,6 +462,34 @@
@@ -421,6 +474,34 @@
prints tSend.txt,0
prints crcval,2
@@ -122,7 +141,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
Button bDown1
Attributes
Scope : local
@@ -878,6 +947,106 @@
@@ -878,6 +959,106 @@
prints tSend.txt,0
prints crcval,2
@@ -229,7 +248,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
Dual-state Button btOnOff1
Attributes
Scope : local
@@ -986,6 +1155,33 @@
@@ -986,6 +1167,33 @@
prints tSend.txt,0
prints crcval,2
@@ -263,7 +282,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
Hotspot mSpecial
Attributes
Scope : local
@@ -1091,6 +1287,28 @@
@@ -1091,6 +1299,28 @@
page popupLight
}
@@ -293,8 +312,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
Attributes
Scope : local
diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt
--- HMI/n2t-out/cardQR.txt 2022-06-23 21:11:30.566513919 +0000
+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-06-23 21:11:31.002513703 +0000
--- HMI/n2t-out/cardQR.txt 2022-06-25 19:33:02.213732211 +0000
+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-06-25 19:33:02.625729111 +0000
@@ -12,21 +12,6 @@
Events
@@ -318,8 +337,8 @@ diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt
vis p0,0
vis tSend,0
diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
--- HMI/n2t-out/cardThermo.txt 2022-06-23 21:11:30.570513917 +0000
+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-06-23 21:11:31.002513703 +0000
--- HMI/n2t-out/cardThermo.txt 2022-06-25 19:33:02.213732211 +0000
+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-06-25 19:33:02.625729111 +0000
@@ -12,11 +12,6 @@
Events
@@ -333,8 +352,8 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
vis p0,0
vis tSend,0
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-06-23 21:11:30.566513919 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-23 21:11:31.002513703 +0000
--- HMI/n2t-out/pageStartup.txt 2022-06-25 19:33:02.213732211 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-25 19:33:02.625729111 +0000
@@ -142,7 +142,7 @@
Disable release event after dragging: 0
Send Component ID : disabled
@@ -354,8 +373,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
diff -bur HMI/n2t-out/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt
--- HMI/n2t-out/pageTest.txt 2022-06-23 21:11:30.566513919 +0000
+++ HMI/US/portrait/n2t-out/pageTest.txt 2022-06-23 21:11:31.002513703 +0000
--- HMI/n2t-out/pageTest.txt 2022-06-25 19:33:02.213732211 +0000
+++ HMI/US/portrait/n2t-out/pageTest.txt 2022-06-25 19:33:02.625729111 +0000
@@ -13,46 +13,6 @@
Events
Preinitialize Event
@@ -404,8 +423,8 @@ diff -bur HMI/n2t-out/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt
Picture p0
Attributes
diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt
--- HMI/n2t-out/popupNotify.txt 2022-06-23 21:11:30.566513919 +0000
+++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-06-23 21:11:31.002513703 +0000
--- HMI/n2t-out/popupNotify.txt 2022-06-25 19:33:02.213732211 +0000
+++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-06-25 19:33:02.625729111 +0000
@@ -12,11 +12,6 @@
Events