sync changes and bump version (add nextion2text)

This commit is contained in:
joBr99
2022-04-02 17:52:31 +00:00
committed by GitHub Actions
parent 158cd2c247
commit 5abc6ffa4e
41 changed files with 166 additions and 106 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-04-01 18:14:32.819231663 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-01 18:14:33.291239313 +0000
--- HMI/n2t-out/Program.s.txt 2022-04-02 17:52:28.361158189 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-02 17:52:28.717160730 +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-04-01 18:14:32.819231663 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-01 18:14:33.291239313 +0000
--- HMI/n2t-out/cardEntities.txt 2022-04-02 17:52:28.361158189 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-02 17:52:28.721160758 +0000
@@ -62,6 +62,26 @@
vis bText4,0
vis hSlider4,0
@@ -206,7 +206,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
Button bDown1
Attributes
Scope : local
@@ -857,6 +1015,206 @@
@@ -859,6 +1017,206 @@
prints tSend.txt,0
prints crcval,2
@@ -413,7 +413,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
Dual-state Button btOnOff1
Attributes
Scope : local
@@ -965,6 +1323,60 @@
@@ -967,6 +1325,60 @@
prints tSend.txt,0
prints crcval,2
@@ -474,7 +474,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
Hotspot mSpecial
Attributes
Scope : local
@@ -1070,6 +1482,50 @@
@@ -1072,6 +1484,50 @@
page popupLight
}
@@ -525,7 +525,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
Timer tmSerial
Attributes
Scope : local
@@ -1648,6 +2104,254 @@
@@ -1650,6 +2106,254 @@
covx tTmp.txt,sys0,0,0
hSlider4.maxval=sys0
}
@@ -781,8 +781,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-04-01 18:14:32.819231663 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-01 18:14:33.291239313 +0000
--- HMI/n2t-out/pageStartup.txt 2022-04-02 17:52:28.361158189 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-02 17:52:28.717160730 +0000
@@ -142,7 +142,7 @@
Disable release event after dragging: 0
Send Component ID : disabled