Compare commits

...

8 Commits

Author SHA1 Message Date
joBr99
ebafe52f39 Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui (add nextion2text) 2022-04-03 07:35:49 +00:00
Johannes
265c95845f Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui 2022-04-03 09:35:25 +02:00
Johannes
218148bcfb change msg format media page 2022-04-03 09:35:14 +02:00
joBr99
d46a4ea46f fixed navigation on subpages for cardThermo cardMedia and cardAlarm (add nextion2text) 2022-04-03 07:18:00 +00:00
Johannes
767ed78c40 fixed navigation on subpages for cardThermo cardMedia and cardAlarm 2022-04-03 09:17:33 +02:00
Johannes
89669f68f0 Update README.md 2022-04-02 23:27:36 +02:00
Johannes
18805ccae2 Update README.md 2022-04-02 22:50:32 +02:00
Johannes
c4d920b3b7 Update README.md 2022-04-02 22:50:00 +02:00
26 changed files with 105 additions and 102 deletions

View File

@@ -123,7 +123,7 @@ The following message can be used to update the content on the cardEntities Page
### cardMedia Page ### cardMedia Page
`entityUpd~|*heading*|*navigation*|*internalNameEntiy*|*icon*|*title*|*author*|*volume*|*playpauseicon*|currentSpeaker|speakerList-seperated-by-?` `entityUpd~*heading*~*navigation*~*internalNameEntiy*~*icon*~*title*~*author*~*volume*~*playpauseicon*~currentSpeaker~speakerList-seperated-by-?`
### cardAlarm Page ### cardAlarm Page

View File

@@ -1,6 +1,6 @@
diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt
--- HMI/n2t-out/Program.s.txt 2022-04-02 17:52:28.361158189 +0000 --- HMI/n2t-out/Program.s.txt 2022-04-03 07:35:47.898571291 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-04-02 17:52:29.069163241 +0000 +++ HMI/US/landscape/n2t-out/Program.s.txt 2022-04-03 07:35:48.646571620 +0000
@@ -11,6 +11,6 @@ @@ -11,6 +11,6 @@
// dim value // dim value
int dimValue=40 int dimValue=40
@@ -11,8 +11,8 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt
+ //lcd_dev fffb 0002 0000 0020 + //lcd_dev fffb 0002 0000 0020
page pageStartup page pageStartup
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-04-02 17:52:28.361158189 +0000 --- HMI/n2t-out/pageStartup.txt 2022-04-03 07:35:47.902571293 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-04-02 17:52:29.069163241 +0000 +++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-04-03 07:35:48.646571620 +0000
@@ -177,7 +177,7 @@ @@ -177,7 +177,7 @@
recmod=1 recmod=1
bauds=115200 bauds=115200

View File

@@ -931,7 +931,7 @@ Timer tmSerial
if(tInstruction.txt=="entityUpd") if(tInstruction.txt=="entityUpd")
{ {
//heading //heading
spstr strCommand.txt,tHeading.txt,"|",1 spstr strCommand.txt,tHeading.txt,"~",1
// navigation icons // navigation icons
spstr strCommand.txt,tId.txt,"~",2 spstr strCommand.txt,tId.txt,"~",2
spstr tId.txt,tTmp.txt,"|",0 spstr tId.txt,tTmp.txt,"|",0
@@ -960,25 +960,25 @@ Timer tmSerial
bNext.txt="" bNext.txt=""
} }
//entity name //entity name
spstr strCommand.txt,entn.txt,"|",3 spstr strCommand.txt,entn.txt,"~",3
//icon //icon
spstr strCommand.txt,tTmp.txt,"|",4 spstr strCommand.txt,tTmp.txt,"~",4
covx tTmp.txt,sys0,0,0 covx tTmp.txt,sys0,0,0
substr pageIcons.tIcons.txt,tIcon.txt,sys0,1 substr pageIcons.tIcons.txt,tIcon.txt,sys0,1
//title //title
spstr strCommand.txt,tTitle.txt,"|",5 spstr strCommand.txt,tTitle.txt,"~",5
//author //author
spstr strCommand.txt,tAuthor.txt,"|",6 spstr strCommand.txt,tAuthor.txt,"~",6
//volume //volume
spstr strCommand.txt,tTmp.txt,"|",7 spstr strCommand.txt,tTmp.txt,"~",7
covx tTmp.txt,sys0,0,0 covx tTmp.txt,sys0,0,0
hVolume.val=sys0 hVolume.val=sys0
//icon //icon
spstr strCommand.txt,tTmp.txt,"|",8 spstr strCommand.txt,tTmp.txt,"~",8
covx tTmp.txt,sys0,0,0 covx tTmp.txt,sys0,0,0
substr pageIcons.tIcons.txt,tPlayPause.txt,sys0,1 substr pageIcons.tIcons.txt,tPlayPause.txt,sys0,1
//speaker current //speaker current
spstr strCommand.txt,tSpeaker.txt,"|",9 spstr strCommand.txt,tSpeaker.txt,"~",9
if(tSpeaker.txt!="") if(tSpeaker.txt!="")
{ {
tSpeaker.pco=1374 tSpeaker.pco=1374
@@ -987,14 +987,14 @@ Timer tmSerial
tSpeaker.pco=65535 tSpeaker.pco=65535
} }
//speaker list //speaker list
spstr strCommand.txt,vaSpeakerList.txt,"|",10 spstr strCommand.txt,vaSpeakerList.txt,"~",10
if(vaSpeakerList.txt=="") if(vaSpeakerList.txt=="")
{ {
vis t6,0 vis t6,0
} }
vaSpeakerPos.val=0 vaSpeakerPos.val=0
// on off button // on off button
spstr strCommand.txt,tTmp.txt,"|",11 spstr strCommand.txt,tTmp.txt,"~",11
if(tTmp.txt=="disable") if(tTmp.txt=="disable")
{ {
vis t5,0 vis t5,0

View File

@@ -22,10 +22,6 @@ pageStartup
19 Component(s) 19 Component(s)
150 Line(s) of event code 150 Line(s) of event code
113 Unique line(s) of event code 113 Unique line(s) of event code
cardMedia
30 Component(s)
333 Line(s) of event code
170 Unique line(s) of event code
popupShutter popupShutter
19 Component(s) 19 Component(s)
178 Line(s) of event code 178 Line(s) of event code
@@ -42,6 +38,10 @@ screensaver
33 Component(s) 33 Component(s)
207 Line(s) of event code 207 Line(s) of event code
158 Unique line(s) of event code 158 Unique line(s) of event code
cardMedia
30 Component(s)
333 Line(s) of event code
170 Unique line(s) of event code
cardAlarm cardAlarm
35 Component(s) 35 Component(s)
345 Line(s) of event code 345 Line(s) of event code
@@ -59,4 +59,4 @@ Total
13 Page(s) 13 Page(s)
355 Component(s) 355 Component(s)
3646 Line(s) of event code 3646 Line(s) of event code
1045 Unique line(s) of event code 1039 Unique line(s) of event code

View File

@@ -402,7 +402,7 @@ Text tVersion
Horizontal Alignment : center Horizontal Alignment : center
Vertical Alignment : center Vertical Alignment : center
Input Type : character Input Type : character
Text : 27 Text : 28
Max. Text Size : 10 Max. Text Size : 10
Word wrap : disabled Word wrap : disabled
Horizontal Spacing : 0 Horizontal Spacing : 0

View File

@@ -509,7 +509,7 @@ Timer tmSerial
if(tInstruction.txt=="entityUpd") if(tInstruction.txt=="entityUpd")
{ {
//heading //heading
spstr strCommand.txt,tHeading.txt,"|",1 spstr strCommand.txt,tHeading.txt,"~",1
// navigation icons // navigation icons
spstr strCommand.txt,tId.txt,"~",2 spstr strCommand.txt,tId.txt,"~",2
spstr tId.txt,tTmp.txt,"|",0 spstr tId.txt,tTmp.txt,"|",0
@@ -538,25 +538,25 @@ Timer tmSerial
bNext.txt="" bNext.txt=""
} }
//entity name //entity name
spstr strCommand.txt,entn.txt,"|",3 spstr strCommand.txt,entn.txt,"~",3
//icon //icon
spstr strCommand.txt,tTmp.txt,"|",4 spstr strCommand.txt,tTmp.txt,"~",4
covx tTmp.txt,sys0,0,0 covx tTmp.txt,sys0,0,0
substr pageIcons.tIcons.txt,tIcon.txt,sys0,1 substr pageIcons.tIcons.txt,tIcon.txt,sys0,1
//title //title
spstr strCommand.txt,tTitle.txt,"|",5 spstr strCommand.txt,tTitle.txt,"~",5
//author //author
spstr strCommand.txt,tAuthor.txt,"|",6 spstr strCommand.txt,tAuthor.txt,"~",6
//volume //volume
spstr strCommand.txt,tTmp.txt,"|",7 spstr strCommand.txt,tTmp.txt,"~",7
covx tTmp.txt,sys0,0,0 covx tTmp.txt,sys0,0,0
hVolume.val=sys0 hVolume.val=sys0
//icon //icon
spstr strCommand.txt,tTmp.txt,"|",8 spstr strCommand.txt,tTmp.txt,"~",8
covx tTmp.txt,sys0,0,0 covx tTmp.txt,sys0,0,0
substr pageIcons.tIcons.txt,tPlayPause.txt,sys0,1 substr pageIcons.tIcons.txt,tPlayPause.txt,sys0,1
//speaker current //speaker current
spstr strCommand.txt,tSpeaker.txt,"|",9 spstr strCommand.txt,tSpeaker.txt,"~",9
if(tSpeaker.txt!="") if(tSpeaker.txt!="")
{ {
tSpeaker.pco=1374 tSpeaker.pco=1374
@@ -565,14 +565,14 @@ Timer tmSerial
tSpeaker.pco=65535 tSpeaker.pco=65535
} }
//speaker list //speaker list
spstr strCommand.txt,vaSpeakerList.txt,"|",10 spstr strCommand.txt,vaSpeakerList.txt,"~",10
if(vaSpeakerList.txt=="") if(vaSpeakerList.txt=="")
{ {
vis t6,0 vis t6,0
} }
vaSpeakerPos.val=0 vaSpeakerPos.val=0
// on off button // on off button
spstr strCommand.txt,tTmp.txt,"|",11 spstr strCommand.txt,tTmp.txt,"~",11
if(tTmp.txt=="disable") if(tTmp.txt=="disable")
{ {
vis t5,0 vis t5,0

View File

@@ -152,7 +152,7 @@ Text tVersion
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Associated Keyboard : none Associated Keyboard : none
Text : 27 Text : 28
Max. Text Size : 10 Max. Text Size : 10
Picture p0 Picture p0

Binary file not shown.

Binary file not shown.

View File

@@ -1,6 +1,6 @@
diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt
--- HMI/n2t-out/Program.s.txt 2022-04-02 17:52:28.361158189 +0000 --- HMI/n2t-out/Program.s.txt 2022-04-03 07:35:47.898571291 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-02 17:52:28.717160730 +0000 +++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-03 07:35:48.266571453 +0000
@@ -11,6 +11,6 @@ @@ -11,6 +11,6 @@
// dim value // dim value
int dimValue=40 int dimValue=40
@@ -11,8 +11,8 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt
+ //lcd_dev fffb 0002 0000 0020 + //lcd_dev fffb 0002 0000 0020
page pageStartup page pageStartup
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
--- HMI/n2t-out/cardEntities.txt 2022-04-02 17:52:28.361158189 +0000 --- HMI/n2t-out/cardEntities.txt 2022-04-03 07:35:47.902571293 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-02 17:52:28.721160758 +0000 +++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-03 07:35:48.266571453 +0000
@@ -62,6 +62,26 @@ @@ -62,6 +62,26 @@
vis bText4,0 vis bText4,0
vis hSlider4,0 vis hSlider4,0
@@ -781,8 +781,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
if(tInstruction.txt=="pageType") if(tInstruction.txt=="pageType")
{ {
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-04-02 17:52:28.361158189 +0000 --- HMI/n2t-out/pageStartup.txt 2022-04-03 07:35:47.902571293 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-02 17:52:28.717160730 +0000 +++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-03 07:35:48.266571453 +0000
@@ -142,7 +142,7 @@ @@ -142,7 +142,7 @@
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled

View File

@@ -931,7 +931,7 @@ Timer tmSerial
if(tInstruction.txt=="entityUpd") if(tInstruction.txt=="entityUpd")
{ {
//heading //heading
spstr strCommand.txt,tHeading.txt,"|",1 spstr strCommand.txt,tHeading.txt,"~",1
// navigation icons // navigation icons
spstr strCommand.txt,tId.txt,"~",2 spstr strCommand.txt,tId.txt,"~",2
spstr tId.txt,tTmp.txt,"|",0 spstr tId.txt,tTmp.txt,"|",0
@@ -960,25 +960,25 @@ Timer tmSerial
bNext.txt="" bNext.txt=""
} }
//entity name //entity name
spstr strCommand.txt,entn.txt,"|",3 spstr strCommand.txt,entn.txt,"~",3
//icon //icon
spstr strCommand.txt,tTmp.txt,"|",4 spstr strCommand.txt,tTmp.txt,"~",4
covx tTmp.txt,sys0,0,0 covx tTmp.txt,sys0,0,0
substr pageIcons.tIcons.txt,tIcon.txt,sys0,1 substr pageIcons.tIcons.txt,tIcon.txt,sys0,1
//title //title
spstr strCommand.txt,tTitle.txt,"|",5 spstr strCommand.txt,tTitle.txt,"~",5
//author //author
spstr strCommand.txt,tAuthor.txt,"|",6 spstr strCommand.txt,tAuthor.txt,"~",6
//volume //volume
spstr strCommand.txt,tTmp.txt,"|",7 spstr strCommand.txt,tTmp.txt,"~",7
covx tTmp.txt,sys0,0,0 covx tTmp.txt,sys0,0,0
hVolume.val=sys0 hVolume.val=sys0
//icon //icon
spstr strCommand.txt,tTmp.txt,"|",8 spstr strCommand.txt,tTmp.txt,"~",8
covx tTmp.txt,sys0,0,0 covx tTmp.txt,sys0,0,0
substr pageIcons.tIcons.txt,tPlayPause.txt,sys0,1 substr pageIcons.tIcons.txt,tPlayPause.txt,sys0,1
//speaker current //speaker current
spstr strCommand.txt,tSpeaker.txt,"|",9 spstr strCommand.txt,tSpeaker.txt,"~",9
if(tSpeaker.txt!="") if(tSpeaker.txt!="")
{ {
tSpeaker.pco=1374 tSpeaker.pco=1374
@@ -987,14 +987,14 @@ Timer tmSerial
tSpeaker.pco=65535 tSpeaker.pco=65535
} }
//speaker list //speaker list
spstr strCommand.txt,vaSpeakerList.txt,"|",10 spstr strCommand.txt,vaSpeakerList.txt,"~",10
if(vaSpeakerList.txt=="") if(vaSpeakerList.txt=="")
{ {
vis t6,0 vis t6,0
} }
vaSpeakerPos.val=0 vaSpeakerPos.val=0
// on off button // on off button
spstr strCommand.txt,tTmp.txt,"|",11 spstr strCommand.txt,tTmp.txt,"~",11
if(tTmp.txt=="disable") if(tTmp.txt=="disable")
{ {
vis t5,0 vis t5,0

View File

@@ -6,18 +6,14 @@ 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
pageStartup
19 Component(s)
150 Line(s) of event code
113 Unique line(s) of event code
pageIcons pageIcons
7 Component(s) 7 Component(s)
0 Line(s) of event code 0 Line(s) of event code
0 Unique line(s) of event code 0 Unique line(s) of event code
cardMedia pageStartup
30 Component(s) 19 Component(s)
333 Line(s) of event code 150 Line(s) of event code
170 Unique line(s) of event code 113 Unique line(s) of event code
popupNotify popupNotify
17 Component(s) 17 Component(s)
178 Line(s) of event code 178 Line(s) of event code
@@ -34,6 +30,10 @@ screensaver
33 Component(s) 33 Component(s)
207 Line(s) of event code 207 Line(s) of event code
158 Unique line(s) of event code 158 Unique line(s) of event code
cardMedia
30 Component(s)
333 Line(s) of event code
170 Unique line(s) of event code
popupShutter popupShutter
19 Component(s) 19 Component(s)
178 Line(s) of event code 178 Line(s) of event code
@@ -59,4 +59,4 @@ Total
13 Page(s) 13 Page(s)
379 Component(s) 379 Component(s)
4036 Line(s) of event code 4036 Line(s) of event code
1159 Unique line(s) of event code 1153 Unique line(s) of event code

View File

@@ -402,7 +402,7 @@ Text tVersion
Horizontal Alignment : center Horizontal Alignment : center
Vertical Alignment : center Vertical Alignment : center
Input Type : character Input Type : character
Text : 27 Text : 28
Max. Text Size : 10 Max. Text Size : 10
Word wrap : disabled Word wrap : disabled
Horizontal Spacing : 0 Horizontal Spacing : 0

View File

@@ -509,7 +509,7 @@ Timer tmSerial
if(tInstruction.txt=="entityUpd") if(tInstruction.txt=="entityUpd")
{ {
//heading //heading
spstr strCommand.txt,tHeading.txt,"|",1 spstr strCommand.txt,tHeading.txt,"~",1
// navigation icons // navigation icons
spstr strCommand.txt,tId.txt,"~",2 spstr strCommand.txt,tId.txt,"~",2
spstr tId.txt,tTmp.txt,"|",0 spstr tId.txt,tTmp.txt,"|",0
@@ -538,25 +538,25 @@ Timer tmSerial
bNext.txt="" bNext.txt=""
} }
//entity name //entity name
spstr strCommand.txt,entn.txt,"|",3 spstr strCommand.txt,entn.txt,"~",3
//icon //icon
spstr strCommand.txt,tTmp.txt,"|",4 spstr strCommand.txt,tTmp.txt,"~",4
covx tTmp.txt,sys0,0,0 covx tTmp.txt,sys0,0,0
substr pageIcons.tIcons.txt,tIcon.txt,sys0,1 substr pageIcons.tIcons.txt,tIcon.txt,sys0,1
//title //title
spstr strCommand.txt,tTitle.txt,"|",5 spstr strCommand.txt,tTitle.txt,"~",5
//author //author
spstr strCommand.txt,tAuthor.txt,"|",6 spstr strCommand.txt,tAuthor.txt,"~",6
//volume //volume
spstr strCommand.txt,tTmp.txt,"|",7 spstr strCommand.txt,tTmp.txt,"~",7
covx tTmp.txt,sys0,0,0 covx tTmp.txt,sys0,0,0
hVolume.val=sys0 hVolume.val=sys0
//icon //icon
spstr strCommand.txt,tTmp.txt,"|",8 spstr strCommand.txt,tTmp.txt,"~",8
covx tTmp.txt,sys0,0,0 covx tTmp.txt,sys0,0,0
substr pageIcons.tIcons.txt,tPlayPause.txt,sys0,1 substr pageIcons.tIcons.txt,tPlayPause.txt,sys0,1
//speaker current //speaker current
spstr strCommand.txt,tSpeaker.txt,"|",9 spstr strCommand.txt,tSpeaker.txt,"~",9
if(tSpeaker.txt!="") if(tSpeaker.txt!="")
{ {
tSpeaker.pco=1374 tSpeaker.pco=1374
@@ -565,14 +565,14 @@ Timer tmSerial
tSpeaker.pco=65535 tSpeaker.pco=65535
} }
//speaker list //speaker list
spstr strCommand.txt,vaSpeakerList.txt,"|",10 spstr strCommand.txt,vaSpeakerList.txt,"~",10
if(vaSpeakerList.txt=="") if(vaSpeakerList.txt=="")
{ {
vis t6,0 vis t6,0
} }
vaSpeakerPos.val=0 vaSpeakerPos.val=0
// on off button // on off button
spstr strCommand.txt,tTmp.txt,"|",11 spstr strCommand.txt,tTmp.txt,"~",11
if(tTmp.txt=="disable") if(tTmp.txt=="disable")
{ {
vis t5,0 vis t5,0

View File

@@ -152,7 +152,7 @@ Text tVersion
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Associated Keyboard : none Associated Keyboard : none
Text : 27 Text : 28
Max. Text Size : 10 Max. Text Size : 10
Picture p0 Picture p0

Binary file not shown.

Binary file not shown.

View File

@@ -931,7 +931,7 @@ Timer tmSerial
if(tInstruction.txt=="entityUpd") if(tInstruction.txt=="entityUpd")
{ {
//heading //heading
spstr strCommand.txt,tHeading.txt,"|",1 spstr strCommand.txt,tHeading.txt,"~",1
// navigation icons // navigation icons
spstr strCommand.txt,tId.txt,"~",2 spstr strCommand.txt,tId.txt,"~",2
spstr tId.txt,tTmp.txt,"|",0 spstr tId.txt,tTmp.txt,"|",0
@@ -960,25 +960,25 @@ Timer tmSerial
bNext.txt="" bNext.txt=""
} }
//entity name //entity name
spstr strCommand.txt,entn.txt,"|",3 spstr strCommand.txt,entn.txt,"~",3
//icon //icon
spstr strCommand.txt,tTmp.txt,"|",4 spstr strCommand.txt,tTmp.txt,"~",4
covx tTmp.txt,sys0,0,0 covx tTmp.txt,sys0,0,0
substr pageIcons.tIcons.txt,tIcon.txt,sys0,1 substr pageIcons.tIcons.txt,tIcon.txt,sys0,1
//title //title
spstr strCommand.txt,tTitle.txt,"|",5 spstr strCommand.txt,tTitle.txt,"~",5
//author //author
spstr strCommand.txt,tAuthor.txt,"|",6 spstr strCommand.txt,tAuthor.txt,"~",6
//volume //volume
spstr strCommand.txt,tTmp.txt,"|",7 spstr strCommand.txt,tTmp.txt,"~",7
covx tTmp.txt,sys0,0,0 covx tTmp.txt,sys0,0,0
hVolume.val=sys0 hVolume.val=sys0
//icon //icon
spstr strCommand.txt,tTmp.txt,"|",8 spstr strCommand.txt,tTmp.txt,"~",8
covx tTmp.txt,sys0,0,0 covx tTmp.txt,sys0,0,0
substr pageIcons.tIcons.txt,tPlayPause.txt,sys0,1 substr pageIcons.tIcons.txt,tPlayPause.txt,sys0,1
//speaker current //speaker current
spstr strCommand.txt,tSpeaker.txt,"|",9 spstr strCommand.txt,tSpeaker.txt,"~",9
if(tSpeaker.txt!="") if(tSpeaker.txt!="")
{ {
tSpeaker.pco=1374 tSpeaker.pco=1374
@@ -987,14 +987,14 @@ Timer tmSerial
tSpeaker.pco=65535 tSpeaker.pco=65535
} }
//speaker list //speaker list
spstr strCommand.txt,vaSpeakerList.txt,"|",10 spstr strCommand.txt,vaSpeakerList.txt,"~",10
if(vaSpeakerList.txt=="") if(vaSpeakerList.txt=="")
{ {
vis t6,0 vis t6,0
} }
vaSpeakerPos.val=0 vaSpeakerPos.val=0
// on off button // on off button
spstr strCommand.txt,tTmp.txt,"|",11 spstr strCommand.txt,tTmp.txt,"~",11
if(tTmp.txt=="disable") if(tTmp.txt=="disable")
{ {
vis t5,0 vis t5,0

View File

@@ -22,10 +22,6 @@ popupShutter
19 Component(s) 19 Component(s)
178 Line(s) of event code 178 Line(s) of event code
101 Unique line(s) of event code 101 Unique line(s) of event code
cardMedia
30 Component(s)
333 Line(s) of event code
170 Unique line(s) of event code
popupLight popupLight
27 Component(s) 27 Component(s)
322 Line(s) of event code 322 Line(s) of event code
@@ -38,6 +34,10 @@ cardThermo
41 Component(s) 41 Component(s)
460 Line(s) of event code 460 Line(s) of event code
284 Unique line(s) of event code 284 Unique line(s) of event code
cardMedia
30 Component(s)
333 Line(s) of event code
170 Unique line(s) of event code
screensaver screensaver
33 Component(s) 33 Component(s)
207 Line(s) of event code 207 Line(s) of event code
@@ -59,4 +59,4 @@ Total
13 Page(s) 13 Page(s)
355 Component(s) 355 Component(s)
3647 Line(s) of event code 3647 Line(s) of event code
1046 Unique line(s) of event code 1040 Unique line(s) of event code

View File

@@ -402,7 +402,7 @@ Text tVersion
Horizontal Alignment : center Horizontal Alignment : center
Vertical Alignment : center Vertical Alignment : center
Input Type : character Input Type : character
Text : 27 Text : 28
Max. Text Size : 10 Max. Text Size : 10
Word wrap : disabled Word wrap : disabled
Horizontal Spacing : 0 Horizontal Spacing : 0

View File

@@ -509,7 +509,7 @@ Timer tmSerial
if(tInstruction.txt=="entityUpd") if(tInstruction.txt=="entityUpd")
{ {
//heading //heading
spstr strCommand.txt,tHeading.txt,"|",1 spstr strCommand.txt,tHeading.txt,"~",1
// navigation icons // navigation icons
spstr strCommand.txt,tId.txt,"~",2 spstr strCommand.txt,tId.txt,"~",2
spstr tId.txt,tTmp.txt,"|",0 spstr tId.txt,tTmp.txt,"|",0
@@ -538,25 +538,25 @@ Timer tmSerial
bNext.txt="" bNext.txt=""
} }
//entity name //entity name
spstr strCommand.txt,entn.txt,"|",3 spstr strCommand.txt,entn.txt,"~",3
//icon //icon
spstr strCommand.txt,tTmp.txt,"|",4 spstr strCommand.txt,tTmp.txt,"~",4
covx tTmp.txt,sys0,0,0 covx tTmp.txt,sys0,0,0
substr pageIcons.tIcons.txt,tIcon.txt,sys0,1 substr pageIcons.tIcons.txt,tIcon.txt,sys0,1
//title //title
spstr strCommand.txt,tTitle.txt,"|",5 spstr strCommand.txt,tTitle.txt,"~",5
//author //author
spstr strCommand.txt,tAuthor.txt,"|",6 spstr strCommand.txt,tAuthor.txt,"~",6
//volume //volume
spstr strCommand.txt,tTmp.txt,"|",7 spstr strCommand.txt,tTmp.txt,"~",7
covx tTmp.txt,sys0,0,0 covx tTmp.txt,sys0,0,0
hVolume.val=sys0 hVolume.val=sys0
//icon //icon
spstr strCommand.txt,tTmp.txt,"|",8 spstr strCommand.txt,tTmp.txt,"~",8
covx tTmp.txt,sys0,0,0 covx tTmp.txt,sys0,0,0
substr pageIcons.tIcons.txt,tPlayPause.txt,sys0,1 substr pageIcons.tIcons.txt,tPlayPause.txt,sys0,1
//speaker current //speaker current
spstr strCommand.txt,tSpeaker.txt,"|",9 spstr strCommand.txt,tSpeaker.txt,"~",9
if(tSpeaker.txt!="") if(tSpeaker.txt!="")
{ {
tSpeaker.pco=1374 tSpeaker.pco=1374
@@ -565,14 +565,14 @@ Timer tmSerial
tSpeaker.pco=65535 tSpeaker.pco=65535
} }
//speaker list //speaker list
spstr strCommand.txt,vaSpeakerList.txt,"|",10 spstr strCommand.txt,vaSpeakerList.txt,"~",10
if(vaSpeakerList.txt=="") if(vaSpeakerList.txt=="")
{ {
vis t6,0 vis t6,0
} }
vaSpeakerPos.val=0 vaSpeakerPos.val=0
// on off button // on off button
spstr strCommand.txt,tTmp.txt,"|",11 spstr strCommand.txt,tTmp.txt,"~",11
if(tTmp.txt=="disable") if(tTmp.txt=="disable")
{ {
vis t5,0 vis t5,0

View File

@@ -152,7 +152,7 @@ Text tVersion
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
Associated Keyboard : none Associated Keyboard : none
Text : 27 Text : 28
Max. Text Size : 10 Max. Text Size : 10
Picture p0 Picture p0

Binary file not shown.

Binary file not shown.

View File

@@ -4,6 +4,7 @@ If you like this project consider buying me a pizza 🍕 <a href="https://paypal
[![hacs_badge](https://img.shields.io/badge/HACS-Default-41BDF5.svg)](https://github.com/hacs/integration) [![hacs_badge](https://img.shields.io/badge/HACS-Default-41BDF5.svg)](https://github.com/hacs/integration)
![hacs validation](https://github.com/joBr99/nspanel-lovelace-ui/actions/workflows/hacs-validation.yaml/badge.svg) ![hacs validation](https://github.com/joBr99/nspanel-lovelace-ui/actions/workflows/hacs-validation.yaml/badge.svg)
[![Man Hours](https://img.shields.io/endpoint?url=https%3A%2F%2Fmh.jessemillar.com%2Fhours%3Frepo%3Dhttps%3A%2F%2Fgithub.com%2FjoBr99%2Fnspanel-lovelace-ui.git)](https://jessemillar.com/r/man-hours)
NsPanel Lovelace UI is a Firmware for the nextion screen inside of NSPanel in the Design of [HomeAssistant](https://www.home-assistant.io/)'s Lovelace UI Design. NsPanel Lovelace UI is a Firmware for the nextion screen inside of NSPanel in the Design of [HomeAssistant](https://www.home-assistant.io/)'s Lovelace UI Design.
@@ -313,6 +314,7 @@ nspanel-1:
- entity: delete - entity: delete
- entity: button.example_item - entity: button.example_item
- entity: cover.example_item - entity: cover.example_item
- entity: delete # delete at the end is optional
title: Exmaple Gird title: Exmaple Gird
- type: cardThermo - type: cardThermo
entity: climate.example_item entity: climate.example_item

View File

@@ -64,6 +64,8 @@ class LuiPagesGen(object):
we_name = self._config._config_screensaver.entity.entityId we_name = self._config._config_screensaver.entity.entityId
unit = self._config._config_screensaver.raw_config.get("weatherUnit", "celsius") unit = self._config._config_screensaver.raw_config.get("weatherUnit", "celsius")
LOGGER.info(f"test123 {we_name}")
if self._ha_api.entity_exists(we_name): if self._ha_api.entity_exists(we_name):
we = self._ha_api.get_entity(we_name) we = self._ha_api.get_entity(we_name)
else: else:
@@ -178,7 +180,7 @@ class LuiPagesGen(object):
def generate_thermo_page(self, navigation, entity): def generate_thermo_page(self, navigation, entity):
item = entity.entityId item = entity.entityId
if not self._ha_api.entity_exists(item): if not self._ha_api.entity_exists(item):
command = f"entityUpd~{item}~Not found~220~220~Not found~150~300~5" command = f"entityUpd~{heading}~{navigation}~{item}~220~220~Not found~150~300~5"
else: else:
entity = self._ha_api.get_entity(item) entity = self._ha_api.get_entity(item)
heading = entity.attributes.friendly_name heading = entity.attributes.friendly_name
@@ -230,13 +232,13 @@ class LuiPagesGen(object):
icon_res = "~"*4*padding_len + icon_res + "~"*4*padding_len icon_res = "~"*4*padding_len + icon_res + "~"*4*padding_len
# use first 5 icons # use first 5 icons
icon_res = icon_res + "~"*4*4 icon_res = icon_res + "~"*4*4
command = f"entityUpd~{heading}~~{item}~{current_temp}~{dest_temp}~{status}~{min_temp}~{max_temp}~{step_temp}{icon_res}" command = f"entityUpd~{heading}~{navigation}~{item}~{current_temp}~{dest_temp}~{status}~{min_temp}~{max_temp}~{step_temp}{icon_res}"
self._send_mqtt_msg(command) self._send_mqtt_msg(command)
def generate_media_page(self, navigation, entity): def generate_media_page(self, navigation, entity):
item = entity.entityId item = entity.entityId
if not self._ha_api.entity_exists(item): if not self._ha_api.entity_exists(item):
command = f"entityUpd~|{item}|Not found|{get_icon_id('alert-circle-outline')}|Please check your|apps.yaml in AppDaemon|50|{get_icon_id('alert-circle-outline')}" command = f"entityUpd~|Not found||{item}|{get_icon_id('alert-circle-outline')}|Please check your|apps.yaml in AppDaemon|50|{get_icon_id('alert-circle-outline')}"
else: else:
entity = self._ha_api.get_entity(item) entity = self._ha_api.get_entity(item)
heading = entity.attributes.friendly_name heading = entity.attributes.friendly_name
@@ -264,13 +266,13 @@ class LuiPagesGen(object):
onoffbutton = 1374 onoffbutton = 1374
else: else:
onoffbutton = rgb_dec565([255,255,255]) onoffbutton = rgb_dec565([255,255,255])
command = f"entityUpd~|{heading}||{item}|{icon}|{title}|{author}|{volume}|{iconplaypause}|{source}|{speakerlist[:200]}|{onoffbutton}" command = f"entityUpd~|{heading}|{navigation}|{item}|{icon}|{title}|{author}|{volume}|{iconplaypause}|{source}|{speakerlist[:200]}|{onoffbutton}"
self._send_mqtt_msg(command) self._send_mqtt_msg(command)
def generate_alarm_page(self, navigation, entity): def generate_alarm_page(self, navigation, entity):
item = entity.entityId item = entity.entityId
if not self._ha_api.entity_exists(item): if not self._ha_api.entity_exists(item):
command = f"entityUpd~{item}~Not found~Not found~Check your~Check your~apps.~apps.~yaml~yaml~0~~0" command = f"entityUpd~{item}~~Not found~Not found~Check your~Check your~apps.~apps.~yaml~yaml~0~~0"
else: else:
entity = self._ha_api.get_entity(item) entity = self._ha_api.get_entity(item)
icon = get_icon_id("shield-off") icon = get_icon_id("shield-off")
@@ -324,7 +326,6 @@ class LuiPagesGen(object):
arm_buttons += f"~{get_translation(self._locale, b)}~{b}" arm_buttons += f"~{get_translation(self._locale, b)}~{b}"
if len(supported_modes) < 4: if len(supported_modes) < 4:
arm_buttons += "~"*((4-len(supported_modes))*2) arm_buttons += "~"*((4-len(supported_modes))*2)
navigation = ""
command = f"entityUpd~{item}~{navigation}{arm_buttons}~{icon}~{color}~{numpad}~{flashing}" command = f"entityUpd~{item}~{navigation}{arm_buttons}~{icon}~{color}~{numpad}~{flashing}"
self._send_mqtt_msg(command) self._send_mqtt_msg(command)