h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2026-01-20 05:04:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

change timer from button to text (add nextion2text)

Browse Source
This commit is contained in:
joBr99
2022-12-21 06:08:48 +00:00
committed by github-actions[bot]
parent 98a1ce3f19
commit 1b017a2211
6 changed files with 118 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
HMI/US/landscape/diff-eu-version.txt
View File

@@ -121,74 +121,74 @@
│ Dragging : 0
│ Disable release event after dragging: 0
│ Send Component ID : disabled
│ @@ -1382,15 +1366,15 @@
│ @@ -1367,15 +1351,15 @@
│ vis hSlider1,0
│ vis nNum1,0
│ bText1.pco=65535
│ bText1.pco2=65535
│ // get Text (optional Value)
│ spstr strCommand.txt,bText1.txt,"~",8
│ // get Button State (optional Value)
│ spstr strCommand.txt,tTmp.txt,"~",8
│ covx tTmp.txt,sys0,0,0
│ btOnOff1.val=sys0
│ }
│ - if(type1.txt=="button"||type1.txt=="input_sel"||type1.txt=="timer")
│ + if(type1.txt=="button"||type1.txt=="input_sel")
│ - if(type1.txt=="text"||type1.txt=="timer")
│ + if(type1.txt=="text")
│ {
│ vis bUp1,0
│ vis bStop1,0
│ vis bDown1,0
│ vis btOnOff1,0
│ vis bText1,1
│ tsw bText1,1
│ @@ -1531,15 +1515,15 @@
│ tsw bText1,0
│ @@ -1516,15 +1500,15 @@
│ vis hSlider2,0
│ vis nNum2,0
│ bText2.pco=65535
│ bText2.pco2=65535
│ // get Text (optional Value)
│ spstr strCommand.txt,bText2.txt,"~",14
│ // get Button State (optional Value)
│ spstr strCommand.txt,tTmp.txt,"~",14
│ covx tTmp.txt,sys0,0,0
│ btOnOff2.val=sys0
│ }
│ - if(type2.txt=="button"||type2.txt=="input_sel"||type2.txt=="timer")
│ + if(type2.txt=="button"||type2.txt=="input_sel")
│ - if(type2.txt=="text"||type2.txt=="timer")
│ + if(type2.txt=="text")
│ {
│ vis bUp2,0
│ vis bStop2,0
│ vis bDown2,0
│ vis btOnOff2,0
│ vis bText2,1
│ tsw bText2,1
│ @@ -1680,15 +1664,15 @@
│ tsw bText2,0
│ @@ -1665,15 +1649,15 @@
│ vis hSlider3,0
│ vis nNum3,0
│ bText3.pco=65535
│ bText3.pco2=65535
│ // get Text (optional Value)
│ spstr strCommand.txt,bText3.txt,"~",20
│ // get Button State (optional Value)
│ spstr strCommand.txt,tTmp.txt,"~",20
│ covx tTmp.txt,sys0,0,0
│ btOnOff3.val=sys0
│ }
│ - if(type3.txt=="button"||type3.txt=="input_sel"||type3.txt=="timer")
│ + if(type3.txt=="button"||type3.txt=="input_sel")
│ - if(type3.txt=="text"||type3.txt=="timer")
│ + if(type3.txt=="text")
│ {
│ vis bUp3,0
│ vis bStop3,0
│ vis bDown3,0
│ vis btOnOff3,0
│ vis bText3,1
│ tsw bText3,1
│ @@ -1829,15 +1813,15 @@
│ tsw bText3,0
│ @@ -1814,15 +1798,15 @@
│ vis hSlider4,0
│ vis nNum4,0
│ bText4.pco=65535
│ bText4.pco2=65535
│ // get Text (optional Value)
│ spstr strCommand.txt,bText4.txt,"~",26
│ // get Button State (optional Value)
│ spstr strCommand.txt,tTmp.txt,"~",26
│ covx tTmp.txt,sys0,0,0
│ btOnOff4.val=sys0
│ }
│ - if(type4.txt=="button"||type4.txt=="input_sel"||type4.txt=="timer")
│ + if(type4.txt=="button"||type4.txt=="input_sel")
│ - if(type4.txt=="text"||type4.txt=="timer")
│ + if(type4.txt=="text")
│ {
│ vis bUp4,0
│ vis bStop4,0
│ vis bDown4,0
│ vis btOnOff4,0
│ vis bText4,1
│ tsw bText4,1
│ tsw bText4,0
│ @@ -1935,14 +1919,18 @@
│ {
│ page cardQR

64
HMI/US/portrait/diff-eu-version.txt
View File

@@ -825,74 +825,74 @@
│ Scope : local
│ Dragging : 0
│ Disable release event after dragging: 0
│ @@ -1382,15 +1830,15 @@
│ @@ -1367,15 +1815,15 @@
│ vis hSlider1,0
│ vis nNum1,0
│ bText1.pco=65535
│ bText1.pco2=65535
│ // get Text (optional Value)
│ spstr strCommand.txt,bText1.txt,"~",8
│ // get Button State (optional Value)
│ spstr strCommand.txt,tTmp.txt,"~",8
│ covx tTmp.txt,sys0,0,0
│ btOnOff1.val=sys0
│ }
│ - if(type1.txt=="button"||type1.txt=="input_sel"||type1.txt=="timer")
│ + if(type1.txt=="button"||type1.txt=="input_sel")
│ - if(type1.txt=="text"||type1.txt=="timer")
│ + if(type1.txt=="text")
│ {
│ vis bUp1,0
│ vis bStop1,0
│ vis bDown1,0
│ vis btOnOff1,0
│ vis bText1,1
│ tsw bText1,1
│ @@ -1531,15 +1979,15 @@
│ tsw bText1,0
│ @@ -1516,15 +1964,15 @@
│ vis hSlider2,0
│ vis nNum2,0
│ bText2.pco=65535
│ bText2.pco2=65535
│ // get Text (optional Value)
│ spstr strCommand.txt,bText2.txt,"~",14
│ // get Button State (optional Value)
│ spstr strCommand.txt,tTmp.txt,"~",14
│ covx tTmp.txt,sys0,0,0
│ btOnOff2.val=sys0
│ }
│ - if(type2.txt=="button"||type2.txt=="input_sel"||type2.txt=="timer")
│ + if(type2.txt=="button"||type2.txt=="input_sel")
│ - if(type2.txt=="text"||type2.txt=="timer")
│ + if(type2.txt=="text")
│ {
│ vis bUp2,0
│ vis bStop2,0
│ vis bDown2,0
│ vis btOnOff2,0
│ vis bText2,1
│ tsw bText2,1
│ @@ -1680,15 +2128,15 @@
│ tsw bText2,0
│ @@ -1665,15 +2113,15 @@
│ vis hSlider3,0
│ vis nNum3,0
│ bText3.pco=65535
│ bText3.pco2=65535
│ // get Text (optional Value)
│ spstr strCommand.txt,bText3.txt,"~",20
│ // get Button State (optional Value)
│ spstr strCommand.txt,tTmp.txt,"~",20
│ covx tTmp.txt,sys0,0,0
│ btOnOff3.val=sys0
│ }
│ - if(type3.txt=="button"||type3.txt=="input_sel"||type3.txt=="timer")
│ + if(type3.txt=="button"||type3.txt=="input_sel")
│ - if(type3.txt=="text"||type3.txt=="timer")
│ + if(type3.txt=="text")
│ {
│ vis bUp3,0
│ vis bStop3,0
│ vis bDown3,0
│ vis btOnOff3,0
│ vis bText3,1
│ tsw bText3,1
│ @@ -1829,15 +2277,15 @@
│ tsw bText3,0
│ @@ -1814,15 +2262,15 @@
│ vis hSlider4,0
│ vis nNum4,0
│ bText4.pco=65535
│ bText4.pco2=65535
│ // get Text (optional Value)
│ spstr strCommand.txt,bText4.txt,"~",26
│ // get Button State (optional Value)
│ spstr strCommand.txt,tTmp.txt,"~",26
│ covx tTmp.txt,sys0,0,0
│ btOnOff4.val=sys0
│ }
│ - if(type4.txt=="button"||type4.txt=="input_sel"||type4.txt=="timer")
│ + if(type4.txt=="button"||type4.txt=="input_sel")
│ - if(type4.txt=="text"||type4.txt=="timer")
│ + if(type4.txt=="text")
│ {
│ vis bUp4,0
│ vis bStop4,0
│ vis bDown4,0
│ vis btOnOff4,0
│ vis bText4,1
│ tsw bText4,1
│ tsw bText4,0
│ @@ -1870,14 +2318,312 @@
│ covx tTmp.txt,sys0,0,0
│ hSlider4.minval=sys0

66
HMI/US/portrait/diff-filtered.txt
View File

@@ -1,4 +1,4 @@
+++ /dev/fd/62 2022-12-20 21:05:02.743512847 +0000
+++ /dev/fd/62 2022-12-21 06:08:41.484371603 +0000
+le list
+ +12,8 @@
+t.txt
@@ -392,74 +392,74 @@
+ Scope : local
+ Dragging : 0
+ Disable release event after dragging: 0
+,15 +1830,15 @@
+,15 +1815,15 @@
+ vis hSlider1,0
+ vis nNum1,0
+ bText1.pco=65535
+ bText1.pco2=65535
+ // get Text (optional Value)
+ spstr strCommand.txt,bText1.txt,"~",8
+ // get Button State (optional Value)
+ spstr strCommand.txt,tTmp.txt,"~",8
+ covx tTmp.txt,sys0,0,0
+ btOnOff1.val=sys0
+ }
+ if(type1.txt=="button"||type1.txt=="input_sel"||type1.txt=="timer")
+ if(type1.txt=="button"||type1.txt=="input_sel")
+ if(type1.txt=="text"||type1.txt=="timer")
+ if(type1.txt=="text")
+ {
+ vis bUp1,0
+ vis bStop1,0
+ vis bDown1,0
+ vis btOnOff1,0
+ vis bText1,1
+ tsw bText1,1
+,15 +1979,15 @@
+ tsw bText1,0
+,15 +1964,15 @@
+ vis hSlider2,0
+ vis nNum2,0
+ bText2.pco=65535
+ bText2.pco2=65535
+ // get Text (optional Value)
+ spstr strCommand.txt,bText2.txt,"~",14
+ // get Button State (optional Value)
+ spstr strCommand.txt,tTmp.txt,"~",14
+ covx tTmp.txt,sys0,0,0
+ btOnOff2.val=sys0
+ }
+ if(type2.txt=="button"||type2.txt=="input_sel"||type2.txt=="timer")
+ if(type2.txt=="button"||type2.txt=="input_sel")
+ if(type2.txt=="text"||type2.txt=="timer")
+ if(type2.txt=="text")
+ {
+ vis bUp2,0
+ vis bStop2,0
+ vis bDown2,0
+ vis btOnOff2,0
+ vis bText2,1
+ tsw bText2,1
+,15 +2128,15 @@
+ tsw bText2,0
+,15 +2113,15 @@
+ vis hSlider3,0
+ vis nNum3,0
+ bText3.pco=65535
+ bText3.pco2=65535
+ // get Text (optional Value)
+ spstr strCommand.txt,bText3.txt,"~",20
+ // get Button State (optional Value)
+ spstr strCommand.txt,tTmp.txt,"~",20
+ covx tTmp.txt,sys0,0,0
+ btOnOff3.val=sys0
+ }
+ if(type3.txt=="button"||type3.txt=="input_sel"||type3.txt=="timer")
+ if(type3.txt=="button"||type3.txt=="input_sel")
+ if(type3.txt=="text"||type3.txt=="timer")
+ if(type3.txt=="text")
+ {
+ vis bUp3,0
+ vis bStop3,0
+ vis bDown3,0
+ vis btOnOff3,0
+ vis bText3,1
+ tsw bText3,1
+,15 +2277,15 @@
+ tsw bText3,0
+,15 +2262,15 @@
+ vis hSlider4,0
+ vis nNum4,0
+ bText4.pco=65535
+ bText4.pco2=65535
+ // get Text (optional Value)
+ spstr strCommand.txt,bText4.txt,"~",26
+ // get Button State (optional Value)
+ spstr strCommand.txt,tTmp.txt,"~",26
+ covx tTmp.txt,sys0,0,0
+ btOnOff4.val=sys0
+ }
+ if(type4.txt=="button"||type4.txt=="input_sel"||type4.txt=="timer")
+ if(type4.txt=="button"||type4.txt=="input_sel")
+ if(type4.txt=="text"||type4.txt=="timer")
+ if(type4.txt=="text")
+ {
+ vis bUp4,0
+ vis bStop4,0
+ vis bDown4,0
+ vis btOnOff4,0
+ vis bText4,1
+ tsw bText4,1
+ tsw bText4,0
+,14 +2318,312 @@
+ // get Type
+ spstr strCommand.txt,type6.txt,"~",33

16
HMI/n2t-out-visual/cardEntities.txt
View File

@@ -2324,7 +2324,7 @@ Timer tmSerial
covx tTmp.txt,sys0,0,0
btOnOff1.val=sys0
}
if(type1.txt=="text")
if(type1.txt=="text"||type1.txt=="timer")
{
vis bUp1,0
vis bStop1,0
@@ -2339,7 +2339,7 @@ Timer tmSerial
// get Text (optional Value)
spstr strCommand.txt,bText1.txt,"~",8
}
if(type1.txt=="button"||type1.txt=="input_sel"||type1.txt=="timer")
if(type1.txt=="button"||type1.txt=="input_sel")
{
vis bUp1,0
vis bStop1,0
@@ -2473,7 +2473,7 @@ Timer tmSerial
covx tTmp.txt,sys0,0,0
btOnOff2.val=sys0
}
if(type2.txt=="text")
if(type2.txt=="text"||type2.txt=="timer")
{
vis bUp2,0
vis bStop2,0
@@ -2488,7 +2488,7 @@ Timer tmSerial
// get Text (optional Value)
spstr strCommand.txt,bText2.txt,"~",14
}
if(type2.txt=="button"||type2.txt=="input_sel"||type2.txt=="timer")
if(type2.txt=="button"||type2.txt=="input_sel")
{
vis bUp2,0
vis bStop2,0
@@ -2622,7 +2622,7 @@ Timer tmSerial
covx tTmp.txt,sys0,0,0
btOnOff3.val=sys0
}
if(type3.txt=="text")
if(type3.txt=="text"||type3.txt=="timer")
{
vis bUp3,0
vis bStop3,0
@@ -2637,7 +2637,7 @@ Timer tmSerial
// get Text (optional Value)
spstr strCommand.txt,bText3.txt,"~",20
}
if(type3.txt=="button"||type3.txt=="input_sel"||type3.txt=="timer")
if(type3.txt=="button"||type3.txt=="input_sel")
{
vis bUp3,0
vis bStop3,0
@@ -2771,7 +2771,7 @@ Timer tmSerial
covx tTmp.txt,sys0,0,0
btOnOff4.val=sys0
}
if(type4.txt=="text")
if(type4.txt=="text"||type4.txt=="timer")
{
vis bUp4,0
vis bStop4,0
@@ -2786,7 +2786,7 @@ Timer tmSerial
// get Text (optional Value)
spstr strCommand.txt,bText4.txt,"~",26
}
if(type4.txt=="button"||type4.txt=="input_sel"||type4.txt=="timer")
if(type4.txt=="button"||type4.txt=="input_sel")
{
vis bUp4,0
vis bStop4,0

10
HMI/n2t-out-visual/nspanel_Stats.txt
View File

@@ -70,17 +70,17 @@ cardThermo
55 Component(s)
555 Line(s) of event code
322 Unique line(s) of event code
cardMedia
57 Component(s)
660 Line(s) of event code
325 Unique line(s) of event code
cardEntities
65 Component(s)
1181 Line(s) of event code
535 Unique line(s) of event code
cardMedia
57 Component(s)
660 Line(s) of event code
325 Unique line(s) of event code
Total
19 Page(s)
678 Component(s)
8425 Line(s) of event code
2130 Unique line(s) of event code
2132 Unique line(s) of event code

16
HMI/n2t-out/cardEntities.txt
View File

@@ -1371,7 +1371,7 @@ Timer tmSerial
covx tTmp.txt,sys0,0,0
btOnOff1.val=sys0
}
if(type1.txt=="text")
if(type1.txt=="text"||type1.txt=="timer")
{
vis bUp1,0
vis bStop1,0
@@ -1386,7 +1386,7 @@ Timer tmSerial
// get Text (optional Value)
spstr strCommand.txt,bText1.txt,"~",8
}
if(type1.txt=="button"||type1.txt=="input_sel"||type1.txt=="timer")
if(type1.txt=="button"||type1.txt=="input_sel")
{
vis bUp1,0
vis bStop1,0
@@ -1520,7 +1520,7 @@ Timer tmSerial
covx tTmp.txt,sys0,0,0
btOnOff2.val=sys0
}
if(type2.txt=="text")
if(type2.txt=="text"||type2.txt=="timer")
{
vis bUp2,0
vis bStop2,0
@@ -1535,7 +1535,7 @@ Timer tmSerial
// get Text (optional Value)
spstr strCommand.txt,bText2.txt,"~",14
}
if(type2.txt=="button"||type2.txt=="input_sel"||type2.txt=="timer")
if(type2.txt=="button"||type2.txt=="input_sel")
{
vis bUp2,0
vis bStop2,0
@@ -1669,7 +1669,7 @@ Timer tmSerial
covx tTmp.txt,sys0,0,0
btOnOff3.val=sys0
}
if(type3.txt=="text")
if(type3.txt=="text"||type3.txt=="timer")
{
vis bUp3,0
vis bStop3,0
@@ -1684,7 +1684,7 @@ Timer tmSerial
// get Text (optional Value)
spstr strCommand.txt,bText3.txt,"~",20
}
if(type3.txt=="button"||type3.txt=="input_sel"||type3.txt=="timer")
if(type3.txt=="button"||type3.txt=="input_sel")
{
vis bUp3,0
vis bStop3,0
@@ -1818,7 +1818,7 @@ Timer tmSerial
covx tTmp.txt,sys0,0,0
btOnOff4.val=sys0
}
if(type4.txt=="text")
if(type4.txt=="text"||type4.txt=="timer")
{
vis bUp4,0
vis bStop4,0
@@ -1833,7 +1833,7 @@ Timer tmSerial
// get Text (optional Value)
spstr strCommand.txt,bText4.txt,"~",26
}
if(type4.txt=="button"||type4.txt=="input_sel"||type4.txt=="timer")
if(type4.txt=="button"||type4.txt=="input_sel")
{
vis bUp4,0
vis bStop4,0