h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2025-12-24 08:24:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
joBr99
2023-01-11 18:11:14 +01:00
parent eeeececb18 0cbd7a6c97
commit 124563fc89
29 changed files with 2608 additions and 196 deletions
Download Patch File Download Diff File Expand all files Collapse all files

221
HMI/US/landscape/diff-eu-version.txt
View File

@@ -1,5 +1,20 @@
--- HMI/n2t-out
+++ HMI/US/landscape/n2t-out
├── file list
│ @@ -1,13 +1,12 @@
│ Program.s.txt
│ cardAlarm.txt
│ cardChart.txt
│ cardEntities.txt
│ cardGrid.txt
│ -cardLChart.txt
│ cardMedia.txt
│ cardPower.txt
│ cardQR.txt
│ cardThermo.txt
│ pageIcons.txt
│ pageStartup.txt
│ pageTest.txt
│ --- HMI/n2t-out/Program.s.txt
├── +++ HMI/US/landscape/n2t-out/Program.s.txt
│ @@ -10,10 +10,8 @@
@@ -13,6 +28,174 @@
│ - // fix touch offset
│ - lcd_dev fffb 0002 0000 0020
│ page pageStartup
│ --- HMI/n2t-out/cardAlarm.txt
├── +++ HMI/US/landscape/n2t-out/cardAlarm.txt
│ @@ -864,18 +864,14 @@
│ {
│ page cardPower
│ }
│ if(tId.txt=="cardChart")
│ {
│ page cardChart
│ }
│ - if(tId.txt=="cardLChart")
│ - {
│ - page cardLChart
│ - }
│ }
│ // end of user code
│ udelete payloadLength-1
│ bufferPos=0
│ }
│ }
│ }
│ --- HMI/n2t-out/cardChart.txt
├── +++ HMI/US/landscape/n2t-out/cardChart.txt
│ @@ -681,18 +681,14 @@
│ {
│ page cardPower
│ }
│ if(tId.txt=="cardChart")
│ {
│ page cardChart
│ }
│ - if(tId.txt=="cardLChart")
│ - {
│ - page cardLChart
│ - }
│ }
│ // end of user code
│ udelete payloadLength-1
│ bufferPos=0
│ }
│ }
│ }
│ --- HMI/n2t-out/cardEntities.txt
├── +++ HMI/US/landscape/n2t-out/cardEntities.txt
│ @@ -1931,18 +1931,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/cardGrid.txt
├── +++ HMI/US/landscape/n2t-out/cardGrid.txt
│ @@ -916,18 +916,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/cardMedia.txt
├── +++ HMI/US/landscape/n2t-out/cardMedia.txt
│ @@ -1200,18 +1200,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/cardPower.txt
├── +++ HMI/US/landscape/n2t-out/cardPower.txt
│ @@ -785,18 +785,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/cardQR.txt
├── +++ HMI/US/landscape/n2t-out/cardQR.txt
│ @@ -715,18 +715,14 @@
│ {
│ page cardPower
│ }
│ if(tId.txt=="cardChart")
│ {
│ page cardChart
│ }
│ - if(tId.txt=="cardLChart")
│ - {
│ - page cardLChart
│ - }
│ }
│ // end of user code
│ udelete payloadLength-1
│ bufferPos=0
│ }
│ }
│ }
│ --- HMI/n2t-out/cardThermo.txt
├── +++ HMI/US/landscape/n2t-out/cardThermo.txt
│ @@ -1117,18 +1117,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
│ @@ -173,15 +173,15 @@
@@ -32,6 +215,25 @@
│ crcputs sys0,2
│ crcputs tSend.txt,0
│ //send cmd
│ @@ -360,18 +360,14 @@
│ {
│ page cardPower
│ }
│ if(tId.txt=="cardChart")
│ {
│ page cardChart
│ }
│ - if(tId.txt=="cardLChart")
│ - {
│ - page cardLChart
│ - }
│ }
│ // end of user code
│ udelete payloadLength-1
│ bufferPos=0
│ }
│ }
│ }
│ --- HMI/n2t-out/screensaver.txt
├── +++ HMI/US/landscape/n2t-out/screensaver.txt
│ @@ -29,17 +29,14 @@
@@ -77,3 +279,22 @@
│ Disable release event after dragging: 0
│ Send Component ID : disabled
│ Associated Keyboard : none
│ @@ -797,18 +784,14 @@
│ {
│ page cardPower
│ }
│ if(tId.txt=="cardChart")
│ {
│ page cardChart
│ }
│ - if(tId.txt=="cardLChart")
│ - {
│ - page cardLChart
│ - }
│ }
│ // end of user code
│ udelete payloadLength-1
│ bufferPos=0
│ }
│ }
│ }

219
HMI/US/portrait/diff-eu-version.txt
View File

@@ -1,5 +1,20 @@
--- HMI/n2t-out
+++ HMI/US/portrait/n2t-out
├── file list
│ @@ -1,13 +1,12 @@
│ Program.s.txt
│ cardAlarm.txt
│ cardChart.txt
│ cardEntities.txt
│ cardGrid.txt
│ -cardLChart.txt
│ cardMedia.txt
│ cardPower.txt
│ cardQR.txt
│ cardThermo.txt
│ pageIcons.txt
│ pageStartup.txt
│ pageTest.txt
│ --- HMI/n2t-out/Program.s.txt
├── +++ HMI/US/portrait/n2t-out/Program.s.txt
│ @@ -10,10 +10,10 @@
@@ -15,6 +30,48 @@
│ + // fix touch offset (Removed for US version)
│ + //lcd_dev fffb 0002 0000 0020
│ page pageStartup
│ --- HMI/n2t-out/cardAlarm.txt
├── +++ HMI/US/portrait/n2t-out/cardAlarm.txt
│ @@ -864,18 +864,14 @@
│ {
│ page cardPower
│ }
│ if(tId.txt=="cardChart")
│ {
│ page cardChart
│ }
│ - if(tId.txt=="cardLChart")
│ - {
│ - page cardLChart
│ - }
│ }
│ // end of user code
│ udelete payloadLength-1
│ bufferPos=0
│ }
│ }
│ }
│ --- HMI/n2t-out/cardChart.txt
├── +++ HMI/US/portrait/n2t-out/cardChart.txt
│ @@ -681,18 +681,14 @@
│ {
│ page cardPower
│ }
│ if(tId.txt=="cardChart")
│ {
│ page cardChart
│ }
│ - if(tId.txt=="cardLChart")
│ - {
│ - page cardLChart
│ - }
│ }
│ // end of user code
│ udelete payloadLength-1
│ bufferPos=0
│ }
│ }
│ }
│ --- HMI/n2t-out/cardEntities.txt
├── +++ HMI/US/portrait/n2t-out/cardEntities.txt
│ @@ -61,14 +61,34 @@
@@ -1044,6 +1101,130 @@
│ //command format pageType,specialPageName
│ //write name of speical page to tId
│ spstr strCommand.txt,tId.txt,"~",1
│ @@ -1931,18 +2711,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/cardGrid.txt
├── +++ HMI/US/portrait/n2t-out/cardGrid.txt
│ @@ -916,18 +916,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/cardMedia.txt
├── +++ HMI/US/portrait/n2t-out/cardMedia.txt
│ @@ -1200,18 +1200,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/cardPower.txt
├── +++ HMI/US/portrait/n2t-out/cardPower.txt
│ @@ -785,18 +785,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/cardQR.txt
├── +++ HMI/US/portrait/n2t-out/cardQR.txt
│ @@ -715,18 +715,14 @@
│ {
│ page cardPower
│ }
│ if(tId.txt=="cardChart")
│ {
│ page cardChart
│ }
│ - if(tId.txt=="cardLChart")
│ - {
│ - page cardLChart
│ - }
│ }
│ // end of user code
│ udelete payloadLength-1
│ bufferPos=0
│ }
│ }
│ }
│ --- HMI/n2t-out/cardThermo.txt
├── +++ HMI/US/portrait/n2t-out/cardThermo.txt
│ @@ -1117,18 +1117,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
│ @@ -118,15 +118,15 @@
@@ -1080,6 +1261,25 @@
│ crcputs sys0,2
│ crcputs tSend.txt,0
│ //send cmd
│ @@ -360,18 +360,14 @@
│ {
│ page cardPower
│ }
│ if(tId.txt=="cardChart")
│ {
│ page cardChart
│ }
│ - if(tId.txt=="cardLChart")
│ - {
│ - page cardLChart
│ - }
│ }
│ // end of user code
│ udelete payloadLength-1
│ bufferPos=0
│ }
│ }
│ }
│ --- HMI/n2t-out/screensaver.txt
├── +++ HMI/US/portrait/n2t-out/screensaver.txt
│ @@ -29,29 +29,20 @@
@@ -1137,3 +1337,22 @@
│ Disable release event after dragging: 0
│ Send Component ID : disabled
│ Associated Keyboard : none
│ @@ -797,18 +778,14 @@
│ {
│ page cardPower
│ }
│ if(tId.txt=="cardChart")
│ {
│ page cardChart
│ }
│ - if(tId.txt=="cardLChart")
│ - {
│ - page cardLChart
│ - }
│ }
│ // end of user code
│ udelete payloadLength-1
│ bufferPos=0
│ }
│ }
│ }

223
HMI/US/portrait/diff-filtered.txt
View File

@@ -1,6 +1,63 @@
+++ /dev/fd/62 2023-01-09 16:10:16.514100386 +0000
+++ /dev/fd/62 2023-01-10 22:38:13.070258504 +0000
+le list
+ +1,12 @@
+.s.txt
+rm.txt
+rt.txt
+ities.txt
+d.txt
+art.txt
+ia.txt
+er.txt
+txt
+rmo.txt
+ns.txt
+rtup.txt
+t.txt
+I/n2t-out/Program.s.txt
++ HMI/US/portrait/n2t-out/Program.s.txt
+I/n2t-out/cardAlarm.txt
++ HMI/US/portrait/n2t-out/cardAlarm.txt
+18 +864,14 @@
+ {
+ page cardPower
+ }
+ if(tId.txt=="cardChart")
+ {
+ page cardChart
+ }
+ if(tId.txt=="cardLChart")
+ {
+ page cardLChart
+ }
+ }
+ // end of user code
+ udelete payloadLength-1
+ bufferPos=0
+ }
+ }
+ }
+I/n2t-out/cardChart.txt
++ HMI/US/portrait/n2t-out/cardChart.txt
+18 +681,14 @@
+ {
+ page cardPower
+ }
+ if(tId.txt=="cardChart")
+ {
+ page cardChart
+ }
+ if(tId.txt=="cardLChart")
+ {
+ page cardLChart
+ }
+ }
+ // end of user code
+ udelete payloadLength-1
+ bufferPos=0
+ }
+ }
+ }
+I/n2t-out/cardEntities.txt
++ HMI/US/portrait/n2t-out/cardEntities.txt
+4 +61,34 @@
@@ -51,13 +108,13 @@
+ributes
+ Scope : local
+ Text :
+ Max. Text Size: 80
+ Max. Text Size: 40
+
+e (string) nent2
+ributes
+ Scope : local
+ Text :
+ Max. Text Size: 80
+ Max. Text Size: 40
+14 +186,26 @@
+e (string) type6
@@ -463,8 +520,151 @@
+ covx tTmp.txt,sys0,0,0
+ hSlider6.maxval=sys0
+ }
+,18 +2711,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/cardGrid.txt
++ HMI/US/portrait/n2t-out/cardGrid.txt
+18 +916,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/cardMedia.txt
++ HMI/US/portrait/n2t-out/cardMedia.txt
+,18 +1200,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/cardPower.txt
++ HMI/US/portrait/n2t-out/cardPower.txt
+18 +785,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/cardQR.txt
++ HMI/US/portrait/n2t-out/cardQR.txt
+18 +715,14 @@
+ {
+ page cardPower
+ }
+ if(tId.txt=="cardChart")
+ {
+ page cardChart
+ }
+ if(tId.txt=="cardLChart")
+ {
+ page cardLChart
+ }
+ }
+ // end of user code
+ udelete payloadLength-1
+ bufferPos=0
+ }
+ }
+ }
+I/n2t-out/cardThermo.txt
++ HMI/US/portrait/n2t-out/cardThermo.txt
+,18 +1117,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
+18 +360,14 @@
+ {
+ page cardPower
+ }
+ if(tId.txt=="cardChart")
+ {
+ page cardChart
+ }
+ if(tId.txt=="cardLChart")
+ {
+ page cardLChart
+ }
+ }
+ // end of user code
+ udelete payloadLength-1
+ bufferPos=0
+ }
+ }
+ }
+I/n2t-out/screensaver.txt
++ HMI/US/portrait/n2t-out/screensaver.txt
+9 +29,20 @@
@@ -522,3 +722,22 @@
+ Disable release event after dragging: 0
+ Send Component ID : disabled
+ Associated Keyboard : none
+18 +778,14 @@
+ {
+ page cardPower
+ }
+ if(tId.txt=="cardChart")
+ {
+ page cardChart
+ }
+ if(tId.txt=="cardLChart")
+ {
+ page cardLChart
+ }
+ }
+ // end of user code
+ udelete payloadLength-1
+ bufferPos=0
+ }
+ }
+ }

4
HMI/n2t-out-visual/cardAlarm.txt
View File

@@ -1453,6 +1453,10 @@ Timer tmSerial
{
page cardChart
}
if(tId.txt=="cardLChart")
{
page cardLChart
}
}
// end of user code
udelete payloadLength-1

4
HMI/n2t-out-visual/cardChart.txt
View File

@@ -847,6 +847,10 @@ Timer tmSerial
{
page cardChart
}
if(tId.txt=="cardLChart")
{
page cardLChart
}
}
// end of user code
udelete payloadLength-1

4
HMI/n2t-out-visual/cardEntities.txt
View File

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

4
HMI/n2t-out-visual/cardGrid.txt
View File

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

872
HMI/n2t-out-visual/cardLChart.txt Normal file
View File

@@ -0,0 +1,872 @@
Page cardLChart
Attributes
ID : 0
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
Width : 480
Effect : load
Effect Priority : 0
Effect Time : 300
Locked : no
Swide up page ID : disabled
Swide down page ID : disabled
Swide left page ID : disabled
Swide right page ID : disabled
Fill : solid color
Back. Color : 6371
Events
Preinitialize Event
dim=dimValueNormal
vis p0,0
vis tSend,0
vis tInstruction,0
vis tTmp,0
vis tId,0
vis bPrev,0
vis bNext,0
cardLChart.bco=defaultBcoColor
//vis x0,0
//x0.bco=defaultBcoColor
//x0.borderc=defaultBcoColor
for(sys0=0;sys0<32;sys0++)
{
if(b[sys0].type==98||b[sys0].type==116)
{
b[sys0].bco=defaultBcoColor
b[sys0].pco=defaultFontColor
}
if(b[sys0].type==53&&defaultBcoColor==6371)
{
b[sys0].pic=1
b[sys0].pic2=2
}
if(b[sys0].type==53&&defaultBcoColor==0)
{
b[sys0].pic=10
b[sys0].pic2=11
}
}
Variable (string) entn
Attributes
ID : 6
Scope : local
Text :
Max. Text Size: 80
Variable (string) strCommand
Attributes
ID : 5
Scope : local
Text :
Max. Text Size: 512
Variable (string) strTmp
Attributes
ID : 18
Scope : local
Text :
Max. Text Size: 200
Variable (string) tId
Attributes
ID : 14
Scope : local
Text :
Max. Text Size: 20
Variable (string) tInstruction
Attributes
ID : 15
Scope : local
Text :
Max. Text Size: 20
Variable (string) tSend
Attributes
ID : 9
Scope : local
Text :
Max. Text Size: 200
Variable (string) tTmp
Attributes
ID : 13
Scope : local
Text :
Max. Text Size: 400
Variable (int32) vNValues
Attributes
ID : 17
Scope: local
Value: 0
Variable (int32) vaBottom
Attributes
ID : 22
Scope: local
Value: 0
Variable (int32) vaColorD
Attributes
ID : 25
Scope: local
Value: 0
Variable (int32) vaColorL
Attributes
ID : 24
Scope: local
Value: 0
Variable (int32) vaLeft
Attributes
ID : 23
Scope: local
Value: 0
Variable (int32) vaMaxX
Attributes
ID : 27
Scope: local
Value: 2147483648
Variable (int32) vaMaxY
Attributes
ID : 26
Scope: local
Value: 0
Variable (int32) vaMinX
Attributes
ID : 29
Scope: local
Value: 2147483647
Variable (int32) vaMinY
Attributes
ID : 30
Scope: local
Value: 2147483647
Variable (int32) vaValue
Attributes
ID : 21
Scope: local
Value: 0
Variable (int32) vaXUnit
Attributes
ID : 20
Scope: local
Value: 0
Variable (int32) vaYUnit
Attributes
ID : 28
Scope: local
Value: 0
Text tHeading
Attributes
ID : 16
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 66
y coordinate : 26
Width : 320
Height : 30
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Associated Keyboard : none
Font ID : 1
Back. Color : 6371
Font Color : 65535
Horizontal Alignment : center
Vertical Alignment : center
Input Type : character
Text :
Max. Text Size : 40
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Picture p0
Attributes
ID : 1
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 0
y coordinate : 0
Width : 480
Height : 320
Effect : load
Effect Priority : 0
Effect Time : 300
Picture ID : 0
Button bNext
Attributes
ID : 2
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 391
y coordinate : 16
Width : 50
Height : 50
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Font ID : 3
Back. Color : 6371
Back. Picture ID (Pressed) : 65535
Back. Color (Pressed) : 14823
Font Color (Unpressed) : 65535
Font Color (Pressed) : 65535
Horizontal Alignment : center
Vertical Alignment : center
State : unpressed
Text : 
Max. Text Size : 10
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Events
Touch Press Event
tSend.txt="event,buttonPress2,cardChart,"
if(bPrev.txt=="")
{
tSend.txt+="bHome"
}else
{
tSend.txt+="bNext"
}
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,2
crcputs tSend.txt,0
//send cmd
printh 55 bb
prints sys0,2
prints tSend.txt,0
prints crcval,2
Button bPrev
Attributes
ID : 3
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 9
y coordinate : 16
Width : 50
Height : 50
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Font ID : 3
Back. Color : 6371
Back. Picture ID (Pressed) : 65535
Back. Color (Pressed) : 14823
Font Color (Unpressed) : 65535
Font Color (Pressed) : 65535
Horizontal Alignment : center
Vertical Alignment : center
State : unpressed
Text : 
Max. Text Size : 10
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Events
Touch Press Event
tSend.txt="event,buttonPress2,cardChart,"
if(bPrev.txt=="")
{
tSend.txt+="bUp"
}else
{
tSend.txt+="bPrev"
}
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,2
crcputs tSend.txt,0
//send cmd
printh 55 bb
prints sys0,2
prints tSend.txt,0
prints crcval,2
Hotspot m0
Attributes
ID : 19
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 20
y coordinate : 90
Width : 410
Height : 220
Effect : load
Effect Priority : 0
Effect Time : 300
Events
Touch Press Event
fill m0.x,m0.y,m0.w,m0.h,RED
Hotspot mSwipeNext
Attributes
ID : 10
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 440
y coordinate : 5
Width : 39
Height : 310
Effect : load
Effect Priority : 0
Effect Time : 300
Events
Touch Press Event
click bNext,1
Hotspot mSwipePrev
Attributes
ID : 12
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 0
y coordinate : 5
Width : 9
Height : 310
Effect : load
Effect Priority : 0
Effect Time : 300
Events
Touch Press Event
click bPrev,1
Hotspot mSwipeUp
Attributes
ID : 11
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 12
y coordinate : 0
Width : 426
Height : 9
Effect : load
Effect Priority : 0
Effect Time : 300
Events
Touch Press Event
click bPrev,1
Timer tmSerial
Attributes
ID : 4
Scope : local
Period (ms): 50
Enabled : yes
Events
Timer Event
// data available
if(usize>1)
{
bufferPos=0
while(bufferPos<usize)
{
// check for 0x55 0xBB - Command Init Secuence
if(u[bufferPos]==187&&u[bufferPos-1]==85)
{
//remove garbage at the start of the buffer if there's any to free buffer for command
if(u[bufferPos]!=1)
{
udelete bufferPos-1
}
//instruction is now aligned with buffer, because we deleted garbage before instrcution
//get length after init sequence (check if there are more than to bytes in buffer)
if(3<usize)
{
// check if serial buffer has reached the announced length
ucopy payloadLength,2,2,0
// we are only checking payload length so we have to skip first 3 bytes (init+payload length) (-1 because of < instead of <=)
payloadLength+=3
// payload length does also not contain crc, so we are adding another 2 bytes for crc
payloadLength+=2
if(payloadLength<usize)
{
// calculate crc
crcrest 1,0xFFFF
// u[2] contains payload legth at 3rd pos in buffer, we are calculating crc from 3rd pos with number of bytes from payload length
//crcputu 3,u[2]
// u[2] cotnains payload length, we are calculating a crc over the whole message, so we have to add 3 to the length from u[2]
crcputu 0,payloadLength-1
// get recived crc to be able to compare it
ucopy recvCrc,payloadLength-1,2,0
// compare crc with recived value
if(crcval==recvCrc)
{
// crc is okay
// here is the location where acual code should be
ucopy strCommand.txt,4,payloadLength-5,0
// write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default)
spstr strCommand.txt,tInstruction.txt,"~",0
if(tInstruction.txt=="entityUpd")
{
spstr strCommand.txt,tHeading.txt,"~",1
// navigation icons
spstr strCommand.txt,tId.txt,"~",2
spstr tId.txt,tTmp.txt,"|",0
if(tTmp.txt=="0")
{
vis bPrev,0
tsw mSwipePrev,0
tsw mSwipeUp,0
}
if(tTmp.txt=="1")
{
vis bPrev,1
tsw mSwipePrev,1
tsw mSwipeUp,0
bPrev.txt=""
}
if(tTmp.txt=="2")
{
vis bPrev,1
tsw mSwipePrev,0
tsw mSwipeUp,1
bPrev.txt=""
}
spstr tId.txt,tTmp.txt,"|",1
if(tTmp.txt=="0")
{
vis bNext,0
tsw mSwipeNext,0
}
if(tTmp.txt=="1")
{
vis bNext,1
tsw mSwipeNext,1
bNext.txt=""
}
if(tTmp.txt=="2")
{
vis bNext,1
bNext.txt=""
}
draw m0.x,m0.y,m0.x+m0.w,m0.y+m0.h,RED
// extract color
spstr strCommand.txt,tTmp.txt,"~",14
covx tTmp.txt,vaColorL.val,0,0
// prepare dark color
sys0=vaColorL.val>>11 // red
vaColorD.val=sys0*8/10<<11 // store and shift
sys0=vaColorL.val>>5%64 // green
vaColorD.val=sys0*8/10<<5+vaColorD.val // store and shift
sys0=vaColorL.val%32
vaColorD.val=sys0*8/10+vaColorD.val // store and add
//
// detect nValues and maxX/Y
vNValues.val=0
spstr strCommand.txt,tTmp.txt,"~",vNValues.val+18
strlen tTmp.txt,sya0
while(sya0>0)
{
tHeading.txt="last value="+tTmp.txt
spstr tTmp.txt,strTmp.txt,":",0
covx strTmp.txt,sya1,0,0
if(sya1>vaMaxX.val)
{
vaMaxX.val=sya1
}
if(sya1<vaMinX.val)
{
vaMinX.val=sya1
}
spstr tTmp.txt,strTmp.txt,":",1
covx strTmp.txt,sya1,0,0
if(sya1>vaMaxY.val)
{
vaMaxY.val=sya1
}
if(sya1<vaMinY.val)
{
vaMinY.val=sya1
}
// next
vNValues.val++
spstr strCommand.txt,tTmp.txt,"~",vNValues.val+18
strlen tTmp.txt,sya0
}
// find first given y axis labels
spstr strCommand.txt,tTmp.txt,"~",16 // labels in tTmp.txt
sys0=0 // <= result (here: first label value)
spstr tTmp.txt,strTmp.txt,":",sys0
strlen strTmp.txt,sya0
while(sya0>0)
{
covx strTmp.txt,sya1,0,0
if(sya1>vaMinY.val)
{
sys0--
if(sys0>=0)
{
// found a y-tick => take is at min...
spstr tTmp.txt,strTmp.txt,":",sys0
covx strTmp.txt,vaMinY.val,0,0
}
sya0=0
}else
{
// next
sys0++
spstr tTmp.txt,strTmp.txt,":",sys0
strlen strTmp.txt,sya0
}
}
sys1=sys0+1 // last label
spstr tTmp.txt,strTmp.txt,":",sys1
strlen strTmp.txt,sya0
while(sya0>0)
{
covx strTmp.txt,sya1,0,0
if(sya1>=vaMaxY.val)
{
vaMaxY.val=sya1
sya0=0
}else
{
// next
sys1++
spstr tTmp.txt,strTmp.txt,":",sys1
strlen strTmp.txt,sya0
}
}
// get first given x axis tick
spstr strCommand.txt,strTmp.txt,"~",17 // X-Axis ticks & labels in strTmp.txt
covx strTmp.txt,vaMinX.val,0,0
// covx vaMinX.val,strTmp.txt,0,0
// tHeading.txt+=strTmp.txt+":"
// covx vaMaxX.val,strTmp.txt,0,0
// tHeading.txt+=strTmp.txt
// calculate unit width
vaBottom.val=m0.y+m0.h-24
vaLeft.val=m0.x+25+40*100
sya1=vaMaxX.val-vaMinX.val
vaXUnit.val=m0.w-25-40*100/sya1
sya1=vaMaxY.val-vaMinY.val
vaYUnit.val=m0.h-24*100/sya1
// draw labels
// labels still in tTmp.txt
line m0.x+25+40-10,m0.y,m0.x+25+40-10,vaBottom.val+5,14823
line m0.x+25+40-5,vaBottom.val,m0.x+25+40-15,vaBottom.val,14823
if(sys0>0)
{
sys0--
}
for(sya0=sys0;sya0<=sys1;sya0++)
{
spstr tTmp.txt,strTmp.txt,":",sya0
covx strTmp.txt,sya1,0,0
sys2=sya1%10
sya1/=10
if(sya1>0)
{
covx sya1,strTmp.txt,0,0
}else
{
strTmp.txt=""
}
if(sys2!=0)
{
covx sys2,tId.txt,0,0
strTmp.txt=strTmp.txt+"."+tId.txt
}
sya1*=10+sys2
sya1-=vaMinY.val
xstr m0.x+28,-1*vaYUnit.val*sya1/100+vaBottom.val-10,20,20,0,defaultFontColor,RED,2,1,3,strTmp.txt
line m0.x+25+40-5,-1*vaYUnit.val*sya1/100+vaBottom.val,m0.x+25+40-15,-1*vaYUnit.val*sya1/100+vaBottom.val,14823
}
// y achis label
spstr strCommand.txt,tTmp.txt,"~",15
strlen tTmp.txt,sys1
sya1=sys1*11+m0.h-48/2
for(sys0=0;sys0<sys1;sys0++)
{
substr tTmp.txt,strTmp.txt,sys0,1
xstr m0.x,sys0*-11+m0.y+sya1,24,20,6,defaultFontColor,RED,2,1,3,strTmp.txt
}
//
// x axis tick/labels
// draw bottom line
line m0.x+25+40,vaBottom.val,m0.x+m0.w,vaBottom.val,14823
spstr strCommand.txt,tTmp.txt,"~",17 // X-Axis ticks & labels in strTmp.txt
//
sys1=0
// extract first tick ~> sya1 contains fist ticks value
spstr tTmp.txt,strTmp.txt,"+",sys1
strlen strTmp.txt,sya0
covx strTmp.txt,sya1,0,0
// loop until current ticks label is smaller than the maximum value observed
while(sya0>0&&sya1<vaMaxX.val)
{
sys2=sya1-vaMinX.val*vaXUnit.val/100+m0.x+25+40
// draw tick line
line sys2,vaBottom.val-5,sys2,vaBottom.val+5,14823
// check for label
spstr strTmp.txt,strTmp.txt,"^",1
strlen strTmp.txt,sya0
if(sya0>0)
{
// label found ~> draw
xstr -6*sya0+sys2,vaBottom.val+2,sya0*12,22,0,defaultFontColor,defaultBcoColor,1,1,3,strTmp.txt
}
// next ~> sya1 contains next ticks label
sys1++
spstr tTmp.txt,strTmp.txt,"+",sys1
strlen strTmp.txt,sya0
covx strTmp.txt,sya1,0,0
}
//
// draw line segments...
sys1=-2147483648
sys2=-2147483648
for(sys0=0;sys0<vNValues.val;sys0++)
{
// extract x:y from "~" separated payload
spstr strCommand.txt,tTmp.txt,"~",sys0+18
spstr tTmp.txt,strTmp.txt,":",0
covx strTmp.txt,sya0,0,0
spstr tTmp.txt,strTmp.txt,":",1
covx strTmp.txt,sya1,0,0
sya0=sya0-vaMinX.val*vaXUnit.val/100+m0.x+25+40
sya1=sya1-vaMinY.val*vaYUnit.val/-100+vaBottom.val
// draw circle
// cir sya0-vaMinX.val*vaXUnit.val/100+m0.x+25+40,sya1-vaMinY.val*vaYUnit.val/-100+vaBottom.val,3,vaColorL.val
if(sys1>0&&sys2>0)
{
// this is not the first point as the last one has been stored in (sys1,sys2)
// ~> connect with a line...
//line sys1,sys2,sya0-vaMinX.val*vaXUnit.val/100+m0.x+25+40,sya1-vaMinY.val*vaYUnit.val/-100+vaBottom.val,vaColorD.val
line sys1,sys2,sya0,sya1,vaColorD.val
//line sys1-1,sys2-1,sya0-1,sya1-1,vaColorL.val
//line sys1+1,sys2+1,sya0+1,sya1+1,vaColorL.val
}
// store current point to (sys1,sys2)
//sys1=sya0-vaMinX.val*vaXUnit.val/100+m0.x+25+40
//sys2=sya1-vaMinY.val*vaYUnit.val/-100+vaBottom.val
sys1=sya0
sys2=sya1
}
}
if(tInstruction.txt=="time")
{
// get set time to global variable
spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
}
if(tInstruction.txt=="date")
{
// get set date to global variable
spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
}
if(tInstruction.txt=="dimmode")
{
// get value
spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0
// get value normal
spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,dimValueNormal,0,0
dim=dimValueNormal
// get background color
spstr strCommand.txt,tTmp.txt,"~",3
if(tTmp.txt!="")
{
covx tTmp.txt,defaultBcoColor,0,0
}
// get font color
spstr strCommand.txt,tTmp.txt,"~",4
if(tTmp.txt!="")
{
covx tTmp.txt,defaultFontColor,0,0
}
}
if(tInstruction.txt=="timeout")
{
//set timeout to global var
spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,sleepTimeout,0,0
}
if(tInstruction.txt=="pageType")
{
sleepValue=0
//command format pageType,specialPageName
//write name of speical page to tId
spstr strCommand.txt,tId.txt,"~",1
//save second arg if there's one
spstr strCommand.txt,tTmp.txt,"~",2
//save third arg if there's one
spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3
spstr strCommand.txt,pageIcons.tTmp3.txt,"~",4
//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=="pageStartup")
{
page pageStartup
}
if(tId.txt=="screensaver")
{
page screensaver
}
if(tId.txt=="cardEntities")
{
page cardEntities
}
if(tId.txt=="cardGrid")
{
page cardGrid
}
if(tId.txt=="popupLight")
{
pageIcons.tTmp1.txt=tTmp.txt
page popupLight
}
if(tId.txt=="popupShutter")
{
pageIcons.tTmp1.txt=tTmp.txt
page popupShutter
}
if(tId.txt=="popupNotify")
{
page popupNotify
}
if(tId.txt=="cardThermo")
{
page cardThermo
}
if(tId.txt=="cardMedia")
{
page cardMedia
}
if(tId.txt=="cardAlarm")
{
page cardAlarm
}
if(tId.txt=="cardQR")
{
page cardQR
}
if(tId.txt=="cardPower")
{
page cardPower
}
if(tId.txt=="cardChart")
{
page cardChart
}
if(tId.txt=="cardLChart")
{
page cardLChart
}
}
// end of user code
udelete payloadLength-1
bufferPos=0
}
}
}
}
// next character
bufferPos++
}
}
Timer tmSleep
Attributes
ID : 7
Scope : local
Period (ms): 1000
Enabled : yes
Events
Timer Event
if(sleepTimeout!=0&&dimValue!=dim)
{
sleepValue+=1
if(sleepTimeout<=sleepValue)
{
sleepValue=0
dim=dimValue
tSend.txt="event,sleepReached,cardAlarm"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,2
crcputs tSend.txt,0
//send cmd
printh 55 bb
prints sys0,2
prints tSend.txt,0
prints crcval,2
}
}
TouchCap tc0
Attributes
ID : 8
Scope: local
Value: 0
Events
Touch Press Event
sleepValue=0

4
HMI/n2t-out-visual/cardMedia.txt
View File

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

4
HMI/n2t-out-visual/cardPower.txt
View File

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

4
HMI/n2t-out-visual/cardQR.txt
View File

@@ -1020,6 +1020,10 @@ Timer tmSerial
{
page cardChart
}
if(tId.txt=="cardLChart")
{
page cardLChart
}
}
// end of user code
udelete payloadLength-1

4
HMI/n2t-out-visual/cardThermo.txt
View File

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

80
HMI/n2t-out-visual/nspanel_Stats.txt
View File

@@ -14,14 +14,14 @@ popupNotify
19 Component(s)
257 Line(s) of event code
166 Unique line(s) of event code
cardQR
34 Component(s)
402 Line(s) of event code
234 Unique line(s) of event code
cardChart
33 Component(s)
425 Line(s) of event code
290 Unique line(s) of event code
cardAlarm
42 Component(s)
415 Line(s) of event code
253 Unique line(s) of event code
429 Line(s) of event code
292 Unique line(s) of event code
popupFan
27 Component(s)
351 Line(s) of event code
@@ -38,49 +38,53 @@ popupShutter
25 Component(s)
398 Line(s) of event code
218 Unique line(s) of event code
cardPower
45 Component(s)
416 Line(s) of event code
291 Unique line(s) of event code
pageStartup
19 Component(s)
181 Line(s) of event code
129 Unique line(s) of event code
cardQR
34 Component(s)
398 Line(s) of event code
232 Unique line(s) of event code
pageTest
21 Component(s)
66 Line(s) of event code
64 Unique line(s) of event code
cardGrid
44 Component(s)
511 Line(s) of event code
289 Unique line(s) of event code
185 Line(s) of event code
131 Unique line(s) of event code
cardLChart
31 Component(s)
424 Line(s) of event code
274 Unique line(s) of event code
cardMedia
59 Component(s)
637 Line(s) of event code
316 Unique line(s) of event code
641 Line(s) of event code
318 Unique line(s) of event code
cardAlarm
42 Component(s)
419 Line(s) of event code
255 Unique line(s) of event code
pageTest
24 Component(s)
68 Line(s) of event code
66 Unique line(s) of event code
popupTimer
42 Component(s)
512 Line(s) of event code
255 Unique line(s) of event code
cardPower
45 Component(s)
412 Line(s) of event code
289 Unique line(s) of event code
cardEntities
67 Component(s)
1158 Line(s) of event code
526 Unique line(s) of event code
cardGrid
44 Component(s)
515 Line(s) of event code
291 Unique line(s) of event code
cardThermo
57 Component(s)
528 Line(s) of event code
313 Unique line(s) of event code
532 Line(s) of event code
315 Unique line(s) of event code
screensaver
47 Component(s)
430 Line(s) of event code
302 Unique line(s) of event code
434 Line(s) of event code
304 Unique line(s) of event code
cardEntities
67 Component(s)
1162 Line(s) of event code
528 Unique line(s) of event code
Total
19 Page(s)
694 Component(s)
8236 Line(s) of event code
2127 Unique line(s) of event code
20 Page(s)
728 Component(s)
8702 Line(s) of event code
2235 Unique line(s) of event code

4
HMI/n2t-out-visual/pageStartup.txt
View File

@@ -659,6 +659,10 @@ Timer tmSerial
{
page cardChart
}
if(tId.txt=="cardLChart")
{
page cardLChart
}
}
// end of user code
udelete payloadLength-1

110
HMI/n2t-out-visual/pageTest.txt
View File

@@ -280,8 +280,44 @@ Button b13
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 152
y coordinate : 245
x coordinate : 406
y coordinate : 133
Width : 43
Height : 50
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : 3D auto
Font ID : 0
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 : showqq
Max. Text Size : 10
Word wrap : enabled
Horizontal Spacing : 0
Vertical Spacing : 0
Events
Touch Press Event
showqq
Button b14
Attributes
ID : 21
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 0
y coordinate : 0
Width : 100
Height : 50
Effect : load
@@ -304,9 +340,77 @@ Button b13
Horizontal Spacing : 0
Vertical Spacing : 0
Button b15
Attributes
ID : 22
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 236
y coordinate : 263
Width : 100
Height : 50
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : 3D auto
Font ID : 0
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 : cardLchart
Max. Text Size : 10
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Events
Touch Press Event
showqq
page cardLChart
Button b16
Attributes
ID : 23
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Opacity : 127
x coordinate : 135
y coordinate : 263
Width : 100
Height : 50
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : 3D auto
Font ID : 0
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 : chart
Max. Text Size : 10
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Events
Touch Press Event
page cardChart
Button b2
Attributes

4
HMI/n2t-out-visual/screensaver.txt
View File

@@ -1394,6 +1394,10 @@ Timer tmSerial
{
page cardChart
}
if(tId.txt=="cardLChart")
{
page cardLChart
}
}
// end of user code
udelete payloadLength-1

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

@@ -868,6 +868,10 @@ Timer tmSerial
{
page cardChart
}
if(tId.txt=="cardLChart")
{
page cardLChart
}
}
// end of user code
udelete payloadLength-1

4
HMI/n2t-out/cardChart.txt
View File

@@ -685,6 +685,10 @@ Timer tmSerial
{
page cardChart
}
if(tId.txt=="cardLChart")
{
page cardLChart
}
}
// end of user code
udelete payloadLength-1

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

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

4
HMI/n2t-out/cardGrid.txt
View File

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

732
HMI/n2t-out/cardLChart.txt Normal file
View File

@@ -0,0 +1,732 @@
Page cardLChart
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Locked : no
Swide up page ID : disabled
Swide down page ID : disabled
Swide left page ID : disabled
Swide right page ID : disabled
Events
Preinitialize Event
dim=dimValueNormal
vis p0,0
vis tSend,0
vis tInstruction,0
vis tTmp,0
vis tId,0
vis bPrev,0
vis bNext,0
cardLChart.bco=defaultBcoColor
//vis x0,0
//x0.bco=defaultBcoColor
//x0.borderc=defaultBcoColor
for(sys0=0;sys0<32;sys0++)
{
if(b[sys0].type==98||b[sys0].type==116)
{
b[sys0].bco=defaultBcoColor
b[sys0].pco=defaultFontColor
}
if(b[sys0].type==53&&defaultBcoColor==6371)
{
b[sys0].pic=1
b[sys0].pic2=2
}
if(b[sys0].type==53&&defaultBcoColor==0)
{
b[sys0].pic=10
b[sys0].pic2=11
}
}
Variable (string) entn
Attributes
Scope : local
Text :
Max. Text Size: 80
Variable (string) strCommand
Attributes
Scope : local
Text :
Max. Text Size: 512
Variable (string) strTmp
Attributes
Scope : local
Text :
Max. Text Size: 200
Variable (string) tId
Attributes
Scope : local
Text :
Max. Text Size: 20
Variable (string) tInstruction
Attributes
Scope : local
Text :
Max. Text Size: 20
Variable (string) tSend
Attributes
Scope : local
Text :
Max. Text Size: 200
Variable (string) tTmp
Attributes
Scope : local
Text :
Max. Text Size: 400
Variable (int32) vNValues
Attributes
Scope: local
Value: 0
Variable (int32) vaBottom
Attributes
Scope: local
Value: 0
Variable (int32) vaColorD
Attributes
Scope: local
Value: 0
Variable (int32) vaColorL
Attributes
Scope: local
Value: 0
Variable (int32) vaLeft
Attributes
Scope: local
Value: 0
Variable (int32) vaMaxX
Attributes
Scope: local
Value: 2147483648
Variable (int32) vaMaxY
Attributes
Scope: local
Value: 0
Variable (int32) vaMinX
Attributes
Scope: local
Value: 2147483647
Variable (int32) vaMinY
Attributes
Scope: local
Value: 2147483647
Variable (int32) vaValue
Attributes
Scope: local
Value: 0
Variable (int32) vaXUnit
Attributes
Scope: local
Value: 0
Variable (int32) vaYUnit
Attributes
Scope: local
Value: 0
Text tHeading
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
Text :
Max. Text Size : 40
Picture p0
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Button bNext
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
State : unpressed
Text : 
Max. Text Size : 10
Events
Touch Press Event
tSend.txt="event,buttonPress2,cardChart,"
if(bPrev.txt=="")
{
tSend.txt+="bHome"
}else
{
tSend.txt+="bNext"
}
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,2
crcputs tSend.txt,0
//send cmd
printh 55 bb
prints sys0,2
prints tSend.txt,0
prints crcval,2
Button bPrev
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
State : unpressed
Text : 
Max. Text Size : 10
Events
Touch Press Event
tSend.txt="event,buttonPress2,cardChart,"
if(bPrev.txt=="")
{
tSend.txt+="bUp"
}else
{
tSend.txt+="bPrev"
}
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,2
crcputs tSend.txt,0
//send cmd
printh 55 bb
prints sys0,2
prints tSend.txt,0
prints crcval,2
Hotspot m0
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Events
Touch Press Event
fill m0.x,m0.y,m0.w,m0.h,RED
Hotspot mSwipeNext
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Events
Touch Press Event
click bNext,1
Hotspot mSwipePrev
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Events
Touch Press Event
click bPrev,1
Hotspot mSwipeUp
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
Events
Touch Press Event
click bPrev,1
Timer tmSerial
Attributes
Scope : local
Period (ms): 50
Enabled : yes
Events
Timer Event
// data available
if(usize>1)
{
bufferPos=0
while(bufferPos<usize)
{
// check for 0x55 0xBB - Command Init Secuence
if(u[bufferPos]==187&&u[bufferPos-1]==85)
{
//remove garbage at the start of the buffer if there's any to free buffer for command
if(u[bufferPos]!=1)
{
udelete bufferPos-1
}
//instruction is now aligned with buffer, because we deleted garbage before instrcution
//get length after init sequence (check if there are more than to bytes in buffer)
if(3<usize)
{
// check if serial buffer has reached the announced length
ucopy payloadLength,2,2,0
// we are only checking payload length so we have to skip first 3 bytes (init+payload length) (-1 because of < instead of <=)
payloadLength+=3
// payload length does also not contain crc, so we are adding another 2 bytes for crc
payloadLength+=2
if(payloadLength<usize)
{
// calculate crc
crcrest 1,0xFFFF
// u[2] contains payload legth at 3rd pos in buffer, we are calculating crc from 3rd pos with number of bytes from payload length
//crcputu 3,u[2]
// u[2] cotnains payload length, we are calculating a crc over the whole message, so we have to add 3 to the length from u[2]
crcputu 0,payloadLength-1
// get recived crc to be able to compare it
ucopy recvCrc,payloadLength-1,2,0
// compare crc with recived value
if(crcval==recvCrc)
{
// crc is okay
// here is the location where acual code should be
ucopy strCommand.txt,4,payloadLength-5,0
// write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default)
spstr strCommand.txt,tInstruction.txt,"~",0
if(tInstruction.txt=="entityUpd")
{
spstr strCommand.txt,tHeading.txt,"~",1
// navigation icons
spstr strCommand.txt,tId.txt,"~",2
spstr tId.txt,tTmp.txt,"|",0
if(tTmp.txt=="0")
{
vis bPrev,0
tsw mSwipePrev,0
tsw mSwipeUp,0
}
if(tTmp.txt=="1")
{
vis bPrev,1
tsw mSwipePrev,1
tsw mSwipeUp,0
bPrev.txt=""
}
if(tTmp.txt=="2")
{
vis bPrev,1
tsw mSwipePrev,0
tsw mSwipeUp,1
bPrev.txt=""
}
spstr tId.txt,tTmp.txt,"|",1
if(tTmp.txt=="0")
{
vis bNext,0
tsw mSwipeNext,0
}
if(tTmp.txt=="1")
{
vis bNext,1
tsw mSwipeNext,1
bNext.txt=""
}
if(tTmp.txt=="2")
{
vis bNext,1
bNext.txt=""
}
draw m0.x,m0.y,m0.x+m0.w,m0.y+m0.h,RED
// extract color
spstr strCommand.txt,tTmp.txt,"~",14
covx tTmp.txt,vaColorL.val,0,0
// prepare dark color
sys0=vaColorL.val>>11 // red
vaColorD.val=sys0*8/10<<11 // store and shift
sys0=vaColorL.val>>5%64 // green
vaColorD.val=sys0*8/10<<5+vaColorD.val // store and shift
sys0=vaColorL.val%32
vaColorD.val=sys0*8/10+vaColorD.val // store and add
//
// detect nValues and maxX/Y
vNValues.val=0
spstr strCommand.txt,tTmp.txt,"~",vNValues.val+18
strlen tTmp.txt,sya0
while(sya0>0)
{
tHeading.txt="last value="+tTmp.txt
spstr tTmp.txt,strTmp.txt,":",0
covx strTmp.txt,sya1,0,0
if(sya1>vaMaxX.val)
{
vaMaxX.val=sya1
}
if(sya1<vaMinX.val)
{
vaMinX.val=sya1
}
spstr tTmp.txt,strTmp.txt,":",1
covx strTmp.txt,sya1,0,0
if(sya1>vaMaxY.val)
{
vaMaxY.val=sya1
}
if(sya1<vaMinY.val)
{
vaMinY.val=sya1
}
// next
vNValues.val++
spstr strCommand.txt,tTmp.txt,"~",vNValues.val+18
strlen tTmp.txt,sya0
}
// find first given y axis labels
spstr strCommand.txt,tTmp.txt,"~",16 // labels in tTmp.txt
sys0=0 // <= result (here: first label value)
spstr tTmp.txt,strTmp.txt,":",sys0
strlen strTmp.txt,sya0
while(sya0>0)
{
covx strTmp.txt,sya1,0,0
if(sya1>vaMinY.val)
{
sys0--
if(sys0>=0)
{
// found a y-tick => take is at min...
spstr tTmp.txt,strTmp.txt,":",sys0
covx strTmp.txt,vaMinY.val,0,0
}
sya0=0
}else
{
// next
sys0++
spstr tTmp.txt,strTmp.txt,":",sys0
strlen strTmp.txt,sya0
}
}
sys1=sys0+1 // last label
spstr tTmp.txt,strTmp.txt,":",sys1
strlen strTmp.txt,sya0
while(sya0>0)
{
covx strTmp.txt,sya1,0,0
if(sya1>=vaMaxY.val)
{
vaMaxY.val=sya1
sya0=0
}else
{
// next
sys1++
spstr tTmp.txt,strTmp.txt,":",sys1
strlen strTmp.txt,sya0
}
}
// get first given x axis tick
spstr strCommand.txt,strTmp.txt,"~",17 // X-Axis ticks & labels in strTmp.txt
covx strTmp.txt,vaMinX.val,0,0
// covx vaMinX.val,strTmp.txt,0,0
// tHeading.txt+=strTmp.txt+":"
// covx vaMaxX.val,strTmp.txt,0,0
// tHeading.txt+=strTmp.txt
// calculate unit width
vaBottom.val=m0.y+m0.h-24
vaLeft.val=m0.x+25+40*100
sya1=vaMaxX.val-vaMinX.val
vaXUnit.val=m0.w-25-40*100/sya1
sya1=vaMaxY.val-vaMinY.val
vaYUnit.val=m0.h-24*100/sya1
// draw labels
// labels still in tTmp.txt
line m0.x+25+40-10,m0.y,m0.x+25+40-10,vaBottom.val+5,14823
line m0.x+25+40-5,vaBottom.val,m0.x+25+40-15,vaBottom.val,14823
if(sys0>0)
{
sys0--
}
for(sya0=sys0;sya0<=sys1;sya0++)
{
spstr tTmp.txt,strTmp.txt,":",sya0
covx strTmp.txt,sya1,0,0
sys2=sya1%10
sya1/=10
if(sya1>0)
{
covx sya1,strTmp.txt,0,0
}else
{
strTmp.txt=""
}
if(sys2!=0)
{
covx sys2,tId.txt,0,0
strTmp.txt=strTmp.txt+"."+tId.txt
}
sya1*=10+sys2
sya1-=vaMinY.val
xstr m0.x+28,-1*vaYUnit.val*sya1/100+vaBottom.val-10,20,20,0,defaultFontColor,RED,2,1,3,strTmp.txt
line m0.x+25+40-5,-1*vaYUnit.val*sya1/100+vaBottom.val,m0.x+25+40-15,-1*vaYUnit.val*sya1/100+vaBottom.val,14823
}
// y achis label
spstr strCommand.txt,tTmp.txt,"~",15
strlen tTmp.txt,sys1
sya1=sys1*11+m0.h-48/2
for(sys0=0;sys0<sys1;sys0++)
{
substr tTmp.txt,strTmp.txt,sys0,1
xstr m0.x,sys0*-11+m0.y+sya1,24,20,6,defaultFontColor,RED,2,1,3,strTmp.txt
}
//
// x axis tick/labels
// draw bottom line
line m0.x+25+40,vaBottom.val,m0.x+m0.w,vaBottom.val,14823
spstr strCommand.txt,tTmp.txt,"~",17 // X-Axis ticks & labels in strTmp.txt
//
sys1=0
// extract first tick ~> sya1 contains fist ticks value
spstr tTmp.txt,strTmp.txt,"+",sys1
strlen strTmp.txt,sya0
covx strTmp.txt,sya1,0,0
// loop until current ticks label is smaller than the maximum value observed
while(sya0>0&&sya1<vaMaxX.val)
{
sys2=sya1-vaMinX.val*vaXUnit.val/100+m0.x+25+40
// draw tick line
line sys2,vaBottom.val-5,sys2,vaBottom.val+5,14823
// check for label
spstr strTmp.txt,strTmp.txt,"^",1
strlen strTmp.txt,sya0
if(sya0>0)
{
// label found ~> draw
xstr -6*sya0+sys2,vaBottom.val+2,sya0*12,22,0,defaultFontColor,defaultBcoColor,1,1,3,strTmp.txt
}
// next ~> sya1 contains next ticks label
sys1++
spstr tTmp.txt,strTmp.txt,"+",sys1
strlen strTmp.txt,sya0
covx strTmp.txt,sya1,0,0
}
//
// draw line segments...
sys1=-2147483648
sys2=-2147483648
for(sys0=0;sys0<vNValues.val;sys0++)
{
// extract x:y from "~" separated payload
spstr strCommand.txt,tTmp.txt,"~",sys0+18
spstr tTmp.txt,strTmp.txt,":",0
covx strTmp.txt,sya0,0,0
spstr tTmp.txt,strTmp.txt,":",1
covx strTmp.txt,sya1,0,0
sya0=sya0-vaMinX.val*vaXUnit.val/100+m0.x+25+40
sya1=sya1-vaMinY.val*vaYUnit.val/-100+vaBottom.val
// draw circle
// cir sya0-vaMinX.val*vaXUnit.val/100+m0.x+25+40,sya1-vaMinY.val*vaYUnit.val/-100+vaBottom.val,3,vaColorL.val
if(sys1>0&&sys2>0)
{
// this is not the first point as the last one has been stored in (sys1,sys2)
// ~> connect with a line...
//line sys1,sys2,sya0-vaMinX.val*vaXUnit.val/100+m0.x+25+40,sya1-vaMinY.val*vaYUnit.val/-100+vaBottom.val,vaColorD.val
line sys1,sys2,sya0,sya1,vaColorD.val
//line sys1-1,sys2-1,sya0-1,sya1-1,vaColorL.val
//line sys1+1,sys2+1,sya0+1,sya1+1,vaColorL.val
}
// store current point to (sys1,sys2)
//sys1=sya0-vaMinX.val*vaXUnit.val/100+m0.x+25+40
//sys2=sya1-vaMinY.val*vaYUnit.val/-100+vaBottom.val
sys1=sya0
sys2=sya1
}
}
if(tInstruction.txt=="time")
{
// get set time to global variable
spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
}
if(tInstruction.txt=="date")
{
// get set date to global variable
spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
}
if(tInstruction.txt=="dimmode")
{
// get value
spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0
// get value normal
spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,dimValueNormal,0,0
dim=dimValueNormal
// get background color
spstr strCommand.txt,tTmp.txt,"~",3
if(tTmp.txt!="")
{
covx tTmp.txt,defaultBcoColor,0,0
}
// get font color
spstr strCommand.txt,tTmp.txt,"~",4
if(tTmp.txt!="")
{
covx tTmp.txt,defaultFontColor,0,0
}
}
if(tInstruction.txt=="timeout")
{
//set timeout to global var
spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,sleepTimeout,0,0
}
if(tInstruction.txt=="pageType")
{
sleepValue=0
//command format pageType,specialPageName
//write name of speical page to tId
spstr strCommand.txt,tId.txt,"~",1
//save second arg if there's one
spstr strCommand.txt,tTmp.txt,"~",2
//save third arg if there's one
spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3
spstr strCommand.txt,pageIcons.tTmp3.txt,"~",4
//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=="pageStartup")
{
page pageStartup
}
if(tId.txt=="screensaver")
{
page screensaver
}
if(tId.txt=="cardEntities")
{
page cardEntities
}
if(tId.txt=="cardGrid")
{
page cardGrid
}
if(tId.txt=="popupLight")
{
pageIcons.tTmp1.txt=tTmp.txt
page popupLight
}
if(tId.txt=="popupShutter")
{
pageIcons.tTmp1.txt=tTmp.txt
page popupShutter
}
if(tId.txt=="popupNotify")
{
page popupNotify
}
if(tId.txt=="cardThermo")
{
page cardThermo
}
if(tId.txt=="cardMedia")
{
page cardMedia
}
if(tId.txt=="cardAlarm")
{
page cardAlarm
}
if(tId.txt=="cardQR")
{
page cardQR
}
if(tId.txt=="cardPower")
{
page cardPower
}
if(tId.txt=="cardChart")
{
page cardChart
}
if(tId.txt=="cardLChart")
{
page cardLChart
}
}
// end of user code
udelete payloadLength-1
bufferPos=0
}
}
}
}
// next character
bufferPos++
}
}
Timer tmSleep
Attributes
Scope : local
Period (ms): 1000
Enabled : yes
Events
Timer Event
if(sleepTimeout!=0&&dimValue!=dim)
{
sleepValue+=1
if(sleepTimeout<=sleepValue)
{
sleepValue=0
dim=dimValue
tSend.txt="event,sleepReached,cardAlarm"
//send calc crc
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
crcputh 55 bb
crcputs sys0,2
crcputs tSend.txt,0
//send cmd
printh 55 bb
prints sys0,2
prints tSend.txt,0
prints crcval,2
}
}
TouchCap tc0
Attributes
Scope: local
Value: 0
Events
Touch Press Event
sleepValue=0

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

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

4
HMI/n2t-out/cardPower.txt
View File

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

4
HMI/n2t-out/cardQR.txt
View File

@@ -719,6 +719,10 @@ Timer tmSerial
{
page cardChart
}
if(tId.txt=="cardLChart")
{
page cardLChart
}
}
// end of user code
udelete payloadLength-1

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

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

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

@@ -364,6 +364,10 @@ Timer tmSerial
{
page cardChart
}
if(tId.txt=="cardLChart")
{
page cardLChart
}
}
// end of user code
udelete payloadLength-1

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

@@ -128,13 +128,51 @@ Button b13
Disable release event after dragging: 0
Send Component ID : disabled
State : unpressed
Text : newtxt
Text : showqq
Max. Text Size : 10
Events
Touch Press Event
showqq
Button b14
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
State : unpressed
Text : newtxt
Max. Text Size : 10
Button b15
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
State : unpressed
Text : cardLchart
Max. Text Size : 10
Events
Touch Press Event
page cardLChart
Button b16
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
Send Component ID : disabled
State : unpressed
Text : chart
Max. Text Size : 10
Events
Touch Press Event
page cardChart
Button b2
Attributes
Scope : local

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

@@ -801,6 +801,10 @@ Timer tmSerial
{
page cardChart
}
if(tId.txt=="cardLChart")
{
page cardLChart
}
}
// end of user code
udelete payloadLength-1

227
ioBroker/NsPanelTs.ts
View File

@@ -1,5 +1,5 @@
/*-----------------------------------------------------------------------
TypeScript v3.8.1 zur Steuerung des SONOFF NSPanel mit dem ioBroker by @Armilar/@Sternmiere/@Britzelpuf
TypeScript v3.8.1.1 zur Steuerung des SONOFF NSPanel mit dem ioBroker by @Armilar/@Sternmiere/@Britzelpuf
- abgestimmt auf TFT 47 / v3.8.1 / BerryDriver 8 / Tasmota 12.3.1
@joBr99 Projekt: https://github.com/joBr99/nspanel-lovelace-ui/tree/main/ioBroker
NsPanelTs.ts (dieses TypeScript in ioBroker) Stable: https://github.com/joBr99/nspanel-lovelace-ui/blob/main/ioBroker/NsPanelTs.ts
@@ -114,6 +114,7 @@ ReleaseNotes:
- 05.01.2023 - v3.8.0 Upgrade TFT 47
- 06.01.2023 - v3.8.0 Add Volumio Tracklist
- 06.01.2023 - v3.8.1 HMI-Hotfix
- 11.01.2023 - v3.8.1.1 Add configurable navigation buttons by @ravenst0ne
*****************************************************************************************************************
* Falls Aliase durch das Skript erstellt werden sollen, muss in der JavaScript Instanz "setObect" gesetzt sein! *
@@ -294,16 +295,12 @@ let vwIconColor = [];
//-- Anfang der Beispiele für Seitengestaltung -- Selbstdefinierte Aliase erforderlich ----------------
let Test_Licht1: PageEntities =
let Test_Licht1 = <PageEntities>
{
'type': 'cardEntities',
'heading': 'Color Aliase 1',
'useColor': true,
'subPage': false,
'parent': undefined,
'prev': undefined,
'next': undefined,
'home': undefined,
'items': [
<PageItem>{ id: 'alias.0.NSPanel_1.TestRGBLichteinzeln', name: 'RGB-Licht Hex-Color', interpolateColor: true},
<PageItem>{ id: 'alias.0.NSPanel_1.TestRGBLicht', name: 'RGB-Licht', minValueBrightness: 0, maxValueBrightness: 100, interpolateColor: true},
@@ -313,16 +310,12 @@ let Test_Licht1: PageEntities =
};
//Only DEV --> Test
let CardChartExample: PageChart =
let CardChartExample = <PageChart>
{
'type': 'cardChart',
'heading': 'Stromzähler L1+L2+L3',
'useColor': true,
'subPage': false,
'parent': undefined,
'prev': undefined,
'next': undefined,
'home': undefined,
'items': [<PageItem>{
id: 'alias.0.NSPanel_1.cardChart',
yAxis: 'Leistung [kW]',
@@ -331,31 +324,23 @@ let CardChartExample: PageChart =
}]
};
let CardPowerExample: PagePower =
let CardPowerExample = <PagePower>
{
'type': 'cardPower',
'heading': 'cardPower Emulator',
'useColor': true,
'subPage': false,
'parent': undefined,
'prev': undefined,
'next': undefined,
'home': undefined,
'items': [
<PageItem>{ id: 'alias.0.NSPanel_1.Power.PowerCard' },
]
};
let Test_Licht2: PageEntities =
let Test_Licht2 = <PageEntities>
{
'type': 'cardEntities',
'heading': 'Color Aliase 2',
'useColor': true,
'subPage': false,
'parent': undefined,
'prev': undefined,
'next': undefined,
'home': undefined,
'items': [
//Beispiel für RGB Light mit neuem PageItem-Parameter colormode: "xy" alternativ colormode: "rgb" oder weglassen
//Steuert im z.B. DeConz Adapter unter Lampen die Farben per CIE (XY)
@@ -364,16 +349,12 @@ let Test_Licht2: PageEntities =
]
};
let Test_Funktionen: PageEntities =
let Test_Funktionen = <PageEntities>
{
'type': 'cardEntities',
'heading': 'Sonstige Aliase',
'useColor': true,
'subPage': false,
'parent': undefined,
'prev': undefined,
'next': undefined,
'home': undefined,
'items': [
<PageItem>{ id: 'alias.0.NSPanel_1.TestLautstärke', offColor: MSRed, onColor: MSGreen, name: 'Echo Spot Büro', minValue: 0, maxValue: 100 },
<PageItem>{ id: 'alias.0.NSPanel_1.TestTemperatur',name: 'Temperatur außen', icon: 'thermometer', onColor: White },
@@ -383,16 +364,12 @@ let Test_Funktionen: PageEntities =
]
};
let Buero_Seite_1: PageEntities =
let Buero_Seite_1 = <PageEntities>
{
'type': 'cardEntities',
'heading': 'Büro',
'useColor': true,
'subPage': false,
'parent': undefined,
'prev': undefined,
'next': undefined,
'home': undefined,
'items': [
<PageItem>{ id: 'alias.0.NSPanel_1.Schreibtischlampe', interpolateColor: true},
<PageItem>{ id: 'alias.0.NSPanel_1.Deckenbeleuchtung', interpolateColor: true},
@@ -401,16 +378,12 @@ let Buero_Seite_1: PageEntities =
]
};
let Fenster_1: PageEntities =
let Fenster_1 = <PageEntities>
{
'type': 'cardEntities',
'heading': 'Fenster und Türen',
'useColor': true,
'subPage': false,
'parent': undefined,
'prev': undefined,
'next': undefined,
'home': undefined,
'items': [
<PageItem>{ id: 'alias.0.NSPanel_1.TestFenster', offColor: MSRed, onColor: MSGreen, name: 'Büro Fenster'},
<PageItem>{ id: 'alias.0.NSPanel_1.Haustuer', offColor: MSRed, onColor: MSGreen, name: 'Haustür'},
@@ -419,16 +392,12 @@ let Fenster_1: PageEntities =
]
};
//<PageItem>{ id: "alias.0.NS-Panel.Buero.Rollade", icon: "blinds-horizontal", offColor: White, onColor: Yellow, name: "Büro", secondRow: "Hier Text für 2. Zeile"},
let Button_1: PageEntities =
let Button_1 = <PageEntities>
{
'type': 'cardEntities',
'heading': 'Button Aliase',
'useColor': true,
'subPage': false,
'parent': undefined,
'prev': undefined,
'next': undefined,
'home': undefined,
'items': [
<PageItem>{ id: 'alias.0.NSPanel_1.TestTastensensor', name: 'Tastensensor (FFN)'},
<PageItem>{ id: 'alias.0.NSPanel_1.Radio.NDR2', icon: 'radio', name: 'Taste (NDR2)', onColor: colorRadio},
@@ -437,16 +406,12 @@ let Button_1: PageEntities =
]
};
let Subpages_1: PageEntities =
let Subpages_1 = <PageEntities>
{
'type': 'cardEntities',
'heading': 'Test Subpages',
'useColor': true,
'subPage': false,
'parent': undefined,
'prev': undefined,
'next': undefined,
'home': undefined,
'items': [
<PageItem>{ navigate: true, id: null, targetPage: 'Abfall', onColor: White, name: "Abfallkalender"},
<PageItem>{ navigate: true, id: 'alias.0.NSPanel_1.TestBlind', targetPage: 'WLAN', name: 'Gäste WLAN', onColor: MSGreen, offColor: MSRed },
@@ -454,16 +419,13 @@ let Subpages_1: PageEntities =
};
//Subpage 1 von Subpages_1
let Abfall: PageEntities =
let Abfall = <PageEntities>
{
'type': 'cardEntities',
'heading': 'Abfallkalender',
'useColor': true,
'subPage': true,
'parent': Subpages_1,
'prev': undefined,
'next': undefined,
'home': undefined,
'items': [
<PageItem>{ id: 'alias.0.NSPanel_1.Abfall.event1',icon: 'trash-can'},
<PageItem>{ id: 'alias.0.NSPanel_1.Abfall.event2',icon: 'trash-can'},
@@ -473,29 +435,22 @@ let Subpages_1: PageEntities =
};
//Subpage 2 von Subpages_1
let WLAN: PageQR =
let WLAN = <PageQR>
{
'type': 'cardQR',
'heading': 'Gäste WLAN',
'useColor': true,
'subPage': true,
'parent': Subpages_1,
'prev': undefined,
'next': undefined,
'home': undefined,
'items': [<PageItem>{ id: 'alias.0.NSPanel_1.Guest_Wifi', hidePassword: true }]
};
let Buero_Seite_2: PageGrid =
let Buero_Seite_2 = <PageGrid>
{
'type': 'cardGrid',
'heading': 'Büro 2',
'useColor': true,
'subPage': false,
'parent': undefined,
'prev': undefined,
'next': undefined,
'home': undefined,
'items': [
<PageItem>{ id: 'alias.0.NSPanel_1.Schreibtischlampe', name: 'Schreibtisch'},
<PageItem>{ id: 'alias.0.NSPanel_1.Deckenbeleuchtung', name: 'Deckenlampe'},
@@ -506,32 +461,24 @@ let Buero_Seite_2: PageGrid =
]
};
let Radiosender: PageGrid =
let Radiosender = <PageGrid>
{
'type': 'cardGrid',
'heading': 'Büro 2',
'useColor': true,
'subPage': false,
'parent': undefined,
'prev': undefined,
'next': undefined,
'home': undefined,
'items': [
<PageItem>{ id: 'alias.0.NSPanel_1.Radio.Bob', icon: 'radio', name: 'Radio BOB', onColor: colorRadio},
<PageItem>{ id: 'alias.0.NSPanel_1.Countdown', icon: 'timer-outline', name: 'Timer', onColor: White}
]
};
let WLED: PageGrid =
let WLED = <PageGrid>
{
'type': 'cardGrid',
'heading': 'WLED Stripes WZ',
'useColor': true,
'subPage': false,
'parent': undefined,
'prev': undefined,
'next': undefined,
'home': undefined,
'items': [
<PageItem>{ id: 'alias.0.NSPanel_1.WLED.Example.On', name: 'Power', icon: 'power', onColor: HMIOn, offColor: HMIOff},
<PageItem>{ id: 'alias.0.NSPanel_1.WLED.Example.Sync', name: 'Sync', icon: 'sync', onColor: HMIOn, offColor: White},
@@ -550,16 +497,12 @@ let WLED: PageGrid =
]
};
let SensorGrid: PageGrid =
let SensorGrid = <PageGrid>
{
'type': 'cardGrid',
'heading': 'Sensor Werte',
'useColor': true,
'subPage': false,
'parent': undefined,
'prev': undefined,
'next': undefined,
'home': undefined,
'items': [
<PageItem>{ id: 'alias.0.NSPanel_1.TestTemperatur', name: 'Außentemp. °C', offColor: MSRed, onColor: MSGreen, useValue: true },
<PageItem>{ id: 'alias.0.NSPanel_1.TestFeuchtigkeit', name: 'Luftfeuchte %', offColor: MSYellow, onColor: MSYellow , useValue: true },
@@ -572,16 +515,12 @@ let SensorGrid: PageGrid =
// NEW: Neue Definition von Medien-Aliasen
// adapterPlayerInstance = alexa2.0. or spotify-premium.0. or sonos.0. or chromecast.0.
let Alexa: PageMedia =
let Alexa = <PageMedia>
{
'type': 'cardMedia',
'heading': 'Alexa',
'useColor': true,
'subPage': false,
'parent': undefined,
'prev': undefined,
'next': undefined,
'home': undefined,
'items': [<PageItem>{
id: AliasPath + 'Media.PlayerAlexa',
adapterPlayerInstance: 'alexa2.0.',
@@ -607,16 +546,12 @@ let Alexa: PageMedia =
}]
};
let Sonos: PageMedia =
let Sonos = <PageMedia>
{
'type': 'cardMedia',
'heading': 'Sonos',
'useColor': true,
'subPage': false,
'parent': undefined,
'prev': undefined,
'next': undefined,
'home': undefined,
'items': [<PageItem>{
id: AliasPath + 'Media.PlayerSonos',
adapterPlayerInstance: 'sonos.0.',
@@ -629,16 +564,12 @@ let Sonos: PageMedia =
}]
};
let SpotifyPremium: PageMedia =
let SpotifyPremium = <PageMedia>
{
"type": "cardMedia",
"heading": "Spotify-Premium",
"useColor": true,
"subPage": false,
"parent": undefined,
'prev': undefined,
'next': undefined,
'home': undefined,
"items": [<PageItem>{
id: AliasPath + 'Media.PlayerSpotifyPremium',
adapterPlayerInstance: "spotify-premium.0.",
@@ -655,16 +586,12 @@ let SpotifyPremium: PageMedia =
}]
};
let SqueezeboxRPC: PageMedia =
let SqueezeboxRPC = <PageMedia>
{
'type': 'cardMedia',
'heading': 'SqueezeboxRPC',
'useColor': true,
'subPage': false,
'parent': undefined,
'prev': undefined,
'next': undefined,
'home': undefined,
'items': [<PageItem>{
id: 'alias.0.Media.LMS.SqueezePlay',
adapterPlayerInstance: 'squeezeboxrpc.0.Players.SqueezePlay.',
@@ -672,29 +599,21 @@ let SqueezeboxRPC: PageMedia =
}]
};
let Buero_Themostat: PageThermo =
let Buero_Themostat = <PageThermo>
{
'type': 'cardThermo',
'heading': 'Test Thermostat',
'useColor': true,
'subPage': false,
'parent': undefined,
'prev': undefined,
'next': undefined,
'home': undefined,
'items': [<PageItem>{ id: 'alias.0.NSPanel_1.Thermostat_Buero', minValue: 50, maxValue: 300 }]
};
let Buero_Klimaanlage: PageThermo =
let Buero_Klimaanlage = <PageThermo>
{
'type': 'cardThermo',
'heading': 'Test Klimaanlage',
'useColor': true,
'subPage': false,
'parent': undefined,
'prev': undefined,
'next': undefined,
'home': undefined,
'items': [<PageItem>{
id: 'alias.0.NSPanel_1.TestKlimaanlage',
minValue: 50,
@@ -709,29 +628,21 @@ let Buero_Klimaanlage: PageThermo =
}]
};
let Buero_Alarm: PageAlarm =
let Buero_Alarm = <PageAlarm >
{
'type': 'cardAlarm',
'heading': 'Alarm',
'useColor': true,
'subPage': false,
'parent': undefined,
'prev': undefined,
'next': undefined,
'home': undefined,
'items': [<PageItem>{ id: 'alias.0.Alarm' }]
};
let button1Page: PageGrid =
let button1Page = <PageGrid>
{
'type': 'cardGrid',
'heading': 'Radio',
'useColor': true,
'subPage': false,
'parent': undefined,
'prev': undefined,
'next': undefined,
'home': undefined,
'items': [
<PageItem>{ id: 'alias.0.NSPanel_1.Radio.FFN', icon: 'radio', name: 'FFN', onColor: colorRadio},
<PageItem>{ id: 'alias.0.NSPanel_1.Radio.Antenne' , icon: 'radio', name: 'Antenne Nds.', onColor: colorRadio},
@@ -742,16 +653,12 @@ let button1Page: PageGrid =
]
};
let button2Page: PageEntities =
let button2Page = <PageEntities>
{
'type': 'cardEntities',
'heading': 'Büro',
'useColor': true,
'subPage': false,
'parent': undefined,
'prev': undefined,
'next': undefined,
'home': undefined,
'items': [
<PageItem>{ id: 'alias.0.NSPanel_1.Schreibtischlampe'},
<PageItem>{ id: 'alias.0.NSPanel_1.Deckenbeleuchtung'}
@@ -765,16 +672,12 @@ let button2Page: PageEntities =
//Service Pages mit Auto-Alias (Nachfolgende Seiten werden mit Alias automatisch angelegt)
/********************************************************************************************************** */
let Service: PageEntities =
let Service = <PageEntities>
{
'type': 'cardEntities',
'heading': 'NSPanel Service',
'useColor': true,
'subPage': false,
'parent': undefined,
'prev': undefined,
'next': undefined,
'home': undefined,
'items': [
<PageItem>{ id: AliasPath + 'autoUpdate', name: 'Auto-Updates' ,icon: 'update', offColor: MSRed, onColor: MSGreen},
<PageItem>{ navigate: true, id: 'NSPanel_Infos', icon: 'information-outline', onColor: White, name: 'NSPanel Infos'},
@@ -784,16 +687,13 @@ let Service: PageEntities =
};
//Subpage 1 von Subpages_2
let NSPanel_Infos: PageEntities =
let NSPanel_Infos = <PageEntities>
{
'type': 'cardEntities',
'heading': 'NSPanel Infos',
'useColor': true,
'subPage': true,
'parent': Service,
'prev': undefined,
'next': undefined,
'home': undefined,
'items': [
<PageItem>{ id: AliasPath + 'Tasmota.Hardware', name: 'Hardware', icon: 'memory', offColor: MSYellow, onColor: MSYellow, useColor: true},
<PageItem>{ id: AliasPath + 'Sensor.ESP32.Temperature', name: 'ESP Temperatur', icon: 'thermometer', unit: '°C', offColor: MSYellow, onColor: MSYellow, useColor: true},
@@ -803,16 +703,13 @@ let Service: PageEntities =
};
//Subpage 2 von Subpages_2
let NSPanel_Einstellungen: PageEntities =
let NSPanel_Einstellungen = <PageEntities>
{
'type': 'cardEntities',
'heading': 'Screensaver',
'useColor': true,
'subPage': true,
'parent': Service,
'prev': undefined,
'next': undefined,
'home': undefined,
'items': [
<PageItem>{ id: AliasPath + 'Dimmode.brightnessDay', name: 'Brightness Tag', icon: 'brightness-5', offColor: MSYellow, onColor: MSYellow, useColor: true, minValue: 5, maxValue: 10},
<PageItem>{ id: AliasPath + 'Dimmode.brightnessNight', name: 'Brightness Nacht', icon: 'brightness-4', offColor: MSYellow, onColor: MSYellow, useColor: true, minValue: 0, maxValue: 4},
@@ -822,16 +719,13 @@ let Service: PageEntities =
};
//Subpage 3 von Subpages_2
let NSPanel_Firmware_Info: PageEntities =
let NSPanel_Firmware_Info = <PageEntities>
{
'type': 'cardEntities',
'heading': 'Firmware-Updates',
'useColor': true,
'subPage': true,
'parent': Service,
'prev': undefined,
'next': undefined,
'home': undefined,
'items': [
<PageItem>{ id: AliasPath + 'Tasmota.Version', name: 'Tasmota Firmware', offColor: MSYellow, onColor: MSYellow, useColor: true},
<PageItem>{ id: AliasPath + 'Display.TFTVersion', name: 'TFT-Firmware', offColor: MSYellow, onColor: MSYellow, useColor: true},
@@ -845,7 +739,6 @@ export const config: Config = {
panelSendTopic: 'mqtt.0.SmartHome.NSPanel_1.cmnd.CustomSend', // anpassen
firstScreensaverEntity: { ScreensaverEntity: 'accuweather.0.Hourly.h0.PrecipitationProbability', ScreensaverEntityIcon: 'weather-pouring', ScreensaverEntityText: 'Regen', ScreensaverEntityUnitText: '%', ScreensaverEntityIconColor: {'val_min': 0, 'val_max': 100} },
secondScreensaverEntity: { ScreensaverEntity: 'accuweather.0.Current.WindSpeed', ScreensaverEntityIcon: 'weather-windy', ScreensaverEntityText: "Wind", ScreensaverEntityUnitText: 'km/h', ScreensaverEntityIconColor: {'val_min': 0, 'val_max': 120} },
//secondScreensaverEntity: { ScreensaverEntity: 'accuweather.0.Current.WindSpeed', ScreensaverEntityIcon: 'weather-windy', ScreensaverEntityText: "Wind", ScreensaverEntityUnitText: 'km/h', ScreensaverEntityIconColor: {'val_min': 0, 'val_max': 120} },
thirdScreensaverEntity: { ScreensaverEntity: 'accuweather.0.Current.UVIndex', ScreensaverEntityIcon: 'solar-power', ScreensaverEntityText: 'UV', ScreensaverEntityUnitText: '', ScreensaverEntityIconColor: {'val_min': 0, 'val_max': 9} },
fourthScreensaverEntity: { ScreensaverEntity: 'accuweather.0.Current.RelativeHumidity', ScreensaverEntityIcon: 'water-percent', ScreensaverEntityText: 'Luft', ScreensaverEntityUnitText: '%', ScreensaverEntityIconColor: {'val_min': 0, 'val_max': 100, 'val_best': 65} },
alternativeScreensaverLayout: false,
@@ -3086,9 +2979,9 @@ function GenerateThermoPage(page: PageThermo): Payload[] {
destTemp2 = getState(id + '.' + page.items[0].setThermoDestTemp2).val;
}
let thermoPopup = 1
let thermoPopup = 0
if (page.items[0].popupThermoMode1 != undefined) {
thermoPopup = 0;
thermoPopup = 1;
}
@@ -4663,14 +4556,40 @@ function GetNavigationString(pageId: number): string {
console.log(pageId);
}
if (activePage.subPage && activePage.prev == undefined && activePage.next == undefined) {
return 'button~bUp~' + Icons.GetIcon('arrow-up-bold') + '~' + rgb_dec565(White) + '~~~button~bHome~' + Icons.GetIcon('home') + '~' + rgb_dec565(White) + '~~';
} else if (activePage.subPage && activePage.prev == undefined && activePage.next != undefined) {
return 'button~bUp~' + Icons.GetIcon('arrow-up-bold') + '~' + rgb_dec565(White) + '~~~button~bSubNext~' + Icons.GetIcon('arrow-right-bold') + '~' + rgb_dec565(White) + '~~';
} else if (activePage.subPage && activePage.prev != undefined && activePage.next != undefined) {
return 'button~bSubPrev~' + Icons.GetIcon('arrow-left-bold') + '~' + rgb_dec565(White) + '~~~button~bSubNext~' + Icons.GetIcon('arrow-right-bold') + '~' + rgb_dec565(White) + '~~';
} else if (activePage.subPage && activePage.prev != undefined && activePage.next == undefined) {
return 'button~bSubPrev~' + Icons.GetIcon('arrow-left-bold') + '~' + rgb_dec565(White) + '~~~button~bHome~' + Icons.GetIcon('home') + '~' + rgb_dec565(White) + '~~';
var navigationString:string = "";
if (activePage.subPage){
if (activePage.prev == undefined){
if (activePage.parentIcon != undefined){
navigationString = navigationString = 'button~bUp~' + Icons.GetIcon(activePage.parentIcon) + '~';
} else {
navigationString = navigationString = 'button~bUp~' + Icons.GetIcon('arrow-up-bold') + '~';
}
} else {
if (activePage.prevIcon != undefined){
navigationString = 'button~bSubPrev~' + Icons.GetIcon(activePage.prevIcon) + '~';
} else {
navigationString = 'button~bSubPrev~' + Icons.GetIcon('arrow-left-bold') + '~';
}
}
if (activePage.next == undefined){
if (activePage.homeIcon != undefined){
navigationString += rgb_dec565(White) + '~~~button~bHome~' + Icons.GetIcon(activePage.homeIcon) + '~' + rgb_dec565(White) + '~~';
} else {
navigationString += rgb_dec565(White) + '~~~button~bHome~' + Icons.GetIcon('home') + '~' + rgb_dec565(White) + '~~';
}
} else {
if (activePage.nextIcon != undefined){
navigationString += rgb_dec565(White) + '~~~button~bSubNext~' + Icons.GetIcon(activePage.nextIcon) + '~' + rgb_dec565(White) + '~~';
} else {
navigationString += rgb_dec565(White) + '~~~button~bSubNext~' + Icons.GetIcon('arrow-right-bold') + '~' + rgb_dec565(White) + '~~';
}
}
}
if (navigationString != ""){
return navigationString
}
switch (pageId) {
@@ -6484,11 +6403,15 @@ type Page = {
heading: string,
items: PageItem[],
useColor: boolean,
subPage: boolean,
parent: Page,
prev: string,
next: string,
home: string
subPage: (boolean | undefined),
parent: (Page | undefined),
parentIcon: (string | undefined),
prev: (string | undefined),
prevIcon: (string | undefined),
next: (string | undefined),
nextIcon: (string | undefined),
home: (string | undefined),
homeIcon: (string | undefined)
};
interface PageEntities extends Page {