mirror of
https://github.com/joBr99/nspanel-lovelace-ui.git
synced 2025-12-23 16:04:25 +01:00
Merge branch 'main' of github.com:joBr99/nspanel-lovelace-ui
This commit is contained in:
@@ -254,7 +254,7 @@
|
||||
│ Max. Text Size: 200
|
||||
│
|
||||
│ Variable (string) strTmp
|
||||
│ @@ -103,24 +100,14 @@
|
||||
│ @@ -103,35 +100,14 @@
|
||||
│ Value: 0
|
||||
│
|
||||
│ Variable (int32) ycR
|
||||
@@ -272,6 +272,17 @@
|
||||
│ - Text :
|
||||
│ - Max. Text Size : 10
|
||||
│ -
|
||||
│ - Events
|
||||
│ - Touch Press Event
|
||||
│ - tTmp.txt="change model conf to us-l/p "
|
||||
│ - 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,25,20,6,WHITE,RED,2,1,3,strTmp.txt
|
||||
│ - }
|
||||
│ -
|
||||
│ Text t10
|
||||
│ Attributes
|
||||
│ Scope : local
|
||||
@@ -279,7 +290,23 @@
|
||||
│ Disable release event after dragging: 0
|
||||
│ Send Component ID : disabled
|
||||
│ Associated Keyboard : none
|
||||
│ @@ -797,18 +784,14 @@
|
||||
│ @@ -624,15 +600,14 @@
|
||||
│ tIcon1.font=3
|
||||
│ }
|
||||
│ spstr strCommand.txt,tTmp.txt,"~",22
|
||||
│ if(tTmp.txt!="")
|
||||
│ {
|
||||
│ tIcon2.font=3
|
||||
│ }
|
||||
│ - click m0,1
|
||||
│ }
|
||||
│ if(tInstruction.txt=="color"&&tNotifyHead.txt==""&&tNotifyText.txt=="")
|
||||
│ {
|
||||
│ spstr strCommand.txt,tTmp.txt,"~",1
|
||||
│ covx tTmp.txt,tTime.bco,0,0
|
||||
│ if(tTime.bco!=screensaver.bco)
|
||||
│ {
|
||||
│ @@ -809,18 +784,14 @@
|
||||
│ {
|
||||
│ page cardPower
|
||||
│ }
|
||||
|
||||
@@ -1312,7 +1312,7 @@
|
||||
│ Max. Text Size: 25
|
||||
│
|
||||
│ Variable (string) tInstruction
|
||||
│ @@ -103,24 +94,14 @@
|
||||
│ @@ -103,35 +94,14 @@
|
||||
│ Value: 0
|
||||
│
|
||||
│ Variable (int32) ycR
|
||||
@@ -1330,6 +1330,17 @@
|
||||
│ - Text :
|
||||
│ - Max. Text Size : 10
|
||||
│ -
|
||||
│ - Events
|
||||
│ - Touch Press Event
|
||||
│ - tTmp.txt="change model conf to us-l/p "
|
||||
│ - 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,25,20,6,WHITE,RED,2,1,3,strTmp.txt
|
||||
│ - }
|
||||
│ -
|
||||
│ Text t10
|
||||
│ Attributes
|
||||
│ Scope : local
|
||||
@@ -1337,7 +1348,23 @@
|
||||
│ Disable release event after dragging: 0
|
||||
│ Send Component ID : disabled
|
||||
│ Associated Keyboard : none
|
||||
│ @@ -797,18 +778,14 @@
|
||||
│ @@ -624,15 +594,14 @@
|
||||
│ tIcon1.font=3
|
||||
│ }
|
||||
│ spstr strCommand.txt,tTmp.txt,"~",22
|
||||
│ if(tTmp.txt!="")
|
||||
│ {
|
||||
│ tIcon2.font=3
|
||||
│ }
|
||||
│ - click m0,1
|
||||
│ }
|
||||
│ if(tInstruction.txt=="color"&&tNotifyHead.txt==""&&tNotifyText.txt=="")
|
||||
│ {
|
||||
│ spstr strCommand.txt,tTmp.txt,"~",1
|
||||
│ covx tTmp.txt,tTime.bco,0,0
|
||||
│ if(tTime.bco!=screensaver.bco)
|
||||
│ {
|
||||
│ @@ -809,18 +778,14 @@
|
||||
│ {
|
||||
│ page cardPower
|
||||
│ }
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
+++ /dev/fd/62 2023-01-10 22:38:13.070258504 +0000
|
||||
+++ /dev/fd/62 2023-01-11 17:33:34.003983051 +0000
|
||||
+le list
|
||||
+ +1,12 @@
|
||||
+.s.txt
|
||||
@@ -108,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
|
||||
@@ -697,7 +697,7 @@
|
||||
+ Max. Text Size: 25
|
||||
+
|
||||
+e (string) tInstruction
|
||||
+24 +94,14 @@
|
||||
+35 +94,14 @@
|
||||
+ Value: 0
|
||||
+
|
||||
+e (int32) ycR
|
||||
@@ -715,6 +715,17 @@
|
||||
+ Text :
|
||||
+ Max. Text Size : 10
|
||||
+
|
||||
+nts
|
||||
+ Touch Press Event
|
||||
+ tTmp.txt="change model conf to us-l/p "
|
||||
+ 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,25,20,6,WHITE,RED,2,1,3,strTmp.txt
|
||||
+ }
|
||||
+
|
||||
+0
|
||||
+ributes
|
||||
+ Scope : local
|
||||
@@ -722,6 +733,22 @@
|
||||
+ Disable release event after dragging: 0
|
||||
+ Send Component ID : disabled
|
||||
+ Associated Keyboard : none
|
||||
+15 +594,14 @@
|
||||
+ tIcon1.font=3
|
||||
+ }
|
||||
+ spstr strCommand.txt,tTmp.txt,"~",22
|
||||
+ if(tTmp.txt!="")
|
||||
+ {
|
||||
+ tIcon2.font=3
|
||||
+ }
|
||||
+ click m0,1
|
||||
+ }
|
||||
+ if(tInstruction.txt=="color"&&tNotifyHead.txt==""&&tNotifyText.txt=="")
|
||||
+ {
|
||||
+ spstr strCommand.txt,tTmp.txt,"~",1
|
||||
+ covx tTmp.txt,tTime.bco,0,0
|
||||
+ if(tTime.bco!=screensaver.bco)
|
||||
+ {
|
||||
+18 +778,14 @@
|
||||
+ {
|
||||
+ page cardPower
|
||||
|
||||
@@ -58,6 +58,20 @@ Variable (string) entn
|
||||
Text :
|
||||
Max. Text Size: 80
|
||||
|
||||
Variable (string) nent1
|
||||
Attributes
|
||||
ID : 32
|
||||
Scope : local
|
||||
Text :
|
||||
Max. Text Size: 80
|
||||
|
||||
Variable (string) nent2
|
||||
Attributes
|
||||
ID : 31
|
||||
Scope : local
|
||||
Text :
|
||||
Max. Text Size: 80
|
||||
|
||||
Variable (string) strCommand
|
||||
Attributes
|
||||
ID : 5
|
||||
@@ -345,7 +359,7 @@ Hotspot m0
|
||||
|
||||
Events
|
||||
Touch Press Event
|
||||
fill m0.x,m0.y,m0.w,m0.h,RED
|
||||
//fill m0.x,m0.y,m0.w,m0.h,RED
|
||||
|
||||
Hotspot mSwipeNext
|
||||
Attributes
|
||||
@@ -461,47 +475,41 @@ Timer tmSerial
|
||||
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")
|
||||
// navigation icon left
|
||||
spstr strCommand.txt,tTmp.txt,"~",2 //type
|
||||
if(tTmp.txt=="delete"||tTmp.txt=="")
|
||||
{
|
||||
vis bPrev,0
|
||||
tsw mSwipePrev,0
|
||||
tsw mSwipeUp,0
|
||||
}
|
||||
if(tTmp.txt=="1")
|
||||
}else
|
||||
{
|
||||
// get internal name
|
||||
spstr strCommand.txt,nent1.txt,"~",3
|
||||
// change icon
|
||||
spstr strCommand.txt,bPrev.txt,"~",4
|
||||
// change icon color
|
||||
spstr strCommand.txt,tTmp.txt,"~",5
|
||||
covx tTmp.txt,sys0,0,0
|
||||
bPrev.pco=sys0
|
||||
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")
|
||||
// navigation icon right
|
||||
spstr strCommand.txt,tTmp.txt,"~",8 //type
|
||||
if(tTmp.txt=="delete"||tTmp.txt=="")
|
||||
{
|
||||
vis bNext,0
|
||||
tsw mSwipeNext,0
|
||||
}
|
||||
if(tTmp.txt=="1")
|
||||
}else
|
||||
{
|
||||
// get internal name
|
||||
spstr strCommand.txt,nent2.txt,"~",9
|
||||
// change icon
|
||||
spstr strCommand.txt,bNext.txt,"~",10
|
||||
// change icon color
|
||||
spstr strCommand.txt,tTmp.txt,"~",11
|
||||
covx tTmp.txt,sys0,0,0
|
||||
bNext.pco=sys0
|
||||
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
|
||||
//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
|
||||
@@ -519,7 +527,7 @@ Timer tmSerial
|
||||
strlen tTmp.txt,sya0
|
||||
while(sya0>0)
|
||||
{
|
||||
tHeading.txt="last value="+tTmp.txt
|
||||
//tHeading.txt="last value="+tTmp.txt
|
||||
spstr tTmp.txt,strTmp.txt,":",0
|
||||
covx strTmp.txt,sya1,0,0
|
||||
if(sya1>vaMaxX.val)
|
||||
|
||||
@@ -22,6 +22,14 @@ cardChart
|
||||
33 Component(s)
|
||||
429 Line(s) of event code
|
||||
292 Unique line(s) of event code
|
||||
cardLChart
|
||||
33 Component(s)
|
||||
408 Line(s) of event code
|
||||
268 Unique line(s) of event code
|
||||
screensaver
|
||||
47 Component(s)
|
||||
443 Line(s) of event code
|
||||
311 Unique line(s) of event code
|
||||
popupFan
|
||||
27 Component(s)
|
||||
351 Line(s) of event code
|
||||
@@ -46,10 +54,6 @@ pageStartup
|
||||
19 Component(s)
|
||||
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)
|
||||
641 Line(s) of event code
|
||||
@@ -74,10 +78,6 @@ cardThermo
|
||||
57 Component(s)
|
||||
532 Line(s) of event code
|
||||
315 Unique line(s) of event code
|
||||
screensaver
|
||||
47 Component(s)
|
||||
434 Line(s) of event code
|
||||
304 Unique line(s) of event code
|
||||
cardEntities
|
||||
67 Component(s)
|
||||
1162 Line(s) of event code
|
||||
@@ -85,6 +85,6 @@ cardEntities
|
||||
|
||||
Total
|
||||
20 Page(s)
|
||||
728 Component(s)
|
||||
8702 Line(s) of event code
|
||||
2235 Unique line(s) of event code
|
||||
730 Component(s)
|
||||
8695 Line(s) of event code
|
||||
2223 Unique line(s) of event code
|
||||
|
||||
@@ -158,6 +158,17 @@ Text m0
|
||||
Horizontal Spacing : 0
|
||||
Vertical Spacing : 0
|
||||
|
||||
Events
|
||||
Touch Press Event
|
||||
tTmp.txt="change model conf to us-l/p "
|
||||
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,25,20,6,WHITE,RED,2,1,3,strTmp.txt
|
||||
}
|
||||
|
||||
Text t10
|
||||
Attributes
|
||||
ID : 15
|
||||
@@ -1210,6 +1221,7 @@ Timer tmSerial
|
||||
{
|
||||
tIcon2.font=3
|
||||
}
|
||||
click m0,1
|
||||
}
|
||||
if(tInstruction.txt=="color"&&tNotifyHead.txt==""&&tNotifyText.txt=="")
|
||||
{
|
||||
|
||||
@@ -49,6 +49,18 @@ Variable (string) entn
|
||||
Text :
|
||||
Max. Text Size: 80
|
||||
|
||||
Variable (string) nent1
|
||||
Attributes
|
||||
Scope : local
|
||||
Text :
|
||||
Max. Text Size: 80
|
||||
|
||||
Variable (string) nent2
|
||||
Attributes
|
||||
Scope : local
|
||||
Text :
|
||||
Max. Text Size: 80
|
||||
|
||||
Variable (string) strCommand
|
||||
Attributes
|
||||
Scope : local
|
||||
@@ -235,7 +247,7 @@ Hotspot m0
|
||||
|
||||
Events
|
||||
Touch Press Event
|
||||
fill m0.x,m0.y,m0.w,m0.h,RED
|
||||
//fill m0.x,m0.y,m0.w,m0.h,RED
|
||||
|
||||
Hotspot mSwipeNext
|
||||
Attributes
|
||||
@@ -323,47 +335,41 @@ Timer tmSerial
|
||||
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")
|
||||
// navigation icon left
|
||||
spstr strCommand.txt,tTmp.txt,"~",2 //type
|
||||
if(tTmp.txt=="delete"||tTmp.txt=="")
|
||||
{
|
||||
vis bPrev,0
|
||||
tsw mSwipePrev,0
|
||||
tsw mSwipeUp,0
|
||||
}
|
||||
if(tTmp.txt=="1")
|
||||
}else
|
||||
{
|
||||
// get internal name
|
||||
spstr strCommand.txt,nent1.txt,"~",3
|
||||
// change icon
|
||||
spstr strCommand.txt,bPrev.txt,"~",4
|
||||
// change icon color
|
||||
spstr strCommand.txt,tTmp.txt,"~",5
|
||||
covx tTmp.txt,sys0,0,0
|
||||
bPrev.pco=sys0
|
||||
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")
|
||||
// navigation icon right
|
||||
spstr strCommand.txt,tTmp.txt,"~",8 //type
|
||||
if(tTmp.txt=="delete"||tTmp.txt=="")
|
||||
{
|
||||
vis bNext,0
|
||||
tsw mSwipeNext,0
|
||||
}
|
||||
if(tTmp.txt=="1")
|
||||
}else
|
||||
{
|
||||
// get internal name
|
||||
spstr strCommand.txt,nent2.txt,"~",9
|
||||
// change icon
|
||||
spstr strCommand.txt,bNext.txt,"~",10
|
||||
// change icon color
|
||||
spstr strCommand.txt,tTmp.txt,"~",11
|
||||
covx tTmp.txt,sys0,0,0
|
||||
bNext.pco=sys0
|
||||
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
|
||||
//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
|
||||
@@ -381,7 +387,7 @@ Timer tmSerial
|
||||
strlen tTmp.txt,sya0
|
||||
while(sya0>0)
|
||||
{
|
||||
tHeading.txt="last value="+tTmp.txt
|
||||
//tHeading.txt="last value="+tTmp.txt
|
||||
spstr tTmp.txt,strTmp.txt,":",0
|
||||
covx strTmp.txt,sya1,0,0
|
||||
if(sya1>vaMaxX.val)
|
||||
|
||||
@@ -117,6 +117,17 @@ Text m0
|
||||
Text :
|
||||
Max. Text Size : 10
|
||||
|
||||
Events
|
||||
Touch Press Event
|
||||
tTmp.txt="change model conf to us-l/p "
|
||||
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,25,20,6,WHITE,RED,2,1,3,strTmp.txt
|
||||
}
|
||||
|
||||
Text t10
|
||||
Attributes
|
||||
Scope : local
|
||||
@@ -617,6 +628,7 @@ Timer tmSerial
|
||||
{
|
||||
tIcon2.font=3
|
||||
}
|
||||
click m0,1
|
||||
}
|
||||
if(tInstruction.txt=="color"&&tNotifyHead.txt==""&&tNotifyText.txt=="")
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user