added model information to startup command from v23 (add nextion2text)

This commit is contained in:
joBr99
2022-03-30 09:17:14 +00:00
committed by GitHub Actions
parent 21dfcec43a
commit 973bcd3baf
10 changed files with 51 additions and 30 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-03-29 23:57:00.704990944 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-03-29 23:57:01.505006185 +0000
--- HMI/n2t-out/Program.s.txt 2022-03-30 09:17:12.762388734 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-03-30 09:17:13.638390126 +0000
@@ -10,6 +10,6 @@
int sleepValue=0
// dim value
@@ -10,3 +10,15 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt
+ // fix touch offset (Removed for US version)
+ //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-03-30 09:17:12.762388734 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-03-30 09:17:13.638390126 +0000
@@ -177,7 +177,7 @@
recmod=1
bauds=115200
// startup event
- tSend.txt="event,startup,"+tVersion.txt+",eu"
+ tSend.txt="event,startup,"+tVersion.txt+",us-l"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC

View File

@@ -402,7 +402,7 @@ Text tVersion
Horizontal Alignment : center
Vertical Alignment : center
Input Type : character
Text : 22
Text : 23
Max. Text Size : 10
Word wrap : disabled
Horizontal Spacing : 0
@@ -462,7 +462,7 @@ Button bSendStartup
recmod=1
bauds=115200
// startup event
tSend.txt="event,startup,"+tVersion.txt
tSend.txt="event,startup,"+tVersion.txt+",us-l"
//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 : 22
Text : 23
Max. Text Size : 10
Picture p0
@@ -177,7 +177,7 @@ Button bSendStartup
recmod=1
bauds=115200
// startup event
tSend.txt="event,startup,"+tVersion.txt
tSend.txt="event,startup,"+tVersion.txt+",us-l"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC

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-03-29 23:57:00.704990944 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-03-29 23:57:01.108998641 +0000
--- HMI/n2t-out/Program.s.txt 2022-03-30 09:17:12.762388734 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-03-30 09:17:13.206389440 +0000
@@ -10,6 +10,6 @@
int sleepValue=0
// dim value
@@ -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-03-29 23:57:00.704990944 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-03-29 23:57:01.112998717 +0000
--- HMI/n2t-out/cardEntities.txt 2022-03-30 09:17:12.766388740 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-03-30 09:17:13.206389440 +0000
@@ -62,6 +62,26 @@
vis bText4,0
vis hSlider4,0
@@ -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/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
--- HMI/n2t-out/cardThermo.txt 2022-03-29 23:57:00.704990944 +0000
+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-03-29 23:57:01.108998641 +0000
--- HMI/n2t-out/cardThermo.txt 2022-03-30 09:17:12.766388740 +0000
+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-03-30 09:17:13.206389440 +0000
@@ -17,6 +17,7 @@
vis tInstruction,0
vis tTmp,0
@@ -808,8 +808,8 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
Attributes
Scope : local
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-03-29 23:57:00.704990944 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-03-29 23:57:01.108998641 +0000
--- HMI/n2t-out/pageStartup.txt 2022-03-30 09:17:12.762388734 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-03-30 09:17:13.206389440 +0000
@@ -142,7 +142,7 @@
Disable release event after dragging: 0
Send Component ID : disabled
@@ -819,3 +819,12 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
Max. Text Size : 100
Text tVersion
@@ -177,7 +177,7 @@
recmod=1
bauds=115200
// startup event
- tSend.txt="event,startup,"+tVersion.txt+",eu"
+ tSend.txt="event,startup,"+tVersion.txt+",us-p"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC

View File

@@ -10,10 +10,6 @@ popupShutter
19 Component(s)
179 Line(s) of event code
102 Unique line(s) of event code
pageStartup
19 Component(s)
150 Line(s) of event code
113 Unique line(s) of event code
popupNotify
17 Component(s)
179 Line(s) of event code
@@ -50,6 +46,10 @@ pageIcons
5 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
cardEntities
86 Component(s)
1320 Line(s) of event code

View File

@@ -402,7 +402,7 @@ Text tVersion
Horizontal Alignment : center
Vertical Alignment : center
Input Type : character
Text : 22
Text : 23
Max. Text Size : 10
Word wrap : disabled
Horizontal Spacing : 0
@@ -462,7 +462,7 @@ Button bSendStartup
recmod=1
bauds=115200
// startup event
tSend.txt="event,startup,"+tVersion.txt
tSend.txt="event,startup,"+tVersion.txt+",us-p"
//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 : 22
Text : 23
Max. Text Size : 10
Picture p0
@@ -177,7 +177,7 @@ Button bSendStartup
recmod=1
bauds=115200
// startup event
tSend.txt="event,startup,"+tVersion.txt
tSend.txt="event,startup,"+tVersion.txt+",us-p"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC

View File

@@ -18,10 +18,6 @@ popupShutter
19 Component(s)
179 Line(s) of event code
102 Unique line(s) of event code
pageStartup
19 Component(s)
150 Line(s) of event code
113 Unique line(s) of event code
popupNotify
17 Component(s)
179 Line(s) of event code
@@ -30,6 +26,10 @@ cardGrid
39 Component(s)
388 Line(s) of event code
224 Unique line(s) of event code
pageStartup
19 Component(s)
150 Line(s) of event code
113 Unique line(s) of event code
cardMedia
30 Component(s)
278 Line(s) of event code

View File

@@ -402,7 +402,7 @@ Text tVersion
Horizontal Alignment : center
Vertical Alignment : center
Input Type : character
Text : 22
Text : 23
Max. Text Size : 10
Word wrap : disabled
Horizontal Spacing : 0
@@ -462,7 +462,7 @@ Button bSendStartup
recmod=1
bauds=115200
// startup event
tSend.txt="event,startup,"+tVersion.txt
tSend.txt="event,startup,"+tVersion.txt+",eu"
//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 : 22
Text : 23
Max. Text Size : 10
Picture p0
@@ -177,7 +177,7 @@ Button bSendStartup
recmod=1
bauds=115200
// startup event
tSend.txt="event,startup,"+tVersion.txt
tSend.txt="event,startup,"+tVersion.txt+",eu"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC