mirror of
https://github.com/joBr99/nspanel-lovelace-ui.git
synced 2026-02-22 14:08:37 +01:00
Merge branch 'main' of github.com:joBr99/nspanel-lovelace-ui (add nextion2text)
This commit is contained in:
committed by
github-actions[bot]
parent
503a105415
commit
ed46d36665
@@ -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=="")
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user