fix type2 (add nextion2text)

This commit is contained in:
joBr99
2022-10-25 17:27:21 +00:00
committed by github-actions[bot]
parent 5e06f1cd95
commit 3d8e6554bb
7 changed files with 9 additions and 43 deletions

View File

@@ -2460,7 +2460,7 @@ Timer tmSerial
// get Text (optional Value)
spstr strCommand.txt,bText2.txt,"~",14
}
if(type2.txt=="button"||type2.txt=="i")
if(type2.txt=="button"||type2.txt=="input_sel")
{
vis bUp2,0
vis bStop2,0

View File

@@ -1507,7 +1507,7 @@ Timer tmSerial
// get Text (optional Value)
spstr strCommand.txt,bText2.txt,"~",14
}
if(type2.txt=="button"||type2.txt=="i")
if(type2.txt=="button"||type2.txt=="input_sel")
{
vis bUp2,0
vis bStop2,0

View File

@@ -372,23 +372,6 @@
│ Disable release event after dragging: 0
│ Send Component ID : disabled
│ @@ -1503,15 +1740,15 @@
│ vis hSlider2,0
│ vis nNum2,0
│ bText2.pco=65535
│ bText2.pco2=65535
│ // get Text (optional Value)
│ spstr strCommand.txt,bText2.txt,"~",14
│ }
│ - if(type2.txt=="button"||type2.txt=="i")
│ + if(type2.txt=="button"||type2.txt=="input_sel")
│ {
│ vis bUp2,0
│ vis bStop2,0
│ vis bDown2,0
│ vis btOnOff2,0
│ vis bText2,1
│ tsw bText2,1
│ @@ -1842,14 +2079,163 @@
│ covx tTmp.txt,sys0,0,0
│ hSlider4.minval=sys0

View File

@@ -1,4 +1,4 @@
+++ /dev/fd/62 2022-10-25 17:08:32.504898978 +0000
+++ /dev/fd/62 2022-10-25 17:27:14.174175138 +0000
+,14 +1329,45 @@
+ page popupFan
+ if(type4.txt=="input_sel")
@@ -7,23 +7,6 @@
+ {
+ page popupInSel
+ }
+,15 +1740,15 @@
+ vis hSlider2,0
+ vis nNum2,0
+ bText2.pco=65535
+ bText2.pco2=65535
+ // get Text (optional Value)
+ spstr strCommand.txt,bText2.txt,"~",14
+ }
+ if(type2.txt=="button"||type2.txt=="i")
+ if(type2.txt=="button"||type2.txt=="input_sel")
+ {
+ vis bUp2,0
+ vis bStop2,0
+ vis bDown2,0
+ vis btOnOff2,0
+ vis bText2,1
+ tsw bText2,1
+,14 +2079,163 @@
+ if(type5.txt=="button"||type5.txt=="input_sel")
+ tSend.txt+="mode-preset_modes,"+tTmp.txt

View File

@@ -2460,7 +2460,7 @@ Timer tmSerial
// get Text (optional Value)
spstr strCommand.txt,bText2.txt,"~",14
}
if(type2.txt=="button"||type2.txt=="i")
if(type2.txt=="button"||type2.txt=="input_sel")
{
vis bUp2,0
vis bStop2,0

View File

@@ -62,14 +62,14 @@ cardAlarm
40 Component(s)
427 Line(s) of event code
258 Unique line(s) of event code
cardEntities
65 Component(s)
1153 Line(s) of event code
527 Unique line(s) of event code
cardPower
43 Component(s)
423 Line(s) of event code
293 Unique line(s) of event code
cardEntities
65 Component(s)
1153 Line(s) of event code
527 Unique line(s) of event code
Total
17 Page(s)

View File

@@ -1507,7 +1507,7 @@ Timer tmSerial
// get Text (optional Value)
spstr strCommand.txt,bText2.txt,"~",14
}
if(type2.txt=="button"||type2.txt=="i")
if(type2.txt=="button"||type2.txt=="input_sel")
{
vis bUp2,0
vis bStop2,0