mirror of
https://github.com/joBr99/nspanel-lovelace-ui.git
synced 2026-01-29 09:34:14 +01:00
808 lines
37 KiB
Plaintext
808 lines
37 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:37:10.876301404 +0000
|
|
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-21 14:37:11.312302066 +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-05-21 14:37:10.880301410 +0000
|
|
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-21 14:37:11.316302072 +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
|
|
@@ -1816,6 +2044,150 @@
|
|
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
|
|
+ // get Button State (optional Value)
|
|
+ spstr strCommand.txt,tId.txt,"~",32
|
|
+ spstr tId.txt,tTmp.txt,"|",0
|
|
+ if(tTmp.txt=="0")
|
|
+ {
|
|
+ bUp5.pco=27501
|
|
+ tsw bUp5,0
|
|
+ }else
|
|
+ {
|
|
+ bUp5.pco=65535
|
|
+ tsw bUp5,1
|
|
+ }
|
|
+ spstr tId.txt,tTmp.txt,"|",1
|
|
+ if(tTmp.txt=="0")
|
|
+ {
|
|
+ bDown5.pco=27501
|
|
+ tsw bDown5,0
|
|
+ }else
|
|
+ {
|
|
+ bDown5.pco=65535
|
|
+ tsw bDown5,1
|
|
+ }
|
|
+ }
|
|
+ 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")
|
|
{
|
|
diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt
|
|
--- HMI/n2t-out/cardQR.txt 2022-05-21 14:37:10.880301410 +0000
|
|
+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-21 14:37:11.316302072 +0000
|
|
@@ -137,7 +137,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 +153,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
|
|
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
|
|
--- HMI/n2t-out/pageStartup.txt 2022-05-21 14:37:10.880301410 +0000
|
|
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-21 14:37:11.312302066 +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
|
|
@@ -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:37:10.880301410 +0000
|
|
+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-21 14:37:11.312302066 +0000
|
|
@@ -12,43 +12,244 @@
|
|
|
|
Events
|
|
Preinitialize Event
|
|
- //get entitiy name
|
|
- tEntity.txt=pageIcons.tTmp1.txt
|
|
- //get entity id
|
|
- entn.txt=pageIcons.tTmp2.txt
|
|
- vis p0,0
|
|
- vis tSend,0
|
|
- vis tTmp,0
|
|
- vis tInstruction,0
|
|
- vis tId,0
|
|
- //page open event
|
|
- // event,pageOpenDetail,typeOfPage,tEntityName
|
|
- // craft command
|
|
- tSend.txt="event,pageOpenDetail,popupLight,"+entn.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
|
|
- //disable brightness by default
|
|
+ // data available
|
|
+ if(usize>1)
|
|
+ {
|
|
+ bufferPos=0
|
|
+ while(bufferPos<usize)
|
|
+ {
|
|
+ // check for 0x55 0xBB - Command Init Secuence
|
|
+ if(u[bufferPos]==187&&u[bufferPos-1]==85)
|
|
+ {
|
|
+ //remove garbage at the start of the buffer if there's any to free buffer for command
|
|
+ if(u[bufferPos]!=1)
|
|
+ {
|
|
+ udelete bufferPos-1
|
|
+ }
|
|
+ //instruction is now aligned with buffer, because we deleted garbage before instrcution
|
|
+ //get length after init sequence (check if there are more than to bytes in buffer)
|
|
+ if(3<usize)
|
|
+ {
|
|
+ // check if serial buffer has reached the announced length
|
|
+ ucopy payloadLength,2,2,0
|
|
+ // we are only checking payload length so we have to skip first 3 bytes (init+payload length) (-1 because of < instead of <=)
|
|
+ payloadLength+=3
|
|
+ // payload length does also not contain crc, so we are adding another 2 bytes for crc
|
|
+ payloadLength+=2
|
|
+ if(payloadLength<usize)
|
|
+ {
|
|
+ // calculate crc
|
|
+ crcrest 1,0xFFFF
|
|
+ // u[2] contains payload legth at 3rd pos in buffer, we are calculating crc from 3rd pos with number of bytes from payload length
|
|
+ //crcputu 3,u[2]
|
|
+ // u[2] cotnains payload length, we are calculating a crc over the whole message, so we have to add 3 to the length from u[2]
|
|
+ crcputu 0,payloadLength-1
|
|
+ // get recived crc to be able to compare it
|
|
+ ucopy recvCrc,payloadLength-1,2,0
|
|
+ // compare crc with recived value
|
|
+ if(crcval==recvCrc)
|
|
+ {
|
|
+ // crc is okay
|
|
+ // here is the location where acual code should be
|
|
+ // write command to variable strCommand
|
|
+ ucopy strCommand.txt,4,payloadLength-5,0
|
|
+ // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default)
|
|
+ spstr strCommand.txt,tInstruction.txt,"~",0
|
|
+ if(tInstruction.txt=="entityUpdateDetail")
|
|
+ {
|
|
+ // change icon
|
|
+ spstr strCommand.txt,tIcon1.txt,"~",1
|
|
+ vis tIcon1,1
|
|
+ // change icon color
|
|
+ spstr strCommand.txt,tTmp.txt,"~",2
|
|
+ covx tTmp.txt,sys0,0,0
|
|
+ tIcon1.pco=sys0
|
|
+ // get Button State
|
|
+ spstr strCommand.txt,tTmp.txt,"~",3
|
|
+ covx tTmp.txt,sys0,0,0
|
|
+ btOnOff1.val=sys0
|
|
+ // get Brightness value
|
|
+ spstr strCommand.txt,tTmp.txt,"~",4
|
|
+ if(tTmp.txt=="disable")
|
|
+ {
|
|
vis t1,0
|
|
vis t2,0
|
|
vis hBrightness,0
|
|
- //disable color temp by default
|
|
- vis t4,0
|
|
- vis t3,0
|
|
+ }else
|
|
+ {
|
|
+ vis t1,1
|
|
+ vis t2,1
|
|
+ vis hBrightness,1
|
|
+ covx tTmp.txt,sys0,0,0
|
|
+ if(tmCooldown.en==0)
|
|
+ {
|
|
+ hBrightness.val=sys0
|
|
+ }
|
|
+ }
|
|
+ // get ColorTemp value
|
|
+ spstr strCommand.txt,tTmp.txt,"~",5
|
|
+ if(tTmp.txt=="disable")
|
|
+ {
|
|
vis hTempSlider,0
|
|
- //disable color wheel components by default
|
|
- vis bColor,0
|
|
+ vis t3,0
|
|
+ vis t4,0
|
|
+ mode_temp.val=0
|
|
+ // mode == 1 is temp controls currently shown
|
|
+ if(mode.val==1)
|
|
+ {
|
|
+ // switch mode
|
|
+ click bColor,1
|
|
+ click bColor,0
|
|
+ }
|
|
+ }else if(tTmp.txt=="unknown") // temp supported, but not in color mode
|
|
+ {
|
|
+ mode_temp.val=1
|
|
+ // mode == 1 is temp controls currently shown
|
|
+ if(mode.val==1)
|
|
+ {
|
|
+ // switch mode
|
|
+ click bColor,1
|
|
+ click bColor,0
|
|
+ }
|
|
+ }else
|
|
+ {
|
|
+ mode_temp.val=1
|
|
+ vis hTempSlider,1
|
|
+ vis t3,1
|
|
+ vis t4,1
|
|
+ if(tmCooldown.en==0)
|
|
+ {
|
|
+ covx tTmp.txt,sys0,0,0
|
|
+ hTempSlider.val=sys0
|
|
+ }
|
|
+ // mode == 0 is rgb controls currently shown
|
|
+ if(mode.val==0)
|
|
+ {
|
|
+ // switch mode
|
|
+ click bColor,1
|
|
+ click bColor,0
|
|
+ }
|
|
+ }
|
|
+ // get Color value
|
|
+ spstr strCommand.txt,tTmp.txt,"~",6
|
|
+ // disable -> isn't supported
|
|
+ if(tTmp.txt=="disable")
|
|
+ {
|
|
vis t0,0
|
|
+ vis bColor,0
|
|
vis pColorWheel,0
|
|
- //vis t0,0
|
|
+ }else
|
|
+ {
|
|
+ vis t0,1
|
|
+ //only enable bColor button if color temp is also supported
|
|
+ if(mode_temp.val==1)
|
|
+ {
|
|
+ vis bColor,1
|
|
+ }
|
|
+ if(mode.val==0)
|
|
+ {
|
|
+ vis pColorWheel,1
|
|
+ }
|
|
+ }
|
|
+ // set t0 Color (Localization)
|
|
+ spstr strCommand.txt,t0.txt,"~",7
|
|
+ // set t4 Temperature (Localization)
|
|
+ spstr strCommand.txt,t4.txt,"~",8
|
|
+ // set t1 Brightness (Localization)
|
|
+ spstr strCommand.txt,t1.txt,"~",9
|
|
+ }
|
|
+ if(tInstruction.txt=="time")
|
|
+ {
|
|
+ // get set time to global variable
|
|
+ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1
|
|
+ }
|
|
+ if(tInstruction.txt=="date")
|
|
+ {
|
|
+ // get set date to global variable
|
|
+ spstr strCommand.txt,pageIcons.vaDate.txt,"~",1
|
|
+ }
|
|
+ if(tInstruction.txt=="dimmode")
|
|
+ {
|
|
+ // get value
|
|
+ spstr strCommand.txt,tTmp.txt,"~",1
|
|
+ covx tTmp.txt,dimValue,0,0
|
|
+ }
|
|
+ if(tInstruction.txt=="timeout")
|
|
+ {
|
|
+ //set timeout to global var
|
|
+ spstr strCommand.txt,tTmp.txt,"~",1
|
|
+ covx tTmp.txt,sleepTimeout,0,0
|
|
+ }
|
|
+ if(tInstruction.txt=="pageType")
|
|
+ {
|
|
+ //command format pageType,specialPageName
|
|
+ //write name of speical page to tId
|
|
+ spstr strCommand.txt,tId.txt,"~",1
|
|
+ //save second arg if there's one
|
|
+ spstr strCommand.txt,tTmp.txt,"~",2
|
|
+ //save third arg if there's one
|
|
+ spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3
|
|
+ //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
|
|
+ udelete payloadLength-1
|
|
+ bufferPos=0
|
|
+ if(tId.txt=="pageStartup")
|
|
+ {
|
|
+ page pageStartup
|
|
+ }
|
|
+ if(tId.txt=="screensaver")
|
|
+ {
|
|
+ page screensaver
|
|
+ }
|
|
+ if(tId.txt=="cardEntities")
|
|
+ {
|
|
+ page cardEntities
|
|
+ }
|
|
+ if(tId.txt=="cardGrid")
|
|
+ {
|
|
+ page cardGrid
|
|
+ }
|
|
+ if(tId.txt=="popupLight")
|
|
+ {
|
|
+ pageIcons.tTmp1.txt=tTmp.txt
|
|
+ page popupLight
|
|
+ }
|
|
+ if(tId.txt=="popupShutter")
|
|
+ {
|
|
+ pageIcons.tTmp1.txt=tTmp.txt
|
|
+ page popupShutter
|
|
+ }
|
|
+ if(tId.txt=="popupNotify")
|
|
+ {
|
|
+ page popupNotify
|
|
+ }
|
|
+ if(tId.txt=="cardThermo")
|
|
+ {
|
|
+ page cardThermo
|
|
+ }
|
|
+ if(tId.txt=="cardMedia")
|
|
+ {
|
|
+ page cardMedia
|
|
+ }
|
|
+ if(tId.txt=="cardAlarm")
|
|
+ {
|
|
+ page cardAlarm
|
|
+ }
|
|
+ if(tId.txt=="cardQR")
|
|
+ {
|
|
+ page cardQR
|
|
+ }
|
|
+ }
|
|
+ // end of user code
|
|
+ udelete payloadLength-1
|
|
+ bufferPos=0
|
|
+ }
|
|
+ }
|
|
+ }
|
|
+ }
|
|
+ // next character
|
|
+ bufferPos++
|
|
+ }
|
|
+ }
|
|
|
|
Variable (string) strCommand
|
|
Attributes
|
|
@@ -618,10 +819,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:37:10.880301410 +0000
|
|
+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-21 14:37:11.316302072 +0000
|
|
@@ -607,10 +607,6 @@
|
|
{
|
|
page cardAlarm
|
|
}
|
|
- if(tId.txt=="cardQR")
|
|
- {
|
|
- page cardQR
|
|
- }
|
|
}
|
|
// end of user code
|
|
udelete payloadLength-1
|