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/landscape/n2t-out/Program.s.txt
--- HMI/n2t-out/Program.s.txt 2022-04-01 18:14:32.819231663 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-04-01 18:14:33.747246705 +0000
--- HMI/n2t-out/Program.s.txt 2022-04-02 17:52:28.361158189 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-04-02 17:52:29.069163241 +0000
@@ -11,6 +11,6 @@
// dim value
int dimValue=40
@@ -11,8 +11,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-04-01 18:14:32.819231663 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-04-01 18:14:33.747246705 +0000
--- HMI/n2t-out/pageStartup.txt 2022-04-02 17:52:28.361158189 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-04-02 17:52:29.069163241 +0000
@@ -177,7 +177,7 @@
recmod=1
bauds=115200

View File

@@ -343,8 +343,10 @@ Button bPrev
if(bPrev.txt=="")
{
tSend.txt+="bUp"
}else
{
tSend.txt+="bPrev"
}
tSend.txt+="bPrev"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC

View File

@@ -1435,8 +1435,10 @@ Button bPrev
if(bPrev.txt=="")
{
tSend.txt+="bUp"
}else
{
tSend.txt+="bPrev"
}
tSend.txt+="bPrev"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC

View File

@@ -519,8 +519,10 @@ Button bPrev
if(bPrev.txt=="")
{
tSend.txt+="bUp"
}else
{
tSend.txt+="bPrev"
}
tSend.txt+="bPrev"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC

View File

@@ -860,8 +860,10 @@ Button bPrev
if(bPrev.txt=="")
{
tSend.txt+="bUp"
}else
{
tSend.txt+="bPrev"
}
tSend.txt+="bPrev"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC

View File

@@ -687,8 +687,10 @@ Button bPrev
if(bPrev.txt=="")
{
tSend.txt+="bUp"
}else
{
tSend.txt+="bPrev"
}
tSend.txt+="bPrev"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC

View File

@@ -22,10 +22,18 @@ pageStartup
19 Component(s)
150 Line(s) of event code
113 Unique line(s) of event code
cardMedia
30 Component(s)
333 Line(s) of event code
170 Unique line(s) of event code
popupShutter
19 Component(s)
178 Line(s) of event code
101 Unique line(s) of event code
cardGrid
39 Component(s)
430 Line(s) of event code
249 Unique line(s) of event code
popupLight
27 Component(s)
322 Line(s) of event code
@@ -34,29 +42,21 @@ screensaver
33 Component(s)
207 Line(s) of event code
158 Unique line(s) of event code
cardEntities
62 Component(s)
970 Line(s) of event code
412 Unique line(s) of event code
cardThermo
41 Component(s)
458 Line(s) of event code
283 Unique line(s) of event code
cardMedia
30 Component(s)
331 Line(s) of event code
169 Unique line(s) of event code
cardGrid
39 Component(s)
428 Line(s) of event code
248 Unique line(s) of event code
cardAlarm
35 Component(s)
343 Line(s) of event code
345 Line(s) of event code
214 Unique line(s) of event code
cardThermo
41 Component(s)
460 Line(s) of event code
284 Unique line(s) of event code
cardEntities
62 Component(s)
972 Line(s) of event code
413 Unique line(s) of event code
Total
13 Page(s)
355 Component(s)
3636 Line(s) of event code
3646 Line(s) of event code
1045 Unique line(s) of event code

View File

@@ -402,7 +402,7 @@ Text tVersion
Horizontal Alignment : center
Vertical Alignment : center
Input Type : character
Text : 26
Text : 27
Max. Text Size : 10
Word wrap : disabled
Horizontal Spacing : 0

View File

@@ -174,8 +174,10 @@ Button bPrev
if(bPrev.txt=="")
{
tSend.txt+="bUp"
}else
{
tSend.txt+="bPrev"
}
tSend.txt+="bPrev"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC

View File

@@ -718,8 +718,10 @@ Button bPrev
if(bPrev.txt=="")
{
tSend.txt+="bUp"
}else
{
tSend.txt+="bPrev"
}
tSend.txt+="bPrev"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC

View File

@@ -246,8 +246,10 @@ Button bPrev
if(bPrev.txt=="")
{
tSend.txt+="bUp"
}else
{
tSend.txt+="bPrev"
}
tSend.txt+="bPrev"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC

View File

@@ -439,8 +439,10 @@ Button bPrev
if(bPrev.txt=="")
{
tSend.txt+="bUp"
}else
{
tSend.txt+="bPrev"
}
tSend.txt+="bPrev"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC

View File

@@ -333,8 +333,10 @@ Button bPrev
if(bPrev.txt=="")
{
tSend.txt+="bUp"
}else
{
tSend.txt+="bPrev"
}
tSend.txt+="bPrev"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC

View File

@@ -152,7 +152,7 @@ Text tVersion
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Text : 26
Text : 27
Max. Text Size : 10
Picture p0

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

View File

@@ -343,8 +343,10 @@ Button bPrev
if(bPrev.txt=="")
{
tSend.txt+="bUp"
}else
{
tSend.txt+="bPrev"
}
tSend.txt+="bPrev"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC

View File

@@ -1749,8 +1749,10 @@ Button bPrev
if(bPrev.txt=="")
{
tSend.txt+="bUp"
}else
{
tSend.txt+="bPrev"
}
tSend.txt+="bPrev"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC

View File

@@ -519,8 +519,10 @@ Button bPrev
if(bPrev.txt=="")
{
tSend.txt+="bUp"
}else
{
tSend.txt+="bPrev"
}
tSend.txt+="bPrev"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC

View File

@@ -860,8 +860,10 @@ Button bPrev
if(bPrev.txt=="")
{
tSend.txt+="bUp"
}else
{
tSend.txt+="bPrev"
}
tSend.txt+="bPrev"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC

View File

@@ -687,8 +687,10 @@ Button bPrev
if(bPrev.txt=="")
{
tSend.txt+="bUp"
}else
{
tSend.txt+="bPrev"
}
tSend.txt+="bPrev"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC

View File

@@ -6,18 +6,18 @@ pageSerialTest
13 Component(s)
48 Line(s) of event code
43 Unique line(s) of event code
pageIcons
7 Component(s)
0 Line(s) of event code
0 Unique line(s) of event code
pageStartup
19 Component(s)
150 Line(s) of event code
113 Unique line(s) of event code
cardAlarm
35 Component(s)
343 Line(s) of event code
214 Unique line(s) of event code
pageIcons
7 Component(s)
0 Line(s) of event code
0 Unique line(s) of event code
cardMedia
30 Component(s)
333 Line(s) of event code
170 Unique line(s) of event code
popupNotify
17 Component(s)
178 Line(s) of event code
@@ -34,29 +34,29 @@ screensaver
33 Component(s)
207 Line(s) of event code
158 Unique line(s) of event code
cardGrid
39 Component(s)
428 Line(s) of event code
248 Unique line(s) of event code
popupShutter
19 Component(s)
178 Line(s) of event code
101 Unique line(s) of event code
cardAlarm
35 Component(s)
345 Line(s) of event code
214 Unique line(s) of event code
cardGrid
39 Component(s)
430 Line(s) of event code
249 Unique line(s) of event code
cardThermo
41 Component(s)
458 Line(s) of event code
283 Unique line(s) of event code
460 Line(s) of event code
284 Unique line(s) of event code
cardEntities
86 Component(s)
1360 Line(s) of event code
552 Unique line(s) of event code
cardMedia
30 Component(s)
331 Line(s) of event code
169 Unique line(s) of event code
1362 Line(s) of event code
553 Unique line(s) of event code
Total
13 Page(s)
379 Component(s)
4026 Line(s) of event code
4036 Line(s) of event code
1159 Unique line(s) of event code

View File

@@ -402,7 +402,7 @@ Text tVersion
Horizontal Alignment : center
Vertical Alignment : center
Input Type : character
Text : 26
Text : 27
Max. Text Size : 10
Word wrap : disabled
Horizontal Spacing : 0

View File

@@ -174,8 +174,10 @@ Button bPrev
if(bPrev.txt=="")
{
tSend.txt+="bUp"
}else
{
tSend.txt+="bPrev"
}
tSend.txt+="bPrev"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC

View File

@@ -876,8 +876,10 @@ Button bPrev
if(bPrev.txt=="")
{
tSend.txt+="bUp"
}else
{
tSend.txt+="bPrev"
}
tSend.txt+="bPrev"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC

View File

@@ -246,8 +246,10 @@ Button bPrev
if(bPrev.txt=="")
{
tSend.txt+="bUp"
}else
{
tSend.txt+="bPrev"
}
tSend.txt+="bPrev"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC

View File

@@ -439,8 +439,10 @@ Button bPrev
if(bPrev.txt=="")
{
tSend.txt+="bUp"
}else
{
tSend.txt+="bPrev"
}
tSend.txt+="bPrev"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC

View File

@@ -333,8 +333,10 @@ Button bPrev
if(bPrev.txt=="")
{
tSend.txt+="bUp"
}else
{
tSend.txt+="bPrev"
}
tSend.txt+="bPrev"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC

View File

@@ -152,7 +152,7 @@ Text tVersion
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Text : 26
Text : 27
Max. Text Size : 10
Picture p0

View File

@@ -343,8 +343,10 @@ Button bPrev
if(bPrev.txt=="")
{
tSend.txt+="bUp"
}else
{
tSend.txt+="bPrev"
}
tSend.txt+="bPrev"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC

View File

@@ -1435,8 +1435,10 @@ Button bPrev
if(bPrev.txt=="")
{
tSend.txt+="bUp"
}else
{
tSend.txt+="bPrev"
}
tSend.txt+="bPrev"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC

View File

@@ -519,8 +519,10 @@ Button bPrev
if(bPrev.txt=="")
{
tSend.txt+="bUp"
}else
{
tSend.txt+="bPrev"
}
tSend.txt+="bPrev"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC

View File

@@ -860,8 +860,10 @@ Button bPrev
if(bPrev.txt=="")
{
tSend.txt+="bUp"
}else
{
tSend.txt+="bPrev"
}
tSend.txt+="bPrev"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC

View File

@@ -687,8 +687,10 @@ Button bPrev
if(bPrev.txt=="")
{
tSend.txt+="bUp"
}else
{
tSend.txt+="bPrev"
}
tSend.txt+="bPrev"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC

View File

@@ -22,10 +22,10 @@ popupShutter
19 Component(s)
178 Line(s) of event code
101 Unique line(s) of event code
cardAlarm
35 Component(s)
343 Line(s) of event code
214 Unique line(s) of event code
cardMedia
30 Component(s)
333 Line(s) of event code
170 Unique line(s) of event code
popupLight
27 Component(s)
322 Line(s) of event code
@@ -34,29 +34,29 @@ pageStartup
19 Component(s)
150 Line(s) of event code
113 Unique line(s) of event code
cardMedia
30 Component(s)
331 Line(s) of event code
169 Unique line(s) of event code
cardThermo
41 Component(s)
460 Line(s) of event code
284 Unique line(s) of event code
screensaver
33 Component(s)
207 Line(s) of event code
158 Unique line(s) of event code
cardAlarm
35 Component(s)
345 Line(s) of event code
214 Unique line(s) of event code
cardGrid
39 Component(s)
428 Line(s) of event code
248 Unique line(s) of event code
cardThermo
41 Component(s)
458 Line(s) of event code
283 Unique line(s) of event code
430 Line(s) of event code
249 Unique line(s) of event code
cardEntities
62 Component(s)
970 Line(s) of event code
412 Unique line(s) of event code
972 Line(s) of event code
413 Unique line(s) of event code
Total
13 Page(s)
355 Component(s)
3637 Line(s) of event code
3647 Line(s) of event code
1046 Unique line(s) of event code

View File

@@ -402,7 +402,7 @@ Text tVersion
Horizontal Alignment : center
Vertical Alignment : center
Input Type : character
Text : 26
Text : 27
Max. Text Size : 10
Word wrap : disabled
Horizontal Spacing : 0

View File

@@ -174,8 +174,10 @@ Button bPrev
if(bPrev.txt=="")
{
tSend.txt+="bUp"
}else
{
tSend.txt+="bPrev"
}
tSend.txt+="bPrev"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC

View File

@@ -718,8 +718,10 @@ Button bPrev
if(bPrev.txt=="")
{
tSend.txt+="bUp"
}else
{
tSend.txt+="bPrev"
}
tSend.txt+="bPrev"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC

View File

@@ -246,8 +246,10 @@ Button bPrev
if(bPrev.txt=="")
{
tSend.txt+="bUp"
}else
{
tSend.txt+="bPrev"
}
tSend.txt+="bPrev"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC

View File

@@ -439,8 +439,10 @@ Button bPrev
if(bPrev.txt=="")
{
tSend.txt+="bUp"
}else
{
tSend.txt+="bPrev"
}
tSend.txt+="bPrev"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC

View File

@@ -333,8 +333,10 @@ Button bPrev
if(bPrev.txt=="")
{
tSend.txt+="bUp"
}else
{
tSend.txt+="bPrev"
}
tSend.txt+="bPrev"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC

View File

@@ -152,7 +152,7 @@ Text tVersion
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Text : 26
Text : 27
Max. Text Size : 10
Picture p0