h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2026-02-22 22:18:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix ignore id file (add nextion2text)

Browse Source
This commit is contained in:
joBr99
2022-03-29 09:55:01 +00:00
committed by GitHub Actions
parent 0ab91236f2
commit 9a0e4982fb
27 changed files with 70 additions and 976 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,6 @@
diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt
--- HMI/n2t-out/Program.s.txt 2022-03-29 09:00:45.659455717 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-03-29 09:00:46.159475076 +0000
--- HMI/n2t-out/Program.s.txt 2022-03-29 09:55:00.533431443 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-03-29 09:55:01.025440103 +0000
@@ -10,6 +10,6 @@
int sleepValue=0
// dim value
@@ -11,9 +11,9 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt
+ //lcd_dev fffb 0002 0000 0020
page pageStartup
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
--- HMI/n2t-out/cardEntities.txt 2022-03-29 09:00:45.659455717 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-03-29 09:00:46.159475076 +0000
@@ -32,7 +32,6 @@
--- HMI/n2t-out/cardEntities.txt 2022-03-29 09:55:00.537431470 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-03-29 09:55:01.025440103 +0000
@@ -31,7 +31,6 @@
vis tEntity1,0
vis bText1,0
vis hSlider1,0
@@ -21,7 +21,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
//ui e2
vis btOnOff2,0
vis bUp2,0
@@ -42,7 +41,6 @@
@@ -41,7 +40,6 @@
vis tEntity2,0
vis bText2,0
vis hSlider2,0
@@ -29,7 +29,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
//ui e3
vis btOnOff3,0
vis bUp3,0
@@ -52,7 +50,6 @@
@@ -51,7 +49,6 @@
vis tEntity3,0
vis bText3,0
vis hSlider3,0
@@ -37,7 +37,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
//ui e4
vis btOnOff4,0
vis bUp4,0
@@ -62,7 +59,24 @@
@@ -61,7 +58,24 @@
vis tEntity4,0
vis bText4,0
vis hSlider4,0
@@ -63,15 +63,13 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
Variable (string) strCommand
Attributes
@@ -127,45 +141,33 @@
@@ -117,41 +131,29 @@
Text :
Max. Text Size: 70
-Number nNum1
+Variable (string) entn5
Attributes
- ID : 58
+ ID : 70
Scope : local
- Dragging : 0
- Disable release event after dragging: 0
@@ -84,8 +82,6 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
-Number nNum2
+Variable (string) entn6
Attributes
- ID : 59
+ ID : 71
Scope : local
- Dragging : 0
- Disable release event after dragging: 0
@@ -98,8 +94,6 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
-Number nNum3
+Variable (string) type5
Attributes
- ID : 60
+ ID : 72
Scope : local
- Dragging : 0
- Disable release event after dragging: 0
@@ -112,8 +106,6 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
-Number nNum4
+Variable (string) type6
Attributes
- ID : 61
+ ID : 73
Scope : local
- Dragging : 0
- Disable release event after dragging: 0
@@ -125,13 +117,12 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
Text tHeading
Attributes
@@ -310,6 +312,50 @@
@@ -283,6 +285,46 @@
Text :
Max. Text Size : 50
+Text tEntity5
+ Attributes
+ ID : 54
+ Scope : local
+ Dragging : 0
+ Disable release event after dragging: 0
@@ -142,7 +133,6 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
+
+Text tIcon5
+ Attributes
+ ID : 55
+ Scope : local
+ Dragging : 0
+ Disable release event after dragging: 0
@@ -153,7 +143,6 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
+
+Text tEntity6
+ Attributes
+ ID : 62
+ Scope : local
+ Dragging : 0
+ Disable release event after dragging: 0
@@ -164,7 +153,6 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
+
+Text tIcon6
+ Attributes
+ ID : 63
+ Scope : local
+ Dragging : 0
+ Disable release event after dragging: 0
@@ -175,51 +163,13 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
+
Picture p0
Attributes
ID : 1
@@ -320,7 +366,7 @@
Slider hSlider1
Attributes
- ID : 54
+ ID : 74
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -331,7 +377,7 @@
@@ -330,6 +372,26 @@
Upper range limit : 100
Lower range limit : 0
Slider hSlider2
Attributes
- ID : 55
+ ID : 75
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -342,7 +388,7 @@
Slider hSlider3
Attributes
- ID : 56
+ ID : 76
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -353,7 +399,29 @@
Slider hSlider4
Attributes
- ID : 57
+ ID : 77
+ Scope : local
+ Dragging : 0
+ Disable release event after dragging: 0
+ Send Component ID : disabled
+ Position : 50
+ Upper range limit : 100
+ Lower range limit : 0
+
+Slider hSlider5
+ Attributes
+ ID : 78
+ Scope : local
+ Dragging : 0
+ Disable release event after dragging: 0
@@ -230,17 +180,23 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
+
+Slider hSlider6
+ Attributes
+ ID : 79
+ Scope : local
+ Dragging : 0
+ Disable release event after dragging: 0
+ Send Component ID : disabled
+ Position : 50
+ Upper range limit : 100
+ Lower range limit : 0
+
Button bDown1
Attributes
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -830,6 +898,214 @@
@@ -780,6 +842,206 @@
prints tSend.txt,0
prints crcval,2
+Button bStop5
+ Attributes
+ ID : 56
+ Scope : local
+ Dragging : 0
+ Disable release event after dragging: 0
@@ -266,7 +222,6 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
+
+Button bDown5
+ Attributes
+ ID : 57
+ Scope : local
+ Dragging : 0
+ Disable release event after dragging: 0
@@ -292,7 +247,6 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
+
+Button bUp5
+ Attributes
+ ID : 58
+ Scope : local
+ Dragging : 0
+ Disable release event after dragging: 0
@@ -318,7 +272,6 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
+
+Button bText5
+ Attributes
+ ID : 60
+ Scope : local
+ Dragging : 0
+ Disable release event after dragging: 0
@@ -344,7 +297,6 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
+
+Button bStop6
+ Attributes
+ ID : 64
+ Scope : local
+ Dragging : 0
+ Disable release event after dragging: 0
@@ -370,7 +322,6 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
+
+Button bDown6
+ Attributes
+ ID : 65
+ Scope : local
+ Dragging : 0
+ Disable release event after dragging: 0
@@ -396,7 +347,6 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
+
+Button bUp6
+ Attributes
+ ID : 66
+ Scope : local
+ Dragging : 0
+ Disable release event after dragging: 0
@@ -422,7 +372,6 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
+
+Button bText6
+ Attributes
+ ID : 68
+ Scope : local
+ Dragging : 0
+ Disable release event after dragging: 0
@@ -448,14 +397,13 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
+
Dual-state Button btOnOff1
Attributes
ID : 23
@@ -942,6 +1218,62 @@
Scope : local
@@ -888,6 +1150,60 @@
prints tSend.txt,0
prints crcval,2
+Dual-state Button btOnOff5
+ Attributes
+ ID : 59
+ Scope : local
+ Dragging : 0
+ Disable release event after dragging: 0
@@ -483,7 +431,6 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
+
+Dual-state Button btOnOff6
+ Attributes
+ ID : 67
+ Scope : local
+ Dragging : 0
+ Disable release event after dragging: 0
@@ -511,14 +458,13 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
+
Hotspot mSpecial
Attributes
ID : 35
@@ -1052,6 +1384,52 @@
Scope : local
@@ -993,6 +1309,50 @@
page popupLight
}
+Hotspot m4
+ Attributes
+ ID : 61
+ Scope : local
+ Dragging : 0
+ Disable release event after dragging: 0
@@ -541,7 +487,6 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
+
+Hotspot m5
+ Attributes
+ ID : 69
+ Scope : local
+ Dragging : 0
+ Disable release event after dragging: 0
@@ -564,8 +509,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
+
Timer tmSerial
Attributes
ID : 30
@@ -1122,7 +1500,6 @@
Scope : local
@@ -1062,7 +1422,6 @@
vis tIcon1,0
vis bText1,0
vis hSlider1,0
@@ -573,7 +518,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
}else
{
// change icon
@@ -1146,7 +1523,6 @@
@@ -1086,7 +1445,6 @@
vis btOnOff1,0
vis bText1,0
vis hSlider1,0
@@ -581,7 +526,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
}
if(type1.txt=="light")
{
@@ -1156,7 +1532,6 @@
@@ -1096,7 +1454,6 @@
vis btOnOff1,1
vis bText1,0
vis hSlider1,0
@@ -589,7 +534,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
// get Button State (optional Value)
spstr strCommand.txt,tTmp.txt,",",8
covx tTmp.txt,sys0,0,0
@@ -1170,7 +1545,6 @@
@@ -1110,7 +1467,6 @@
vis btOnOff1,1
vis bText1,0
vis hSlider1,0
@@ -597,7 +542,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
// get Button State (optional Value)
spstr strCommand.txt,tTmp.txt,",",8
covx tTmp.txt,sys0,0,0
@@ -1185,7 +1559,6 @@
@@ -1125,7 +1481,6 @@
vis bText1,1
tsw bText1,0
vis hSlider1,0
@@ -605,7 +550,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
bText1.pco=65535
bText1.pco2=65535
// get Text (optional Value)
@@ -1200,7 +1573,6 @@
@@ -1140,7 +1495,6 @@
vis bText1,1
tsw bText1,1
vis hSlider1,0
@@ -613,7 +558,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
bText1.pco=1374
bText1.pco2=1374
// get Text (optional Value)
@@ -1215,14 +1587,12 @@
@@ -1155,14 +1509,12 @@
vis bText1,0
tsw bText1,0
vis hSlider1,1
@@ -628,7 +573,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
//second value is min value
spstr bText1.txt,tTmp.txt,"|",2
covx tTmp.txt,sys0,0,0
@@ -1246,7 +1616,6 @@
@@ -1186,7 +1538,6 @@
vis tIcon2,0
vis bText2,0
vis hSlider2,0
@@ -636,7 +581,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
}else
{
// change icon
@@ -1270,7 +1639,6 @@
@@ -1210,7 +1561,6 @@
vis btOnOff2,0
vis bText2,0
vis hSlider2,0
@@ -644,7 +589,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
}
if(type2.txt=="light")
{
@@ -1280,7 +1648,6 @@
@@ -1220,7 +1570,6 @@
vis btOnOff2,1
vis bText2,0
vis hSlider2,0
@@ -652,7 +597,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
// get Button State (optional Value)
spstr strCommand.txt,tTmp.txt,",",14
covx tTmp.txt,sys0,0,0
@@ -1294,7 +1661,6 @@
@@ -1234,7 +1583,6 @@
vis btOnOff2,1
vis bText2,0
vis hSlider2,0
@@ -660,7 +605,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
// get Button State (optional Value)
spstr strCommand.txt,tTmp.txt,",",14
covx tTmp.txt,sys0,0,0
@@ -1309,7 +1675,6 @@
@@ -1249,7 +1597,6 @@
vis bText2,1
tsw bText2,0
vis hSlider2,0
@@ -668,7 +613,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
bText2.pco=65535
bText2.pco2=65535
// get Text (optional Value)
@@ -1324,7 +1689,6 @@
@@ -1264,7 +1611,6 @@
vis bText2,1
tsw bText2,1
vis hSlider2,0
@@ -676,7 +621,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
bText2.pco=1374
bText2.pco2=1374
// get Text (optional Value)
@@ -1339,14 +1703,12 @@
@@ -1279,14 +1625,12 @@
vis bText2,0
tsw bText2,0
vis hSlider2,1
@@ -691,7 +636,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
//second value is min value
spstr bText2.txt,tTmp.txt,"|",2
covx tTmp.txt,sys0,0,0
@@ -1370,7 +1732,6 @@
@@ -1310,7 +1654,6 @@
vis tIcon3,0
vis bText3,0
vis hSlider3,0
@@ -699,7 +644,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
}else
{
// change icon
@@ -1394,7 +1755,6 @@
@@ -1334,7 +1677,6 @@
vis btOnOff3,0
vis bText3,0
vis hSlider3,0
@@ -707,7 +652,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
}
if(type3.txt=="light")
{
@@ -1404,7 +1764,6 @@
@@ -1344,7 +1686,6 @@
vis btOnOff3,1
vis bText3,0
vis hSlider3,0
@@ -715,7 +660,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
// get Button State (optional Value)
spstr strCommand.txt,tTmp.txt,",",20
covx tTmp.txt,sys0,0,0
@@ -1418,7 +1777,6 @@
@@ -1358,7 +1699,6 @@
vis btOnOff3,1
vis bText3,0
vis hSlider3,0
@@ -723,7 +668,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
// get Button State (optional Value)
spstr strCommand.txt,tTmp.txt,",",20
covx tTmp.txt,sys0,0,0
@@ -1433,7 +1791,6 @@
@@ -1373,7 +1713,6 @@
vis bText3,1
tsw bText3,0
vis hSlider3,0
@@ -731,7 +676,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
bText3.pco=65535
bText3.pco2=65535
// get Text (optional Value)
@@ -1448,7 +1805,6 @@
@@ -1388,7 +1727,6 @@
vis bText3,1
tsw bText3,1
vis hSlider3,0
@@ -739,7 +684,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
bText3.pco=1374
bText3.pco2=1374
// get Text (optional Value)
@@ -1463,14 +1819,12 @@
@@ -1403,14 +1741,12 @@
vis bText3,0
tsw bText3,0
vis hSlider3,1
@@ -754,7 +699,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
//second value is min value
spstr bText3.txt,tTmp.txt,"|",2
covx tTmp.txt,sys0,0,0
@@ -1494,7 +1848,6 @@
@@ -1434,7 +1770,6 @@
vis tIcon4,0
vis bText4,0
vis hSlider4,0
@@ -762,7 +707,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
}else
{
// change icon
@@ -1518,7 +1871,6 @@
@@ -1458,7 +1793,6 @@
vis btOnOff4,0
vis bText4,0
vis hSlider4,0
@@ -770,7 +715,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
}
if(type4.txt=="light")
{
@@ -1528,7 +1880,6 @@
@@ -1468,7 +1802,6 @@
vis btOnOff4,1
vis bText4,0
vis hSlider4,0
@@ -778,7 +723,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
// get Button State (optional Value)
spstr strCommand.txt,tTmp.txt,",",26
covx tTmp.txt,sys0,0,0
@@ -1542,7 +1893,6 @@
@@ -1482,7 +1815,6 @@
vis btOnOff4,1
vis bText4,0
vis hSlider4,0
@@ -786,7 +731,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
// get Button State (optional Value)
spstr strCommand.txt,tTmp.txt,",",26
covx tTmp.txt,sys0,0,0
@@ -1557,7 +1907,6 @@
@@ -1497,7 +1829,6 @@
vis bText4,1
tsw bText4,0
vis hSlider4,0
@@ -794,7 +739,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
bText4.pco=65535
bText4.pco2=65535
// get Text (optional Value)
@@ -1572,7 +1921,6 @@
@@ -1512,7 +1843,6 @@
vis bText4,1
tsw bText4,1
vis hSlider4,0
@@ -802,7 +747,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
bText4.pco=1374
bText4.pco2=1374
// get Text (optional Value)
@@ -1587,14 +1935,12 @@
@@ -1527,14 +1857,12 @@
vis bText4,0
tsw bText4,0
vis hSlider4,1
@@ -817,7 +762,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
//second value is min value
spstr bText4.txt,tTmp.txt,"|",2
covx tTmp.txt,sys0,0,0
@@ -1604,6 +1950,238 @@
@@ -1544,6 +1872,238 @@
covx tTmp.txt,sys0,0,0
hSlider4.maxval=sys0
}
@@ -1056,137 +1001,10 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
}
if(tInstruction.txt=="pageType")
{
diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
--- HMI/n2t-out/cardMedia.txt 2022-03-29 09:00:45.659455717 +0000
+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-03-29 09:00:46.159475076 +0000
@@ -30,21 +30,21 @@
Variable (string) entn
Attributes
- ID : 18
+ ID : 17
Scope : local
Text :
Max. Text Size: 50
Variable (string) vaSpeakerList
Attributes
- ID : 27
+ ID : 26
Scope : local
Text :
Max. Text Size: 200
Variable (int32) vaSpeakerPos
Attributes
- ID : 28
+ ID : 27
Scope: local
Value: 0
@@ -217,7 +217,7 @@
Text tIcon
Attributes
- ID : 17
+ ID : 16
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -228,7 +228,7 @@
Text t1
Attributes
- ID : 22
+ ID : 21
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -259,7 +259,7 @@
Text t3
Attributes
- ID : 23
+ ID : 22
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -290,7 +290,7 @@
Text t4
Attributes
- ID : 24
+ ID : 23
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -301,7 +301,7 @@
Text tSpeaker
Attributes
- ID : 25
+ ID : 24
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -331,7 +331,7 @@
Text t6
Attributes
- ID : 26
+ ID : 25
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -354,7 +354,7 @@
Text t5
Attributes
- ID : 29
+ ID : 28
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -392,7 +392,7 @@
Slider hVolume
Attributes
- ID : 16
+ ID : 29
Scope : local
Dragging : 0
Disable release event after dragging: 0
@@ -663,7 +663,7 @@
Timer tmSleep
Attributes
- ID : 19
+ ID : 18
Scope : local
Period (ms): 1000
Enabled : yes
@@ -683,7 +683,7 @@
Timer tmCooldown
Attributes
- ID : 21
+ ID : 20
Scope : local
Period (ms): 100
Enabled : no
@@ -694,7 +694,7 @@
TouchCap tc0
Attributes
- ID : 20
+ ID : 19
Scope: local
Value: 0
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-03-29 09:00:45.659455717 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-03-29 09:00:46.159475076 +0000
@@ -155,7 +155,7 @@
--- HMI/n2t-out/pageStartup.txt 2022-03-29 09:55:00.537431470 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-03-29 09:55:01.025440103 +0000
@@ -142,7 +142,7 @@
Disable release event after dragging: 0
Send Component ID : disabled
Associated Keyboard : none
@@ -1195,7 +1013,7 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
Max. Text Size : 100
Text tVersion
@@ -315,10 +315,6 @@
@@ -297,10 +297,6 @@
{
page cardThermo
}
@@ -1207,9 +1025,9 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
{
pageIcons.tTmp1.txt=tTmp.txt
diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
--- HMI/n2t-out/popupLight.txt 2022-03-29 09:00:45.659455717 +0000
+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-03-29 09:00:46.159475076 +0000
@@ -252,8 +252,6 @@
--- HMI/n2t-out/popupLight.txt 2022-03-29 09:55:00.537431470 +0000
+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-03-29 09:55:01.025440103 +0000
@@ -233,8 +233,6 @@
Events
Touch Release Event
@@ -1218,7 +1036,7 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
//craft command
tSend.txt="event,buttonPress2,"+entn.txt+",brightnessSlider,"
covx hBrightness.val,tTmp.txt,0,0
@@ -283,8 +281,6 @@
@@ -263,8 +261,6 @@
Events
Touch Release Event
@@ -1227,7 +1045,7 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
//craft command
tSend.txt="event,buttonPress2,"+entn.txt+",colorTempSlider,"
covx hTempSlider.val,tTmp.txt,0,0
@@ -493,11 +489,8 @@
@@ -468,11 +464,8 @@
vis t2,1
vis hBrightness,1
covx tTmp.txt,sys0,0,0
@@ -1239,7 +1057,7 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
// get ColorTemp value
spstr strCommand.txt,tTmp.txt,",",5
if(tTmp.txt=="disable")
@@ -529,11 +522,6 @@
@@ -504,11 +497,6 @@
vis hTempSlider,1
vis t3,1
vis t4,1
@@ -1251,13 +1069,12 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
// mode == 0 is rgb controls currently shown
if(mode.val==0)
{
@@ -635,17 +623,6 @@
@@ -610,16 +598,6 @@
}
}
-Timer tmCooldown
- Attributes
- ID : 26
- Scope : local
- Period (ms): 100
- Enabled : no
@@ -1268,4 +1085,4 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
-
TouchCap tc0
Attributes
ID : 14
Scope: local