Merge branch 'main' of github.com:joBr99/nspanel-lovelace-ui

This commit is contained in:
joBr99
2023-06-01 16:48:58 +02:00
6 changed files with 80 additions and 13 deletions

View File

@@ -14,6 +14,27 @@
│ + //lcd_dev fffb 0002 0000 0020
│ printh 00 00 00 ff ff ff 88 ff ff ff//Output power on information to serial port
│ page pageStartup
│ --- HMI/n2t-out/cardPower.txt
├── +++ HMI/US/landscape/n2t-out/cardPower.txt
│ @@ -960,18 +960,14 @@
│ {
│ page cardPower
│ }
│ if(tId.txt=="cardChart")
│ {
│ page cardChart
│ }
│ - if(tId.txt=="cardLChart")
│ - {
│ - page cardLChart
│ - }
│ }
│ if(tInstruction.txt=="time")
│ {
│ // get set time to global variable
│ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
│ }
│ if(tInstruction.txt=="date")
│ --- HMI/n2t-out/pageStartup.txt
├── +++ HMI/US/landscape/n2t-out/pageStartup.txt
│ @@ -164,15 +164,15 @@

View File

@@ -1565,6 +1565,25 @@
│ Scope : local
│ Period (ms): 50
│ Enabled : yes
│ @@ -960,18 +936,14 @@
│ {
│ page cardPower
│ }
│ if(tId.txt=="cardChart")
│ {
│ page cardChart
│ }
│ - if(tId.txt=="cardLChart")
│ - {
│ - page cardLChart
│ - }
│ }
│ if(tInstruction.txt=="time")
│ {
│ // get set time to global variable
│ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
│ }
│ if(tInstruction.txt=="date")
│ --- HMI/n2t-out/pageStartup.txt
├── +++ HMI/US/portrait/n2t-out/pageStartup.txt
│ @@ -34,20 +34,14 @@

View File

@@ -1,4 +1,4 @@
+++ /dev/fd/62 2023-05-21 07:42:40.316901599 +0000
+++ /dev/fd/62 2023-05-23 19:25:50.449149755 +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 @@
@@ -796,6 +789,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 @@
@@ -1123,6 +1123,25 @@
+ Scope : local
+ Period (ms): 50
+ Enabled : yes
+18 +936,14 @@
+ {
+ page cardPower
+ }
+ if(tId.txt=="cardChart")
+ {
+ page cardChart
+ }
+ if(tId.txt=="cardLChart")
+ {
+ page cardLChart
+ }
+ }
+ if(tInstruction.txt=="time")
+ {
+ // get set time to global variable
+ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
+ }
+ if(tInstruction.txt=="date")
+I/n2t-out/pageStartup.txt
++ HMI/US/portrait/n2t-out/pageStartup.txt
+0 +34,14 @@

View File

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

View File

@@ -34,10 +34,6 @@ popupNotify
19 Component(s)
267 Line(s) of event code
172 Unique line(s) of event code
cardPower
54 Component(s)
527 Line(s) of event code
347 Unique line(s) of event code
pageStartup
20 Component(s)
193 Line(s) of event code
@@ -78,6 +74,10 @@ cardGrid2
52 Component(s)
611 Line(s) of event code
319 Unique line(s) of event code
cardPower
54 Component(s)
531 Line(s) of event code
349 Unique line(s) of event code
popupTimer
42 Component(s)
516 Line(s) of event code
@@ -94,5 +94,5 @@ cardEntities
Total
22 Page(s)
850 Component(s)
9940 Line(s) of event code
9944 Line(s) of event code
2369 Unique line(s) of event code

View File

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