display light detail in correct mode (add nextion2text)

This commit is contained in:
joBr99
2022-03-16 16:37:58 +00:00
committed by GitHub Actions
parent 4d27f2f485
commit a65b8cb2df
3 changed files with 34 additions and 28 deletions

View File

@@ -92,56 +92,56 @@ Variable (string) strCommand
Variable (string) type1 Variable (string) type1
Attributes Attributes
ID : 47 ID : 46
Scope : local Scope : local
Text : Text :
Max. Text Size: 10 Max. Text Size: 10
Variable (string) type2 Variable (string) type2
Attributes Attributes
ID : 48 ID : 47
Scope : local Scope : local
Text : Text :
Max. Text Size: 10 Max. Text Size: 10
Variable (string) type3 Variable (string) type3
Attributes Attributes
ID : 49 ID : 48
Scope : local Scope : local
Text : Text :
Max. Text Size: 10 Max. Text Size: 10
Variable (string) type4 Variable (string) type4
Attributes Attributes
ID : 50 ID : 49
Scope : local Scope : local
Text : Text :
Max. Text Size: 10 Max. Text Size: 10
Variable (string) entn1 Variable (string) entn1
Attributes Attributes
ID : 51 ID : 50
Scope : local Scope : local
Text : Text :
Max. Text Size: 50 Max. Text Size: 50
Variable (string) entn2 Variable (string) entn2
Attributes Attributes
ID : 52 ID : 51
Scope : local Scope : local
Text : Text :
Max. Text Size: 50 Max. Text Size: 50
Variable (string) entn3 Variable (string) entn3
Attributes Attributes
ID : 53 ID : 52
Scope : local Scope : local
Text : Text :
Max. Text Size: 50 Max. Text Size: 50
Variable (string) entn4 Variable (string) entn4
Attributes Attributes
ID : 54 ID : 53
Scope : local Scope : local
Text : Text :
Max. Text Size: 50 Max. Text Size: 50
@@ -1341,7 +1341,7 @@ Button bNext
Button bText1 Button bText1
Attributes Attributes
ID : 39 ID : 38
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -1395,7 +1395,7 @@ Button bText1
Button bText2 Button bText2
Attributes Attributes
ID : 40 ID : 39
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -1449,7 +1449,7 @@ Button bText2
Button bText3 Button bText3
Attributes Attributes
ID : 41 ID : 40
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -1503,7 +1503,7 @@ Button bText3
Button bText4 Button bText4
Attributes Attributes
ID : 42 ID : 41
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -1791,7 +1791,7 @@ Hotspot mSpecial
Hotspot m2 Hotspot m2
Attributes Attributes
ID : 43 ID : 42
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -1806,7 +1806,7 @@ Hotspot m2
Effect Time : 300 Effect Time : 300
Events Events
Touch Release Event Touch Press Event
pageIcons.tTmp1.txt=tEntity3.txt pageIcons.tTmp1.txt=tEntity3.txt
pageIcons.tTmp2.txt=entn3.txt pageIcons.tTmp2.txt=entn3.txt
if(type3.txt=="shutter") if(type3.txt=="shutter")
@@ -1822,7 +1822,7 @@ Hotspot m2
Hotspot m1 Hotspot m1
Attributes Attributes
ID : 44 ID : 43
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -1837,7 +1837,7 @@ Hotspot m1
Effect Time : 300 Effect Time : 300
Events Events
Touch Release Event Touch Press Event
pageIcons.tTmp1.txt=tEntity2.txt pageIcons.tTmp1.txt=tEntity2.txt
pageIcons.tTmp2.txt=entn2.txt pageIcons.tTmp2.txt=entn2.txt
if(type2.txt=="shutter") if(type2.txt=="shutter")
@@ -1853,7 +1853,7 @@ Hotspot m1
Hotspot m0 Hotspot m0
Attributes Attributes
ID : 45 ID : 44
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -1868,7 +1868,7 @@ Hotspot m0
Effect Time : 300 Effect Time : 300
Events Events
Touch Release Event Touch Press Event
pageIcons.tTmp1.txt=tEntity1.txt pageIcons.tTmp1.txt=tEntity1.txt
pageIcons.tTmp2.txt=entn1.txt pageIcons.tTmp2.txt=entn1.txt
if(type1.txt=="shutter") if(type1.txt=="shutter")
@@ -1884,7 +1884,7 @@ Hotspot m0
Hotspot m3 Hotspot m3
Attributes Attributes
ID : 46 ID : 45
Scope : local Scope : local
Dragging : 0 Dragging : 0
Disable release event after dragging: 0 Disable release event after dragging: 0
@@ -1899,7 +1899,7 @@ Hotspot m3
Effect Time : 300 Effect Time : 300
Events Events
Touch Release Event Touch Press Event
pageIcons.tTmp1.txt=tEntity4.txt pageIcons.tTmp1.txt=tEntity4.txt
pageIcons.tTmp2.txt=entn4.txt pageIcons.tTmp2.txt=entn4.txt
if(type4.txt=="shutter") if(type4.txt=="shutter")
@@ -2424,7 +2424,7 @@ Timer tmSleep
TouchCap tc0 TouchCap tc0
Attributes Attributes
ID : 38 ID : 54
Scope: local Scope: local
Value: 0 Value: 0

View File

@@ -26,10 +26,6 @@ popupNotify
15 Component(s) 15 Component(s)
143 Line(s) of event code 143 Line(s) of event code
95 Unique line(s) of event code 95 Unique line(s) of event code
popupLight
27 Component(s)
284 Line(s) of event code
145 Unique line(s) of event code
cardMedia cardMedia
22 Component(s) 22 Component(s)
219 Line(s) of event code 219 Line(s) of event code
@@ -42,6 +38,10 @@ popupShutter
19 Component(s) 19 Component(s)
148 Line(s) of event code 148 Line(s) of event code
84 Unique line(s) of event code 84 Unique line(s) of event code
popupLight
27 Component(s)
290 Line(s) of event code
149 Unique line(s) of event code
cardThermo cardThermo
42 Component(s) 42 Component(s)
450 Line(s) of event code 450 Line(s) of event code
@@ -54,5 +54,5 @@ cardEntities
Total Total
12 Page(s) 12 Page(s)
273 Component(s) 273 Component(s)
2493 Line(s) of event code 2499 Line(s) of event code
666 Unique line(s) of event code 670 Unique line(s) of event code

View File

@@ -54,6 +54,7 @@ Page popupLight
vis hTempSlider,0 vis hTempSlider,0
//disable color wheel components by default //disable color wheel components by default
vis bColor,0 vis bColor,0
vis t0,0
vis pColorWheel,0 vis pColorWheel,0
//vis t0,0 //vis t0,0
@@ -873,7 +874,11 @@ Timer tmSerial
{ {
// get ColorTemp value // get ColorTemp value
spstr strCommand.txt,tTmp.txt,",",3 spstr strCommand.txt,tTmp.txt,",",3
if(tTmp.txt=="disable") if(tTmp.txt=="unknown")
{
click bColor,1
mode_temp.val=1
}else if(tTmp.txt=="disable")
{ {
vis t4,0 vis t4,0
vis t3,0 vis t3,0
@@ -894,6 +899,7 @@ Timer tmSerial
if(tTmp.txt!="disable") if(tTmp.txt!="disable")
{ {
vis bColor,1 vis bColor,1
vis t0,1
} }
} }
if(tInstruction.txt=="time") if(tInstruction.txt=="time")