mirror of
https://github.com/joBr99/nspanel-lovelace-ui.git
synced 2025-12-19 22:24:15 +01:00
Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui
This commit is contained in:
joBr99
@@ -1,6 +1,6 @@
|
||||
diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt
|
||||
--- HMI/n2t-out/Program.s.txt 2022-05-21 09:56:57.358746022 +0000
|
||||
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-21 09:56:58.218752853 +0000
|
||||
--- HMI/n2t-out/Program.s.txt 2022-05-21 11:07:42.160888502 +0000
|
||||
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-21 11:07:43.064904905 +0000
|
||||
@@ -11,6 +11,3 @@
|
||||
// dim value
|
||||
int dimValue=40
|
||||
@@ -8,10 +8,205 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt
|
||||
- // fix touch offset
|
||||
- lcd_dev fffb 0002 0000 0020
|
||||
- page pageStartup
|
||||
diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt
|
||||
--- HMI/n2t-out/cardAlarm.txt 2022-05-21 11:07:42.160888502 +0000
|
||||
+++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-05-21 11:07:43.064904905 +0000
|
||||
@@ -788,10 +788,6 @@
|
||||
{
|
||||
page cardAlarm
|
||||
}
|
||||
- if(tId.txt=="cardQR")
|
||||
- {
|
||||
- page cardQR
|
||||
- }
|
||||
}
|
||||
// end of user code
|
||||
udelete payloadLength-1
|
||||
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt
|
||||
--- HMI/n2t-out/cardEntities.txt 2022-05-21 11:07:42.160888502 +0000
|
||||
+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-05-21 11:07:43.064904905 +0000
|
||||
@@ -1277,28 +1277,6 @@
|
||||
vis bText1,0
|
||||
vis hSlider1,0
|
||||
vis nNum1,0
|
||||
- // get Button State (optional Value)
|
||||
- spstr strCommand.txt,tId.txt,"~",8
|
||||
- spstr tId.txt,tTmp.txt,"|",0
|
||||
- if(tTmp.txt=="0")
|
||||
- {
|
||||
- bUp1.bco2=27501
|
||||
- tsw bUp1,0
|
||||
- }else
|
||||
- {
|
||||
- bUp1.bco2=14823
|
||||
- tsw bUp1,1
|
||||
- }
|
||||
- spstr tId.txt,tTmp.txt,"|",1
|
||||
- if(tTmp.txt=="0")
|
||||
- {
|
||||
- bDown1.bco2=27501
|
||||
- tsw bDown1,0
|
||||
- }else
|
||||
- {
|
||||
- bDown1.bco2=14823
|
||||
- tsw bDown1,1
|
||||
- }
|
||||
}
|
||||
if(type1.txt=="light")
|
||||
{
|
||||
@@ -1421,28 +1399,6 @@
|
||||
vis bText2,0
|
||||
vis hSlider2,0
|
||||
vis nNum2,0
|
||||
- // get Button State (optional Value)
|
||||
- spstr strCommand.txt,tId.txt,"~",14
|
||||
- spstr tId.txt,tTmp.txt,"|",0
|
||||
- if(tTmp.txt=="0")
|
||||
- {
|
||||
- bUp2.bco2=27501
|
||||
- tsw bUp2,0
|
||||
- }else
|
||||
- {
|
||||
- bUp2.bco2=14823
|
||||
- tsw bUp2,1
|
||||
- }
|
||||
- spstr tId.txt,tTmp.txt,"|",1
|
||||
- if(tTmp.txt=="0")
|
||||
- {
|
||||
- bDown2.bco2=27501
|
||||
- tsw bDown2,0
|
||||
- }else
|
||||
- {
|
||||
- bDown2.bco2=14823
|
||||
- tsw bDown2,1
|
||||
- }
|
||||
}
|
||||
if(type2.txt=="light")
|
||||
{
|
||||
@@ -1565,28 +1521,6 @@
|
||||
vis bText3,0
|
||||
vis hSlider3,0
|
||||
vis nNum3,0
|
||||
- // get Button State (optional Value)
|
||||
- spstr strCommand.txt,tId.txt,"~",20
|
||||
- spstr tId.txt,tTmp.txt,"|",0
|
||||
- if(tTmp.txt=="0")
|
||||
- {
|
||||
- bUp3.bco2=27501
|
||||
- tsw bUp3,0
|
||||
- }else
|
||||
- {
|
||||
- bUp3.bco2=14823
|
||||
- tsw bUp3,1
|
||||
- }
|
||||
- spstr tId.txt,tTmp.txt,"|",1
|
||||
- if(tTmp.txt=="0")
|
||||
- {
|
||||
- bDown3.bco2=27501
|
||||
- tsw bDown3,0
|
||||
- }else
|
||||
- {
|
||||
- bDown3.bco2=14823
|
||||
- tsw bDown3,1
|
||||
- }
|
||||
}
|
||||
if(type3.txt=="light")
|
||||
{
|
||||
@@ -1709,28 +1643,6 @@
|
||||
vis bText4,0
|
||||
vis hSlider4,0
|
||||
vis nNum4,0
|
||||
- // get Button State (optional Value)
|
||||
- spstr strCommand.txt,tId.txt,"~",26
|
||||
- spstr tId.txt,tTmp.txt,"|",0
|
||||
- if(tTmp.txt=="0")
|
||||
- {
|
||||
- bUp4.bco2=27501
|
||||
- tsw bUp4,0
|
||||
- }else
|
||||
- {
|
||||
- bUp4.bco2=14823
|
||||
- tsw bUp4,1
|
||||
- }
|
||||
- spstr tId.txt,tTmp.txt,"|",1
|
||||
- if(tTmp.txt=="0")
|
||||
- {
|
||||
- bDown4.bco2=27501
|
||||
- tsw bDown4,0
|
||||
- }else
|
||||
- {
|
||||
- bDown4.bco2=14823
|
||||
- tsw bDown4,1
|
||||
- }
|
||||
}
|
||||
if(type4.txt=="light")
|
||||
{
|
||||
@@ -1871,10 +1783,6 @@
|
||||
{
|
||||
page cardAlarm
|
||||
}
|
||||
- if(tId.txt=="cardQR")
|
||||
- {
|
||||
- page cardQR
|
||||
- }
|
||||
}
|
||||
if(tInstruction.txt=="time")
|
||||
{
|
||||
diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt
|
||||
--- HMI/n2t-out/cardGrid.txt 2022-05-21 11:07:42.160888502 +0000
|
||||
+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-05-21 11:07:43.064904905 +0000
|
||||
@@ -869,10 +869,6 @@
|
||||
{
|
||||
page cardAlarm
|
||||
}
|
||||
- if(tId.txt=="cardQR")
|
||||
- {
|
||||
- page cardQR
|
||||
- }
|
||||
}
|
||||
if(tInstruction.txt=="time")
|
||||
{
|
||||
diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt
|
||||
--- HMI/n2t-out/cardMedia.txt 2022-05-21 11:07:42.160888502 +0000
|
||||
+++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-05-21 11:07:43.064904905 +0000
|
||||
@@ -740,10 +740,6 @@
|
||||
{
|
||||
page cardAlarm
|
||||
}
|
||||
- if(tId.txt=="cardQR")
|
||||
- {
|
||||
- page cardQR
|
||||
- }
|
||||
}
|
||||
// end of user code
|
||||
udelete payloadLength-1
|
||||
Only in HMI/n2t-out: cardQR.txt
|
||||
diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
|
||||
--- HMI/n2t-out/cardThermo.txt 2022-05-21 11:07:42.160888502 +0000
|
||||
+++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-05-21 11:07:43.064904905 +0000
|
||||
@@ -1192,10 +1192,6 @@
|
||||
{
|
||||
page cardAlarm
|
||||
}
|
||||
- if(tId.txt=="cardQR")
|
||||
- {
|
||||
- page cardQR
|
||||
- }
|
||||
}
|
||||
if(tInstruction.txt=="time")
|
||||
{
|
||||
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
|
||||
--- HMI/n2t-out/pageStartup.txt 2022-05-21 09:56:57.358746022 +0000
|
||||
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-21 09:56:58.218752853 +0000
|
||||
--- HMI/n2t-out/pageStartup.txt 2022-05-21 11:07:42.160888502 +0000
|
||||
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-21 11:07:43.064904905 +0000
|
||||
@@ -152,7 +152,7 @@
|
||||
Disable release event after dragging: 0
|
||||
Send Component ID : disabled
|
||||
Associated Keyboard : none
|
||||
- Text : 35
|
||||
+ Text : 34
|
||||
Max. Text Size : 10
|
||||
|
||||
Picture p0
|
||||
@@ -177,7 +177,7 @@
|
||||
recmod=1
|
||||
bauds=115200
|
||||
@@ -21,9 +216,20 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
|
||||
//send calc crc
|
||||
btlen tSend.txt,sys0
|
||||
crcrest 1,0xffff // reset CRC
|
||||
@@ -330,10 +330,6 @@
|
||||
{
|
||||
page cardAlarm
|
||||
}
|
||||
- if(tId.txt=="cardQR")
|
||||
- {
|
||||
- page cardQR
|
||||
- }
|
||||
}
|
||||
// end of user code
|
||||
udelete payloadLength-1
|
||||
diff -bur HMI/n2t-out/pageTest.txt HMI/US/landscape/n2t-out/pageTest.txt
|
||||
--- HMI/n2t-out/pageTest.txt 2022-05-21 09:56:57.358746022 +0000
|
||||
+++ HMI/US/landscape/n2t-out/pageTest.txt 2022-05-21 09:56:58.218752853 +0000
|
||||
--- HMI/n2t-out/pageTest.txt 2022-05-21 11:07:42.160888502 +0000
|
||||
+++ HMI/US/landscape/n2t-out/pageTest.txt 2022-05-21 11:07:43.064904905 +0000
|
||||
@@ -176,17 +176,3 @@
|
||||
Touch Press Event
|
||||
bauds=115200
|
||||
@@ -42,3 +248,59 @@ diff -bur HMI/n2t-out/pageTest.txt HMI/US/landscape/n2t-out/pageTest.txt
|
||||
- Touch Press Event
|
||||
- page cardQR
|
||||
-
|
||||
diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt
|
||||
--- HMI/n2t-out/popupLight.txt 2022-05-21 11:07:42.160888502 +0000
|
||||
+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-05-21 11:07:43.064904905 +0000
|
||||
@@ -618,10 +618,6 @@
|
||||
{
|
||||
page cardAlarm
|
||||
}
|
||||
- if(tId.txt=="cardQR")
|
||||
- {
|
||||
- page cardQR
|
||||
- }
|
||||
}
|
||||
// end of user code
|
||||
udelete payloadLength-1
|
||||
diff -bur HMI/n2t-out/popupNotify.txt HMI/US/landscape/n2t-out/popupNotify.txt
|
||||
--- HMI/n2t-out/popupNotify.txt 2022-05-21 11:07:42.160888502 +0000
|
||||
+++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-05-21 11:07:43.064904905 +0000
|
||||
@@ -381,10 +381,6 @@
|
||||
{
|
||||
page cardAlarm
|
||||
}
|
||||
- if(tId.txt=="cardQR")
|
||||
- {
|
||||
- page cardQR
|
||||
- }
|
||||
}
|
||||
// end of user code
|
||||
udelete payloadLength-1
|
||||
diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt
|
||||
--- HMI/n2t-out/popupShutter.txt 2022-05-21 11:07:42.160888502 +0000
|
||||
+++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-05-21 11:07:43.064904905 +0000
|
||||
@@ -422,10 +422,6 @@
|
||||
{
|
||||
page cardAlarm
|
||||
}
|
||||
- if(tId.txt=="cardQR")
|
||||
- {
|
||||
- page cardQR
|
||||
- }
|
||||
}
|
||||
// end of user code
|
||||
udelete payloadLength-1
|
||||
diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt
|
||||
--- HMI/n2t-out/screensaver.txt 2022-05-21 11:07:42.160888502 +0000
|
||||
+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-05-21 11:07:43.064904905 +0000
|
||||
@@ -607,10 +607,6 @@
|
||||
{
|
||||
page cardAlarm
|
||||
}
|
||||
- if(tId.txt=="cardQR")
|
||||
- {
|
||||
- page cardQR
|
||||
- }
|
||||
}
|
||||
// end of user code
|
||||
udelete payloadLength-1
|
||||
|
||||
@@ -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-05-21 09:56:57.358746022 +0000
|
||||
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-21 09:56:57.790749453 +0000
|
||||
--- HMI/n2t-out/Program.s.txt 2022-05-21 11:07:42.160888502 +0000
|
||||
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-21 11:07:42.588896268 +0000
|
||||
@@ -11,6 +11,6 @@
|
||||
// dim value
|
||||
int dimValue=40
|
||||
@@ -10,9 +10,23 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt
|
||||
+ // fix touch offset (Removed for US version)
|
||||
+ //lcd_dev fffb 0002 0000 0020
|
||||
page pageStartup
|
||||
diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
|
||||
--- HMI/n2t-out/cardAlarm.txt 2022-05-21 11:07:42.160888502 +0000
|
||||
+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-21 11:07:42.588896268 +0000
|
||||
@@ -788,10 +788,6 @@
|
||||
{
|
||||
page cardAlarm
|
||||
}
|
||||
- if(tId.txt=="cardQR")
|
||||
- {
|
||||
- page cardQR
|
||||
- }
|
||||
}
|
||||
// end of user code
|
||||
udelete payloadLength-1
|
||||
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
|
||||
--- HMI/n2t-out/cardEntities.txt 2022-05-21 09:56:57.358746022 +0000
|
||||
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-21 09:56:57.794749485 +0000
|
||||
--- HMI/n2t-out/cardEntities.txt 2022-05-21 11:07:42.160888502 +0000
|
||||
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-21 11:07:42.592896340 +0000
|
||||
@@ -62,6 +62,16 @@
|
||||
vis bText4,0
|
||||
vis hSlider4,0
|
||||
@@ -297,7 +311,123 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
|
||||
Hotspot mSwipeNext
|
||||
Attributes
|
||||
Scope : local
|
||||
@@ -1728,6 +1956,128 @@
|
||||
@@ -1277,28 +1505,6 @@
|
||||
vis bText1,0
|
||||
vis hSlider1,0
|
||||
vis nNum1,0
|
||||
- // get Button State (optional Value)
|
||||
- spstr strCommand.txt,tId.txt,"~",8
|
||||
- spstr tId.txt,tTmp.txt,"|",0
|
||||
- if(tTmp.txt=="0")
|
||||
- {
|
||||
- bUp1.bco2=27501
|
||||
- tsw bUp1,0
|
||||
- }else
|
||||
- {
|
||||
- bUp1.bco2=14823
|
||||
- tsw bUp1,1
|
||||
- }
|
||||
- spstr tId.txt,tTmp.txt,"|",1
|
||||
- if(tTmp.txt=="0")
|
||||
- {
|
||||
- bDown1.bco2=27501
|
||||
- tsw bDown1,0
|
||||
- }else
|
||||
- {
|
||||
- bDown1.bco2=14823
|
||||
- tsw bDown1,1
|
||||
- }
|
||||
}
|
||||
if(type1.txt=="light")
|
||||
{
|
||||
@@ -1421,28 +1627,6 @@
|
||||
vis bText2,0
|
||||
vis hSlider2,0
|
||||
vis nNum2,0
|
||||
- // get Button State (optional Value)
|
||||
- spstr strCommand.txt,tId.txt,"~",14
|
||||
- spstr tId.txt,tTmp.txt,"|",0
|
||||
- if(tTmp.txt=="0")
|
||||
- {
|
||||
- bUp2.bco2=27501
|
||||
- tsw bUp2,0
|
||||
- }else
|
||||
- {
|
||||
- bUp2.bco2=14823
|
||||
- tsw bUp2,1
|
||||
- }
|
||||
- spstr tId.txt,tTmp.txt,"|",1
|
||||
- if(tTmp.txt=="0")
|
||||
- {
|
||||
- bDown2.bco2=27501
|
||||
- tsw bDown2,0
|
||||
- }else
|
||||
- {
|
||||
- bDown2.bco2=14823
|
||||
- tsw bDown2,1
|
||||
- }
|
||||
}
|
||||
if(type2.txt=="light")
|
||||
{
|
||||
@@ -1565,28 +1749,6 @@
|
||||
vis bText3,0
|
||||
vis hSlider3,0
|
||||
vis nNum3,0
|
||||
- // get Button State (optional Value)
|
||||
- spstr strCommand.txt,tId.txt,"~",20
|
||||
- spstr tId.txt,tTmp.txt,"|",0
|
||||
- if(tTmp.txt=="0")
|
||||
- {
|
||||
- bUp3.bco2=27501
|
||||
- tsw bUp3,0
|
||||
- }else
|
||||
- {
|
||||
- bUp3.bco2=14823
|
||||
- tsw bUp3,1
|
||||
- }
|
||||
- spstr tId.txt,tTmp.txt,"|",1
|
||||
- if(tTmp.txt=="0")
|
||||
- {
|
||||
- bDown3.bco2=27501
|
||||
- tsw bDown3,0
|
||||
- }else
|
||||
- {
|
||||
- bDown3.bco2=14823
|
||||
- tsw bDown3,1
|
||||
- }
|
||||
}
|
||||
if(type3.txt=="light")
|
||||
{
|
||||
@@ -1709,28 +1871,6 @@
|
||||
vis bText4,0
|
||||
vis hSlider4,0
|
||||
vis nNum4,0
|
||||
- // get Button State (optional Value)
|
||||
- spstr strCommand.txt,tId.txt,"~",26
|
||||
- spstr tId.txt,tTmp.txt,"|",0
|
||||
- if(tTmp.txt=="0")
|
||||
- {
|
||||
- bUp4.bco2=27501
|
||||
- tsw bUp4,0
|
||||
- }else
|
||||
- {
|
||||
- bUp4.bco2=14823
|
||||
- tsw bUp4,1
|
||||
- }
|
||||
- spstr tId.txt,tTmp.txt,"|",1
|
||||
- if(tTmp.txt=="0")
|
||||
- {
|
||||
- bDown4.bco2=27501
|
||||
- tsw bDown4,0
|
||||
- }else
|
||||
- {
|
||||
- bDown4.bco2=14823
|
||||
- tsw bDown4,1
|
||||
- }
|
||||
}
|
||||
if(type4.txt=="light")
|
||||
{
|
||||
@@ -1816,6 +1956,128 @@
|
||||
covx tTmp.txt,sys0,0,0
|
||||
hSlider4.maxval=sys0
|
||||
}
|
||||
@@ -426,9 +556,76 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
|
||||
}
|
||||
if(tInstruction.txt=="pageType")
|
||||
{
|
||||
@@ -1871,10 +2133,6 @@
|
||||
{
|
||||
page cardAlarm
|
||||
}
|
||||
- if(tId.txt=="cardQR")
|
||||
- {
|
||||
- page cardQR
|
||||
- }
|
||||
}
|
||||
if(tInstruction.txt=="time")
|
||||
{
|
||||
diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt
|
||||
--- HMI/n2t-out/cardGrid.txt 2022-05-21 11:07:42.160888502 +0000
|
||||
+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-21 11:07:42.588896268 +0000
|
||||
@@ -869,10 +869,6 @@
|
||||
{
|
||||
page cardAlarm
|
||||
}
|
||||
- if(tId.txt=="cardQR")
|
||||
- {
|
||||
- page cardQR
|
||||
- }
|
||||
}
|
||||
if(tInstruction.txt=="time")
|
||||
{
|
||||
diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
|
||||
--- HMI/n2t-out/cardMedia.txt 2022-05-21 11:07:42.160888502 +0000
|
||||
+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-05-21 11:07:42.588896268 +0000
|
||||
@@ -740,10 +740,6 @@
|
||||
{
|
||||
page cardAlarm
|
||||
}
|
||||
- if(tId.txt=="cardQR")
|
||||
- {
|
||||
- page cardQR
|
||||
- }
|
||||
}
|
||||
// end of user code
|
||||
udelete payloadLength-1
|
||||
diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt
|
||||
--- HMI/n2t-out/cardQR.txt 2022-05-21 11:07:42.160888502 +0000
|
||||
+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-21 11:07:42.588896268 +0000
|
||||
@@ -541,10 +541,6 @@
|
||||
{
|
||||
page cardAlarm
|
||||
}
|
||||
- if(tId.txt=="cardQR")
|
||||
- {
|
||||
- page cardQR
|
||||
- }
|
||||
}
|
||||
// end of user code
|
||||
udelete payloadLength-1
|
||||
diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
|
||||
--- HMI/n2t-out/cardThermo.txt 2022-05-21 11:07:42.160888502 +0000
|
||||
+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-21 11:07:42.588896268 +0000
|
||||
@@ -1192,10 +1192,6 @@
|
||||
{
|
||||
page cardAlarm
|
||||
}
|
||||
- if(tId.txt=="cardQR")
|
||||
- {
|
||||
- page cardQR
|
||||
- }
|
||||
}
|
||||
if(tInstruction.txt=="time")
|
||||
{
|
||||
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
|
||||
--- HMI/n2t-out/pageStartup.txt 2022-05-21 09:56:57.358746022 +0000
|
||||
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-21 09:56:57.790749453 +0000
|
||||
--- HMI/n2t-out/pageStartup.txt 2022-05-21 11:07:42.160888502 +0000
|
||||
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-21 11:07:42.588896268 +0000
|
||||
@@ -142,7 +142,7 @@
|
||||
Disable release event after dragging: 0
|
||||
Send Component ID : disabled
|
||||
@@ -438,6 +635,15 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
|
||||
Max. Text Size : 100
|
||||
|
||||
Text tVersion
|
||||
@@ -152,7 +152,7 @@
|
||||
Disable release event after dragging: 0
|
||||
Send Component ID : disabled
|
||||
Associated Keyboard : none
|
||||
- Text : 35
|
||||
+ Text : 34
|
||||
Max. Text Size : 10
|
||||
|
||||
Picture p0
|
||||
@@ -177,7 +177,7 @@
|
||||
recmod=1
|
||||
bauds=115200
|
||||
@@ -447,3 +653,70 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
|
||||
//send calc crc
|
||||
btlen tSend.txt,sys0
|
||||
crcrest 1,0xffff // reset CRC
|
||||
@@ -330,10 +330,6 @@
|
||||
{
|
||||
page cardAlarm
|
||||
}
|
||||
- if(tId.txt=="cardQR")
|
||||
- {
|
||||
- page cardQR
|
||||
- }
|
||||
}
|
||||
// end of user code
|
||||
udelete payloadLength-1
|
||||
diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
|
||||
--- HMI/n2t-out/popupLight.txt 2022-05-21 11:07:42.160888502 +0000
|
||||
+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-21 11:07:42.592896340 +0000
|
||||
@@ -618,10 +618,6 @@
|
||||
{
|
||||
page cardAlarm
|
||||
}
|
||||
- if(tId.txt=="cardQR")
|
||||
- {
|
||||
- page cardQR
|
||||
- }
|
||||
}
|
||||
// end of user code
|
||||
udelete payloadLength-1
|
||||
diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt
|
||||
--- HMI/n2t-out/popupNotify.txt 2022-05-21 11:07:42.160888502 +0000
|
||||
+++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-05-21 11:07:42.588896268 +0000
|
||||
@@ -381,10 +381,6 @@
|
||||
{
|
||||
page cardAlarm
|
||||
}
|
||||
- if(tId.txt=="cardQR")
|
||||
- {
|
||||
- page cardQR
|
||||
- }
|
||||
}
|
||||
// end of user code
|
||||
udelete payloadLength-1
|
||||
diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt
|
||||
--- HMI/n2t-out/popupShutter.txt 2022-05-21 11:07:42.160888502 +0000
|
||||
+++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-05-21 11:07:42.588896268 +0000
|
||||
@@ -422,10 +422,6 @@
|
||||
{
|
||||
page cardAlarm
|
||||
}
|
||||
- if(tId.txt=="cardQR")
|
||||
- {
|
||||
- page cardQR
|
||||
- }
|
||||
}
|
||||
// end of user code
|
||||
udelete payloadLength-1
|
||||
diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt
|
||||
--- HMI/n2t-out/screensaver.txt 2022-05-21 11:07:42.160888502 +0000
|
||||
+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-21 11:07:42.588896268 +0000
|
||||
@@ -607,10 +607,6 @@
|
||||
{
|
||||
page cardAlarm
|
||||
}
|
||||
- if(tId.txt=="cardQR")
|
||||
- {
|
||||
- page cardQR
|
||||
- }
|
||||
}
|
||||
// end of user code
|
||||
udelete payloadLength-1
|
||||
|
||||
@@ -1,10 +1,283 @@
|
||||
+++ HMI/US/portrait/diff-eu-version.txt 2022-05-21 09:56:57.806749580 +0000
|
||||
+--- HMI/n2t-out/Program.s.txt 2022-05-21 09:56:57.358746022 +0000
|
||||
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-21 09:56:57.790749453 +0000
|
||||
+--- HMI/n2t-out/cardEntities.txt 2022-05-21 09:56:57.358746022 +0000
|
||||
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-21 09:56:57.794749485 +0000
|
||||
+++ HMI/US/portrait/diff-eu-version.txt 2022-05-21 11:07:42.652897429 +0000
|
||||
+--- HMI/n2t-out/Program.s.txt 2022-05-21 11:07:42.160888502 +0000
|
||||
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-21 11:07:42.588896268 +0000
|
||||
+diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
|
||||
+--- HMI/n2t-out/cardAlarm.txt 2022-05-21 11:07:42.160888502 +0000
|
||||
++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-21 11:07:42.588896268 +0000
|
||||
+@@ -788,10 +788,6 @@
|
||||
+ {
|
||||
+ page cardAlarm
|
||||
+ }
|
||||
+- if(tId.txt=="cardQR")
|
||||
+- {
|
||||
+- page cardQR
|
||||
+- }
|
||||
+ }
|
||||
+ // end of user code
|
||||
+ udelete payloadLength-1
|
||||
+--- HMI/n2t-out/cardEntities.txt 2022-05-21 11:07:42.160888502 +0000
|
||||
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-21 11:07:42.592896340 +0000
|
||||
+ Hotspot mSwipeNext
|
||||
+ Scope : local
|
||||
+@@ -1728,6 +1956,128 @@
|
||||
+--- HMI/n2t-out/pageStartup.txt 2022-05-21 09:56:57.358746022 +0000
|
||||
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-21 09:56:57.790749453 +0000
|
||||
+@@ -1277,28 +1505,6 @@
|
||||
+ vis bText1,0
|
||||
+ vis hSlider1,0
|
||||
+ vis nNum1,0
|
||||
+- // get Button State (optional Value)
|
||||
+- spstr strCommand.txt,tId.txt,"~",8
|
||||
+- spstr tId.txt,tTmp.txt,"|",0
|
||||
+- if(tTmp.txt=="0")
|
||||
+- {
|
||||
+- bUp1.bco2=27501
|
||||
+- tsw bUp1,0
|
||||
+- }else
|
||||
+- {
|
||||
+- bUp1.bco2=14823
|
||||
+- tsw bUp1,1
|
||||
+- }
|
||||
+- spstr tId.txt,tTmp.txt,"|",1
|
||||
+- if(tTmp.txt=="0")
|
||||
+- {
|
||||
+- bDown1.bco2=27501
|
||||
+- tsw bDown1,0
|
||||
+- }else
|
||||
+- {
|
||||
+- bDown1.bco2=14823
|
||||
+- tsw bDown1,1
|
||||
+- }
|
||||
+ }
|
||||
+ if(type1.txt=="light")
|
||||
+ {
|
||||
+@@ -1421,28 +1627,6 @@
|
||||
+ vis bText2,0
|
||||
+ vis hSlider2,0
|
||||
+ vis nNum2,0
|
||||
+- // get Button State (optional Value)
|
||||
+- spstr strCommand.txt,tId.txt,"~",14
|
||||
+- spstr tId.txt,tTmp.txt,"|",0
|
||||
+- if(tTmp.txt=="0")
|
||||
+- {
|
||||
+- bUp2.bco2=27501
|
||||
+- tsw bUp2,0
|
||||
+- }else
|
||||
+- {
|
||||
+- bUp2.bco2=14823
|
||||
+- tsw bUp2,1
|
||||
+- }
|
||||
+- spstr tId.txt,tTmp.txt,"|",1
|
||||
+- if(tTmp.txt=="0")
|
||||
+- {
|
||||
+- bDown2.bco2=27501
|
||||
+- tsw bDown2,0
|
||||
+- }else
|
||||
+- {
|
||||
+- bDown2.bco2=14823
|
||||
+- tsw bDown2,1
|
||||
+- }
|
||||
+ }
|
||||
+ if(type2.txt=="light")
|
||||
+ {
|
||||
+@@ -1565,28 +1749,6 @@
|
||||
+ vis bText3,0
|
||||
+ vis hSlider3,0
|
||||
+ vis nNum3,0
|
||||
+- // get Button State (optional Value)
|
||||
+- spstr strCommand.txt,tId.txt,"~",20
|
||||
+- spstr tId.txt,tTmp.txt,"|",0
|
||||
+- if(tTmp.txt=="0")
|
||||
+- {
|
||||
+- bUp3.bco2=27501
|
||||
+- tsw bUp3,0
|
||||
+- }else
|
||||
+- {
|
||||
+- bUp3.bco2=14823
|
||||
+- tsw bUp3,1
|
||||
+- }
|
||||
+- spstr tId.txt,tTmp.txt,"|",1
|
||||
+- if(tTmp.txt=="0")
|
||||
+- {
|
||||
+- bDown3.bco2=27501
|
||||
+- tsw bDown3,0
|
||||
+- }else
|
||||
+- {
|
||||
+- bDown3.bco2=14823
|
||||
+- tsw bDown3,1
|
||||
+- }
|
||||
+ }
|
||||
+ if(type3.txt=="light")
|
||||
+ {
|
||||
+@@ -1709,28 +1871,6 @@
|
||||
+ vis bText4,0
|
||||
+ vis hSlider4,0
|
||||
+ vis nNum4,0
|
||||
+- // get Button State (optional Value)
|
||||
+- spstr strCommand.txt,tId.txt,"~",26
|
||||
+- spstr tId.txt,tTmp.txt,"|",0
|
||||
+- if(tTmp.txt=="0")
|
||||
+- {
|
||||
+- bUp4.bco2=27501
|
||||
+- tsw bUp4,0
|
||||
+- }else
|
||||
+- {
|
||||
+- bUp4.bco2=14823
|
||||
+- tsw bUp4,1
|
||||
+- }
|
||||
+- spstr tId.txt,tTmp.txt,"|",1
|
||||
+- if(tTmp.txt=="0")
|
||||
+- {
|
||||
+- bDown4.bco2=27501
|
||||
+- tsw bDown4,0
|
||||
+- }else
|
||||
+- {
|
||||
+- bDown4.bco2=14823
|
||||
+- tsw bDown4,1
|
||||
+- }
|
||||
+ }
|
||||
+ if(type4.txt=="light")
|
||||
+ {
|
||||
+@@ -1816,6 +1956,128 @@
|
||||
+@@ -1871,10 +2133,6 @@
|
||||
+ {
|
||||
+ page cardAlarm
|
||||
+ }
|
||||
+- if(tId.txt=="cardQR")
|
||||
+- {
|
||||
+- page cardQR
|
||||
+- }
|
||||
+ }
|
||||
+ if(tInstruction.txt=="time")
|
||||
+ {
|
||||
+diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt
|
||||
+--- HMI/n2t-out/cardGrid.txt 2022-05-21 11:07:42.160888502 +0000
|
||||
++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-21 11:07:42.588896268 +0000
|
||||
+@@ -869,10 +869,6 @@
|
||||
+ {
|
||||
+ page cardAlarm
|
||||
+ }
|
||||
+- if(tId.txt=="cardQR")
|
||||
+- {
|
||||
+- page cardQR
|
||||
+- }
|
||||
+ }
|
||||
+ if(tInstruction.txt=="time")
|
||||
+ {
|
||||
+diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
|
||||
+--- HMI/n2t-out/cardMedia.txt 2022-05-21 11:07:42.160888502 +0000
|
||||
++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-05-21 11:07:42.588896268 +0000
|
||||
+@@ -740,10 +740,6 @@
|
||||
+ {
|
||||
+ page cardAlarm
|
||||
+ }
|
||||
+- if(tId.txt=="cardQR")
|
||||
+- {
|
||||
+- page cardQR
|
||||
+- }
|
||||
+ }
|
||||
+ // end of user code
|
||||
+ udelete payloadLength-1
|
||||
+diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt
|
||||
+--- HMI/n2t-out/cardQR.txt 2022-05-21 11:07:42.160888502 +0000
|
||||
++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-21 11:07:42.588896268 +0000
|
||||
+@@ -541,10 +541,6 @@
|
||||
+ {
|
||||
+ page cardAlarm
|
||||
+ }
|
||||
+- if(tId.txt=="cardQR")
|
||||
+- {
|
||||
+- page cardQR
|
||||
+- }
|
||||
+ }
|
||||
+ // end of user code
|
||||
+ udelete payloadLength-1
|
||||
+diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
|
||||
+--- HMI/n2t-out/cardThermo.txt 2022-05-21 11:07:42.160888502 +0000
|
||||
++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-21 11:07:42.588896268 +0000
|
||||
+@@ -1192,10 +1192,6 @@
|
||||
+ {
|
||||
+ page cardAlarm
|
||||
+ }
|
||||
+- if(tId.txt=="cardQR")
|
||||
+- {
|
||||
+- page cardQR
|
||||
+- }
|
||||
+ }
|
||||
+ if(tInstruction.txt=="time")
|
||||
+ {
|
||||
+--- HMI/n2t-out/pageStartup.txt 2022-05-21 11:07:42.160888502 +0000
|
||||
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-21 11:07:42.588896268 +0000
|
||||
+@@ -152,7 +152,7 @@
|
||||
+ Disable release event after dragging: 0
|
||||
+ Send Component ID : disabled
|
||||
+ Associated Keyboard : none
|
||||
+- Text : 35
|
||||
++ Text : 34
|
||||
+ Max. Text Size : 10
|
||||
+
|
||||
+ Picture p0
|
||||
+@@ -330,10 +330,6 @@
|
||||
+ {
|
||||
+ page cardAlarm
|
||||
+ }
|
||||
+- if(tId.txt=="cardQR")
|
||||
+- {
|
||||
+- page cardQR
|
||||
+- }
|
||||
+ }
|
||||
+ // end of user code
|
||||
+ udelete payloadLength-1
|
||||
+diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
|
||||
+--- HMI/n2t-out/popupLight.txt 2022-05-21 11:07:42.160888502 +0000
|
||||
++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-21 11:07:42.592896340 +0000
|
||||
+@@ -618,10 +618,6 @@
|
||||
+ {
|
||||
+ page cardAlarm
|
||||
+ }
|
||||
+- if(tId.txt=="cardQR")
|
||||
+- {
|
||||
+- page cardQR
|
||||
+- }
|
||||
+ }
|
||||
+ // end of user code
|
||||
+ udelete payloadLength-1
|
||||
+diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt
|
||||
+--- HMI/n2t-out/popupNotify.txt 2022-05-21 11:07:42.160888502 +0000
|
||||
++++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-05-21 11:07:42.588896268 +0000
|
||||
+@@ -381,10 +381,6 @@
|
||||
+ {
|
||||
+ page cardAlarm
|
||||
+ }
|
||||
+- if(tId.txt=="cardQR")
|
||||
+- {
|
||||
+- page cardQR
|
||||
+- }
|
||||
+ }
|
||||
+ // end of user code
|
||||
+ udelete payloadLength-1
|
||||
+diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt
|
||||
+--- HMI/n2t-out/popupShutter.txt 2022-05-21 11:07:42.160888502 +0000
|
||||
++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-05-21 11:07:42.588896268 +0000
|
||||
+@@ -422,10 +422,6 @@
|
||||
+ {
|
||||
+ page cardAlarm
|
||||
+ }
|
||||
+- if(tId.txt=="cardQR")
|
||||
+- {
|
||||
+- page cardQR
|
||||
+- }
|
||||
+ }
|
||||
+ // end of user code
|
||||
+ udelete payloadLength-1
|
||||
+diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt
|
||||
+--- HMI/n2t-out/screensaver.txt 2022-05-21 11:07:42.160888502 +0000
|
||||
++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-21 11:07:42.588896268 +0000
|
||||
+@@ -607,10 +607,6 @@
|
||||
+ {
|
||||
+ page cardAlarm
|
||||
+ }
|
||||
+- if(tId.txt=="cardQR")
|
||||
+- {
|
||||
+- page cardQR
|
||||
+- }
|
||||
+ }
|
||||
+ // end of user code
|
||||
+ udelete payloadLength-1
|
||||
|
||||
@@ -1345,6 +1345,10 @@ Timer tmSerial
|
||||
{
|
||||
page cardAlarm
|
||||
}
|
||||
if(tId.txt=="cardQR")
|
||||
{
|
||||
page cardQR
|
||||
}
|
||||
}
|
||||
// end of user code
|
||||
udelete payloadLength-1
|
||||
|
||||
@@ -2249,6 +2249,28 @@ Timer tmSerial
|
||||
vis bText1,0
|
||||
vis hSlider1,0
|
||||
vis nNum1,0
|
||||
// get Button State (optional Value)
|
||||
spstr strCommand.txt,tId.txt,"~",8
|
||||
spstr tId.txt,tTmp.txt,"|",0
|
||||
if(tTmp.txt=="0")
|
||||
{
|
||||
bUp1.bco2=27501
|
||||
tsw bUp1,0
|
||||
}else
|
||||
{
|
||||
bUp1.bco2=14823
|
||||
tsw bUp1,1
|
||||
}
|
||||
spstr tId.txt,tTmp.txt,"|",1
|
||||
if(tTmp.txt=="0")
|
||||
{
|
||||
bDown1.bco2=27501
|
||||
tsw bDown1,0
|
||||
}else
|
||||
{
|
||||
bDown1.bco2=14823
|
||||
tsw bDown1,1
|
||||
}
|
||||
}
|
||||
if(type1.txt=="light")
|
||||
{
|
||||
@@ -2371,6 +2393,28 @@ Timer tmSerial
|
||||
vis bText2,0
|
||||
vis hSlider2,0
|
||||
vis nNum2,0
|
||||
// get Button State (optional Value)
|
||||
spstr strCommand.txt,tId.txt,"~",14
|
||||
spstr tId.txt,tTmp.txt,"|",0
|
||||
if(tTmp.txt=="0")
|
||||
{
|
||||
bUp2.bco2=27501
|
||||
tsw bUp2,0
|
||||
}else
|
||||
{
|
||||
bUp2.bco2=14823
|
||||
tsw bUp2,1
|
||||
}
|
||||
spstr tId.txt,tTmp.txt,"|",1
|
||||
if(tTmp.txt=="0")
|
||||
{
|
||||
bDown2.bco2=27501
|
||||
tsw bDown2,0
|
||||
}else
|
||||
{
|
||||
bDown2.bco2=14823
|
||||
tsw bDown2,1
|
||||
}
|
||||
}
|
||||
if(type2.txt=="light")
|
||||
{
|
||||
@@ -2493,6 +2537,28 @@ Timer tmSerial
|
||||
vis bText3,0
|
||||
vis hSlider3,0
|
||||
vis nNum3,0
|
||||
// get Button State (optional Value)
|
||||
spstr strCommand.txt,tId.txt,"~",20
|
||||
spstr tId.txt,tTmp.txt,"|",0
|
||||
if(tTmp.txt=="0")
|
||||
{
|
||||
bUp3.bco2=27501
|
||||
tsw bUp3,0
|
||||
}else
|
||||
{
|
||||
bUp3.bco2=14823
|
||||
tsw bUp3,1
|
||||
}
|
||||
spstr tId.txt,tTmp.txt,"|",1
|
||||
if(tTmp.txt=="0")
|
||||
{
|
||||
bDown3.bco2=27501
|
||||
tsw bDown3,0
|
||||
}else
|
||||
{
|
||||
bDown3.bco2=14823
|
||||
tsw bDown3,1
|
||||
}
|
||||
}
|
||||
if(type3.txt=="light")
|
||||
{
|
||||
@@ -2615,6 +2681,28 @@ Timer tmSerial
|
||||
vis bText4,0
|
||||
vis hSlider4,0
|
||||
vis nNum4,0
|
||||
// get Button State (optional Value)
|
||||
spstr strCommand.txt,tId.txt,"~",26
|
||||
spstr tId.txt,tTmp.txt,"|",0
|
||||
if(tTmp.txt=="0")
|
||||
{
|
||||
bUp4.bco2=27501
|
||||
tsw bUp4,0
|
||||
}else
|
||||
{
|
||||
bUp4.bco2=14823
|
||||
tsw bUp4,1
|
||||
}
|
||||
spstr tId.txt,tTmp.txt,"|",1
|
||||
if(tTmp.txt=="0")
|
||||
{
|
||||
bDown4.bco2=27501
|
||||
tsw bDown4,0
|
||||
}else
|
||||
{
|
||||
bDown4.bco2=14823
|
||||
tsw bDown4,1
|
||||
}
|
||||
}
|
||||
if(type4.txt=="light")
|
||||
{
|
||||
@@ -2755,6 +2843,10 @@ Timer tmSerial
|
||||
{
|
||||
page cardAlarm
|
||||
}
|
||||
if(tId.txt=="cardQR")
|
||||
{
|
||||
page cardQR
|
||||
}
|
||||
}
|
||||
if(tInstruction.txt=="time")
|
||||
{
|
||||
|
||||
@@ -1333,6 +1333,10 @@ Timer tmSerial
|
||||
{
|
||||
page cardAlarm
|
||||
}
|
||||
if(tId.txt=="cardQR")
|
||||
{
|
||||
page cardQR
|
||||
}
|
||||
}
|
||||
if(tInstruction.txt=="time")
|
||||
{
|
||||
|
||||
@@ -1189,6 +1189,10 @@ Timer tmSerial
|
||||
{
|
||||
page cardAlarm
|
||||
}
|
||||
if(tId.txt=="cardQR")
|
||||
{
|
||||
page cardQR
|
||||
}
|
||||
}
|
||||
// end of user code
|
||||
udelete payloadLength-1
|
||||
|
||||
@@ -829,6 +829,10 @@ Timer tmSerial
|
||||
{
|
||||
page cardAlarm
|
||||
}
|
||||
if(tId.txt=="cardQR")
|
||||
{
|
||||
page cardQR
|
||||
}
|
||||
}
|
||||
// end of user code
|
||||
udelete payloadLength-1
|
||||
|
||||
@@ -1973,6 +1973,10 @@ Timer tmSerial
|
||||
{
|
||||
page cardAlarm
|
||||
}
|
||||
if(tId.txt=="cardQR")
|
||||
{
|
||||
page cardQR
|
||||
}
|
||||
}
|
||||
if(tInstruction.txt=="time")
|
||||
{
|
||||
|
||||
@@ -10,53 +10,53 @@ pageTest
|
||||
14 Component(s)
|
||||
14 Line(s) of event code
|
||||
14 Unique line(s) of event code
|
||||
popupNotify
|
||||
17 Component(s)
|
||||
196 Line(s) of event code
|
||||
123 Unique line(s) of event code
|
||||
pageStartup
|
||||
19 Component(s)
|
||||
150 Line(s) of event code
|
||||
113 Unique line(s) of event code
|
||||
cardQR
|
||||
28 Component(s)
|
||||
247 Line(s) of event code
|
||||
137 Unique line(s) of event code
|
||||
cardMedia
|
||||
33 Component(s)
|
||||
346 Line(s) of event code
|
||||
177 Unique line(s) of event code
|
||||
screensaver
|
||||
35 Component(s)
|
||||
292 Line(s) of event code
|
||||
235 Unique line(s) of event code
|
||||
popupShutter
|
||||
20 Component(s)
|
||||
193 Line(s) of event code
|
||||
109 Unique line(s) of event code
|
||||
197 Line(s) of event code
|
||||
111 Unique line(s) of event code
|
||||
pageStartup
|
||||
19 Component(s)
|
||||
154 Line(s) of event code
|
||||
115 Unique line(s) of event code
|
||||
cardMedia
|
||||
33 Component(s)
|
||||
350 Line(s) of event code
|
||||
179 Unique line(s) of event code
|
||||
popupNotify
|
||||
17 Component(s)
|
||||
200 Line(s) of event code
|
||||
125 Unique line(s) of event code
|
||||
screensaver
|
||||
35 Component(s)
|
||||
296 Line(s) of event code
|
||||
237 Unique line(s) of event code
|
||||
popupLight
|
||||
27 Component(s)
|
||||
341 Line(s) of event code
|
||||
185 Unique line(s) of event code
|
||||
cardThermo
|
||||
56 Component(s)
|
||||
542 Line(s) of event code
|
||||
288 Unique line(s) of event code
|
||||
345 Line(s) of event code
|
||||
187 Unique line(s) of event code
|
||||
cardQR
|
||||
28 Component(s)
|
||||
251 Line(s) of event code
|
||||
139 Unique line(s) of event code
|
||||
cardGrid
|
||||
42 Component(s)
|
||||
435 Line(s) of event code
|
||||
252 Unique line(s) of event code
|
||||
439 Line(s) of event code
|
||||
254 Unique line(s) of event code
|
||||
cardAlarm
|
||||
38 Component(s)
|
||||
360 Line(s) of event code
|
||||
222 Unique line(s) of event code
|
||||
364 Line(s) of event code
|
||||
224 Unique line(s) of event code
|
||||
cardEntities
|
||||
65 Component(s)
|
||||
981 Line(s) of event code
|
||||
418 Unique line(s) of event code
|
||||
1069 Line(s) of event code
|
||||
462 Unique line(s) of event code
|
||||
cardThermo
|
||||
56 Component(s)
|
||||
546 Line(s) of event code
|
||||
290 Unique line(s) of event code
|
||||
|
||||
Total
|
||||
13 Page(s)
|
||||
400 Component(s)
|
||||
4108 Line(s) of event code
|
||||
1063 Unique line(s) of event code
|
||||
4236 Line(s) of event code
|
||||
1105 Unique line(s) of event code
|
||||
|
||||
@@ -402,7 +402,7 @@ Text tVersion
|
||||
Horizontal Alignment : center
|
||||
Vertical Alignment : center
|
||||
Input Type : character
|
||||
Text : 34
|
||||
Text : 35
|
||||
Max. Text Size : 10
|
||||
Word wrap : disabled
|
||||
Horizontal Spacing : 0
|
||||
@@ -625,6 +625,10 @@ Timer tmSerial
|
||||
{
|
||||
page cardAlarm
|
||||
}
|
||||
if(tId.txt=="cardQR")
|
||||
{
|
||||
page cardQR
|
||||
}
|
||||
}
|
||||
// end of user code
|
||||
udelete payloadLength-1
|
||||
|
||||
@@ -964,6 +964,10 @@ Timer tmSerial
|
||||
{
|
||||
page cardAlarm
|
||||
}
|
||||
if(tId.txt=="cardQR")
|
||||
{
|
||||
page cardQR
|
||||
}
|
||||
}
|
||||
// end of user code
|
||||
udelete payloadLength-1
|
||||
|
||||
@@ -590,6 +590,10 @@ Timer tmSerial
|
||||
{
|
||||
page cardAlarm
|
||||
}
|
||||
if(tId.txt=="cardQR")
|
||||
{
|
||||
page cardQR
|
||||
}
|
||||
}
|
||||
// end of user code
|
||||
udelete payloadLength-1
|
||||
|
||||
@@ -707,6 +707,10 @@ Timer tmSerial
|
||||
{
|
||||
page cardAlarm
|
||||
}
|
||||
if(tId.txt=="cardQR")
|
||||
{
|
||||
page cardQR
|
||||
}
|
||||
}
|
||||
// end of user code
|
||||
udelete payloadLength-1
|
||||
|
||||
@@ -1131,6 +1131,10 @@ Timer tmSerial
|
||||
{
|
||||
page cardAlarm
|
||||
}
|
||||
if(tId.txt=="cardQR")
|
||||
{
|
||||
page cardQR
|
||||
}
|
||||
}
|
||||
// end of user code
|
||||
udelete payloadLength-1
|
||||
|
||||
@@ -788,6 +788,10 @@ Timer tmSerial
|
||||
{
|
||||
page cardAlarm
|
||||
}
|
||||
if(tId.txt=="cardQR")
|
||||
{
|
||||
page cardQR
|
||||
}
|
||||
}
|
||||
// end of user code
|
||||
udelete payloadLength-1
|
||||
|
||||
@@ -1277,6 +1277,28 @@ Timer tmSerial
|
||||
vis bText1,0
|
||||
vis hSlider1,0
|
||||
vis nNum1,0
|
||||
// get Button State (optional Value)
|
||||
spstr strCommand.txt,tId.txt,"~",8
|
||||
spstr tId.txt,tTmp.txt,"|",0
|
||||
if(tTmp.txt=="0")
|
||||
{
|
||||
bUp1.bco2=27501
|
||||
tsw bUp1,0
|
||||
}else
|
||||
{
|
||||
bUp1.bco2=14823
|
||||
tsw bUp1,1
|
||||
}
|
||||
spstr tId.txt,tTmp.txt,"|",1
|
||||
if(tTmp.txt=="0")
|
||||
{
|
||||
bDown1.bco2=27501
|
||||
tsw bDown1,0
|
||||
}else
|
||||
{
|
||||
bDown1.bco2=14823
|
||||
tsw bDown1,1
|
||||
}
|
||||
}
|
||||
if(type1.txt=="light")
|
||||
{
|
||||
@@ -1399,6 +1421,28 @@ Timer tmSerial
|
||||
vis bText2,0
|
||||
vis hSlider2,0
|
||||
vis nNum2,0
|
||||
// get Button State (optional Value)
|
||||
spstr strCommand.txt,tId.txt,"~",14
|
||||
spstr tId.txt,tTmp.txt,"|",0
|
||||
if(tTmp.txt=="0")
|
||||
{
|
||||
bUp2.bco2=27501
|
||||
tsw bUp2,0
|
||||
}else
|
||||
{
|
||||
bUp2.bco2=14823
|
||||
tsw bUp2,1
|
||||
}
|
||||
spstr tId.txt,tTmp.txt,"|",1
|
||||
if(tTmp.txt=="0")
|
||||
{
|
||||
bDown2.bco2=27501
|
||||
tsw bDown2,0
|
||||
}else
|
||||
{
|
||||
bDown2.bco2=14823
|
||||
tsw bDown2,1
|
||||
}
|
||||
}
|
||||
if(type2.txt=="light")
|
||||
{
|
||||
@@ -1521,6 +1565,28 @@ Timer tmSerial
|
||||
vis bText3,0
|
||||
vis hSlider3,0
|
||||
vis nNum3,0
|
||||
// get Button State (optional Value)
|
||||
spstr strCommand.txt,tId.txt,"~",20
|
||||
spstr tId.txt,tTmp.txt,"|",0
|
||||
if(tTmp.txt=="0")
|
||||
{
|
||||
bUp3.bco2=27501
|
||||
tsw bUp3,0
|
||||
}else
|
||||
{
|
||||
bUp3.bco2=14823
|
||||
tsw bUp3,1
|
||||
}
|
||||
spstr tId.txt,tTmp.txt,"|",1
|
||||
if(tTmp.txt=="0")
|
||||
{
|
||||
bDown3.bco2=27501
|
||||
tsw bDown3,0
|
||||
}else
|
||||
{
|
||||
bDown3.bco2=14823
|
||||
tsw bDown3,1
|
||||
}
|
||||
}
|
||||
if(type3.txt=="light")
|
||||
{
|
||||
@@ -1643,6 +1709,28 @@ Timer tmSerial
|
||||
vis bText4,0
|
||||
vis hSlider4,0
|
||||
vis nNum4,0
|
||||
// get Button State (optional Value)
|
||||
spstr strCommand.txt,tId.txt,"~",26
|
||||
spstr tId.txt,tTmp.txt,"|",0
|
||||
if(tTmp.txt=="0")
|
||||
{
|
||||
bUp4.bco2=27501
|
||||
tsw bUp4,0
|
||||
}else
|
||||
{
|
||||
bUp4.bco2=14823
|
||||
tsw bUp4,1
|
||||
}
|
||||
spstr tId.txt,tTmp.txt,"|",1
|
||||
if(tTmp.txt=="0")
|
||||
{
|
||||
bDown4.bco2=27501
|
||||
tsw bDown4,0
|
||||
}else
|
||||
{
|
||||
bDown4.bco2=14823
|
||||
tsw bDown4,1
|
||||
}
|
||||
}
|
||||
if(type4.txt=="light")
|
||||
{
|
||||
@@ -1783,6 +1871,10 @@ Timer tmSerial
|
||||
{
|
||||
page cardAlarm
|
||||
}
|
||||
if(tId.txt=="cardQR")
|
||||
{
|
||||
page cardQR
|
||||
}
|
||||
}
|
||||
if(tInstruction.txt=="time")
|
||||
{
|
||||
|
||||
@@ -869,6 +869,10 @@ Timer tmSerial
|
||||
{
|
||||
page cardAlarm
|
||||
}
|
||||
if(tId.txt=="cardQR")
|
||||
{
|
||||
page cardQR
|
||||
}
|
||||
}
|
||||
if(tInstruction.txt=="time")
|
||||
{
|
||||
|
||||
@@ -740,6 +740,10 @@ Timer tmSerial
|
||||
{
|
||||
page cardAlarm
|
||||
}
|
||||
if(tId.txt=="cardQR")
|
||||
{
|
||||
page cardQR
|
||||
}
|
||||
}
|
||||
// end of user code
|
||||
udelete payloadLength-1
|
||||
|
||||
@@ -541,6 +541,10 @@ Timer tmSerial
|
||||
{
|
||||
page cardAlarm
|
||||
}
|
||||
if(tId.txt=="cardQR")
|
||||
{
|
||||
page cardQR
|
||||
}
|
||||
}
|
||||
// end of user code
|
||||
udelete payloadLength-1
|
||||
|
||||
@@ -1192,6 +1192,10 @@ Timer tmSerial
|
||||
{
|
||||
page cardAlarm
|
||||
}
|
||||
if(tId.txt=="cardQR")
|
||||
{
|
||||
page cardQR
|
||||
}
|
||||
}
|
||||
if(tInstruction.txt=="time")
|
||||
{
|
||||
|
||||
@@ -152,7 +152,7 @@ Text tVersion
|
||||
Disable release event after dragging: 0
|
||||
Send Component ID : disabled
|
||||
Associated Keyboard : none
|
||||
Text : 34
|
||||
Text : 35
|
||||
Max. Text Size : 10
|
||||
|
||||
Picture p0
|
||||
@@ -330,6 +330,10 @@ Timer tmSerial
|
||||
{
|
||||
page cardAlarm
|
||||
}
|
||||
if(tId.txt=="cardQR")
|
||||
{
|
||||
page cardQR
|
||||
}
|
||||
}
|
||||
// end of user code
|
||||
udelete payloadLength-1
|
||||
|
||||
@@ -618,6 +618,10 @@ Timer tmSerial
|
||||
{
|
||||
page cardAlarm
|
||||
}
|
||||
if(tId.txt=="cardQR")
|
||||
{
|
||||
page cardQR
|
||||
}
|
||||
}
|
||||
// end of user code
|
||||
udelete payloadLength-1
|
||||
|
||||
@@ -381,6 +381,10 @@ Timer tmSerial
|
||||
{
|
||||
page cardAlarm
|
||||
}
|
||||
if(tId.txt=="cardQR")
|
||||
{
|
||||
page cardQR
|
||||
}
|
||||
}
|
||||
// end of user code
|
||||
udelete payloadLength-1
|
||||
|
||||
@@ -422,6 +422,10 @@ Timer tmSerial
|
||||
{
|
||||
page cardAlarm
|
||||
}
|
||||
if(tId.txt=="cardQR")
|
||||
{
|
||||
page cardQR
|
||||
}
|
||||
}
|
||||
// end of user code
|
||||
udelete payloadLength-1
|
||||
|
||||
@@ -607,6 +607,10 @@ Timer tmSerial
|
||||
{
|
||||
page cardAlarm
|
||||
}
|
||||
if(tId.txt=="cardQR")
|
||||
{
|
||||
page cardQR
|
||||
}
|
||||
}
|
||||
// end of user code
|
||||
udelete payloadLength-1
|
||||
|
||||
Reference in New Issue
Block a user