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

@@ -54,28 +54,6 @@
│ spstr strCommand.txt,tTmp.txt,"~",1
│ covx tTmp.txt,sleepTimeout,0,0
│ }
│ --- HMI/n2t-out/popupNotify.txt
├── +++ HMI/US/landscape/n2t-out/popupNotify.txt
│ @@ -295,19 +295,14 @@
│ covx tTmp.txt,sys0,0,0
│ tText.pco=sys0
│ //preserve old sleepTimeout
│ vaOldSleepT.val=sleepTimeout
│ // sleep timeout
│ spstr strCommand.txt,tTmp.txt,"~",10
│ covx tTmp.txt,sys0,0,0
│ - if(sys0==0)
│ - {
│ - //0 is buggy, a years is permanent enough
│ - sys0=31536000
│ - }
│ sleepTimeout=sys0
│ //font size
│ spstr strCommand.txt,tTmp.txt,"~",11
│ covx tTmp.txt,sys0,0,0
│ tTextAlt.font=sys0
│ tText.font=sys0
│ //icon
│ --- HMI/n2t-out/screensaver.txt
├── +++ HMI/US/landscape/n2t-out/screensaver.txt
│ @@ -28,17 +28,14 @@

View File

@@ -10,10 +10,6 @@ pageIcons
7 Component(s)
0 Line(s) of event code
0 Unique line(s) of event code
popupNotify
19 Component(s)
267 Line(s) of event code
172 Unique line(s) of event code
popupTimer
42 Component(s)
516 Line(s) of event code
@@ -30,6 +26,10 @@ popupInSel
34 Component(s)
621 Line(s) of event code
297 Unique line(s) of event code
popupNotify
19 Component(s)
267 Line(s) of event code
172 Unique line(s) of event code
pageTest
26 Component(s)
68 Line(s) of event code
@@ -99,4 +99,4 @@ Total
23 Page(s)
875 Component(s)
10379 Line(s) of event code
2406 Unique line(s) of event code
2407 Unique line(s) of event code

View File

@@ -581,7 +581,7 @@ Timer tmSerial
covx tTmp.txt,defaultFontColor,0,0
}
}
if(tInstruction.txt=="timeout")
if(tInstruction.txt=="timeout2")
{
//set timeout to global var
spstr strCommand.txt,tTmp.txt,"~",1

View File

@@ -352,7 +352,7 @@ Timer tmSerial
covx tTmp.txt,defaultFontColor,0,0
}
}
if(tInstruction.txt=="timeout")
if(tInstruction.txt=="timeout2")
{
//set timeout to global var
spstr strCommand.txt,tTmp.txt,"~",1