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

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

Browse Source
This commit is contained in:
Johannes
2022-04-03 09:53:04 +02:00
parent b9ddb24a6d ebafe52f39
commit ab74c80ab2
11 changed files with 85 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,6 @@
diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt
--- HMI/n2t-out/Program.s.txt 2022-04-03 07:17:59.034353405 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-04-03 07:17:59.946371492 +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-03 07:35:48.646571620 +0000
@@ -11,6 +11,6 @@
// dim value
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
page pageStartup
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-04-03 07:17:59.038353485 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-04-03 07:17:59.946371492 +0000
--- HMI/n2t-out/pageStartup.txt 2022-04-03 07:35:47.902571293 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-04-03 07:35:48.646571620 +0000
@@ -177,7 +177,7 @@
recmod=1
bauds=115200

20
HMI/US/landscape/n2t-out-visual/cardMedia.txt
View File

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

10
HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt
View File

@@ -22,10 +22,6 @@ pageStartup
19 Component(s)
150 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
19 Component(s)
178 Line(s) of event code
@@ -42,6 +38,10 @@ screensaver
33 Component(s)
207 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
35 Component(s)
345 Line(s) of event code
@@ -59,4 +59,4 @@ Total
13 Page(s)
355 Component(s)
3646 Line(s) of event code
1045 Unique line(s) of event code
1039 Unique line(s) of event code

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

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

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

@@ -1,6 +1,6 @@
diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt
--- HMI/n2t-out/Program.s.txt 2022-04-03 07:17:59.034353405 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-03 07:17:59.478362211 +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-03 07:35:48.266571453 +0000
@@ -11,6 +11,6 @@
// dim value
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
page pageStartup
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
--- HMI/n2t-out/cardEntities.txt 2022-04-03 07:17:59.038353485 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-03 07:17:59.478362211 +0000
--- HMI/n2t-out/cardEntities.txt 2022-04-03 07:35:47.902571293 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-03 07:35:48.266571453 +0000
@@ -62,6 +62,26 @@
vis bText4,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")
{
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-04-03 07:17:59.038353485 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-03 07:17:59.478362211 +0000
--- HMI/n2t-out/pageStartup.txt 2022-04-03 07:35:47.902571293 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-03 07:35:48.266571453 +0000
@@ -142,7 +142,7 @@
Disable release event after dragging: 0
Send Component ID : disabled

20
HMI/US/portrait/n2t-out-visual/cardMedia.txt
View File

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

10
HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt
View File

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

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

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

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

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

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

@@ -22,10 +22,6 @@ popupShutter
19 Component(s)
178 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
27 Component(s)
322 Line(s) of event code
@@ -38,6 +34,10 @@ cardThermo
41 Component(s)
460 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
33 Component(s)
207 Line(s) of event code
@@ -59,4 +59,4 @@ Total
13 Page(s)
355 Component(s)
3647 Line(s) of event code
1046 Unique line(s) of event code
1040 Unique line(s) of event code

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

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