fixes #933 (add nextion2text)

This commit is contained in:
joBr99
2023-08-20 13:07:23 +00:00
committed by github-actions[bot]
parent e580333560
commit 652dd0b157
20 changed files with 238 additions and 474 deletions

View File

@@ -1036,26 +1036,26 @@ Button bEntity7
Events
Touch Press Event
tmLP.en=1
tTmp.txt=type2.txt
pageIcons.tTmp1.txt=tEntity2.txt
pageIcons.tTmp2.txt=entn2.txt
pageIcons.tTmp3.txt=bEntity2.txt
if(type2.txt=="shutter")
tTmp.txt=type7.txt
pageIcons.tTmp1.txt=tEntity7.txt
pageIcons.tTmp2.txt=entn7.txt
pageIcons.tTmp3.txt=bEntity7.txt
if(type7.txt=="shutter")
{
page popupShutter
}
if(type2.txt=="input_sel")
if(type7.txt=="input_sel")
{
page popupInSel
}
if(type2.txt=="timer")
if(type7.txt=="timer")
{
page popupTimer
}
Touch Release Event
tmLP.en=0
tSend.txt="event,buttonPress2,"+entn2.txt+",button"
tSend.txt="event,buttonPress2,"+entn7.txt+",button"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
@@ -1102,26 +1102,26 @@ Button bEntity8
Events
Touch Press Event
tmLP.en=1
tTmp.txt=type6.txt
pageIcons.tTmp1.txt=tEntity6.txt
pageIcons.tTmp2.txt=entn6.txt
pageIcons.tTmp3.txt=bEntity6.txt
if(type6.txt=="shutter")
tTmp.txt=type8.txt
pageIcons.tTmp1.txt=tEntity8.txt
pageIcons.tTmp2.txt=entn8.txt
pageIcons.tTmp3.txt=bEntity8.txt
if(type8.txt=="shutter")
{
page popupShutter
}
if(type6.txt=="input_sel")
if(type8.txt=="input_sel")
{
page popupInSel
}
if(type6.txt=="timer")
if(type8.txt=="timer")
{
page popupTimer
}
Touch Release Event
tmLP.en=0
tSend.txt="event,buttonPress2,"+entn6.txt+",button"
tSend.txt="event,buttonPress2,"+entn8.txt+",button"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
@@ -1168,26 +1168,26 @@ Button bEntity9
Events
Touch Press Event
tmLP.en=1
tTmp.txt=type6.txt
pageIcons.tTmp1.txt=tEntity6.txt
pageIcons.tTmp2.txt=entn6.txt
pageIcons.tTmp3.txt=bEntity6.txt
if(type6.txt=="shutter")
tTmp.txt=type9.txt
pageIcons.tTmp1.txt=tEntity9.txt
pageIcons.tTmp2.txt=entn9.txt
pageIcons.tTmp3.txt=bEntity9.txt
if(type9.txt=="shutter")
{
page popupShutter
}
if(type6.txt=="input_sel")
if(type9.txt=="input_sel")
{
page popupInSel
}
if(type6.txt=="timer")
if(type9.txt=="timer")
{
page popupTimer
}
Touch Release Event
tmLP.en=0
tSend.txt="event,buttonPress2,"+entn6.txt+",button"
tSend.txt="event,buttonPress2,"+entn9.txt+",button"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC

View File

@@ -1514,6 +1514,10 @@ Timer tmSerial
{
page cardChart
}
if(tId.txt=="cardLChart")
{
page cardChart
}
}
if(tInstruction.txt=="time")
{

View File

@@ -22,10 +22,10 @@ popupTimer
42 Component(s)
516 Line(s) of event code
257 Unique line(s) of event code
pageStartup
19 Component(s)
193 Line(s) of event code
135 Unique line(s) of event code
popupLight
28 Component(s)
412 Line(s) of event code
227 Unique line(s) of event code
popupFan
27 Component(s)
355 Line(s) of event code
@@ -46,10 +46,10 @@ cardLChart
33 Component(s)
402 Line(s) of event code
266 Unique line(s) of event code
popupLight
28 Component(s)
412 Line(s) of event code
226 Unique line(s) of event code
pageStartup
19 Component(s)
198 Line(s) of event code
137 Unique line(s) of event code
popupShutter
25 Component(s)
402 Line(s) of event code
@@ -69,19 +69,11 @@ popupInSel
cardGrid2
56 Component(s)
663 Line(s) of event code
335 Unique line(s) of event code
359 Unique line(s) of event code
cardAlarm
43 Component(s)
500 Line(s) of event code
273 Unique line(s) of event code
cardPower
54 Component(s)
521 Line(s) of event code
341 Unique line(s) of event code
screensaver2
58 Component(s)
348 Line(s) of event code
245 Unique line(s) of event code
cardThermo
57 Component(s)
540 Line(s) of event code
@@ -90,6 +82,14 @@ screensaver
46 Component(s)
429 Line(s) of event code
306 Unique line(s) of event code
cardPower
54 Component(s)
525 Line(s) of event code
342 Unique line(s) of event code
screensaver2
58 Component(s)
352 Line(s) of event code
247 Unique line(s) of event code
cardEntities
91 Component(s)
1666 Line(s) of event code
@@ -98,5 +98,5 @@ cardEntities
Total
23 Page(s)
890 Component(s)
10823 Line(s) of event code
2527 Unique line(s) of event code
10836 Line(s) of event code
2553 Unique line(s) of event code

View File

@@ -568,8 +568,14 @@ Timer tmSerial
{
covx tTmp.txt,defaultFontColor,0,0
}
// get feature flag popup
spstr strCommand.txt,tTmp.txt,"~",5
if(tTmp.txt!="")
{
covx tTmp.txt,featNewSliders,0,0
}
}
if(tInstruction.txt=="timeout")
if(tInstruction.txt=="timeout2")
{
//set timeout to global var
spstr strCommand.txt,tTmp.txt,"~",1

View File

@@ -984,7 +984,7 @@ Timer tmSerial
}
if(tId.txt=="cardGrid2")
{
page cardGrid
page cardGrid2
}
if(tId.txt=="popupLight")
{

View File

@@ -1617,6 +1617,10 @@ Timer tmSerial
{
page cardChart
}
if(tId.txt=="cardLChart")
{
page cardLChart
}
}
if(tInstruction.txt=="timeout")
{