sync (add nextion2text)

This commit is contained in:
joBr99
2022-12-21 20:15:32 +00:00
committed by github-actions[bot]
parent fb694b17ce
commit d4433d989c
5 changed files with 56 additions and 236 deletions

View File

@@ -999,121 +999,7 @@
│ spstr strCommand.txt,tId.txt,"~",1 │ spstr strCommand.txt,tId.txt,"~",1
│ --- HMI/n2t-out/cardGrid.txt │ --- HMI/n2t-out/cardGrid.txt
├── +++ HMI/US/portrait/n2t-out/cardGrid.txt ├── +++ HMI/US/portrait/n2t-out/cardGrid.txt
│ @@ -258,18 +258,14 @@ │ @@ -633,14 +633,18 @@
│ {
│ page popupShutter
│ }
│ if(type1.txt=="input_sel")
│ {
│ page popupInSel
│ }
│ - if(type1.txt=="timer")
│ - {
│ - page popupTimer
│ - }
│ Touch Release Event
│ tmLP.en=0
│ tSend.txt="event,buttonPress2,"+entn1.txt+",button"
│ //send calc crc
│ btlen tSend.txt,sys0
│ crcrest 1,0xffff // reset CRC
│ @@ -303,18 +299,14 @@
│ {
│ page popupShutter
│ }
│ if(type2.txt=="input_sel")
│ {
│ page popupInSel
│ }
│ - if(type2.txt=="timer")
│ - {
│ - page popupTimer
│ - }
│ Touch Release Event
│ tmLP.en=0
│ tSend.txt="event,buttonPress2,"+entn2.txt+",button"
│ //send calc crc
│ btlen tSend.txt,sys0
│ crcrest 1,0xffff // reset CRC
│ @@ -348,18 +340,14 @@
│ {
│ page popupShutter
│ }
│ if(type3.txt=="input_sel")
│ {
│ page popupInSel
│ }
│ - if(type3.txt=="timer")
│ - {
│ - page popupTimer
│ - }
│ Touch Release Event
│ tmLP.en=0
│ tSend.txt="event,buttonPress2,"+entn3.txt+",button"
│ //send calc crc
│ btlen tSend.txt,sys0
│ crcrest 1,0xffff // reset CRC
│ @@ -393,18 +381,14 @@
│ {
│ page popupShutter
│ }
│ if(type4.txt=="input_sel")
│ {
│ page popupInSel
│ }
│ - if(type4.txt=="timer")
│ - {
│ - page popupTimer
│ - }
│ Touch Release Event
│ tmLP.en=0
│ tSend.txt="event,buttonPress2,"+entn4.txt+",button"
│ //send calc crc
│ btlen tSend.txt,sys0
│ crcrest 1,0xffff // reset CRC
│ @@ -438,18 +422,14 @@
│ {
│ page popupShutter
│ }
│ if(type5.txt=="input_sel")
│ {
│ page popupInSel
│ }
│ - if(type5.txt=="timer")
│ - {
│ - page popupTimer
│ - }
│ Touch Release Event
│ tmLP.en=0
│ tSend.txt="event,buttonPress2,"+entn5.txt+",button"
│ //send calc crc
│ btlen tSend.txt,sys0
│ crcrest 1,0xffff // reset CRC
│ @@ -483,18 +463,14 @@
│ {
│ page popupShutter
│ }
│ if(type6.txt=="input_sel")
│ {
│ page popupInSel
│ }
│ - if(type6.txt=="timer")
│ - {
│ - page popupTimer
│ - }
│ Touch Release Event
│ tmLP.en=0
│ tSend.txt="event,buttonPress2,"+entn6.txt+",button"
│ //send calc crc
│ btlen tSend.txt,sys0
│ crcrest 1,0xffff // reset CRC
│ @@ -633,14 +609,18 @@
│ { │ {
│ page popupLight │ page popupLight
│ } │ }

View File

@@ -1,4 +1,4 @@
+++ /dev/fd/62 2022-12-21 20:02:53.423928525 +0000 +++ /dev/fd/62 2022-12-21 20:15:25.252534958 +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
@@ -406,121 +406,7 @@
+ } + }
+I/n2t-out/cardGrid.txt +I/n2t-out/cardGrid.txt
++ HMI/US/portrait/n2t-out/cardGrid.txt ++ HMI/US/portrait/n2t-out/cardGrid.txt
+18 +258,14 @@ +14 +633,18 @@
+ {
+ page popupShutter
+ }
+ if(type1.txt=="input_sel")
+ {
+ page popupInSel
+ }
+ if(type1.txt=="timer")
+ {
+ page popupTimer
+ }
+
+ Touch Release Event
+ tmLP.en=0
+ tSend.txt="event,buttonPress2,"+entn1.txt+",button"
+ //send calc crc
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC
+18 +299,14 @@
+ {
+ page popupShutter
+ }
+ if(type2.txt=="input_sel")
+ {
+ page popupInSel
+ }
+ if(type2.txt=="timer")
+ {
+ page popupTimer
+ }
+
+ Touch Release Event
+ tmLP.en=0
+ tSend.txt="event,buttonPress2,"+entn2.txt+",button"
+ //send calc crc
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC
+18 +340,14 @@
+ {
+ page popupShutter
+ }
+ if(type3.txt=="input_sel")
+ {
+ page popupInSel
+ }
+ if(type3.txt=="timer")
+ {
+ page popupTimer
+ }
+
+ Touch Release Event
+ tmLP.en=0
+ tSend.txt="event,buttonPress2,"+entn3.txt+",button"
+ //send calc crc
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC
+18 +381,14 @@
+ {
+ page popupShutter
+ }
+ if(type4.txt=="input_sel")
+ {
+ page popupInSel
+ }
+ if(type4.txt=="timer")
+ {
+ page popupTimer
+ }
+
+ Touch Release Event
+ tmLP.en=0
+ tSend.txt="event,buttonPress2,"+entn4.txt+",button"
+ //send calc crc
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC
+18 +422,14 @@
+ {
+ page popupShutter
+ }
+ if(type5.txt=="input_sel")
+ {
+ page popupInSel
+ }
+ if(type5.txt=="timer")
+ {
+ page popupTimer
+ }
+
+ Touch Release Event
+ tmLP.en=0
+ tSend.txt="event,buttonPress2,"+entn5.txt+",button"
+ //send calc crc
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC
+18 +463,14 @@
+ {
+ page popupShutter
+ }
+ if(type6.txt=="input_sel")
+ {
+ page popupInSel
+ }
+ if(type6.txt=="timer")
+ {
+ page popupTimer
+ }
+
+ Touch Release Event
+ tmLP.en=0
+ tSend.txt="event,buttonPress2,"+entn6.txt+",button"
+ //send calc crc
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC
+14 +609,18 @@
+ { + {
+ page popupLight + page popupLight
+ } + }

View File

@@ -516,6 +516,10 @@ Button bEntity1
{ {
page popupInSel page popupInSel
} }
if(type1.txt=="timer")
{
page popupTimer
}
Touch Release Event Touch Release Event
tmLP.en=0 tmLP.en=0
@@ -579,6 +583,10 @@ Button bEntity2
{ {
page popupInSel page popupInSel
} }
if(type2.txt=="timer")
{
page popupTimer
}
Touch Release Event Touch Release Event
tmLP.en=0 tmLP.en=0
@@ -642,6 +650,10 @@ Button bEntity3
{ {
page popupInSel page popupInSel
} }
if(type3.txt=="timer")
{
page popupTimer
}
Touch Release Event Touch Release Event
tmLP.en=0 tmLP.en=0
@@ -705,6 +717,10 @@ Button bEntity4
{ {
page popupInSel page popupInSel
} }
if(type4.txt=="timer")
{
page popupTimer
}
Touch Release Event Touch Release Event
tmLP.en=0 tmLP.en=0
@@ -768,6 +784,10 @@ Button bEntity5
{ {
page popupInSel page popupInSel
} }
if(type5.txt=="timer")
{
page popupTimer
}
Touch Release Event Touch Release Event
tmLP.en=0 tmLP.en=0
@@ -831,6 +851,10 @@ Button bEntity6
{ {
page popupInSel page popupInSel
} }
if(type6.txt=="timer")
{
page popupTimer
}
Touch Release Event Touch Release Event
tmLP.en=0 tmLP.en=0

View File

@@ -30,10 +30,6 @@ pageStartup
19 Component(s) 19 Component(s)
181 Line(s) of event code 181 Line(s) of event code
129 Unique line(s) of event code 129 Unique line(s) of event code
cardGrid
42 Component(s)
518 Line(s) of event code
294 Unique line(s) of event code
popupShutter popupShutter
25 Component(s) 25 Component(s)
398 Line(s) of event code 398 Line(s) of event code
@@ -46,6 +42,10 @@ cardPower
43 Component(s) 43 Component(s)
439 Line(s) of event code 439 Line(s) of event code
299 Unique line(s) of event code 299 Unique line(s) of event code
cardGrid
42 Component(s)
542 Line(s) of event code
301 Unique line(s) of event code
cardMedia cardMedia
57 Component(s) 57 Component(s)
660 Line(s) of event code 660 Line(s) of event code
@@ -82,5 +82,5 @@ cardEntities
Total Total
19 Page(s) 19 Page(s)
693 Component(s) 693 Component(s)
8806 Line(s) of event code 8830 Line(s) of event code
2253 Unique line(s) of event code 2253 Unique line(s) of event code

View File

@@ -262,6 +262,10 @@ Button bEntity1
{ {
page popupInSel page popupInSel
} }
if(type1.txt=="timer")
{
page popupTimer
}
Touch Release Event Touch Release Event
tmLP.en=0 tmLP.en=0
@@ -303,6 +307,10 @@ Button bEntity2
{ {
page popupInSel page popupInSel
} }
if(type2.txt=="timer")
{
page popupTimer
}
Touch Release Event Touch Release Event
tmLP.en=0 tmLP.en=0
@@ -344,6 +352,10 @@ Button bEntity3
{ {
page popupInSel page popupInSel
} }
if(type3.txt=="timer")
{
page popupTimer
}
Touch Release Event Touch Release Event
tmLP.en=0 tmLP.en=0
@@ -385,6 +397,10 @@ Button bEntity4
{ {
page popupInSel page popupInSel
} }
if(type4.txt=="timer")
{
page popupTimer
}
Touch Release Event Touch Release Event
tmLP.en=0 tmLP.en=0
@@ -426,6 +442,10 @@ Button bEntity5
{ {
page popupInSel page popupInSel
} }
if(type5.txt=="timer")
{
page popupTimer
}
Touch Release Event Touch Release Event
tmLP.en=0 tmLP.en=0
@@ -467,6 +487,10 @@ Button bEntity6
{ {
page popupInSel page popupInSel
} }
if(type6.txt=="timer")
{
page popupTimer
}
Touch Release Event Touch Release Event
tmLP.en=0 tmLP.en=0