h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2026-02-19 12:44:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
joBr99
2022-03-19 23:50:35 +01:00
parent fc57570cd3 8583702547
commit f6eedc28cf
9 changed files with 1219 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
HMI/n2t-out/cardAlarm.txt
View File

@@ -939,15 +939,9 @@ Timer tmSerial
spstr strCommand.txt,tTmp.txt,",",2 spstr strCommand.txt,tTmp.txt,",",2
//save third arg if there's one //save third arg if there's one
spstr strCommand.txt,pageIcons.tTmp2.txt,",",3 spstr strCommand.txt,pageIcons.tTmp2.txt,",",3
if(tId.txt=="cardMedia") //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
{ udelete payloadLength-1
//yay, we are already on the correct page bufferPos=0
}else
{
//we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
udelete payloadLength-1
bufferPos=0
}
if(tId.txt=="popupLight") if(tId.txt=="popupLight")
{ {
pageIcons.tTmp1.txt=tTmp.txt pageIcons.tTmp1.txt=tTmp.txt
@@ -969,6 +963,14 @@ Timer tmSerial
{ {
page popupNotify page popupNotify
} }
if(tId.txt=="cardGrid")
{
page cardGrid
}
if(tId.txt=="cardMedia")
{
page cardMedia
}
} }
// end of user code // end of user code
udelete payloadLength-1 udelete payloadLength-1
@@ -980,15 +982,6 @@ Timer tmSerial
// next character // next character
bufferPos++ bufferPos++
} }
if(bufferPos==usize)
{
// copy whole buffer to t1.txt, for debugging
//ucopy t2.txt,0,usize,0
// ucopy n2.val,0,usize,0
// clear whole buffer
//code_c
//bufferPos=0
}
} }
Timer tmSleep Timer tmSleep

29
HMI/n2t-out/cardEntities.txt
View File

@@ -2329,15 +2329,9 @@ Timer tmSerial
spstr strCommand.txt,tTmp.txt,",",2 spstr strCommand.txt,tTmp.txt,",",2
//save third arg if there's one //save third arg if there's one
spstr strCommand.txt,pageIcons.tTmp2.txt,",",3 spstr strCommand.txt,pageIcons.tTmp2.txt,",",3
if(tId.txt=="cardEntities") //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
{ udelete payloadLength-1
//yay, we are already on the correct page bufferPos=0
}else
{
//we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
udelete payloadLength-1
bufferPos=0
}
if(tId.txt=="popupLight") if(tId.txt=="popupLight")
{ {
pageIcons.tTmp1.txt=tTmp.txt pageIcons.tTmp1.txt=tTmp.txt
@@ -2359,6 +2353,14 @@ Timer tmSerial
{ {
page popupNotify page popupNotify
} }
if(tId.txt=="cardGrid")
{
page cardGrid
}
if(tId.txt=="cardAlarm")
{
page cardAlarm
}
} }
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {
@@ -2392,15 +2394,6 @@ Timer tmSerial
// next character // next character
bufferPos++ bufferPos++
} }
if(bufferPos==usize)
{
// copy whole buffer to t1.txt, for debugging
//ucopy t2.txt,0,usize,0
// ucopy n2.val,0,usize,0
// clear whole buffer
//code_c
//bufferPos=0
}
} }
Timer tmSleep Timer tmSleep

1093
HMI/n2t-out/cardGrid.txt Normal file
View File

File diff suppressed because it is too large Load Diff

20
HMI/n2t-out/cardMedia.txt
View File

@@ -768,15 +768,9 @@ Timer tmSerial
spstr strCommand.txt,tTmp.txt,",",2 spstr strCommand.txt,tTmp.txt,",",2
//save third arg if there's one //save third arg if there's one
spstr strCommand.txt,pageIcons.tTmp2.txt,",",3 spstr strCommand.txt,pageIcons.tTmp2.txt,",",3
if(tId.txt=="cardMedia") //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
{ udelete payloadLength-1
//yay, we are already on the correct page bufferPos=0
}else
{
//we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
udelete payloadLength-1
bufferPos=0
}
if(tId.txt=="popupLight") if(tId.txt=="popupLight")
{ {
pageIcons.tTmp1.txt=tTmp.txt pageIcons.tTmp1.txt=tTmp.txt
@@ -798,6 +792,14 @@ Timer tmSerial
{ {
page popupNotify page popupNotify
} }
if(tId.txt=="cardGrid")
{
page cardGrid
}
if(tId.txt=="cardAlarm")
{
page cardAlarm
}
} }
// end of user code // end of user code
udelete payloadLength-1 udelete payloadLength-1

29
HMI/n2t-out/cardThermo.txt
View File

@@ -1518,15 +1518,9 @@ Timer tmSerial
spstr strCommand.txt,tTmp.txt,",",2 spstr strCommand.txt,tTmp.txt,",",2
//save third arg if there's one //save third arg if there's one
spstr strCommand.txt,pageIcons.tTmp2.txt,",",3 spstr strCommand.txt,pageIcons.tTmp2.txt,",",3
if(tId.txt=="cardThermo") //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
{ udelete payloadLength-1
//yay, we are already on the correct page bufferPos=0
}else
{
//we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
udelete payloadLength-1
bufferPos=0
}
if(tId.txt=="popupLight") if(tId.txt=="popupLight")
{ {
pageIcons.tTmp1.txt=tTmp.txt pageIcons.tTmp1.txt=tTmp.txt
@@ -1548,6 +1542,14 @@ Timer tmSerial
{ {
page popupNotify page popupNotify
} }
if(tId.txt=="cardGrid")
{
page cardGrid
}
if(tId.txt=="cardAlarm")
{
page cardAlarm
}
} }
// end of user code // end of user code
udelete payloadLength-1 udelete payloadLength-1
@@ -1559,15 +1561,6 @@ Timer tmSerial
// next character // next character
bufferPos++ bufferPos++
} }
if(bufferPos==usize)
{
// copy whole buffer to t1.txt, for debugging
//ucopy t2.txt,0,usize,0
// ucopy n2.val,0,usize,0
// clear whole buffer
//code_c
//bufferPos=0
}
} }
Timer tmSleep Timer tmSleep

56
HMI/n2t-out/nspanel_Stats.txt
View File

@@ -14,34 +14,30 @@ pageSerialTest
13 Component(s) 13 Component(s)
48 Line(s) of event code 48 Line(s) of event code
43 Unique line(s) of event code 43 Unique line(s) of event code
cardMedia screensaver
22 Component(s) 25 Component(s)
219 Line(s) of event code 160 Line(s) of event code
114 Unique line(s) of event code 122 Unique line(s) of event code
pageTest
13 Component(s)
13 Line(s) of event code
13 Unique line(s) of event code
popupShutter popupShutter
19 Component(s) 19 Component(s)
148 Line(s) of event code 148 Line(s) of event code
84 Unique line(s) of event code 84 Unique line(s) of event code
pageStartup
19 Component(s)
145 Line(s) of event code
110 Unique line(s) of event code
pageSwipeTest pageSwipeTest
18 Component(s) 18 Component(s)
62 Line(s) of event code 62 Line(s) of event code
44 Unique line(s) of event code 44 Unique line(s) of event code
screensaver cardGrid
25 Component(s) 38 Component(s)
152 Line(s) of event code 245 Line(s) of event code
118 Unique line(s) of event code 158 Unique line(s) of event code
cardThermo pageTest
42 Component(s) 14 Component(s)
450 Line(s) of event code 14 Line(s) of event code
220 Unique line(s) of event code 14 Unique line(s) of event code
pageStartup
19 Component(s)
140 Line(s) of event code
107 Unique line(s) of event code
popupLight popupLight
27 Component(s) 27 Component(s)
297 Line(s) of event code 297 Line(s) of event code
@@ -49,14 +45,22 @@ popupLight
cardAlarm cardAlarm
28 Component(s) 28 Component(s)
159 Line(s) of event code 159 Line(s) of event code
105 Unique line(s) of event code 106 Unique line(s) of event code
cardMedia
22 Component(s)
222 Line(s) of event code
116 Unique line(s) of event code
cardThermo
42 Component(s)
450 Line(s) of event code
221 Unique line(s) of event code
cardEntities cardEntities
55 Component(s) 55 Component(s)
823 Line(s) of event code 823 Line(s) of event code
320 Unique line(s) of event code 322 Unique line(s) of event code
Total Total
13 Page(s) 14 Page(s)
302 Component(s) 341 Component(s)
2671 Line(s) of event code 2933 Line(s) of event code
693 Unique line(s) of event code 739 Unique line(s) of event code

17
HMI/n2t-out/pageStartup.txt
View File

@@ -612,6 +612,14 @@ Timer tmSerial
{ {
page cardMedia page cardMedia
} }
if(tId.txt=="cardGrid")
{
page cardGrid
}
if(tId.txt=="cardAlarm")
{
page cardAlarm
}
} }
// end of user code // end of user code
udelete payloadLength-1 udelete payloadLength-1
@@ -623,15 +631,6 @@ Timer tmSerial
// next character // next character
bufferPos++ bufferPos++
} }
if(bufferPos==usize)
{
// copy whole buffer to t1.txt, for debugging
//ucopy t2.txt,0,usize,0
// ucopy n2.val,0,usize,0
// clear whole buffer
//code_c
//bufferPos=0
}
} }
Timer tmSpinner Timer tmSpinner

36
HMI/n2t-out/pageTest.txt
View File

@@ -436,3 +436,39 @@ Button b10
Touch Press Event Touch Press Event
page cardAlarm page cardAlarm
Button b11
Attributes
ID : 13
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 117
y coordinate : 184
Width : 100
Height : 50
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : 3D auto
Font ID : 4
Back. Color : 50712
Back. Picture ID (Pressed) : 65535
Back. Color (Pressed) : 1024
Font Color (Unpressed) : 0
Font Color (Pressed) : 65535
Horizontal Alignment : center
Vertical Alignment : center
State : unpressed
Text : grid
Max. Text Size : 10
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Events
Touch Press Event
page cardGrid

8
HMI/n2t-out/screensaver.txt
View File

@@ -770,6 +770,14 @@ Timer tmSerial
{ {
page popupNotify page popupNotify
} }
if(tId.txt=="cardGrid")
{
page cardGrid
}
if(tId.txt=="cardAlarm")
{
page cardAlarm
}
} }
// end of user code // end of user code
udelete payloadLength-1 udelete payloadLength-1