mirror of
https://github.com/joBr99/nspanel-lovelace-ui.git
synced 2025-12-22 15:34:26 +01:00
Merge branch 'main' of github.com:joBr99/nspanel-lovelace-ui (add nextion2text)
This commit is contained in:
committed by
github-actions[bot]
parent
893714d569
commit
75d652e402
@@ -268,3 +268,22 @@
|
||||
│ if(tAMPM.txt=="")
|
||||
│ {
|
||||
│ vis tAMPM,0
|
||||
│ @@ -824,18 +800,14 @@
|
||||
│ {
|
||||
│ page cardPower
|
||||
│ }
|
||||
│ if(tId.txt=="cardChart")
|
||||
│ {
|
||||
│ page cardChart
|
||||
│ }
|
||||
│ - if(tId.txt=="cardLChart")
|
||||
│ - {
|
||||
│ - page cardLChart
|
||||
│ - }
|
||||
│ }
|
||||
│ if(tInstruction.txt=="timeout")
|
||||
│ {
|
||||
│ //set timeout to global var
|
||||
│ spstr strCommand.txt,tTmp.txt,"~",1
|
||||
│ covx tTmp.txt,sleepTimeout,0,0
|
||||
│ }
|
||||
|
||||
@@ -1842,3 +1842,22 @@
|
||||
│ if(tAMPM.txt=="")
|
||||
│ {
|
||||
│ vis tAMPM,0
|
||||
│ @@ -824,18 +800,14 @@
|
||||
│ {
|
||||
│ page cardPower
|
||||
│ }
|
||||
│ if(tId.txt=="cardChart")
|
||||
│ {
|
||||
│ page cardChart
|
||||
│ }
|
||||
│ - if(tId.txt=="cardLChart")
|
||||
│ - {
|
||||
│ - page cardLChart
|
||||
│ - }
|
||||
│ }
|
||||
│ if(tInstruction.txt=="timeout")
|
||||
│ {
|
||||
│ //set timeout to global var
|
||||
│ spstr strCommand.txt,tTmp.txt,"~",1
|
||||
│ covx tTmp.txt,sleepTimeout,0,0
|
||||
│ }
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
+++ /dev/fd/62 2023-06-01 14:52:47.691403479 +0000
|
||||
+++ /dev/fd/62 2023-06-23 18:14:46.258673287 +0000
|
||||
+I/n2t-out/Program.s.txt
|
||||
++ HMI/US/portrait/n2t-out/Program.s.txt
|
||||
+1 +10,11 @@
|
||||
@@ -586,13 +586,6 @@
|
||||
+ covx tTmp.txt,sys0,0,0
|
||||
+ hSlider6.maxval=sys0
|
||||
+ }
|
||||
+ }
|
||||
+ if(tInstruction.txt=="pageType")
|
||||
+ {
|
||||
+ sleepValue=0
|
||||
+ //command format pageType,specialPageName
|
||||
+ //write name of speical page to tId
|
||||
+ spstr strCommand.txt,tId.txt,"~",1
|
||||
+I/n2t-out/cardGrid2.txt
|
||||
++ HMI/US/portrait/n2t-out/cardGrid2.txt
|
||||
+6 +25,28 @@
|
||||
@@ -850,6 +843,13 @@
|
||||
+ spstr strCommand.txt,tEntity9.txt,"~",66
|
||||
+ vis tEntity9,1
|
||||
+ }
|
||||
+ }
|
||||
+ if(tInstruction.txt=="pageType")
|
||||
+ {
|
||||
+ sleepValue=0
|
||||
+ //command format pageType,specialPageName
|
||||
+ //write name of speical page to tId
|
||||
+ spstr strCommand.txt,tId.txt,"~",1
|
||||
+I/n2t-out/cardPower.txt
|
||||
++ HMI/US/portrait/n2t-out/cardPower.txt
|
||||
+6 +45,16 @@
|
||||
@@ -1380,3 +1380,22 @@
|
||||
+ if(tAMPM.txt=="")
|
||||
+ {
|
||||
+ vis tAMPM,0
|
||||
+18 +800,14 @@
|
||||
+ {
|
||||
+ page cardPower
|
||||
+ }
|
||||
+ if(tId.txt=="cardChart")
|
||||
+ {
|
||||
+ page cardChart
|
||||
+ }
|
||||
+ if(tId.txt=="cardLChart")
|
||||
+ {
|
||||
+ page cardLChart
|
||||
+ }
|
||||
+ }
|
||||
+ if(tInstruction.txt=="timeout")
|
||||
+ {
|
||||
+ //set timeout to global var
|
||||
+ spstr strCommand.txt,tTmp.txt,"~",1
|
||||
+ covx tTmp.txt,sleepTimeout,0,0
|
||||
+ }
|
||||
|
||||
@@ -50,6 +50,10 @@ cardChart
|
||||
33 Component(s)
|
||||
437 Line(s) of event code
|
||||
296 Unique line(s) of event code
|
||||
screensaver2
|
||||
59 Component(s)
|
||||
362 Line(s) of event code
|
||||
255 Unique line(s) of event code
|
||||
cardAlarm
|
||||
43 Component(s)
|
||||
500 Line(s) of event code
|
||||
@@ -62,10 +66,6 @@ cardThermo
|
||||
57 Component(s)
|
||||
540 Line(s) of event code
|
||||
319 Unique line(s) of event code
|
||||
screensaver2
|
||||
59 Component(s)
|
||||
358 Line(s) of event code
|
||||
253 Unique line(s) of event code
|
||||
cardMedia
|
||||
59 Component(s)
|
||||
649 Line(s) of event code
|
||||
@@ -94,5 +94,5 @@ cardEntities
|
||||
Total
|
||||
22 Page(s)
|
||||
850 Component(s)
|
||||
9944 Line(s) of event code
|
||||
9948 Line(s) of event code
|
||||
2385 Unique line(s) of event code
|
||||
|
||||
@@ -1661,6 +1661,10 @@ Timer tmSerial
|
||||
{
|
||||
page cardChart
|
||||
}
|
||||
if(tId.txt=="cardLChart")
|
||||
{
|
||||
page cardLChart
|
||||
}
|
||||
}
|
||||
if(tInstruction.txt=="timeout")
|
||||
{
|
||||
|
||||
@@ -828,6 +828,10 @@ Timer tmSerial
|
||||
{
|
||||
page cardChart
|
||||
}
|
||||
if(tId.txt=="cardLChart")
|
||||
{
|
||||
page cardLChart
|
||||
}
|
||||
}
|
||||
if(tInstruction.txt=="timeout")
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user