mirror of
https://github.com/joBr99/nspanel-lovelace-ui.git
synced 2025-12-23 07:54:25 +01:00
918 lines
43 KiB
Plaintext
918 lines
43 KiB
Plaintext
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 14:30:06.481412328 +0000
|
|
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-21 14:30:06.897411144 +0000
|
|
@@ -11,6 +11,6 @@
|
|
// dim value
|
|
int dimValue=40
|
|
int dimValueNormal=100
|
|
- // fix touch offset
|
|
- lcd_dev fffb 0002 0000 0020
|
|
+ // 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 14:30:06.481412328 +0000
|
|
+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-21 14:30:06.897411144 +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 14:30:06.485412317 +0000
|
|
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-21 14:30:06.901411132 +0000
|
|
@@ -62,6 +62,16 @@
|
|
vis bText4,0
|
|
vis hSlider4,0
|
|
vis nNum4,0
|
|
+ //ui e5
|
|
+ vis btOnOff5,0
|
|
+ vis bUp5,0
|
|
+ vis bStop5,0
|
|
+ vis bDown5,0
|
|
+ vis tIcon5,0
|
|
+ vis tEntity5,0
|
|
+ vis bText5,0
|
|
+ vis hSlider5,0
|
|
+ vis nNum5,0
|
|
vis bPrev,0
|
|
vis bNext,0
|
|
|
|
@@ -119,6 +129,18 @@
|
|
Text :
|
|
Max. Text Size: 80
|
|
|
|
+Variable (string) entn5
|
|
+ Attributes
|
|
+ Scope : local
|
|
+ Text :
|
|
+ Max. Text Size: 80
|
|
+
|
|
+Variable (string) type5
|
|
+ Attributes
|
|
+ Scope : local
|
|
+ Text :
|
|
+ Max. Text Size: 10
|
|
+
|
|
Number nNum1
|
|
Attributes
|
|
Scope : local
|
|
@@ -155,6 +177,15 @@
|
|
Associated Keyboard : none
|
|
Value : 0
|
|
|
|
+Number nNum5
|
|
+ Attributes
|
|
+ Scope : local
|
|
+ Dragging : 0
|
|
+ Disable release event after dragging: 0
|
|
+ Send Component ID : disabled
|
|
+ Associated Keyboard : none
|
|
+ Value : 0
|
|
+
|
|
Text tHeading
|
|
Attributes
|
|
Scope : local
|
|
@@ -285,6 +316,26 @@
|
|
Text :
|
|
Max. Text Size : 50
|
|
|
|
+Text tEntity5
|
|
+ Attributes
|
|
+ Scope : local
|
|
+ Dragging : 0
|
|
+ Disable release event after dragging: 0
|
|
+ Send Component ID : disabled
|
|
+ Associated Keyboard : none
|
|
+ Text : tEntity5
|
|
+ Max. Text Size : 30
|
|
+
|
|
+Text tIcon5
|
|
+ Attributes
|
|
+ Scope : local
|
|
+ Dragging : 0
|
|
+ Disable release event after dragging: 0
|
|
+ Send Component ID : disabled
|
|
+ Associated Keyboard : none
|
|
+ Text : î°
|
|
+ Max. Text Size : 5
|
|
+
|
|
Picture p0
|
|
Attributes
|
|
Scope : local
|
|
@@ -404,6 +455,34 @@
|
|
prints tSend.txt,0
|
|
prints crcval,2
|
|
|
|
+Slider hSlider5
|
|
+ Attributes
|
|
+ Scope : local
|
|
+ Dragging : 0
|
|
+ Disable release event after dragging: 0
|
|
+ Send Component ID : disabled
|
|
+ Position : 50
|
|
+ Upper range limit : 100
|
|
+ Lower range limit : 0
|
|
+
|
|
+ Events
|
|
+ Touch Release Event
|
|
+ nNum5.val=hSlider5.val
|
|
+ tSend.txt="event,buttonPress2,"+entn5.txt+",number-set,"
|
|
+ covx nNum5.val,tTmp.txt,0,0
|
|
+ tSend.txt+=tTmp.txt
|
|
+ //send calc crc
|
|
+ btlen tSend.txt,sys0
|
|
+ crcrest 1,0xffff // reset CRC
|
|
+ crcputh 55 bb
|
|
+ crcputs sys0,2
|
|
+ crcputs tSend.txt,0
|
|
+ //send cmd
|
|
+ printh 55 bb
|
|
+ prints sys0,2
|
|
+ prints tSend.txt,0
|
|
+ prints crcval,2
|
|
+
|
|
Button bDown1
|
|
Attributes
|
|
Scope : local
|
|
@@ -861,6 +940,106 @@
|
|
prints tSend.txt,0
|
|
prints crcval,2
|
|
|
|
+Button bStop5
|
|
+ Attributes
|
|
+ Scope : local
|
|
+ Dragging : 0
|
|
+ Disable release event after dragging: 0
|
|
+ Send Component ID : disabled
|
|
+ State : unpressed
|
|
+ Text : î
|
|
+ Max. Text Size : 10
|
|
+
|
|
+ Events
|
|
+ Touch Press Event
|
|
+ tSend.txt="event,buttonPress2,"+entn5.txt+",stop"
|
|
+ //send calc crc
|
|
+ btlen tSend.txt,sys0
|
|
+ crcrest 1,0xffff // reset CRC
|
|
+ crcputh 55 bb
|
|
+ crcputs sys0,2
|
|
+ crcputs tSend.txt,0
|
|
+ //send cmd
|
|
+ printh 55 bb
|
|
+ prints sys0,2
|
|
+ prints tSend.txt,0
|
|
+ prints crcval,2
|
|
+
|
|
+Button bDown5
|
|
+ Attributes
|
|
+ Scope : local
|
|
+ Dragging : 0
|
|
+ Disable release event after dragging: 0
|
|
+ Send Component ID : disabled
|
|
+ State : unpressed
|
|
+ Text : î
|
|
+ Max. Text Size : 10
|
|
+
|
|
+ Events
|
|
+ Touch Press Event
|
|
+ tSend.txt="event,buttonPress2,"+entn5.txt+",down"
|
|
+ //send calc crc
|
|
+ btlen tSend.txt,sys0
|
|
+ crcrest 1,0xffff // reset CRC
|
|
+ crcputh 55 bb
|
|
+ crcputs sys0,2
|
|
+ crcputs tSend.txt,0
|
|
+ //send cmd
|
|
+ printh 55 bb
|
|
+ prints sys0,2
|
|
+ prints tSend.txt,0
|
|
+ prints crcval,2
|
|
+
|
|
+Button bUp5
|
|
+ Attributes
|
|
+ Scope : local
|
|
+ Dragging : 0
|
|
+ Disable release event after dragging: 0
|
|
+ Send Component ID : disabled
|
|
+ State : unpressed
|
|
+ Text : î
|
|
+ Max. Text Size : 10
|
|
+
|
|
+ Events
|
|
+ Touch Press Event
|
|
+ tSend.txt="event,buttonPress2,"+entn5.txt+",up"
|
|
+ //send calc crc
|
|
+ btlen tSend.txt,sys0
|
|
+ crcrest 1,0xffff // reset CRC
|
|
+ crcputh 55 bb
|
|
+ crcputs sys0,2
|
|
+ crcputs tSend.txt,0
|
|
+ //send cmd
|
|
+ printh 55 bb
|
|
+ prints sys0,2
|
|
+ prints tSend.txt,0
|
|
+ prints crcval,2
|
|
+
|
|
+Button bText5
|
|
+ Attributes
|
|
+ Scope : local
|
|
+ Dragging : 0
|
|
+ Disable release event after dragging: 0
|
|
+ Send Component ID : disabled
|
|
+ State : unpressed
|
|
+ Text : newtxt
|
|
+ Max. Text Size : 10
|
|
+
|
|
+ Events
|
|
+ Touch Press Event
|
|
+ tSend.txt="event,buttonPress2,"+entn5.txt+",button"
|
|
+ //send calc crc
|
|
+ btlen tSend.txt,sys0
|
|
+ crcrest 1,0xffff // reset CRC
|
|
+ crcputh 55 bb
|
|
+ crcputs sys0,2
|
|
+ crcputs tSend.txt,0
|
|
+ //send cmd
|
|
+ printh 55 bb
|
|
+ prints sys0,2
|
|
+ prints tSend.txt,0
|
|
+ prints crcval,2
|
|
+
|
|
Dual-state Button btOnOff1
|
|
Attributes
|
|
Scope : local
|
|
@@ -969,6 +1148,33 @@
|
|
prints tSend.txt,0
|
|
prints crcval,2
|
|
|
|
+Dual-state Button btOnOff5
|
|
+ Attributes
|
|
+ Scope : local
|
|
+ Dragging : 0
|
|
+ Disable release event after dragging: 0
|
|
+ Send Component ID : disabled
|
|
+ State : unpressed
|
|
+ Text :
|
|
+ Max. Text Size : 10
|
|
+
|
|
+ Events
|
|
+ Touch Press Event
|
|
+ tSend.txt="event,buttonPress2,"+entn5.txt+",OnOff,"
|
|
+ covx btOnOff5.val,tTmp.txt,0,0
|
|
+ tSend.txt+=tTmp.txt
|
|
+ //send calc crc
|
|
+ btlen tSend.txt,sys0
|
|
+ crcrest 1,0xffff // reset CRC
|
|
+ crcputh 55 bb
|
|
+ crcputs sys0,2
|
|
+ crcputs tSend.txt,0
|
|
+ //send cmd
|
|
+ printh 55 bb
|
|
+ prints sys0,2
|
|
+ prints tSend.txt,0
|
|
+ prints crcval,2
|
|
+
|
|
Hotspot mSpecial
|
|
Attributes
|
|
Scope : local
|
|
@@ -1074,6 +1280,28 @@
|
|
page popupLight
|
|
}
|
|
|
|
+Hotspot m4
|
|
+ Attributes
|
|
+ Scope : local
|
|
+ Dragging : 0
|
|
+ Disable release event after dragging: 0
|
|
+ Send Component ID : disabled
|
|
+
|
|
+ Events
|
|
+ Touch Press Event
|
|
+ pageIcons.tTmp1.txt=tEntity5.txt
|
|
+ pageIcons.tTmp2.txt=entn5.txt
|
|
+ if(type5.txt=="shutter")
|
|
+ {
|
|
+ //popupShutter.tHeading.txt=tEntity5.txt
|
|
+ page popupShutter
|
|
+ }
|
|
+ if(type5.txt=="light")
|
|
+ {
|
|
+ //popupLight.tEntity.txt=tEntity5.txt
|
|
+ page popupLight
|
|
+ }
|
|
+
|
|
Hotspot mSwipeNext
|
|
Attributes
|
|
Scope : local
|
|
@@ -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.pco=27501
|
|
- tsw bUp1,0
|
|
- }else
|
|
- {
|
|
- bUp1.pco=65535
|
|
- tsw bUp1,1
|
|
- }
|
|
- spstr tId.txt,tTmp.txt,"|",1
|
|
- if(tTmp.txt=="0")
|
|
- {
|
|
- bDown1.pco=27501
|
|
- tsw bDown1,0
|
|
- }else
|
|
- {
|
|
- bDown1.pco=65535
|
|
- 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.pco=27501
|
|
- tsw bUp2,0
|
|
- }else
|
|
- {
|
|
- bUp2.pco=65535
|
|
- tsw bUp2,1
|
|
- }
|
|
- spstr tId.txt,tTmp.txt,"|",1
|
|
- if(tTmp.txt=="0")
|
|
- {
|
|
- bDown2.pco=27501
|
|
- tsw bDown2,0
|
|
- }else
|
|
- {
|
|
- bDown2.pco=65535
|
|
- 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.pco=27501
|
|
- tsw bUp3,0
|
|
- }else
|
|
- {
|
|
- bUp3.pco=65535
|
|
- tsw bUp3,1
|
|
- }
|
|
- spstr tId.txt,tTmp.txt,"|",1
|
|
- if(tTmp.txt=="0")
|
|
- {
|
|
- bDown3.pco=27501
|
|
- tsw bDown3,0
|
|
- }else
|
|
- {
|
|
- bDown3.pco=65535
|
|
- 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.pco=27501
|
|
- tsw bUp4,0
|
|
- }else
|
|
- {
|
|
- bUp4.pco=65535
|
|
- tsw bUp4,1
|
|
- }
|
|
- spstr tId.txt,tTmp.txt,"|",1
|
|
- if(tTmp.txt=="0")
|
|
- {
|
|
- bDown4.pco=27501
|
|
- tsw bDown4,0
|
|
- }else
|
|
- {
|
|
- bDown4.pco=65535
|
|
- tsw bDown4,1
|
|
- }
|
|
}
|
|
if(type4.txt=="light")
|
|
{
|
|
@@ -1816,6 +1956,128 @@
|
|
covx tTmp.txt,sys0,0,0
|
|
hSlider4.maxval=sys0
|
|
}
|
|
+ // get Type
|
|
+ spstr strCommand.txt,type5.txt,"~",27
|
|
+ // get internal name
|
|
+ spstr strCommand.txt,entn5.txt,"~",28
|
|
+ if(type5.txt=="delete"||type5.txt=="")
|
|
+ {
|
|
+ vis bUp5,0
|
|
+ vis bStop5,0
|
|
+ vis bDown5,0
|
|
+ vis btOnOff5,0
|
|
+ vis tEntity5,0
|
|
+ vis tIcon5,0
|
|
+ vis bText5,0
|
|
+ vis hSlider5,0
|
|
+ vis nNum5,0
|
|
+ }else
|
|
+ {
|
|
+ // change icon
|
|
+ spstr strCommand.txt,tIcon5.txt,"~",29
|
|
+ vis tIcon5,1
|
|
+ // change icon color
|
|
+ spstr strCommand.txt,tTmp.txt,"~",30
|
|
+ covx tTmp.txt,sys0,0,0
|
|
+ tIcon5.pco=sys0
|
|
+ // set name
|
|
+ spstr strCommand.txt,tEntity5.txt,"~",31
|
|
+ vis tEntity5,1
|
|
+ }
|
|
+ if(type5.txt=="shutter")
|
|
+ {
|
|
+ vis bUp5,1
|
|
+ vis bStop5,1
|
|
+ vis bDown5,1
|
|
+ vis btOnOff5,0
|
|
+ vis bText5,0
|
|
+ vis hSlider5,0
|
|
+ vis nNum5,0
|
|
+ }
|
|
+ if(type5.txt=="light")
|
|
+ {
|
|
+ vis bUp5,0
|
|
+ vis bStop5,0
|
|
+ vis bDown5,0
|
|
+ vis btOnOff5,1
|
|
+ vis bText5,0
|
|
+ vis hSlider5,0
|
|
+ vis nNum5,0
|
|
+ // get Button State (optional Value)
|
|
+ spstr strCommand.txt,tTmp.txt,"~",32
|
|
+ covx tTmp.txt,sys0,0,0
|
|
+ btOnOff5.val=sys0
|
|
+ }
|
|
+ if(type5.txt=="switch")
|
|
+ {
|
|
+ vis bUp5,0
|
|
+ vis bStop5,0
|
|
+ vis bDown5,0
|
|
+ vis btOnOff5,1
|
|
+ vis bText5,0
|
|
+ vis hSlider5,0
|
|
+ vis nNum5,0
|
|
+ // get Button State (optional Value)
|
|
+ spstr strCommand.txt,tTmp.txt,"~",32
|
|
+ covx tTmp.txt,sys0,0,0
|
|
+ btOnOff5.val=sys0
|
|
+ }
|
|
+ if(type5.txt=="text")
|
|
+ {
|
|
+ vis bUp5,0
|
|
+ vis bStop5,0
|
|
+ vis bDown5,0
|
|
+ vis btOnOff5,0
|
|
+ vis bText5,1
|
|
+ tsw bText5,0
|
|
+ vis hSlider5,0
|
|
+ vis nNum5,0
|
|
+ bText5.pco=65535
|
|
+ bText5.pco2=65535
|
|
+ // get Text (optional Value)
|
|
+ spstr strCommand.txt,bText5.txt,"~",32
|
|
+ }
|
|
+ if(type5.txt=="button")
|
|
+ {
|
|
+ vis bUp5,0
|
|
+ vis bStop5,0
|
|
+ vis bDown5,0
|
|
+ vis btOnOff5,0
|
|
+ vis bText5,1
|
|
+ tsw bText5,1
|
|
+ vis hSlider5,0
|
|
+ vis nNum5,0
|
|
+ bText5.pco=1374
|
|
+ bText5.pco2=1374
|
|
+ // get Text (optional Value)
|
|
+ spstr strCommand.txt,bText5.txt,"~",32
|
|
+ }
|
|
+ if(type5.txt=="number")
|
|
+ {
|
|
+ vis bUp5,0
|
|
+ vis bStop5,0
|
|
+ vis bDown5,0
|
|
+ vis btOnOff5,0
|
|
+ vis bText5,0
|
|
+ tsw bText5,0
|
|
+ vis hSlider5,1
|
|
+ vis nNum5,1
|
|
+ // get config (optional Value) (use bText as variable)
|
|
+ spstr strCommand.txt,bText5.txt,"~",32
|
|
+ //first value is current value
|
|
+ spstr bText5.txt,tTmp.txt,"|",0
|
|
+ covx tTmp.txt,sys0,0,0
|
|
+ hSlider5.val=sys0
|
|
+ nNum5.val=sys0
|
|
+ //second value is min value
|
|
+ spstr bText5.txt,tTmp.txt,"|",1
|
|
+ covx tTmp.txt,sys0,0,0
|
|
+ hSlider5.minval=sys0
|
|
+ //third value is max value
|
|
+ spstr bText5.txt,tTmp.txt,"|",2
|
|
+ covx tTmp.txt,sys0,0,0
|
|
+ hSlider5.maxval=sys0
|
|
+ }
|
|
}
|
|
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 14:30:06.481412328 +0000
|
|
+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-21 14:30:06.897411144 +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 14:30:06.481412328 +0000
|
|
+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-05-21 14:30:06.897411144 +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 14:30:06.481412328 +0000
|
|
+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-21 14:30:06.897411144 +0000
|
|
@@ -19,16 +19,6 @@
|
|
vis tId,0
|
|
vis bPrev,0
|
|
vis bNext,0
|
|
- //ui e1
|
|
- vis btOnOff1,0
|
|
- vis tIcon1,0
|
|
- vis tEntity1,0
|
|
- vis bText1,0
|
|
- //ui e2
|
|
- vis btOnOff2,0
|
|
- vis tIcon2,0
|
|
- vis tEntity2,0
|
|
- vis bText2,0
|
|
|
|
Variable (string) strCommand
|
|
Attributes
|
|
@@ -78,18 +68,6 @@
|
|
Text :
|
|
Max. Text Size: 80
|
|
|
|
-Variable (string) type1
|
|
- Attributes
|
|
- Scope : local
|
|
- Text :
|
|
- Max. Text Size: 10
|
|
-
|
|
-Variable (string) type2
|
|
- Attributes
|
|
- Scope : local
|
|
- Text :
|
|
- Max. Text Size: 10
|
|
-
|
|
Text tEntity1
|
|
Attributes
|
|
Scope : local
|
|
@@ -137,7 +115,7 @@
|
|
Disable release event after dragging: 0
|
|
Send Component ID : disabled
|
|
Associated Keyboard : none
|
|
- Text :
|
|
+ Text : testHeading
|
|
Max. Text Size : 40
|
|
|
|
Picture p0
|
|
@@ -153,7 +131,7 @@
|
|
Dragging : 0
|
|
Disable release event after dragging: 0
|
|
Send Component ID : disabled
|
|
- Text :
|
|
+ Text : WIFI:S:SSID;T:WPA;P:PASSWORD;;
|
|
Max. Text Size : 105
|
|
|
|
Button bNext
|
|
@@ -454,9 +432,8 @@
|
|
spstr strCommand.txt,tInstruction.txt,"~",0
|
|
if(tInstruction.txt=="entityUpd")
|
|
{
|
|
- // command format: entityUpd,heading,navigation,textQR[,type,internalName,iconId,displayName,optionalValue]x2
|
|
- //tHeading
|
|
- spstr strCommand.txt,tHeading.txt,"~",1
|
|
+ //entn
|
|
+ spstr strCommand.txt,entn.txt,"~",1
|
|
// navigation icons
|
|
spstr strCommand.txt,tId.txt,"~",2
|
|
spstr tId.txt,tTmp.txt,"|",0
|
|
@@ -486,128 +463,6 @@
|
|
}
|
|
//text qrcode
|
|
spstr strCommand.txt,qr0.txt,"~",3
|
|
- // get Type
|
|
- spstr strCommand.txt,type1.txt,"~",4
|
|
- // get internal name
|
|
- spstr strCommand.txt,entn1.txt,"~",5
|
|
- if(type1.txt=="delete"||type1.txt=="")
|
|
- {
|
|
- vis btOnOff1,0
|
|
- vis tEntity1,0
|
|
- vis tIcon1,0
|
|
- vis bText1,0
|
|
- }else
|
|
- {
|
|
- // change icon
|
|
- spstr strCommand.txt,tIcon1.txt,"~",6
|
|
- vis tIcon1,1
|
|
- // change icon color
|
|
- spstr strCommand.txt,tTmp.txt,"~",7
|
|
- covx tTmp.txt,sys0,0,0
|
|
- tIcon1.pco=sys0
|
|
- // set name
|
|
- spstr strCommand.txt,tEntity1.txt,"~",8
|
|
- vis tEntity1,1
|
|
- }
|
|
- if(type1.txt=="light")
|
|
- {
|
|
- vis btOnOff1,1
|
|
- vis bText1,0
|
|
- // get Button State (optional Value)
|
|
- spstr strCommand.txt,tTmp.txt,"~",9
|
|
- covx tTmp.txt,sys0,0,0
|
|
- btOnOff1.val=sys0
|
|
- }
|
|
- if(type1.txt=="switch")
|
|
- {
|
|
- vis btOnOff1,1
|
|
- vis bText1,0
|
|
- // get Button State (optional Value)
|
|
- spstr strCommand.txt,tTmp.txt,"~",9
|
|
- covx tTmp.txt,sys0,0,0
|
|
- btOnOff1.val=sys0
|
|
- }
|
|
- if(type1.txt=="text")
|
|
- {
|
|
- vis btOnOff1,0
|
|
- vis bText1,1
|
|
- tsw bText1,0
|
|
- bText1.pco=65535
|
|
- bText1.pco2=65535
|
|
- // get Text (optional Value)
|
|
- spstr strCommand.txt,bText1.txt,"~",9
|
|
- }
|
|
- if(type1.txt=="button")
|
|
- {
|
|
- vis btOnOff1,0
|
|
- vis bText1,1
|
|
- tsw bText1,1
|
|
- bText1.pco=1374
|
|
- bText1.pco2=1374
|
|
- // get Text (optional Value)
|
|
- spstr strCommand.txt,bText1.txt,"~",9
|
|
- }
|
|
- // get Type
|
|
- spstr strCommand.txt,type2.txt,"~",10
|
|
- // get internal name
|
|
- spstr strCommand.txt,entn2.txt,"~",11
|
|
- if(type2.txt=="delete"||type2.txt=="")
|
|
- {
|
|
- vis btOnOff2,0
|
|
- vis tEntity2,0
|
|
- vis tIcon2,0
|
|
- vis bText2,0
|
|
- }else
|
|
- {
|
|
- // change icon
|
|
- spstr strCommand.txt,tIcon2.txt,"~",12
|
|
- vis tIcon2,1
|
|
- // change icon color
|
|
- spstr strCommand.txt,tTmp.txt,"~",13
|
|
- covx tTmp.txt,sys0,0,0
|
|
- tIcon2.pco=sys0
|
|
- // set name
|
|
- spstr strCommand.txt,tEntity2.txt,"~",14
|
|
- vis tEntity2,1
|
|
- }
|
|
- if(type2.txt=="light")
|
|
- {
|
|
- vis btOnOff2,1
|
|
- vis bText2,0
|
|
- // get Button State (optional Value)
|
|
- spstr strCommand.txt,tTmp.txt,"~",15
|
|
- covx tTmp.txt,sys0,0,0
|
|
- btOnOff2.val=sys0
|
|
- }
|
|
- if(type2.txt=="switch")
|
|
- {
|
|
- vis btOnOff2,1
|
|
- vis bText2,0
|
|
- // get Button State (optional Value)
|
|
- spstr strCommand.txt,tTmp.txt,"~",15
|
|
- covx tTmp.txt,sys0,0,0
|
|
- btOnOff2.val=sys0
|
|
- }
|
|
- if(type2.txt=="text")
|
|
- {
|
|
- vis btOnOff2,0
|
|
- vis bText2,1
|
|
- tsw bText2,0
|
|
- bText2.pco=65535
|
|
- bText2.pco2=65535
|
|
- // get Text (optional Value)
|
|
- spstr strCommand.txt,bText2.txt,"~",15
|
|
- }
|
|
- if(type2.txt=="button")
|
|
- {
|
|
- vis btOnOff2,0
|
|
- vis bText2,1
|
|
- tsw bText2,1
|
|
- bText2.pco=1374
|
|
- bText2.pco2=1374
|
|
- // get Text (optional Value)
|
|
- spstr strCommand.txt,bText2.txt,"~",15
|
|
- }
|
|
}
|
|
if(tInstruction.txt=="time")
|
|
{
|
|
@@ -686,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 14:30:06.481412328 +0000
|
|
+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-21 14:30:06.897411144 +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 14:30:06.481412328 +0000
|
|
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-21 14:30:06.897411144 +0000
|
|
@@ -142,7 +142,7 @@
|
|
Disable release event after dragging: 0
|
|
Send Component ID : disabled
|
|
Associated Keyboard : none
|
|
- Text : please check your backend configuration
|
|
+ Text : pls check your backend configuration
|
|
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
|
|
// startup event
|
|
- tSend.txt="event,startup,"+tVersion.txt+",eu"
|
|
+ tSend.txt="event,startup,"+tVersion.txt+",us-p"
|
|
//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 14:30:06.481412328 +0000
|
|
+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-21 14:30:06.901411132 +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 14:30:06.481412328 +0000
|
|
+++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-05-21 14:30:06.897411144 +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 14:30:06.481412328 +0000
|
|
+++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-05-21 14:30:06.897411144 +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 14:30:06.481412328 +0000
|
|
+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-21 14:30:06.897411144 +0000
|
|
@@ -607,10 +607,6 @@
|
|
{
|
|
page cardAlarm
|
|
}
|
|
- if(tId.txt=="cardQR")
|
|
- {
|
|
- page cardQR
|
|
- }
|
|
}
|
|
// end of user code
|
|
udelete payloadLength-1
|