mirror of
https://github.com/joBr99/nspanel-lovelace-ui.git
synced 2026-02-23 13:02:14 +01:00
Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui
This commit is contained in:
Johannes
@@ -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-04 21:08:13.436944769 +0000
|
||||
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-04-04 21:08:14.140947479 +0000
|
||||
--- HMI/n2t-out/Program.s.txt 2022-04-04 21:26:08.660575169 +0000
|
||||
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-04-04 21:26:09.652584145 +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-04 21:08:13.436944769 +0000
|
||||
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-04-04 21:08:14.144947495 +0000
|
||||
--- HMI/n2t-out/pageStartup.txt 2022-04-04 21:26:08.660575169 +0000
|
||||
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-04-04 21:26:09.652584145 +0000
|
||||
@@ -177,7 +177,7 @@
|
||||
recmod=1
|
||||
bauds=115200
|
||||
|
||||
@@ -1011,7 +1011,7 @@ Timer tmSerial
|
||||
if(tInstruction.txt=="entityUpd")
|
||||
{
|
||||
// command format: entityUpd,heading,navigation,[,type,internalName,iconId,iconColor,displayName,optionalValue]x6
|
||||
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
|
||||
@@ -1040,9 +1040,9 @@ Timer tmSerial
|
||||
bNext.txt="î³"
|
||||
}
|
||||
// get Type
|
||||
spstr strCommand.txt,type1.txt,",",3
|
||||
spstr strCommand.txt,type1.txt,"~",3
|
||||
// get internal name
|
||||
spstr strCommand.txt,entn1.txt,",",4
|
||||
spstr strCommand.txt,entn1.txt,"~",4
|
||||
if(type1.txt=="delete"||type1.txt=="")
|
||||
{
|
||||
vis tEntity1,0
|
||||
@@ -1050,20 +1050,20 @@ Timer tmSerial
|
||||
}else
|
||||
{
|
||||
// change icon
|
||||
spstr strCommand.txt,bEntity1.txt,",",5
|
||||
spstr strCommand.txt,bEntity1.txt,"~",5
|
||||
vis bEntity1,1
|
||||
// change icon color
|
||||
spstr strCommand.txt,tTmp.txt,",",6
|
||||
spstr strCommand.txt,tTmp.txt,"~",6
|
||||
covx tTmp.txt,sys0,0,0
|
||||
bEntity1.pco=sys0
|
||||
// set name
|
||||
spstr strCommand.txt,tEntity1.txt,",",7
|
||||
spstr strCommand.txt,tEntity1.txt,"~",7
|
||||
vis tEntity1,1
|
||||
}
|
||||
// get Type
|
||||
spstr strCommand.txt,type2.txt,",",9
|
||||
spstr strCommand.txt,type2.txt,"~",9
|
||||
// get internal name
|
||||
spstr strCommand.txt,entn2.txt,",",10
|
||||
spstr strCommand.txt,entn2.txt,"~",10
|
||||
if(type2.txt=="delete"||type2.txt=="")
|
||||
{
|
||||
vis tEntity2,0
|
||||
@@ -1071,20 +1071,20 @@ Timer tmSerial
|
||||
}else
|
||||
{
|
||||
// change icon
|
||||
spstr strCommand.txt,bEntity2.txt,",",11
|
||||
spstr strCommand.txt,bEntity2.txt,"~",11
|
||||
vis bEntity2,1
|
||||
// change icon color
|
||||
spstr strCommand.txt,tTmp.txt,",",12
|
||||
spstr strCommand.txt,tTmp.txt,"~",12
|
||||
covx tTmp.txt,sys0,0,0
|
||||
bEntity2.pco=sys0
|
||||
// set name
|
||||
spstr strCommand.txt,tEntity2.txt,",",13
|
||||
spstr strCommand.txt,tEntity2.txt,"~",13
|
||||
vis tEntity2,1
|
||||
}
|
||||
// get Type
|
||||
spstr strCommand.txt,type3.txt,",",15
|
||||
spstr strCommand.txt,type3.txt,"~",15
|
||||
// get internal name
|
||||
spstr strCommand.txt,entn3.txt,",",16
|
||||
spstr strCommand.txt,entn3.txt,"~",16
|
||||
if(type3.txt=="delete"||type3.txt=="")
|
||||
{
|
||||
vis tEntity3,0
|
||||
@@ -1092,20 +1092,20 @@ Timer tmSerial
|
||||
}else
|
||||
{
|
||||
// change icon
|
||||
spstr strCommand.txt,bEntity3.txt,",",17
|
||||
spstr strCommand.txt,bEntity3.txt,"~",17
|
||||
vis bEntity3,1
|
||||
// change icon color
|
||||
spstr strCommand.txt,tTmp.txt,",",18
|
||||
spstr strCommand.txt,tTmp.txt,"~",18
|
||||
covx tTmp.txt,sys0,0,0
|
||||
bEntity3.pco=sys0
|
||||
// set name
|
||||
spstr strCommand.txt,tEntity3.txt,",",19
|
||||
spstr strCommand.txt,tEntity3.txt,"~",19
|
||||
vis tEntity3,1
|
||||
}
|
||||
// get Type
|
||||
spstr strCommand.txt,type4.txt,",",21
|
||||
spstr strCommand.txt,type4.txt,"~",21
|
||||
// get internal name
|
||||
spstr strCommand.txt,entn4.txt,",",22
|
||||
spstr strCommand.txt,entn4.txt,"~",22
|
||||
if(type4.txt=="delete"||type4.txt=="")
|
||||
{
|
||||
vis tEntity4,0
|
||||
@@ -1113,20 +1113,20 @@ Timer tmSerial
|
||||
}else
|
||||
{
|
||||
// change icon
|
||||
spstr strCommand.txt,bEntity4.txt,",",23
|
||||
spstr strCommand.txt,bEntity4.txt,"~",23
|
||||
vis bEntity4,1
|
||||
// change icon color
|
||||
spstr strCommand.txt,tTmp.txt,",",24
|
||||
spstr strCommand.txt,tTmp.txt,"~",24
|
||||
covx tTmp.txt,sys0,0,0
|
||||
bEntity4.pco=sys0
|
||||
// set name
|
||||
spstr strCommand.txt,tEntity4.txt,",",25
|
||||
spstr strCommand.txt,tEntity4.txt,"~",25
|
||||
vis tEntity4,1
|
||||
}
|
||||
// get Type
|
||||
spstr strCommand.txt,type5.txt,",",27
|
||||
spstr strCommand.txt,type5.txt,"~",27
|
||||
// get internal name
|
||||
spstr strCommand.txt,entn5.txt,",",28
|
||||
spstr strCommand.txt,entn5.txt,"~",28
|
||||
if(type5.txt=="delete"||type5.txt=="")
|
||||
{
|
||||
vis tEntity5,0
|
||||
@@ -1134,20 +1134,20 @@ Timer tmSerial
|
||||
}else
|
||||
{
|
||||
// change icon
|
||||
spstr strCommand.txt,bEntity5.txt,",",29
|
||||
spstr strCommand.txt,bEntity5.txt,"~",29
|
||||
vis bEntity5,1
|
||||
// change icon color
|
||||
spstr strCommand.txt,tTmp.txt,",",30
|
||||
spstr strCommand.txt,tTmp.txt,"~",30
|
||||
covx tTmp.txt,sys0,0,0
|
||||
bEntity5.pco=sys0
|
||||
// set name
|
||||
spstr strCommand.txt,tEntity5.txt,",",31
|
||||
spstr strCommand.txt,tEntity5.txt,"~",31
|
||||
vis tEntity5,1
|
||||
}
|
||||
// get Type
|
||||
spstr strCommand.txt,type6.txt,",",33
|
||||
spstr strCommand.txt,type6.txt,"~",33
|
||||
// get internal name
|
||||
spstr strCommand.txt,entn6.txt,",",34
|
||||
spstr strCommand.txt,entn6.txt,"~",34
|
||||
if(type6.txt=="delete"||type6.txt=="")
|
||||
{
|
||||
vis tEntity6,0
|
||||
@@ -1155,14 +1155,14 @@ Timer tmSerial
|
||||
}else
|
||||
{
|
||||
// change icon
|
||||
spstr strCommand.txt,bEntity6.txt,",",35
|
||||
spstr strCommand.txt,bEntity6.txt,"~",35
|
||||
vis bEntity6,1
|
||||
// change icon color
|
||||
spstr strCommand.txt,tTmp.txt,",",36
|
||||
spstr strCommand.txt,tTmp.txt,"~",36
|
||||
covx tTmp.txt,sys0,0,0
|
||||
bEntity6.pco=sys0
|
||||
// set name
|
||||
spstr strCommand.txt,tEntity6.txt,",",37
|
||||
spstr strCommand.txt,tEntity6.txt,"~",37
|
||||
vis tEntity6,1
|
||||
}
|
||||
}
|
||||
|
||||
@@ -55,4 +55,4 @@ Total
|
||||
12 Page(s)
|
||||
341 Component(s)
|
||||
3540 Line(s) of event code
|
||||
964 Unique line(s) of event code
|
||||
946 Unique line(s) of event code
|
||||
|
||||
@@ -574,7 +574,7 @@ Timer tmSerial
|
||||
if(tInstruction.txt=="entityUpd")
|
||||
{
|
||||
// command format: entityUpd,heading,navigation,[,type,internalName,iconId,iconColor,displayName,optionalValue]x6
|
||||
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
|
||||
@@ -603,9 +603,9 @@ Timer tmSerial
|
||||
bNext.txt="î³"
|
||||
}
|
||||
// get Type
|
||||
spstr strCommand.txt,type1.txt,",",3
|
||||
spstr strCommand.txt,type1.txt,"~",3
|
||||
// get internal name
|
||||
spstr strCommand.txt,entn1.txt,",",4
|
||||
spstr strCommand.txt,entn1.txt,"~",4
|
||||
if(type1.txt=="delete"||type1.txt=="")
|
||||
{
|
||||
vis tEntity1,0
|
||||
@@ -613,20 +613,20 @@ Timer tmSerial
|
||||
}else
|
||||
{
|
||||
// change icon
|
||||
spstr strCommand.txt,bEntity1.txt,",",5
|
||||
spstr strCommand.txt,bEntity1.txt,"~",5
|
||||
vis bEntity1,1
|
||||
// change icon color
|
||||
spstr strCommand.txt,tTmp.txt,",",6
|
||||
spstr strCommand.txt,tTmp.txt,"~",6
|
||||
covx tTmp.txt,sys0,0,0
|
||||
bEntity1.pco=sys0
|
||||
// set name
|
||||
spstr strCommand.txt,tEntity1.txt,",",7
|
||||
spstr strCommand.txt,tEntity1.txt,"~",7
|
||||
vis tEntity1,1
|
||||
}
|
||||
// get Type
|
||||
spstr strCommand.txt,type2.txt,",",9
|
||||
spstr strCommand.txt,type2.txt,"~",9
|
||||
// get internal name
|
||||
spstr strCommand.txt,entn2.txt,",",10
|
||||
spstr strCommand.txt,entn2.txt,"~",10
|
||||
if(type2.txt=="delete"||type2.txt=="")
|
||||
{
|
||||
vis tEntity2,0
|
||||
@@ -634,20 +634,20 @@ Timer tmSerial
|
||||
}else
|
||||
{
|
||||
// change icon
|
||||
spstr strCommand.txt,bEntity2.txt,",",11
|
||||
spstr strCommand.txt,bEntity2.txt,"~",11
|
||||
vis bEntity2,1
|
||||
// change icon color
|
||||
spstr strCommand.txt,tTmp.txt,",",12
|
||||
spstr strCommand.txt,tTmp.txt,"~",12
|
||||
covx tTmp.txt,sys0,0,0
|
||||
bEntity2.pco=sys0
|
||||
// set name
|
||||
spstr strCommand.txt,tEntity2.txt,",",13
|
||||
spstr strCommand.txt,tEntity2.txt,"~",13
|
||||
vis tEntity2,1
|
||||
}
|
||||
// get Type
|
||||
spstr strCommand.txt,type3.txt,",",15
|
||||
spstr strCommand.txt,type3.txt,"~",15
|
||||
// get internal name
|
||||
spstr strCommand.txt,entn3.txt,",",16
|
||||
spstr strCommand.txt,entn3.txt,"~",16
|
||||
if(type3.txt=="delete"||type3.txt=="")
|
||||
{
|
||||
vis tEntity3,0
|
||||
@@ -655,20 +655,20 @@ Timer tmSerial
|
||||
}else
|
||||
{
|
||||
// change icon
|
||||
spstr strCommand.txt,bEntity3.txt,",",17
|
||||
spstr strCommand.txt,bEntity3.txt,"~",17
|
||||
vis bEntity3,1
|
||||
// change icon color
|
||||
spstr strCommand.txt,tTmp.txt,",",18
|
||||
spstr strCommand.txt,tTmp.txt,"~",18
|
||||
covx tTmp.txt,sys0,0,0
|
||||
bEntity3.pco=sys0
|
||||
// set name
|
||||
spstr strCommand.txt,tEntity3.txt,",",19
|
||||
spstr strCommand.txt,tEntity3.txt,"~",19
|
||||
vis tEntity3,1
|
||||
}
|
||||
// get Type
|
||||
spstr strCommand.txt,type4.txt,",",21
|
||||
spstr strCommand.txt,type4.txt,"~",21
|
||||
// get internal name
|
||||
spstr strCommand.txt,entn4.txt,",",22
|
||||
spstr strCommand.txt,entn4.txt,"~",22
|
||||
if(type4.txt=="delete"||type4.txt=="")
|
||||
{
|
||||
vis tEntity4,0
|
||||
@@ -676,20 +676,20 @@ Timer tmSerial
|
||||
}else
|
||||
{
|
||||
// change icon
|
||||
spstr strCommand.txt,bEntity4.txt,",",23
|
||||
spstr strCommand.txt,bEntity4.txt,"~",23
|
||||
vis bEntity4,1
|
||||
// change icon color
|
||||
spstr strCommand.txt,tTmp.txt,",",24
|
||||
spstr strCommand.txt,tTmp.txt,"~",24
|
||||
covx tTmp.txt,sys0,0,0
|
||||
bEntity4.pco=sys0
|
||||
// set name
|
||||
spstr strCommand.txt,tEntity4.txt,",",25
|
||||
spstr strCommand.txt,tEntity4.txt,"~",25
|
||||
vis tEntity4,1
|
||||
}
|
||||
// get Type
|
||||
spstr strCommand.txt,type5.txt,",",27
|
||||
spstr strCommand.txt,type5.txt,"~",27
|
||||
// get internal name
|
||||
spstr strCommand.txt,entn5.txt,",",28
|
||||
spstr strCommand.txt,entn5.txt,"~",28
|
||||
if(type5.txt=="delete"||type5.txt=="")
|
||||
{
|
||||
vis tEntity5,0
|
||||
@@ -697,20 +697,20 @@ Timer tmSerial
|
||||
}else
|
||||
{
|
||||
// change icon
|
||||
spstr strCommand.txt,bEntity5.txt,",",29
|
||||
spstr strCommand.txt,bEntity5.txt,"~",29
|
||||
vis bEntity5,1
|
||||
// change icon color
|
||||
spstr strCommand.txt,tTmp.txt,",",30
|
||||
spstr strCommand.txt,tTmp.txt,"~",30
|
||||
covx tTmp.txt,sys0,0,0
|
||||
bEntity5.pco=sys0
|
||||
// set name
|
||||
spstr strCommand.txt,tEntity5.txt,",",31
|
||||
spstr strCommand.txt,tEntity5.txt,"~",31
|
||||
vis tEntity5,1
|
||||
}
|
||||
// get Type
|
||||
spstr strCommand.txt,type6.txt,",",33
|
||||
spstr strCommand.txt,type6.txt,"~",33
|
||||
// get internal name
|
||||
spstr strCommand.txt,entn6.txt,",",34
|
||||
spstr strCommand.txt,entn6.txt,"~",34
|
||||
if(type6.txt=="delete"||type6.txt=="")
|
||||
{
|
||||
vis tEntity6,0
|
||||
@@ -718,14 +718,14 @@ Timer tmSerial
|
||||
}else
|
||||
{
|
||||
// change icon
|
||||
spstr strCommand.txt,bEntity6.txt,",",35
|
||||
spstr strCommand.txt,bEntity6.txt,"~",35
|
||||
vis bEntity6,1
|
||||
// change icon color
|
||||
spstr strCommand.txt,tTmp.txt,",",36
|
||||
spstr strCommand.txt,tTmp.txt,"~",36
|
||||
covx tTmp.txt,sys0,0,0
|
||||
bEntity6.pco=sys0
|
||||
// set name
|
||||
spstr strCommand.txt,tEntity6.txt,",",37
|
||||
spstr strCommand.txt,tEntity6.txt,"~",37
|
||||
vis tEntity6,1
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user