fix navigation on cardlchart (add nextion2text)

This commit is contained in:
joBr99
2023-01-24 21:09:36 +00:00
committed by github-actions[bot]
parent a21fdabbe6
commit 259179b323
10 changed files with 31 additions and 115 deletions

View File

@@ -267,14 +267,7 @@ Button bNext
Events Events
Touch Press Event Touch Press Event
tSend.txt="event,buttonPress2,cardChart," tSend.txt="event,buttonPress2,"+nent2.txt+",button"
if(bPrev.txt=="")
{
tSend.txt+="bHome"
}else
{
tSend.txt+="bNext"
}
//send calc crc //send calc crc
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
@@ -321,14 +314,7 @@ Button bPrev
Events Events
Touch Press Event Touch Press Event
tSend.txt="event,buttonPress2,cardChart," tSend.txt="event,buttonPress2,"+nent1.txt+",button"
if(bPrev.txt=="")
{
tSend.txt+="bUp"
}else
{
tSend.txt+="bPrev"
}
//send calc crc //send calc crc
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC

View File

@@ -18,10 +18,6 @@ cardChart
33 Component(s) 33 Component(s)
429 Line(s) of event code 429 Line(s) of event code
292 Unique line(s) of event code 292 Unique line(s) of event code
cardLChart
33 Component(s)
408 Line(s) of event code
268 Unique line(s) of event code
popupInSel popupInSel
34 Component(s) 34 Component(s)
617 Line(s) of event code 617 Line(s) of event code
@@ -42,6 +38,10 @@ cardQR
34 Component(s) 34 Component(s)
402 Line(s) of event code 402 Line(s) of event code
234 Unique line(s) of event code 234 Unique line(s) of event code
cardLChart
33 Component(s)
394 Line(s) of event code
262 Unique line(s) of event code
pageStartup pageStartup
20 Component(s) 20 Component(s)
185 Line(s) of event code 185 Line(s) of event code
@@ -86,5 +86,5 @@ screensaver
Total Total
20 Page(s) 20 Page(s)
736 Component(s) 736 Component(s)
8814 Line(s) of event code 8800 Line(s) of event code
2263 Unique line(s) of event code 2256 Unique line(s) of event code

View File

@@ -186,14 +186,7 @@ Button bNext
Events Events
Touch Press Event Touch Press Event
tSend.txt="event,buttonPress2,cardChart," tSend.txt="event,buttonPress2,"+nent2.txt+",button"
if(bPrev.txt=="")
{
tSend.txt+="bHome"
}else
{
tSend.txt+="bNext"
}
//send calc crc //send calc crc
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
@@ -218,14 +211,7 @@ Button bPrev
Events Events
Touch Press Event Touch Press Event
tSend.txt="event,buttonPress2,cardChart," tSend.txt="event,buttonPress2,"+nent1.txt+",button"
if(bPrev.txt=="")
{
tSend.txt+="bUp"
}else
{
tSend.txt+="bPrev"
}
//send calc crc //send calc crc
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC

View File

@@ -1,4 +1,4 @@
+++ /dev/fd/62 2023-01-24 18:23:47.994140804 +0000 +++ /dev/fd/62 2023-01-24 21:09:29.347966042 +0000
+I/n2t-out/Program.s.txt +I/n2t-out/Program.s.txt
++ HMI/US/portrait/n2t-out/Program.s.txt ++ HMI/US/portrait/n2t-out/Program.s.txt
+I/n2t-out/cardEntities.txt +I/n2t-out/cardEntities.txt

View File

@@ -267,14 +267,7 @@ Button bNext
Events Events
Touch Press Event Touch Press Event
tSend.txt="event,buttonPress2,cardChart," tSend.txt="event,buttonPress2,"+nent2.txt+",button"
if(bPrev.txt=="")
{
tSend.txt+="bHome"
}else
{
tSend.txt+="bNext"
}
//send calc crc //send calc crc
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
@@ -321,14 +314,7 @@ Button bPrev
Events Events
Touch Press Event Touch Press Event
tSend.txt="event,buttonPress2,cardChart," tSend.txt="event,buttonPress2,"+nent1.txt+",button"
if(bPrev.txt=="")
{
tSend.txt+="bUp"
}else
{
tSend.txt+="bPrev"
}
//send calc crc //send calc crc
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC

View File

@@ -22,6 +22,10 @@ popupFan
27 Component(s) 27 Component(s)
351 Line(s) of event code 351 Line(s) of event code
204 Unique line(s) of event code 204 Unique line(s) of event code
cardLChart
33 Component(s)
394 Line(s) of event code
262 Unique line(s) of event code
pageStartup pageStartup
19 Component(s) 19 Component(s)
185 Line(s) of event code 185 Line(s) of event code
@@ -54,10 +58,6 @@ cardChart
33 Component(s) 33 Component(s)
429 Line(s) of event code 429 Line(s) of event code
292 Unique line(s) of event code 292 Unique line(s) of event code
cardLChart
33 Component(s)
408 Line(s) of event code
268 Unique line(s) of event code
screensaver screensaver
46 Component(s) 46 Component(s)
418 Line(s) of event code 418 Line(s) of event code
@@ -86,5 +86,5 @@ cardEntities
Total Total
20 Page(s) 20 Page(s)
747 Component(s) 747 Component(s)
9219 Line(s) of event code 9205 Line(s) of event code
2390 Unique line(s) of event code 2383 Unique line(s) of event code

View File

@@ -186,14 +186,7 @@ Button bNext
Events Events
Touch Press Event Touch Press Event
tSend.txt="event,buttonPress2,cardChart," tSend.txt="event,buttonPress2,"+nent2.txt+",button"
if(bPrev.txt=="")
{
tSend.txt+="bHome"
}else
{
tSend.txt+="bNext"
}
//send calc crc //send calc crc
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
@@ -218,14 +211,7 @@ Button bPrev
Events Events
Touch Press Event Touch Press Event
tSend.txt="event,buttonPress2,cardChart," tSend.txt="event,buttonPress2,"+nent1.txt+",button"
if(bPrev.txt=="")
{
tSend.txt+="bUp"
}else
{
tSend.txt+="bPrev"
}
//send calc crc //send calc crc
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC

View File

@@ -267,14 +267,7 @@ Button bNext
Events Events
Touch Press Event Touch Press Event
tSend.txt="event,buttonPress2,cardChart," tSend.txt="event,buttonPress2,"+nent2.txt+",button"
if(bPrev.txt=="")
{
tSend.txt+="bHome"
}else
{
tSend.txt+="bNext"
}
//send calc crc //send calc crc
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
@@ -321,14 +314,7 @@ Button bPrev
Events Events
Touch Press Event Touch Press Event
tSend.txt="event,buttonPress2,cardChart," tSend.txt="event,buttonPress2,"+nent1.txt+",button"
if(bPrev.txt=="")
{
tSend.txt+="bUp"
}else
{
tSend.txt+="bPrev"
}
//send calc crc //send calc crc
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC

View File

@@ -26,10 +26,6 @@ cardChart
33 Component(s) 33 Component(s)
429 Line(s) of event code 429 Line(s) of event code
292 Unique line(s) of event code 292 Unique line(s) of event code
cardLChart
33 Component(s)
408 Line(s) of event code
268 Unique line(s) of event code
pageTest pageTest
26 Component(s) 26 Component(s)
68 Line(s) of event code 68 Line(s) of event code
@@ -46,6 +42,10 @@ cardAlarm
43 Component(s) 43 Component(s)
492 Line(s) of event code 492 Line(s) of event code
269 Unique line(s) of event code 269 Unique line(s) of event code
cardLChart
33 Component(s)
394 Line(s) of event code
262 Unique line(s) of event code
screensaver screensaver
47 Component(s) 47 Component(s)
428 Line(s) of event code 428 Line(s) of event code
@@ -86,5 +86,5 @@ cardEntities
Total Total
20 Page(s) 20 Page(s)
737 Component(s) 737 Component(s)
8824 Line(s) of event code 8810 Line(s) of event code
2271 Unique line(s) of event code 2264 Unique line(s) of event code

View File

@@ -186,14 +186,7 @@ Button bNext
Events Events
Touch Press Event Touch Press Event
tSend.txt="event,buttonPress2,cardChart," tSend.txt="event,buttonPress2,"+nent2.txt+",button"
if(bPrev.txt=="")
{
tSend.txt+="bHome"
}else
{
tSend.txt+="bNext"
}
//send calc crc //send calc crc
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC
@@ -218,14 +211,7 @@ Button bPrev
Events Events
Touch Press Event Touch Press Event
tSend.txt="event,buttonPress2,cardChart," tSend.txt="event,buttonPress2,"+nent1.txt+",button"
if(bPrev.txt=="")
{
tSend.txt+="bUp"
}else
{
tSend.txt+="bPrev"
}
//send calc crc //send calc crc
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC