mirror of
https://github.com/joBr99/nspanel-lovelace-ui.git
synced 2025-12-22 15:34:26 +01:00
added known-good diff
This commit is contained in:
Johannes
803
HMI/US/portrait/diff-eu-version-known-good.txt
Normal file
803
HMI/US/portrait/diff-eu-version-known-good.txt
Normal file
@@ -0,0 +1,803 @@
|
||||
diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt
|
||||
--- HMI/n2t-out/Program.s.txt 2022-04-01 04:54:12.884151859 +0000
|
||||
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-01 04:54:13.372185922 +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/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
|
||||
--- HMI/n2t-out/cardEntities.txt 2022-04-01 04:54:12.888152138 +0000
|
||||
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-01 04:54:13.372185922 +0000
|
||||
@@ -62,6 +62,26 @@
|
||||
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
|
||||
+ //ui e6
|
||||
+ vis btOnOff6,0
|
||||
+ vis bUp6,0
|
||||
+ vis bStop6,0
|
||||
+ vis bDown6,0
|
||||
+ vis tIcon6,0
|
||||
+ vis tEntity6,0
|
||||
+ vis bText6,0
|
||||
+ vis hSlider6,0
|
||||
+ vis nNum6,0
|
||||
|
||||
Variable (string) strCommand
|
||||
Attributes
|
||||
@@ -117,6 +137,30 @@
|
||||
Text :
|
||||
Max. Text Size: 70
|
||||
|
||||
+Variable (string) entn5
|
||||
+ Attributes
|
||||
+ Scope : local
|
||||
+ Text :
|
||||
+ Max. Text Size: 70
|
||||
+
|
||||
+Variable (string) entn6
|
||||
+ Attributes
|
||||
+ Scope : local
|
||||
+ Text :
|
||||
+ Max. Text Size: 70
|
||||
+
|
||||
+Variable (string) type5
|
||||
+ Attributes
|
||||
+ Scope : local
|
||||
+ Text :
|
||||
+ Max. Text Size: 10
|
||||
+
|
||||
+Variable (string) type6
|
||||
+ Attributes
|
||||
+ Scope : local
|
||||
+ Text :
|
||||
+ Max. Text Size: 10
|
||||
+
|
||||
Number nNum1
|
||||
Attributes
|
||||
Scope : local
|
||||
@@ -153,6 +197,24 @@
|
||||
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
|
||||
+
|
||||
+Number nNum6
|
||||
+ 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
|
||||
@@ -283,6 +345,46 @@
|
||||
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
|
||||
+
|
||||
+Text tEntity6
|
||||
+ Attributes
|
||||
+ Scope : local
|
||||
+ Dragging : 0
|
||||
+ Disable release event after dragging: 0
|
||||
+ Send Component ID : disabled
|
||||
+ Associated Keyboard : none
|
||||
+ Text : tEntity6
|
||||
+ Max. Text Size : 30
|
||||
+
|
||||
+Text tIcon6
|
||||
+ 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
|
||||
@@ -402,6 +504,62 @@
|
||||
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,1
|
||||
+ crcputs tSend.txt,0
|
||||
+ //send cmd
|
||||
+ printh 55 bb
|
||||
+ prints sys0,2
|
||||
+ prints tSend.txt,0
|
||||
+ prints crcval,2
|
||||
+
|
||||
+Slider hSlider6
|
||||
+ 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
|
||||
+ nNum6.val=hSlider6.val
|
||||
+ tSend.txt="event,buttonPress2,"+entn6.txt+",number-set,"
|
||||
+ covx nNum6.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,1
|
||||
+ crcputs tSend.txt,0
|
||||
+ //send cmd
|
||||
+ printh 55 bb
|
||||
+ prints sys0,2
|
||||
+ prints tSend.txt,0
|
||||
+ prints crcval,2
|
||||
+
|
||||
Button bDown1
|
||||
Attributes
|
||||
Scope : local
|
||||
@@ -857,6 +1015,206 @@
|
||||
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,1
|
||||
+ 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,1
|
||||
+ 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,1
|
||||
+ 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,1
|
||||
+ crcputs tSend.txt,0
|
||||
+ //send cmd
|
||||
+ printh 55 bb
|
||||
+ prints sys0,2
|
||||
+ prints tSend.txt,0
|
||||
+ prints crcval,2
|
||||
+
|
||||
+Button bStop6
|
||||
+ 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,"+entn6.txt+",stop"
|
||||
+ //send calc crc
|
||||
+ btlen tSend.txt,sys0
|
||||
+ crcrest 1,0xffff // reset CRC
|
||||
+ crcputh 55 bb
|
||||
+ crcputs sys0,1
|
||||
+ crcputs tSend.txt,0
|
||||
+ //send cmd
|
||||
+ printh 55 bb
|
||||
+ prints sys0,2
|
||||
+ prints tSend.txt,0
|
||||
+ prints crcval,2
|
||||
+
|
||||
+Button bDown6
|
||||
+ 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,"+entn6.txt+",down"
|
||||
+ //send calc crc
|
||||
+ btlen tSend.txt,sys0
|
||||
+ crcrest 1,0xffff // reset CRC
|
||||
+ crcputh 55 bb
|
||||
+ crcputs sys0,1
|
||||
+ crcputs tSend.txt,0
|
||||
+ //send cmd
|
||||
+ printh 55 bb
|
||||
+ prints sys0,2
|
||||
+ prints tSend.txt,0
|
||||
+ prints crcval,2
|
||||
+
|
||||
+Button bUp6
|
||||
+ 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,"+entn6.txt+",up"
|
||||
+ //send calc crc
|
||||
+ btlen tSend.txt,sys0
|
||||
+ crcrest 1,0xffff // reset CRC
|
||||
+ crcputh 55 bb
|
||||
+ crcputs sys0,1
|
||||
+ crcputs tSend.txt,0
|
||||
+ //send cmd
|
||||
+ printh 55 bb
|
||||
+ prints sys0,2
|
||||
+ prints tSend.txt,0
|
||||
+ prints crcval,2
|
||||
+
|
||||
+Button bText6
|
||||
+ 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,"+entn6.txt+",button"
|
||||
+ //send calc crc
|
||||
+ btlen tSend.txt,sys0
|
||||
+ crcrest 1,0xffff // reset CRC
|
||||
+ crcputh 55 bb
|
||||
+ crcputs sys0,1
|
||||
+ 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
|
||||
@@ -965,6 +1323,60 @@
|
||||
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,1
|
||||
+ crcputs tSend.txt,0
|
||||
+ //send cmd
|
||||
+ printh 55 bb
|
||||
+ prints sys0,2
|
||||
+ prints tSend.txt,0
|
||||
+ prints crcval,2
|
||||
+
|
||||
+Dual-state Button btOnOff6
|
||||
+ 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,"+entn6.txt+",OnOff,"
|
||||
+ covx btOnOff6.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,1
|
||||
+ crcputs tSend.txt,0
|
||||
+ //send cmd
|
||||
+ printh 55 bb
|
||||
+ prints sys0,2
|
||||
+ prints tSend.txt,0
|
||||
+ prints crcval,2
|
||||
+
|
||||
Hotspot mSpecial
|
||||
Attributes
|
||||
Scope : local
|
||||
@@ -1070,6 +1482,50 @@
|
||||
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 m5
|
||||
+ Attributes
|
||||
+ Scope : local
|
||||
+ Dragging : 0
|
||||
+ Disable release event after dragging: 0
|
||||
+ Send Component ID : disabled
|
||||
+
|
||||
+ Events
|
||||
+ Touch Press Event
|
||||
+ pageIcons.tTmp1.txt=tEntity6.txt
|
||||
+ pageIcons.tTmp2.txt=entn6.txt
|
||||
+ if(type6.txt=="shutter")
|
||||
+ {
|
||||
+ //popupShutter.tHeading.txt=tEntity6.txt
|
||||
+ page popupShutter
|
||||
+ }
|
||||
+ if(type6.txt=="light")
|
||||
+ {
|
||||
+ //popupLight.tEntity.txt=tEntity6.txt
|
||||
+ page popupLight
|
||||
+ }
|
||||
+
|
||||
Timer tmSerial
|
||||
Attributes
|
||||
Scope : local
|
||||
@@ -1648,6 +2104,254 @@
|
||||
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,tTmp.txt,",",29
|
||||
+ covx tTmp.txt,sys0,0,0
|
||||
+ substr pageIcons.tIcons.txt,tIcon5.txt,sys0,1
|
||||
+ 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
|
||||
+ }
|
||||
+ // get Type
|
||||
+ spstr strCommand.txt,type6.txt,",",33
|
||||
+ // get internal name
|
||||
+ spstr strCommand.txt,entn6.txt,",",34
|
||||
+ if(type6.txt=="delete"||type6.txt=="")
|
||||
+ {
|
||||
+ vis bUp6,0
|
||||
+ vis bStop6,0
|
||||
+ vis bDown6,0
|
||||
+ vis btOnOff6,0
|
||||
+ vis tEntity6,0
|
||||
+ vis tIcon6,0
|
||||
+ vis bText6,0
|
||||
+ vis hSlider6,0
|
||||
+ vis nNum6,0
|
||||
+ }else
|
||||
+ {
|
||||
+ // change icon
|
||||
+ spstr strCommand.txt,tTmp.txt,",",35
|
||||
+ covx tTmp.txt,sys0,0,0
|
||||
+ substr pageIcons.tIcons.txt,tIcon6.txt,sys0,1
|
||||
+ vis tIcon6,1
|
||||
+ // change icon color
|
||||
+ spstr strCommand.txt,tTmp.txt,",",36
|
||||
+ covx tTmp.txt,sys0,0,0
|
||||
+ tIcon6.pco=sys0
|
||||
+ // set name
|
||||
+ spstr strCommand.txt,tEntity6.txt,",",37
|
||||
+ vis tEntity6,1
|
||||
+ }
|
||||
+ if(type6.txt=="shutter")
|
||||
+ {
|
||||
+ vis bUp6,1
|
||||
+ vis bStop6,1
|
||||
+ vis bDown6,1
|
||||
+ vis btOnOff6,0
|
||||
+ vis bText6,0
|
||||
+ vis hSlider6,0
|
||||
+ vis nNum6,0
|
||||
+ }
|
||||
+ if(type6.txt=="light")
|
||||
+ {
|
||||
+ vis bUp6,0
|
||||
+ vis bStop6,0
|
||||
+ vis bDown6,0
|
||||
+ vis btOnOff6,1
|
||||
+ vis bText6,0
|
||||
+ vis hSlider6,0
|
||||
+ vis nNum6,0
|
||||
+ // get Button State (optional Value)
|
||||
+ spstr strCommand.txt,tTmp.txt,",",38
|
||||
+ covx tTmp.txt,sys0,0,0
|
||||
+ btOnOff6.val=sys0
|
||||
+ }
|
||||
+ if(type6.txt=="switch")
|
||||
+ {
|
||||
+ vis bUp6,0
|
||||
+ vis bStop6,0
|
||||
+ vis bDown6,0
|
||||
+ vis btOnOff6,1
|
||||
+ vis bText6,0
|
||||
+ vis hSlider6,0
|
||||
+ vis nNum6,0
|
||||
+ // get Button State (optional Value)
|
||||
+ spstr strCommand.txt,tTmp.txt,",",38
|
||||
+ covx tTmp.txt,sys0,0,0
|
||||
+ btOnOff6.val=sys0
|
||||
+ }
|
||||
+ if(type6.txt=="text")
|
||||
+ {
|
||||
+ vis bUp6,0
|
||||
+ vis bStop6,0
|
||||
+ vis bDown6,0
|
||||
+ vis btOnOff6,0
|
||||
+ vis bText6,1
|
||||
+ tsw bText6,0
|
||||
+ vis hSlider6,0
|
||||
+ vis nNum6,0
|
||||
+ bText6.pco=65535
|
||||
+ bText6.pco2=65535
|
||||
+ // get Text (optional Value)
|
||||
+ spstr strCommand.txt,bText6.txt,",",38
|
||||
+ }
|
||||
+ if(type6.txt=="button")
|
||||
+ {
|
||||
+ vis bUp6,0
|
||||
+ vis bStop6,0
|
||||
+ vis bDown6,0
|
||||
+ vis btOnOff6,0
|
||||
+ vis bText6,1
|
||||
+ tsw bText6,1
|
||||
+ vis hSlider6,0
|
||||
+ vis nNum6,0
|
||||
+ bText6.pco=1374
|
||||
+ bText6.pco2=1374
|
||||
+ // get Text (optional Value)
|
||||
+ spstr strCommand.txt,bText6.txt,",",38
|
||||
+ }
|
||||
+ if(type6.txt=="number")
|
||||
+ {
|
||||
+ vis bUp6,0
|
||||
+ vis bStop6,0
|
||||
+ vis bDown6,0
|
||||
+ vis btOnOff6,0
|
||||
+ vis bText6,0
|
||||
+ tsw bText6,0
|
||||
+ vis hSlider6,1
|
||||
+ vis nNum6,1
|
||||
+ // get config (optional Value) (use bText as variable)
|
||||
+ spstr strCommand.txt,bText6.txt,",",38
|
||||
+ //first value is current value
|
||||
+ spstr bText6.txt,tTmp.txt,"|",0
|
||||
+ covx tTmp.txt,sys0,0,0
|
||||
+ hSlider6.val=sys0
|
||||
+ nNum6.val=sys0
|
||||
+ //second value is min value
|
||||
+ spstr bText6.txt,tTmp.txt,"|",1
|
||||
+ covx tTmp.txt,sys0,0,0
|
||||
+ hSlider6.minval=sys0
|
||||
+ //third value is max value
|
||||
+ spstr bText6.txt,tTmp.txt,"|",2
|
||||
+ covx tTmp.txt,sys0,0,0
|
||||
+ hSlider6.maxval=sys0
|
||||
+ }
|
||||
}
|
||||
if(tInstruction.txt=="pageType")
|
||||
{
|
||||
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
|
||||
--- HMI/n2t-out/pageStartup.txt 2022-04-01 04:54:12.884151859 +0000
|
||||
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-01 04:54:13.372185922 +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
|
||||
@@ -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
|
||||
@@ -1,30 +0,0 @@
|
||||
Text :
|
||||
Max. Text Size: 70
|
||||
|
||||
+Variable (string) entn5
|
||||
+ Attributes
|
||||
+ Scope : local
|
||||
+ Text :
|
||||
+ Max. Text Size: 70
|
||||
+
|
||||
+Variable (string) entn6
|
||||
+ Attributes
|
||||
+ Scope : local
|
||||
+ Text :
|
||||
+ Max. Text Size: 70
|
||||
+
|
||||
+Variable (string) type5
|
||||
+ Attributes
|
||||
+ Scope : local
|
||||
+ Text :
|
||||
+ Max. Text Size: 10
|
||||
+
|
||||
+Variable (string) type6
|
||||
+ Attributes
|
||||
+ Scope : local
|
||||
+ Text :
|
||||
+ Max. Text Size: 10
|
||||
+
|
||||
Number nNum1
|
||||
Attributes
|
||||
Scope : local
|
||||
@@ -1,24 +0,0 @@
|
||||
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
|
||||
+
|
||||
+Number nNum6
|
||||
+ 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
|
||||
@@ -1,46 +0,0 @@
|
||||
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 : 30
|
||||
+
|
||||
+Text tEntity6
|
||||
+ Attributes
|
||||
+ Scope : local
|
||||
+ Dragging : 0
|
||||
+ Disable release event after dragging: 0
|
||||
+ Send Component ID : disabled
|
||||
+ Associated Keyboard : none
|
||||
+ Text : tEntity6
|
||||
+ Max. Text Size : 30
|
||||
+
|
||||
+Text tIcon6
|
||||
+ Attributes
|
||||
+ Scope : local
|
||||
+ Dragging : 0
|
||||
+ Disable release event after dragging: 0
|
||||
+ Send Component ID : disabled
|
||||
+ Associated Keyboard : none
|
||||
+ Text : î°
|
||||
+ Max. Text Size : 30
|
||||
+
|
||||
Picture p0
|
||||
Attributes
|
||||
Scope : local
|
||||
@@ -1,62 +0,0 @@
|
||||
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,1
|
||||
+ crcputs tSend.txt,0
|
||||
+ //send cmd
|
||||
+ printh 55 bb
|
||||
+ prints sys0,2
|
||||
+ prints tSend.txt,0
|
||||
+ prints crcval,2
|
||||
+
|
||||
+Slider hSlider6
|
||||
+ 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
|
||||
+ nNum6.val=hSlider6.val
|
||||
+ tSend.txt="event,buttonPress2,"+entn6.txt+",number-set,"
|
||||
+ covx nNum6.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,1
|
||||
+ crcputs tSend.txt,0
|
||||
+ //send cmd
|
||||
+ printh 55 bb
|
||||
+ prints sys0,2
|
||||
+ prints tSend.txt,0
|
||||
+ prints crcval,2
|
||||
+
|
||||
Button bDown1
|
||||
Attributes
|
||||
Scope : local
|
||||
@@ -1,206 +0,0 @@
|
||||
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,1
|
||||
+ 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,1
|
||||
+ 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,1
|
||||
+ 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,1
|
||||
+ crcputs tSend.txt,0
|
||||
+ //send cmd
|
||||
+ printh 55 bb
|
||||
+ prints sys0,2
|
||||
+ prints tSend.txt,0
|
||||
+ prints crcval,2
|
||||
+
|
||||
+Button bStop6
|
||||
+ 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,"+entn6.txt+",stop"
|
||||
+ //send calc crc
|
||||
+ btlen tSend.txt,sys0
|
||||
+ crcrest 1,0xffff // reset CRC
|
||||
+ crcputh 55 bb
|
||||
+ crcputs sys0,1
|
||||
+ crcputs tSend.txt,0
|
||||
+ //send cmd
|
||||
+ printh 55 bb
|
||||
+ prints sys0,2
|
||||
+ prints tSend.txt,0
|
||||
+ prints crcval,2
|
||||
+
|
||||
+Button bDown6
|
||||
+ 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,"+entn6.txt+",down"
|
||||
+ //send calc crc
|
||||
+ btlen tSend.txt,sys0
|
||||
+ crcrest 1,0xffff // reset CRC
|
||||
+ crcputh 55 bb
|
||||
+ crcputs sys0,1
|
||||
+ crcputs tSend.txt,0
|
||||
+ //send cmd
|
||||
+ printh 55 bb
|
||||
+ prints sys0,2
|
||||
+ prints tSend.txt,0
|
||||
+ prints crcval,2
|
||||
+
|
||||
+Button bUp6
|
||||
+ 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,"+entn6.txt+",up"
|
||||
+ //send calc crc
|
||||
+ btlen tSend.txt,sys0
|
||||
+ crcrest 1,0xffff // reset CRC
|
||||
+ crcputh 55 bb
|
||||
+ crcputs sys0,1
|
||||
+ crcputs tSend.txt,0
|
||||
+ //send cmd
|
||||
+ printh 55 bb
|
||||
+ prints sys0,2
|
||||
+ prints tSend.txt,0
|
||||
+ prints crcval,2
|
||||
+
|
||||
+Button bText6
|
||||
+ 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,"+entn6.txt+",button"
|
||||
+ //send calc crc
|
||||
+ btlen tSend.txt,sys0
|
||||
+ crcrest 1,0xffff // reset CRC
|
||||
+ crcputh 55 bb
|
||||
+ crcputs sys0,1
|
||||
+ 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
|
||||
@@ -1,60 +0,0 @@
|
||||
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,1
|
||||
+ crcputs tSend.txt,0
|
||||
+ //send cmd
|
||||
+ printh 55 bb
|
||||
+ prints sys0,2
|
||||
+ prints tSend.txt,0
|
||||
+ prints crcval,2
|
||||
+
|
||||
+Dual-state Button btOnOff6
|
||||
+ 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,"+entn6.txt+",OnOff,"
|
||||
+ covx btOnOff6.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,1
|
||||
+ crcputs tSend.txt,0
|
||||
+ //send cmd
|
||||
+ printh 55 bb
|
||||
+ prints sys0,2
|
||||
+ prints tSend.txt,0
|
||||
+ prints crcval,2
|
||||
+
|
||||
Hotspot mSpecial
|
||||
Attributes
|
||||
Scope : local
|
||||
@@ -1,23 +0,0 @@
|
||||
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
|
||||
+ //ui e6
|
||||
+ vis btOnOff6,0
|
||||
+ vis bUp6,0
|
||||
+ vis bStop6,0
|
||||
+ vis bDown6,0
|
||||
+ vis tIcon6,0
|
||||
+ vis tEntity6,0
|
||||
+ vis bText6,0
|
||||
+ vis hSlider6,0
|
||||
+ vis nNum6,0
|
||||
@@ -1,254 +0,0 @@
|
||||
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,tTmp.txt,",",29
|
||||
+ covx tTmp.txt,sys0,0,0
|
||||
+ substr pageIcons.tIcons.txt,tIcon5.txt,sys0,1
|
||||
+ 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
|
||||
+ }
|
||||
+ // get Type
|
||||
+ spstr strCommand.txt,type6.txt,",",33
|
||||
+ // get internal name
|
||||
+ spstr strCommand.txt,entn6.txt,",",34
|
||||
+ if(type6.txt=="delete"||type6.txt=="")
|
||||
+ {
|
||||
+ vis bUp6,0
|
||||
+ vis bStop6,0
|
||||
+ vis bDown6,0
|
||||
+ vis btOnOff6,0
|
||||
+ vis tEntity6,0
|
||||
+ vis tIcon6,0
|
||||
+ vis bText6,0
|
||||
+ vis hSlider6,0
|
||||
+ vis nNum6,0
|
||||
+ }else
|
||||
+ {
|
||||
+ // change icon
|
||||
+ spstr strCommand.txt,tTmp.txt,",",35
|
||||
+ covx tTmp.txt,sys0,0,0
|
||||
+ substr pageIcons.tIcons.txt,tIcon6.txt,sys0,1
|
||||
+ vis tIcon6,1
|
||||
+ // change icon color
|
||||
+ spstr strCommand.txt,tTmp.txt,",",36
|
||||
+ covx tTmp.txt,sys0,0,0
|
||||
+ tIcon6.pco=sys0
|
||||
+ // set name
|
||||
+ spstr strCommand.txt,tEntity6.txt,",",37
|
||||
+ vis tEntity6,1
|
||||
+ }
|
||||
+ if(type6.txt=="shutter")
|
||||
+ {
|
||||
+ vis bUp6,1
|
||||
+ vis bStop6,1
|
||||
+ vis bDown6,1
|
||||
+ vis btOnOff6,0
|
||||
+ vis bText6,0
|
||||
+ vis hSlider6,0
|
||||
+ vis nNum6,0
|
||||
+ }
|
||||
+ if(type6.txt=="light")
|
||||
+ {
|
||||
+ vis bUp6,0
|
||||
+ vis bStop6,0
|
||||
+ vis bDown6,0
|
||||
+ vis btOnOff6,1
|
||||
+ vis bText6,0
|
||||
+ vis hSlider6,0
|
||||
+ vis nNum6,0
|
||||
+ // get Button State (optional Value)
|
||||
+ spstr strCommand.txt,tTmp.txt,",",38
|
||||
+ covx tTmp.txt,sys0,0,0
|
||||
+ btOnOff6.val=sys0
|
||||
+ }
|
||||
+ if(type6.txt=="switch")
|
||||
+ {
|
||||
+ vis bUp6,0
|
||||
+ vis bStop6,0
|
||||
+ vis bDown6,0
|
||||
+ vis btOnOff6,1
|
||||
+ vis bText6,0
|
||||
+ vis hSlider6,0
|
||||
+ vis nNum6,0
|
||||
+ // get Button State (optional Value)
|
||||
+ spstr strCommand.txt,tTmp.txt,",",38
|
||||
+ covx tTmp.txt,sys0,0,0
|
||||
+ btOnOff6.val=sys0
|
||||
+ }
|
||||
+ if(type6.txt=="text")
|
||||
+ {
|
||||
+ vis bUp6,0
|
||||
+ vis bStop6,0
|
||||
+ vis bDown6,0
|
||||
+ vis btOnOff6,0
|
||||
+ vis bText6,1
|
||||
+ tsw bText6,0
|
||||
+ vis hSlider6,0
|
||||
+ vis nNum6,0
|
||||
+ bText6.pco=65535
|
||||
+ bText6.pco2=65535
|
||||
+ // get Text (optional Value)
|
||||
+ spstr strCommand.txt,bText6.txt,",",38
|
||||
+ }
|
||||
+ if(type6.txt=="button")
|
||||
+ {
|
||||
+ vis bUp6,0
|
||||
+ vis bStop6,0
|
||||
+ vis bDown6,0
|
||||
+ vis btOnOff6,0
|
||||
+ vis bText6,1
|
||||
+ tsw bText6,1
|
||||
+ vis hSlider6,0
|
||||
+ vis nNum6,0
|
||||
+ bText6.pco=1374
|
||||
+ bText6.pco2=1374
|
||||
+ // get Text (optional Value)
|
||||
+ spstr strCommand.txt,bText6.txt,",",38
|
||||
+ }
|
||||
+ if(type6.txt=="number")
|
||||
+ {
|
||||
+ vis bUp6,0
|
||||
+ vis bStop6,0
|
||||
+ vis bDown6,0
|
||||
+ vis btOnOff6,0
|
||||
+ vis bText6,0
|
||||
+ tsw bText6,0
|
||||
+ vis hSlider6,1
|
||||
+ vis nNum6,1
|
||||
+ // get config (optional Value) (use bText as variable)
|
||||
+ spstr strCommand.txt,bText6.txt,",",38
|
||||
+ //first value is current value
|
||||
+ spstr bText6.txt,tTmp.txt,"|",0
|
||||
+ covx tTmp.txt,sys0,0,0
|
||||
+ hSlider6.val=sys0
|
||||
+ nNum6.val=sys0
|
||||
+ //second value is min value
|
||||
+ spstr bText6.txt,tTmp.txt,"|",1
|
||||
+ covx tTmp.txt,sys0,0,0
|
||||
+ hSlider6.minval=sys0
|
||||
+ //third value is max value
|
||||
+ spstr bText6.txt,tTmp.txt,"|",2
|
||||
+ covx tTmp.txt,sys0,0,0
|
||||
+ hSlider6.maxval=sys0
|
||||
+ }
|
||||
}
|
||||
if(tInstruction.txt=="pageType")
|
||||
{
|
||||
@@ -1,50 +0,0 @@
|
||||
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 m5
|
||||
+ Attributes
|
||||
+ Scope : local
|
||||
+ Dragging : 0
|
||||
+ Disable release event after dragging: 0
|
||||
+ Send Component ID : disabled
|
||||
+
|
||||
+ Events
|
||||
+ Touch Press Event
|
||||
+ pageIcons.tTmp1.txt=tEntity6.txt
|
||||
+ pageIcons.tTmp2.txt=entn6.txt
|
||||
+ if(type6.txt=="shutter")
|
||||
+ {
|
||||
+ //popupShutter.tHeading.txt=tEntity6.txt
|
||||
+ page popupShutter
|
||||
+ }
|
||||
+ if(type6.txt=="light")
|
||||
+ {
|
||||
+ //popupLight.tEntity.txt=tEntity6.txt
|
||||
+ page popupLight
|
||||
+ }
|
||||
+
|
||||
Timer tmSerial
|
||||
Attributes
|
||||
Scope : local
|
||||
@@ -1,13 +0,0 @@
|
||||
#!/bin/bash
|
||||
FILES="HMI/US/portrait/diff-ignore/*.txt"
|
||||
for f in $FILES
|
||||
do
|
||||
echo $f
|
||||
perl -0777 -i.bkp -ne '$#ARGV==1 ? $s=s/\n\z//r : $#ARGV==0 ? $r=$_ :
|
||||
print s/\Q$s/$r/gr' $f test HMI/US/portrait/n2t-out/cardEntities.txt
|
||||
mv $f.bkp $f
|
||||
#mv HMI/US/portrait/n2t-out/cardEntities.txt.bkp HMI/US/portrait/n2t-out/cardEntities.txt
|
||||
done
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user