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

This commit is contained in:
joBr99
2022-03-26 09:31:24 +00:00
committed by GitHub Actions
parent 27f48819a4
commit adb99623e9
2 changed files with 31 additions and 8 deletions

View File

@@ -30,6 +30,10 @@ cardAlarm
35 Component(s) 35 Component(s)
253 Line(s) of event code 253 Line(s) of event code
160 Unique line(s) of event code 160 Unique line(s) of event code
popupLight
27 Component(s)
323 Line(s) of event code
173 Unique line(s) of event code
cardGrid cardGrid
39 Component(s) 39 Component(s)
378 Line(s) of event code 378 Line(s) of event code
@@ -46,10 +50,6 @@ cardEntities
54 Component(s) 54 Component(s)
752 Line(s) of event code 752 Line(s) of event code
330 Unique line(s) of event code 330 Unique line(s) of event code
popupLight
26 Component(s)
306 Line(s) of event code
167 Unique line(s) of event code
screensaver screensaver
26 Component(s) 26 Component(s)
176 Line(s) of event code 176 Line(s) of event code
@@ -57,6 +57,6 @@ screensaver
Total Total
13 Page(s) 13 Page(s)
330 Component(s) 331 Component(s)
3043 Line(s) of event code 3060 Line(s) of event code
808 Unique line(s) of event code 814 Unique line(s) of event code

View File

@@ -500,6 +500,8 @@ Slider hBrightness
Events Events
Touch Release Event Touch Release Event
tmCooldown.en=1
tmCooldown.tim=100
//craft command //craft command
tSend.txt="event,buttonPress2,"+entn.txt+",brightnessSlider," tSend.txt="event,buttonPress2,"+entn.txt+",brightnessSlider,"
covx hBrightness.val,tTmp.txt,0,0 covx hBrightness.val,tTmp.txt,0,0
@@ -543,6 +545,8 @@ Slider hTempSlider
Events Events
Touch Release Event Touch Release Event
tmCooldown.en=1
tmCooldown.tim=100
//craft command //craft command
tSend.txt="event,buttonPress2,"+entn.txt+",colorTempSlider," tSend.txt="event,buttonPress2,"+entn.txt+",colorTempSlider,"
covx hTempSlider.val,tTmp.txt,0,0 covx hTempSlider.val,tTmp.txt,0,0
@@ -810,7 +814,10 @@ Timer tmSerial
vis t2,1 vis t2,1
vis hBrightness,1 vis hBrightness,1
covx tTmp.txt,sys0,0,0 covx tTmp.txt,sys0,0,0
hBrightness.val=sys0 if(tmCooldown.en==0)
{
hBrightness.val=sys0
}
} }
// get ColorTemp value // get ColorTemp value
spstr strCommand.txt,tTmp.txt,",",5 spstr strCommand.txt,tTmp.txt,",",5
@@ -843,6 +850,11 @@ Timer tmSerial
vis hTempSlider,1 vis hTempSlider,1
vis t3,1 vis t3,1
vis t4,1 vis t4,1
if(tmCooldown.en==0)
{
covx tTmp.txt,sys0,0,0
hTempSlider.val=sys0
}
// mode == 0 is rgb controls currently shown // mode == 0 is rgb controls currently shown
if(mode.val==0) if(mode.val==0)
{ {
@@ -944,6 +956,17 @@ Timer tmSerial
} }
} }
Timer tmCooldown
Attributes
ID : 26
Scope : local
Period (ms): 100
Enabled : no
Events
Timer Event
tmCooldown.en=0
TouchCap tc0 TouchCap tc0
Attributes Attributes
ID : 14 ID : 14