sync us-p (add nextion2text)

This commit is contained in:
joBr99
2023-05-13 09:27:33 +00:00
committed by github-actions[bot]
parent 54db718a0b
commit d19a1bcb9f
11 changed files with 2404 additions and 3774 deletions

View File

@@ -1491,501 +1491,6 @@
│ crcputs sys0,2 │ crcputs sys0,2
│ crcputs tSend.txt,0 │ crcputs tSend.txt,0
│ //send cmd │ //send cmd
│ --- HMI/n2t-out/popupLight.txt
├── +++ HMI/US/portrait/n2t-out/popupLight.txt
│ @@ -12,20 +12,21 @@
│ Events
│ Preinitialize Event
│ dim=dimValueNormal
│ //get entitiy name
│ tEntity.txt=pageIcons.tTmp1.txt
│ //get entity id
│ entn.txt=pageIcons.tTmp2.txt
│ + tIcon1.txt=pageIcons.tTmp3.txt
│ + vis p0,0
│ vis tSend,0
│ vis tTmp,0
│ vis tInstruction,0
│ vis tId,0
│ vis bEffect,0
│ - vis hBrightness,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
│ @@ -34,24 +35,24 @@
│ crcputs tSend.txt,0
│ //send cmd
│ printh 55 bb
│ prints sys0,2
│ prints tSend.txt,0
│ prints crcval,2
│ //disable brightness by default
│ - //vis t1,0
│ - //vis t2,0
│ - vis hBrightness,1
│ + vis t1,0
│ + vis t2,0
│ + vis hBrightness,0
│ //disable color temp by default
│ - //vis t4,0
│ - //vis t3,0
│ + vis t4,0
│ + vis t3,0
│ vis hTempSlider,0
│ //disable color wheel components by default
│ vis bColor,0
│ - //vis t0,0
│ + vis t0,0
│ vis pColorWheel,0
│ //vis t0,0
│ popupLight.bco=defaultBcoColor
│ for(sys0=0;sys0<27;sys0++)
│ {
│ if(b[sys0].type==98||b[sys0].type==116)
│ {
│ @@ -62,26 +63,22 @@
│ {
│ b[sys0].pic=10
│ b[sys0].pic2=11
│ }
│ }
│ if(defaultBcoColor==0)
│ {
│ + hBrightness.pic=14
│ + hBrightness.pic1=13
│ + hBrightness.pic2=15
│ hTempSlider.pic=16
│ - hTempSlider.pic1=16
│ + hTempSlider.pic1=17
│ + hTempSlider.pic2=15
│ }
│ - Postinitialize Event
│ - fill hBrightness.x,hBrightness.y,100,250,defaultBcoColor
│ -
│ -Variable (int32) col
│ - Attributes
│ - Scope: local
│ - Value: 65504
│ -
│ Variable (string) entn
│ Attributes
│ Scope : local
│ Text :
│ Max. Text Size: 80
│ Variable (int32) mode
│ @@ -96,47 +93,116 @@
│ Variable (string) strCommand
│ Attributes
│ Scope : local
│ Text :
│ Max. Text Size: 500
│ -Variable (string) tId
│ +Variable (string) tSend
│ Attributes
│ Scope : local
│ Text :
│ - Max. Text Size: 20
│ + Max. Text Size: 200
│ -Variable (string) tInstruction
│ +Text t0
│ Attributes
│ - Scope : local
│ - Text :
│ - Max. Text Size: 20
│ + Scope : local
│ + Dragging : 0
│ + Send Component ID : disabled
│ + Associated Keyboard: none
│ + Text : Color
│ + Max. Text Size : 50
│ -Variable (string) tSend
│ +Text t1
│ Attributes
│ - Scope : local
│ - Text :
│ - Max. Text Size: 200
│ + Scope : local
│ + Dragging : 0
│ + Send Component ID : disabled
│ + Associated Keyboard: none
│ + Text : Brightness
│ + Max. Text Size : 50
│ -Variable (string) tTmp
│ +Text t2
│ Attributes
│ - Scope : local
│ - Text :
│ - Max. Text Size: 80
│ + Scope : local
│ + Dragging : 0
│ + Send Component ID : disabled
│ + Associated Keyboard: none
│ + Text : 
│ + Max. Text Size : 10
│ +
│ +Text t3
│ + Attributes
│ + Scope : local
│ + Dragging : 0
│ + Send Component ID : disabled
│ + Associated Keyboard: none
│ + Text : 
│ + Max. Text Size : 10
│ +
│ +Text t4
│ + Attributes
│ + Scope : local
│ + Dragging : 0
│ + Send Component ID : disabled
│ + Associated Keyboard: none
│ + Text : Temperature
│ + Max. Text Size : 50
│ Text tEntity
│ Attributes
│ Scope : local
│ Dragging : 0
│ Send Component ID : disabled
│ Associated Keyboard: none
│ Text : tEntity1
│ Max. Text Size : 25
│ +Text tIcon1
│ + Attributes
│ + Scope : local
│ + Dragging : 0
│ + Send Component ID : disabled
│ + Associated Keyboard: none
│ + Text : 
│ + Max. Text Size : 10
│ +
│ +Text tId
│ + Attributes
│ + Scope : local
│ + Dragging : 0
│ + Send Component ID : disabled
│ + Associated Keyboard: none
│ + Text :
│ + Max. Text Size : 20
│ +
│ +Text tInstruction
│ + Attributes
│ + Scope : local
│ + Dragging : 0
│ + Send Component ID : disabled
│ + Associated Keyboard: none
│ + Text :
│ + Max. Text Size : 20
│ +
│ +Text tTmp
│ + Attributes
│ + Scope : local
│ + Dragging : 0
│ + Send Component ID : disabled
│ + Associated Keyboard: none
│ + Text :
│ + Max. Text Size : 80
│ +
│ +Picture p0
│ + Attributes
│ + Scope : local
│ + Dragging : 0
│ + Send Component ID: disabled
│ +
│ Picture pColorWheel
│ Attributes
│ Scope : local
│ Dragging : 0
│ Send Component ID: disabled
│ Events
│ @@ -174,28 +240,14 @@
│ Send Component ID: disabled
│ Position : 50
│ Upper range limit: 100
│ Lower range limit: 0
│ Events
│ Touch Release Event
│ - //draw black background
│ - fill hBrightness.x,hBrightness.y,100,hBrightness.val*-25/10+250,8484
│ - //draw draw colored bar at the position of the current brightness value
│ - fill hBrightness.x,hBrightness.val*-25/10+314,100,hBrightness.val*25/10,col.val
│ - if(hBrightness.val>7)
│ - {
│ - //draw cursor
│ - fill hBrightness.x+25,hBrightness.val*-25/10+322,50,4,WHITE
│ - //paint corner
│ - xstr hBrightness.x,hBrightness.val*-25/10+314,100,hBrightness.h,7,8484,0,0,0,3,"a"
│ - }
│ - //paint corners
│ - xstr hBrightness.x,hBrightness.y,100,hBrightness.h,7,defaultBcoColor,0,0,0,3,"a"
│ - xstr hBrightness.x,hBrightness.y+hBrightness.h-15,100,hBrightness.h,7,defaultBcoColor,0,0,0,3,"b"
│ tmCooldown.en=1
│ tmCooldown.tim=2500
│ //craft command
│ tSend.txt="event,buttonPress2,"+entn.txt+",brightnessSlider,"
│ covx hBrightness.val,tTmp.txt,0,0
│ tSend.txt+=tTmp.txt
│ //send calc crc
│ @@ -276,27 +328,27 @@
│ Touch Press Event
│ if(mode.val==1)
│ {
│ mode.val=0
│ //enable color wheel
│ vis pColorWheel,1
│ //disable color temp
│ - //vis t4,0
│ - //vis t3,0
│ + vis t4,0
│ + vis t3,0
│ vis hTempSlider,0
│ }else
│ {
│ mode.val=1
│ //disable color wheel
│ vis pColorWheel,0
│ if(mode_temp.val==1)
│ {
│ //enable color temp
│ - //vis t4,1
│ - //vis t3,1
│ + vis t4,1
│ + vis t3,1
│ vis hTempSlider,1
│ }
│ }
│ Button bEffect
│ Attributes
│ Scope : local
│ @@ -306,14 +358,15 @@
│ Text : 
│ Max. Text Size : 10
│ Events
│ Touch Press Event
│ pageIcons.tTmp1.txt=tEntity.txt
│ pageIcons.tTmp2.txt=entn.txt
│ + pageIcons.tTmp3.txt=tIcon1.txt
│ page popupInSel
│ Dual-state Button btOnOff1
│ Attributes
│ Scope : local
│ Dragging : 0
│ Send Component ID: disabled
│ @@ -345,38 +398,14 @@
│ Period (ms): 100
│ Enabled : no
│ Events
│ Timer Event
│ tmCooldown.en=0
│ -Timer tmDrawCooldown
│ - Attributes
│ - Scope : local
│ - Period (ms): 500
│ - Enabled : no
│ -
│ - Events
│ - Timer Event
│ - //draw black background
│ - fill hBrightness.x,hBrightness.y,100,hBrightness.val*-25/10+250,8484
│ - //draw draw colored bar at the position of the current brightness value
│ - fill hBrightness.x,hBrightness.val*-25/10+314,100,hBrightness.val*25/10,col.val
│ - if(hBrightness.val>7)
│ - {
│ - //draw cursor
│ - fill hBrightness.x+25,hBrightness.val*-25/10+322,50,4,WHITE
│ - //paint corner
│ - xstr hBrightness.x,hBrightness.val*-25/10+314,100,hBrightness.h,7,8484,0,0,0,3,"a"
│ - }
│ - //paint corners
│ - xstr hBrightness.x,hBrightness.y,100,hBrightness.h,7,defaultBcoColor,0,0,0,3,"a"
│ - xstr hBrightness.x,hBrightness.y+hBrightness.h-15,100,hBrightness.h,7,defaultBcoColor,0,0,0,3,"b"
│ - tmDrawCooldown.en=0
│ -
│ Timer tmSerial
│ Attributes
│ Scope : local
│ Period (ms): 50
│ Enabled : yes
│ Events
│ @@ -425,48 +454,48 @@
│ // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default)
│ spstr strCommand.txt,tInstruction.txt,"~",0
│ spstr strCommand.txt,tTmp.txt,"~",1
│ if(tInstruction.txt=="entityUpdateDetail"&&entn.txt==tTmp.txt)
│ {
│ // change icon
│ //spstr strCommand.txt,tIcon1.txt,"~",2
│ - //vis tIcon1,1
│ + vis tIcon1,1
│ // change icon color
│ spstr strCommand.txt,tTmp.txt,"~",3
│ covx tTmp.txt,sys0,0,0
│ - col.val=sys0
│ - //tEntity.pco=sys0
│ + tIcon1.pco=sys0
│ // get Button State
│ spstr strCommand.txt,tTmp.txt,"~",4
│ covx tTmp.txt,sys0,0,0
│ btOnOff1.val=sys0
│ // get Brightness value
│ spstr strCommand.txt,tTmp.txt,"~",5
│ if(tTmp.txt=="disable")
│ {
│ - //vis t1,0
│ - //vis t2,0
│ + vis t1,0
│ + vis t2,0
│ vis hBrightness,0
│ }else
│ {
│ - //vis t1,1
│ - //vis t2,1
│ + vis t1,1
│ + vis t2,1
│ vis hBrightness,1
│ covx tTmp.txt,sys0,0,0
│ - hBrightness.val=sys0
│ - tmDrawCooldown.en=1
│ - tmDrawCooldown.tim=500
│ + if(tmCooldown.en==0)
│ + {
│ + hBrightness.val=sys0
│ + }
│ }
│ // get ColorTemp value
│ spstr strCommand.txt,tTmp.txt,"~",6
│ if(tTmp.txt=="disable")
│ {
│ vis hTempSlider,0
│ - //vis t3,0
│ - //vis t4,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
│ @@ -481,16 +510,16 @@
│ click bColor,1
│ click bColor,0
│ }
│ }else
│ {
│ mode_temp.val=1
│ vis hTempSlider,1
│ - //vis t3,1
│ - //vis t4,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)
│ @@ -501,36 +530,36 @@
│ }
│ }
│ // get Color value
│ spstr strCommand.txt,tTmp.txt,"~",7
│ // disable -> isn't supported
│ if(tTmp.txt=="disable")
│ {
│ - //vis t0,0
│ + vis t0,0
│ vis bColor,0
│ vis pColorWheel,0
│ }else
│ {
│ - //vis t0,1
│ + 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,"~",8
│ + spstr strCommand.txt,t0.txt,"~",8
│ // set t4 Temperature (Localization)
│ - //spstr strCommand.txt,t4.txt,"~",9
│ + spstr strCommand.txt,t4.txt,"~",9
│ // set t1 Brightness (Localization)
│ - //spstr strCommand.txt,t1.txt,"~",10
│ + spstr strCommand.txt,t1.txt,"~",10
│ // activate effect button
│ spstr strCommand.txt,tTmp.txt,"~",11
│ if(tTmp.txt=="enable")
│ {
│ vis bEffect,1
│ }else
│ {
│ --- HMI/n2t-out/popupThermo.txt
├── +++ HMI/US/portrait/n2t-out/popupThermo.txt
│ @@ -228,15 +228,15 @@
│ Send Component ID: disabled
│ State : unpressed
│ Text : 
│ Max. Text Size : 10
│ Events
│ Touch Press Event
│ - tSend.txt="event,buttonPress2,popupThermo,bExit"
│ + tSend.txt="event,buttonPress2,popupLight,bExit"
│ //send calc crc
│ btlen tSend.txt,sys0
│ crcrest 1,0xffff // reset CRC
│ crcputh 55 bb
│ crcputs sys0,2
│ crcputs tSend.txt,0
│ //send cmd
│ --- HMI/n2t-out/popupTimer.txt
├── +++ HMI/US/portrait/n2t-out/popupTimer.txt
│ @@ -298,15 +298,15 @@
│ Send Component ID: disabled
│ State : unpressed
│ Text : 
│ Max. Text Size : 10
│ Events
│ Touch Press Event
│ - tSend.txt="event,buttonPress2,popupTimer,bExit"
│ + tSend.txt="event,buttonPress2,popupLight,bExit"
│ //send calc crc
│ btlen tSend.txt,sys0
│ crcrest 1,0xffff // reset CRC
│ crcputh 55 bb
│ crcputs sys0,2
│ crcputs tSend.txt,0
│ //send cmd
│ --- HMI/n2t-out/screensaver.txt │ --- HMI/n2t-out/screensaver.txt
├── +++ HMI/US/portrait/n2t-out/screensaver.txt ├── +++ HMI/US/portrait/n2t-out/screensaver.txt
│ @@ -28,17 +28,14 @@ │ @@ -28,17 +28,14 @@
@@ -2117,33 +1622,6 @@
│ Send Component ID : disabled │ Send Component ID : disabled
│ Associated Keyboard: none │ Associated Keyboard: none
│ Text : PM │ Text : PM
│ @@ -408,24 +385,24 @@
│ Text tIcon1
│ Attributes
│ Scope : local
│ Dragging : 0
│ Send Component ID : disabled
│ Associated Keyboard: none
│ Text :
│ - Max. Text Size : 16
│ + Max. Text Size : 10
│ Text tIcon2
│ Attributes
│ Scope : local
│ Dragging : 0
│ Send Component ID : disabled
│ Associated Keyboard: none
│ Text :
│ - Max. Text Size : 16
│ + Max. Text Size : 10
│ Text tMainIcon
│ Attributes
│ Scope : local
│ Dragging : 0
│ Send Component ID : disabled
│ Associated Keyboard: none
│ @@ -572,15 +549,14 @@ │ @@ -572,15 +549,14 @@
│ if(tTmp.txt!="") │ if(tTmp.txt!="")
│ { │ {

View File

@@ -1,4 +1,4 @@
+++ /dev/fd/62 2023-05-13 09:17:23.360441539 +0000 +++ /dev/fd/62 2023-05-13 09:27:24.610159768 +0000
+I/n2t-out/Program.s.txt +I/n2t-out/Program.s.txt
++ HMI/US/portrait/n2t-out/Program.s.txt ++ HMI/US/portrait/n2t-out/Program.s.txt
+1 +10,11 @@ +1 +10,11 @@
@@ -57,13 +57,13 @@
+ributes +ributes
+ Scope : local + Scope : local
+ Text : + Text :
+ Max. Text Size: 80
+ Max. Text Size: 40 + Max. Text Size: 40
+ +
+e (string) nent2 +e (string) nent2
+ributes +ributes
+ Scope : local + Scope : local
+ Text : + Text :
+ Max. Text Size: 80
+ Max. Text Size: 40 + Max. Text Size: 40
+14 +185,26 @@ +14 +185,26 @@
+e (string) type6 +e (string) type6
@@ -1029,501 +1029,6 @@
+ crcputs sys0,2 + crcputs sys0,2
+ crcputs tSend.txt,0 + crcputs tSend.txt,0
+ //send cmd + //send cmd
+I/n2t-out/popupLight.txt
++ HMI/US/portrait/n2t-out/popupLight.txt
+0 +12,21 @@
+nts
+ Preinitialize Event
+ dim=dimValueNormal
+ //get entitiy name
+ tEntity.txt=pageIcons.tTmp1.txt
+ //get entity id
+ entn.txt=pageIcons.tTmp2.txt
+ tIcon1.txt=pageIcons.tTmp3.txt
+ vis p0,0
+ vis tSend,0
+ vis tTmp,0
+ vis tInstruction,0
+ vis tId,0
+ vis bEffect,0
+ vis hBrightness,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
+4 +35,24 @@
+ crcputs tSend.txt,0
+ //send cmd
+ printh 55 bb
+ prints sys0,2
+ prints tSend.txt,0
+ prints crcval,2
+ //disable brightness by default
+ //vis t1,0
+ //vis t2,0
+ vis hBrightness,1
+ vis t1,0
+ vis t2,0
+ vis hBrightness,0
+ //disable color temp by default
+ //vis t4,0
+ //vis t3,0
+ vis t4,0
+ vis t3,0
+ vis hTempSlider,0
+ //disable color wheel components by default
+ vis bColor,0
+ //vis t0,0
+ vis t0,0
+ vis pColorWheel,0
+ //vis t0,0
+ popupLight.bco=defaultBcoColor
+ for(sys0=0;sys0<27;sys0++)
+ {
+ if(b[sys0].type==98||b[sys0].type==116)
+ {
+6 +63,22 @@
+ {
+ b[sys0].pic=10
+ b[sys0].pic2=11
+ }
+ }
+ if(defaultBcoColor==0)
+ {
+ hBrightness.pic=14
+ hBrightness.pic1=13
+ hBrightness.pic2=15
+ hTempSlider.pic=16
+ hTempSlider.pic1=16
+ hTempSlider.pic1=17
+ hTempSlider.pic2=15
+ }
+
+ Postinitialize Event
+ fill hBrightness.x,hBrightness.y,100,250,defaultBcoColor
+
+e (int32) col
+ributes
+ Scope: local
+ Value: 65504
+
+e (string) entn
+ributes
+ Scope : local
+ Text :
+ Max. Text Size: 80
+
+e (int32) mode
+7 +93,116 @@
+
+e (string) strCommand
+ributes
+ Scope : local
+ Text :
+ Max. Text Size: 500
+
+e (string) tId
+e (string) tSend
+ributes
+ Scope : local
+ Text :
+ Max. Text Size: 20
+ Max. Text Size: 200
+
+e (string) tInstruction
+
+ributes
+ Scope : local
+ Text :
+ Max. Text Size: 20
+ Scope : local
+ Dragging : 0
+ Send Component ID : disabled
+ Associated Keyboard: none
+ Text : Color
+ Max. Text Size : 50
+
+e (string) tSend
+
+ributes
+ Scope : local
+ Text :
+ Max. Text Size: 200
+ Scope : local
+ Dragging : 0
+ Send Component ID : disabled
+ Associated Keyboard: none
+ Text : Brightness
+ Max. Text Size : 50
+
+e (string) tTmp
+
+ributes
+ Scope : local
+ Text :
+ Max. Text Size: 80
+ Scope : local
+ Dragging : 0
+ Send Component ID : disabled
+ Associated Keyboard: none
+ Text : 
+ Max. Text Size : 10
+
+
+ributes
+ Scope : local
+ Dragging : 0
+ Send Component ID : disabled
+ Associated Keyboard: none
+ Text : 
+ Max. Text Size : 10
+
+
+ributes
+ Scope : local
+ Dragging : 0
+ Send Component ID : disabled
+ Associated Keyboard: none
+ Text : Temperature
+ Max. Text Size : 50
+
+ntity
+ributes
+ Scope : local
+ Dragging : 0
+ Send Component ID : disabled
+ Associated Keyboard: none
+ Text : tEntity1
+ Max. Text Size : 25
+
+con1
+ributes
+ Scope : local
+ Dragging : 0
+ Send Component ID : disabled
+ Associated Keyboard: none
+ Text : 
+ Max. Text Size : 10
+
+d
+ributes
+ Scope : local
+ Dragging : 0
+ Send Component ID : disabled
+ Associated Keyboard: none
+ Text :
+ Max. Text Size : 20
+
+nstruction
+ributes
+ Scope : local
+ Dragging : 0
+ Send Component ID : disabled
+ Associated Keyboard: none
+ Text :
+ Max. Text Size : 20
+
+mp
+ributes
+ Scope : local
+ Dragging : 0
+ Send Component ID : disabled
+ Associated Keyboard: none
+ Text :
+ Max. Text Size : 80
+
+ p0
+ributes
+ Scope : local
+ Dragging : 0
+ Send Component ID: disabled
+
+ pColorWheel
+ributes
+ Scope : local
+ Dragging : 0
+ Send Component ID: disabled
+
+nts
+28 +240,14 @@
+ Send Component ID: disabled
+ Position : 50
+ Upper range limit: 100
+ Lower range limit: 0
+
+nts
+ Touch Release Event
+ //draw black background
+ fill hBrightness.x,hBrightness.y,100,hBrightness.val*-25/10+250,8484
+ //draw draw colored bar at the position of the current brightness value
+ fill hBrightness.x,hBrightness.val*-25/10+314,100,hBrightness.val*25/10,col.val
+ if(hBrightness.val>7)
+ {
+ //draw cursor
+ fill hBrightness.x+25,hBrightness.val*-25/10+322,50,4,WHITE
+ //paint corner
+ xstr hBrightness.x,hBrightness.val*-25/10+314,100,hBrightness.h,7,8484,0,0,0,3,"a"
+ }
+ //paint corners
+ xstr hBrightness.x,hBrightness.y,100,hBrightness.h,7,defaultBcoColor,0,0,0,3,"a"
+ xstr hBrightness.x,hBrightness.y+hBrightness.h-15,100,hBrightness.h,7,defaultBcoColor,0,0,0,3,"b"
+ tmCooldown.en=1
+ tmCooldown.tim=2500
+ //craft command
+ tSend.txt="event,buttonPress2,"+entn.txt+",brightnessSlider,"
+ covx hBrightness.val,tTmp.txt,0,0
+ tSend.txt+=tTmp.txt
+ //send calc crc
+27 +328,27 @@
+ Touch Press Event
+ if(mode.val==1)
+ {
+ mode.val=0
+ //enable color wheel
+ vis pColorWheel,1
+ //disable color temp
+ //vis t4,0
+ //vis t3,0
+ vis t4,0
+ vis t3,0
+ vis hTempSlider,0
+ }else
+ {
+ mode.val=1
+ //disable color wheel
+ vis pColorWheel,0
+ if(mode_temp.val==1)
+ {
+ //enable color temp
+ //vis t4,1
+ //vis t3,1
+ vis t4,1
+ vis t3,1
+ vis hTempSlider,1
+ }
+ }
+
+bEffect
+ributes
+ Scope : local
+14 +358,15 @@
+ Text : 
+ Max. Text Size : 10
+
+nts
+ Touch Press Event
+ pageIcons.tTmp1.txt=tEntity.txt
+ pageIcons.tTmp2.txt=entn.txt
+ pageIcons.tTmp3.txt=tIcon1.txt
+ page popupInSel
+
+ate Button btOnOff1
+ributes
+ Scope : local
+ Dragging : 0
+ Send Component ID: disabled
+38 +398,14 @@
+ Period (ms): 100
+ Enabled : no
+
+nts
+ Timer Event
+ tmCooldown.en=0
+
+mDrawCooldown
+ributes
+ Scope : local
+ Period (ms): 500
+ Enabled : no
+
+nts
+ Timer Event
+ //draw black background
+ fill hBrightness.x,hBrightness.y,100,hBrightness.val*-25/10+250,8484
+ //draw draw colored bar at the position of the current brightness value
+ fill hBrightness.x,hBrightness.val*-25/10+314,100,hBrightness.val*25/10,col.val
+ if(hBrightness.val>7)
+ {
+ //draw cursor
+ fill hBrightness.x+25,hBrightness.val*-25/10+322,50,4,WHITE
+ //paint corner
+ xstr hBrightness.x,hBrightness.val*-25/10+314,100,hBrightness.h,7,8484,0,0,0,3,"a"
+ }
+ //paint corners
+ xstr hBrightness.x,hBrightness.y,100,hBrightness.h,7,defaultBcoColor,0,0,0,3,"a"
+ xstr hBrightness.x,hBrightness.y+hBrightness.h-15,100,hBrightness.h,7,defaultBcoColor,0,0,0,3,"b"
+ tmDrawCooldown.en=0
+
+mSerial
+ributes
+ Scope : local
+ Period (ms): 50
+ Enabled : yes
+
+nts
+48 +454,48 @@
+ // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default)
+ spstr strCommand.txt,tInstruction.txt,"~",0
+ spstr strCommand.txt,tTmp.txt,"~",1
+ if(tInstruction.txt=="entityUpdateDetail"&&entn.txt==tTmp.txt)
+ {
+ // change icon
+ //spstr strCommand.txt,tIcon1.txt,"~",2
+ //vis tIcon1,1
+ vis tIcon1,1
+ // change icon color
+ spstr strCommand.txt,tTmp.txt,"~",3
+ covx tTmp.txt,sys0,0,0
+ col.val=sys0
+ //tEntity.pco=sys0
+ tIcon1.pco=sys0
+ // get Button State
+ spstr strCommand.txt,tTmp.txt,"~",4
+ covx tTmp.txt,sys0,0,0
+ btOnOff1.val=sys0
+ // get Brightness value
+ spstr strCommand.txt,tTmp.txt,"~",5
+ if(tTmp.txt=="disable")
+ {
+ //vis t1,0
+ //vis t2,0
+ vis t1,0
+ vis t2,0
+ vis hBrightness,0
+ }else
+ {
+ //vis t1,1
+ //vis t2,1
+ vis t1,1
+ vis t2,1
+ vis hBrightness,1
+ covx tTmp.txt,sys0,0,0
+ hBrightness.val=sys0
+ tmDrawCooldown.en=1
+ tmDrawCooldown.tim=500
+ if(tmCooldown.en==0)
+ {
+ hBrightness.val=sys0
+ }
+ }
+ // get ColorTemp value
+ spstr strCommand.txt,tTmp.txt,"~",6
+ if(tTmp.txt=="disable")
+ {
+ vis hTempSlider,0
+ //vis t3,0
+ //vis t4,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
+16 +510,16 @@
+ click bColor,1
+ click bColor,0
+ }
+ }else
+ {
+ mode_temp.val=1
+ vis hTempSlider,1
+ //vis t3,1
+ //vis t4,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)
+36 +530,36 @@
+ }
+ }
+ // get Color value
+ spstr strCommand.txt,tTmp.txt,"~",7
+ // disable -> isn't supported
+ if(tTmp.txt=="disable")
+ {
+ //vis t0,0
+ vis t0,0
+ vis bColor,0
+ vis pColorWheel,0
+ }else
+ {
+ //vis t0,1
+ 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,"~",8
+ spstr strCommand.txt,t0.txt,"~",8
+ // set t4 Temperature (Localization)
+ //spstr strCommand.txt,t4.txt,"~",9
+ spstr strCommand.txt,t4.txt,"~",9
+ // set t1 Brightness (Localization)
+ //spstr strCommand.txt,t1.txt,"~",10
+ spstr strCommand.txt,t1.txt,"~",10
+ // activate effect button
+ spstr strCommand.txt,tTmp.txt,"~",11
+ if(tTmp.txt=="enable")
+ {
+ vis bEffect,1
+ }else
+ {
+I/n2t-out/popupThermo.txt
++ HMI/US/portrait/n2t-out/popupThermo.txt
+15 +228,15 @@
+ Send Component ID: disabled
+ State : unpressed
+ Text : 
+ Max. Text Size : 10
+
+nts
+ Touch Press Event
+ tSend.txt="event,buttonPress2,popupThermo,bExit"
+ tSend.txt="event,buttonPress2,popupLight,bExit"
+ //send calc crc
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC
+ crcputh 55 bb
+ crcputs sys0,2
+ crcputs tSend.txt,0
+ //send cmd
+I/n2t-out/popupTimer.txt
++ HMI/US/portrait/n2t-out/popupTimer.txt
+15 +298,15 @@
+ Send Component ID: disabled
+ State : unpressed
+ Text : 
+ Max. Text Size : 10
+
+nts
+ Touch Press Event
+ tSend.txt="event,buttonPress2,popupTimer,bExit"
+ tSend.txt="event,buttonPress2,popupLight,bExit"
+ //send calc crc
+ btlen tSend.txt,sys0
+ crcrest 1,0xffff // reset CRC
+ crcputh 55 bb
+ crcputs sys0,2
+ crcputs tSend.txt,0
+ //send cmd
+I/n2t-out/screensaver.txt +I/n2t-out/screensaver.txt
++ HMI/US/portrait/n2t-out/screensaver.txt ++ HMI/US/portrait/n2t-out/screensaver.txt
+7 +28,14 @@ +7 +28,14 @@
@@ -1655,33 +1160,6 @@
+ Send Component ID : disabled + Send Component ID : disabled
+ Associated Keyboard: none + Associated Keyboard: none
+ Text : PM + Text : PM
+24 +385,24 @@
+con1
+ributes
+ Scope : local
+ Dragging : 0
+ Send Component ID : disabled
+ Associated Keyboard: none
+ Text :
+ Max. Text Size : 16
+ Max. Text Size : 10
+
+con2
+ributes
+ Scope : local
+ Dragging : 0
+ Send Component ID : disabled
+ Associated Keyboard: none
+ Text :
+ Max. Text Size : 16
+ Max. Text Size : 10
+
+ainIcon
+ributes
+ Scope : local
+ Dragging : 0
+ Send Component ID : disabled
+ Associated Keyboard: none
+15 +549,14 @@ +15 +549,14 @@
+ if(tTmp.txt!="") + if(tTmp.txt!="")
+ { + {

View File

@@ -11,17 +11,21 @@ pageTest
14 Line(s) of event code 14 Line(s) of event code
14 Unique line(s) of event code 14 Unique line(s) of event code
popupLight popupLight
28 Component(s) 23 Component(s)
408 Line(s) of event code 406 Line(s) of event code
225 Unique line(s) of event code 207 Unique line(s) of event code
screensaver2 popupTimer
58 Component(s) 42 Component(s)
344 Line(s) of event code 512 Line(s) of event code
243 Unique line(s) of event code 255 Unique line(s) of event code
popupFan popupFan
27 Component(s) 27 Component(s)
351 Line(s) of event code 351 Line(s) of event code
204 Unique line(s) of event code 204 Unique line(s) of event code
popupThermo
44 Component(s)
519 Line(s) of event code
274 Unique line(s) of event code
cardPower cardPower
54 Component(s) 54 Component(s)
517 Line(s) of event code 517 Line(s) of event code
@@ -34,10 +38,6 @@ popupShutter
25 Component(s) 25 Component(s)
398 Line(s) of event code 398 Line(s) of event code
218 Unique line(s) of event code 218 Unique line(s) of event code
popupThermo
44 Component(s)
519 Line(s) of event code
274 Unique line(s) of event code
cardAlarm cardAlarm
43 Component(s) 43 Component(s)
496 Line(s) of event code 496 Line(s) of event code
@@ -66,10 +66,6 @@ cardQR
34 Component(s) 34 Component(s)
406 Line(s) of event code 406 Line(s) of event code
236 Unique line(s) of event code 236 Unique line(s) of event code
popupTimer
42 Component(s)
512 Line(s) of event code
255 Unique line(s) of event code
screensaver screensaver
46 Component(s) 46 Component(s)
425 Line(s) of event code 425 Line(s) of event code
@@ -86,9 +82,13 @@ cardEntities
91 Component(s) 91 Component(s)
1626 Line(s) of event code 1626 Line(s) of event code
703 Unique line(s) of event code 703 Unique line(s) of event code
screensaver2
58 Component(s)
344 Line(s) of event code
243 Unique line(s) of event code
Total Total
22 Page(s) 22 Page(s)
811 Component(s) 806 Component(s)
9629 Line(s) of event code 9627 Line(s) of event code
2454 Unique line(s) of event code 2446 Unique line(s) of event code

View File

@@ -24,13 +24,12 @@ Page popupLight
tEntity.txt=pageIcons.tTmp1.txt tEntity.txt=pageIcons.tTmp1.txt
//get entity id //get entity id
entn.txt=pageIcons.tTmp2.txt entn.txt=pageIcons.tTmp2.txt
tIcon1.txt=pageIcons.tTmp3.txt
vis p0,0
vis tSend,0 vis tSend,0
vis tTmp,0 vis tTmp,0
vis tInstruction,0 vis tInstruction,0
vis tId,0 vis tId,0
vis bEffect,0 vis bEffect,0
vis hBrightness,0
//page open event //page open event
// event,pageOpenDetail,typeOfPage,tEntityName // event,pageOpenDetail,typeOfPage,tEntityName
// craft command // craft command
@@ -47,16 +46,16 @@ Page popupLight
prints tSend.txt,0 prints tSend.txt,0
prints crcval,2 prints crcval,2
//disable brightness by default //disable brightness by default
vis t1,0 //vis t1,0
vis t2,0 //vis t2,0
vis hBrightness,0 vis hBrightness,1
//disable color temp by default //disable color temp by default
vis t4,0 //vis t4,0
vis t3,0 //vis t3,0
vis hTempSlider,0 vis hTempSlider,0
//disable color wheel components by default //disable color wheel components by default
vis bColor,0 vis bColor,0
vis t0,0 //vis t0,0
vis pColorWheel,0 vis pColorWheel,0
//vis t0,0 //vis t0,0
popupLight.bco=defaultBcoColor popupLight.bco=defaultBcoColor
@@ -75,202 +74,83 @@ Page popupLight
} }
if(defaultBcoColor==0) if(defaultBcoColor==0)
{ {
hBrightness.pic=14
hBrightness.pic1=13
hBrightness.pic2=15
hTempSlider.pic=16 hTempSlider.pic=16
hTempSlider.pic1=17 hTempSlider.pic1=16
hTempSlider.pic2=15
} }
Postinitialize Event
fill hBrightness.x,hBrightness.y,100,250,defaultBcoColor
Variable (int32) col
Attributes
ID : 18
Scope: local
Value: 65504
Variable (string) entn Variable (string) entn
Attributes Attributes
ID : 20 ID : 11
Scope : local Scope : local
Text : Text :
Max. Text Size: 80 Max. Text Size: 80
Variable (int32) mode Variable (int32) mode
Attributes Attributes
ID : 22 ID : 13
Scope: local Scope: local
Value: 1 Value: 1
Variable (int32) mode_temp Variable (int32) mode_temp
Attributes Attributes
ID : 23 ID : 14
Scope: local Scope: local
Value: 0 Value: 0
Variable (string) strCommand Variable (string) strCommand
Attributes Attributes
ID : 16 ID : 9
Scope : local Scope : local
Text : Text :
Max. Text Size: 500 Max. Text Size: 500
Variable (string) tId
Attributes
ID : 20
Scope : local
Text :
Max. Text Size: 20
Variable (string) tInstruction
Attributes
ID : 19
Scope : local
Text :
Max. Text Size: 20
Variable (string) tSend Variable (string) tSend
Attributes Attributes
ID : 26 ID : 16
Scope : local Scope : local
Text : Text :
Max. Text Size: 200 Max. Text Size: 200
Text t0 Variable (string) tTmp
Attributes Attributes
ID : 24 ID : 21
Scope : local Scope : local
Dragging : 0 Text :
Send Component ID : disabled Max. Text Size: 80
Opacity : 127
x coordinate : 12
y coordinate : 57
Width : 141
Height : 30
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Associated Keyboard : none
Font ID : 0
Back. Color : 6371
Font Color : 65535
Horizontal Alignment: left
Vertical Alignment : center
Input Type : character
Text : Color
Max. Text Size : 50
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Text t1
Attributes
ID : 6
Scope : local
Dragging : 0
Send Component ID : disabled
Opacity : 127
x coordinate : 60
y coordinate : 374
Width : 251
Height : 30
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Associated Keyboard : none
Font ID : 0
Back. Color : 6371
Font Color : 65535
Horizontal Alignment: left
Vertical Alignment : center
Input Type : character
Text : Brightness
Max. Text Size : 50
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Text t2
Attributes
ID : 9
Scope : local
Dragging : 0
Send Component ID : disabled
Opacity : 127
x coordinate : 10
y coordinate : 374
Width : 45
Height : 30
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Associated Keyboard : none
Font ID : 1
Back. Color : 6371
Font Color : 40147
Horizontal Alignment: center
Vertical Alignment : center
Input Type : character
Text : 
Max. Text Size : 10
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Text t3
Attributes
ID : 10
Scope : local
Dragging : 0
Send Component ID : disabled
Opacity : 127
x coordinate : 10
y coordinate : 267
Width : 45
Height : 30
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Associated Keyboard : none
Font ID : 1
Back. Color : 6371
Font Color : 40147
Horizontal Alignment: center
Vertical Alignment : center
Input Type : character
Text : 
Max. Text Size : 10
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Text t4
Attributes
ID : 11
Scope : local
Dragging : 0
Send Component ID : disabled
Opacity : 127
x coordinate : 60
y coordinate : 266
Width : 250
Height : 30
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Associated Keyboard : none
Font ID : 0
Back. Color : 6371
Font Color : 65535
Horizontal Alignment: left
Vertical Alignment : center
Input Type : character
Text : Temperature
Max. Text Size : 50
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Text tEntity Text tEntity
Attributes Attributes
ID : 3 ID : 2
Scope : local Scope : local
Dragging : 0 Dragging : 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 60 x coordinate : 19
y coordinate : 21 y coordinate : 21
Width : 200 Width : 224
Height : 30 Height : 30
Effect : load Effect : load
Effect Priority : 0 Effect Priority : 0
@@ -278,10 +158,10 @@ Text tEntity
Fill : solid color Fill : solid color
Style : flat Style : flat
Associated Keyboard : none Associated Keyboard : none
Font ID : 0 Font ID : 1
Back. Color : 6371 Back. Color : 6371
Font Color : 65535 Font Color : 65535
Horizontal Alignment: left Horizontal Alignment: center
Vertical Alignment : center Vertical Alignment : center
Input Type : character Input Type : character
Text : tEntity1 Text : tEntity1
@@ -290,149 +170,17 @@ Text tEntity
Horizontal Spacing : 0 Horizontal Spacing : 0
Vertical Spacing : 0 Vertical Spacing : 0
Text tIcon1 Picture pColorWheel
Attributes
ID : 4
Scope : local
Dragging : 0
Send Component ID : disabled
Opacity : 127
x coordinate : 11
y coordinate : 21
Width : 45
Height : 30
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Associated Keyboard : none
Font ID : 1
Back. Color : 6371
Font Color : 17299
Horizontal Alignment: center
Vertical Alignment : center
Input Type : character
Text : 
Max. Text Size : 10
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Text tId
Attributes
ID : 18
Scope : local
Dragging : 0
Send Component ID : disabled
Opacity : 127
x coordinate : 100
y coordinate : 450
Width : 100
Height : 30
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Associated Keyboard : none
Font ID : 0
Back. Color : 65535
Font Color : 0
Horizontal Alignment: center
Vertical Alignment : center
Input Type : character
Text :
Max. Text Size : 20
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Text tInstruction
Attributes
ID : 17
Scope : local
Dragging : 0
Send Component ID : disabled
Opacity : 127
x coordinate : 0
y coordinate : 450
Width : 100
Height : 30
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Associated Keyboard : none
Font ID : 0
Back. Color : 65535
Font Color : 0
Horizontal Alignment: center
Vertical Alignment : center
Input Type : character
Text :
Max. Text Size : 20
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Text tTmp
Attributes
ID : 12
Scope : local
Dragging : 0
Send Component ID : disabled
Opacity : 127
x coordinate : 282
y coordinate : 446
Width : 34
Height : 30
Effect : load
Effect Priority : 0
Effect Time : 300
Fill : solid color
Style : flat
Associated Keyboard : none
Font ID : 0
Back. Color : 65535
Font Color : 0
Horizontal Alignment: center
Vertical Alignment : center
Input Type : character
Text :
Max. Text Size : 80
Word wrap : disabled
Horizontal Spacing : 0
Vertical Spacing : 0
Picture p0
Attributes Attributes
ID : 1 ID : 1
Scope : local Scope : local
Dragging : 0 Dragging : 0
Send Component ID: disabled Send Component ID: disabled
Opacity : 127 Opacity : 127
x coordinate : 0 x coordinate : 150
y coordinate : 1 y coordinate : 168
Width : 319 Width : 160
Height : 479 Height : 160
Effect : load
Effect Priority : 0
Effect Time : 300
Picture ID : 0
Picture pColorWheel
Attributes
ID : 2
Scope : local
Dragging : 0
Send Component ID: disabled
Opacity : 127
x coordinate : 67
y coordinate : 89
Width : 245
Height : 245
Effect : load Effect : load
Effect Priority : 0 Effect Priority : 0
Effect Time : 300 Effect Time : 300
@@ -468,30 +216,44 @@ Picture pColorWheel
Slider hBrightness Slider hBrightness
Attributes Attributes
ID : 7 ID : 4
Scope : local Scope : local
Dragging : 0 Dragging : 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 12 x coordinate : 25
y coordinate : 409 y coordinate : 127
Width : 300 Width : 100
Height : 44 Height : 250
Effect : load Effect : load
Effect Priority : 0 Effect Priority : 0
Effect Time : 300 Effect Time : 300
Direction : horizontal Direction : vertical
Fill : image Fill : image
Cursor width : auto Cursor width : auto
Cursor height : 255 Cursor height : 1
Back. Picture ID : 5 Back. Picture ID : 65535
Slided Back. Picture ID: 4 Slided Back. Picture ID: 65535
Position : 50 Position : 50
Upper range limit : 100 Upper range limit : 100
Lower range limit : 0 Lower range limit : 0
Events Events
Touch Release Event Touch Release Event
//draw black background
fill hBrightness.x,hBrightness.y,100,hBrightness.val*-25/10+250,8484
//draw draw colored bar at the position of the current brightness value
fill hBrightness.x,hBrightness.val*-25/10+314,100,hBrightness.val*25/10,col.val
if(hBrightness.val>7)
{
//draw cursor
fill hBrightness.x+25,hBrightness.val*-25/10+322,50,4,WHITE
//paint corner
xstr hBrightness.x,hBrightness.val*-25/10+314,100,hBrightness.h,7,8484,0,0,0,3,"a"
}
//paint corners
xstr hBrightness.x,hBrightness.y,100,hBrightness.h,7,defaultBcoColor,0,0,0,3,"a"
xstr hBrightness.x,hBrightness.y+hBrightness.h-15,100,hBrightness.h,7,defaultBcoColor,0,0,0,3,"b"
tmCooldown.en=1 tmCooldown.en=1
tmCooldown.tim=2500 tmCooldown.tim=2500
//craft command //craft command
@@ -512,24 +274,24 @@ Slider hBrightness
Slider hTempSlider Slider hTempSlider
Attributes Attributes
ID : 19 ID : 10
Scope : local Scope : local
Dragging : 0 Dragging : 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 12 x coordinate : 187
y coordinate : 304 y coordinate : 127
Width : 100 Width : 100
Height : 25 Height : 250
Effect : load Effect : load
Effect Priority : 0 Effect Priority : 0
Effect Time : 300 Effect Time : 300
Direction : horizontal Direction : vertical
Fill : image Fill : image
Cursor width : auto Cursor width : auto
Cursor height : 255 Cursor height : 255
Back. Picture ID : 7 Back. Picture ID : 7
Slided Back. Picture ID: 8 Slided Back. Picture ID: 7
Position : 50 Position : 50
Upper range limit : 100 Upper range limit : 100
Lower range limit : 0 Lower range limit : 0
@@ -556,13 +318,13 @@ Slider hTempSlider
Button b0 Button b0
Attributes Attributes
ID : 5 ID : 3
Scope : local Scope : local
Dragging : 0 Dragging : 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 266 x coordinate : 256
y coordinate : 14 y coordinate : 12
Width : 50 Width : 50
Height : 50 Height : 50
Effect : load Effect : load
@@ -602,13 +364,13 @@ Button b0
Button bColor Button bColor
Attributes Attributes
ID : 21 ID : 12
Scope : local Scope : local
Dragging : 0 Dragging : 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 12 x coordinate : 134
y coordinate : 89 y coordinate : 407
Width : 50 Width : 50
Height : 50 Height : 50
Effect : load Effect : load
@@ -639,8 +401,8 @@ Button bColor
//enable color wheel //enable color wheel
vis pColorWheel,1 vis pColorWheel,1
//disable color temp //disable color temp
vis t4,0 //vis t4,0
vis t3,0 //vis t3,0
vis hTempSlider,0 vis hTempSlider,0
}else }else
{ {
@@ -650,21 +412,21 @@ Button bColor
if(mode_temp.val==1) if(mode_temp.val==1)
{ {
//enable color temp //enable color temp
vis t4,1 //vis t4,1
vis t3,1 //vis t3,1
vis hTempSlider,1 vis hTempSlider,1
} }
} }
Button bEffect Button bEffect
Attributes Attributes
ID : 27 ID : 17
Scope : local Scope : local
Dragging : 0 Dragging : 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 12 x coordinate : 60
y coordinate : 195 y coordinate : 407
Width : 50 Width : 50
Height : 50 Height : 50
Effect : load Effect : load
@@ -691,18 +453,17 @@ Button bEffect
Touch Press Event Touch Press Event
pageIcons.tTmp1.txt=tEntity.txt pageIcons.tTmp1.txt=tEntity.txt
pageIcons.tTmp2.txt=entn.txt pageIcons.tTmp2.txt=entn.txt
pageIcons.tTmp3.txt=tIcon1.txt
page popupInSel page popupInSel
Dual-state Button btOnOff1 Dual-state Button btOnOff1
Attributes Attributes
ID : 8 ID : 5
Scope : local Scope : local
Dragging : 0 Dragging : 0
Send Component ID : disabled Send Component ID : disabled
Opacity : 127 Opacity : 127
x coordinate : 12 x coordinate : 208
y coordinate : 142 y coordinate : 407
Width : 50 Width : 50
Height : 50 Height : 50
Effect : load Effect : load
@@ -741,7 +502,7 @@ Dual-state Button btOnOff1
Timer tmCooldown Timer tmCooldown
Attributes Attributes
ID : 25 ID : 15
Scope : local Scope : local
Period (ms): 100 Period (ms): 100
Enabled : no Enabled : no
@@ -750,9 +511,34 @@ Timer tmCooldown
Timer Event Timer Event
tmCooldown.en=0 tmCooldown.en=0
Timer tmDrawCooldown
Attributes
ID : 22
Scope : local
Period (ms): 500
Enabled : no
Events
Timer Event
//draw black background
fill hBrightness.x,hBrightness.y,100,hBrightness.val*-25/10+250,8484
//draw draw colored bar at the position of the current brightness value
fill hBrightness.x,hBrightness.val*-25/10+314,100,hBrightness.val*25/10,col.val
if(hBrightness.val>7)
{
//draw cursor
fill hBrightness.x+25,hBrightness.val*-25/10+322,50,4,WHITE
//paint corner
xstr hBrightness.x,hBrightness.val*-25/10+314,100,hBrightness.h,7,8484,0,0,0,3,"a"
}
//paint corners
xstr hBrightness.x,hBrightness.y,100,hBrightness.h,7,defaultBcoColor,0,0,0,3,"a"
xstr hBrightness.x,hBrightness.y+hBrightness.h-15,100,hBrightness.h,7,defaultBcoColor,0,0,0,3,"b"
tmDrawCooldown.en=0
Timer tmSerial Timer tmSerial
Attributes Attributes
ID : 15 ID : 8
Scope : local Scope : local
Period (ms): 50 Period (ms): 50
Enabled : yes Enabled : yes
@@ -807,11 +593,12 @@ Timer tmSerial
{ {
// change icon // change icon
//spstr strCommand.txt,tIcon1.txt,"~",2 //spstr strCommand.txt,tIcon1.txt,"~",2
vis tIcon1,1 //vis tIcon1,1
// change icon color // change icon color
spstr strCommand.txt,tTmp.txt,"~",3 spstr strCommand.txt,tTmp.txt,"~",3
covx tTmp.txt,sys0,0,0 covx tTmp.txt,sys0,0,0
tIcon1.pco=sys0 col.val=sys0
//tEntity.pco=sys0
// get Button State // get Button State
spstr strCommand.txt,tTmp.txt,"~",4 spstr strCommand.txt,tTmp.txt,"~",4
covx tTmp.txt,sys0,0,0 covx tTmp.txt,sys0,0,0
@@ -820,27 +607,26 @@ Timer tmSerial
spstr strCommand.txt,tTmp.txt,"~",5 spstr strCommand.txt,tTmp.txt,"~",5
if(tTmp.txt=="disable") if(tTmp.txt=="disable")
{ {
vis t1,0 //vis t1,0
vis t2,0 //vis t2,0
vis hBrightness,0 vis hBrightness,0
}else }else
{ {
vis t1,1 //vis t1,1
vis t2,1 //vis t2,1
vis hBrightness,1 vis hBrightness,1
covx tTmp.txt,sys0,0,0 covx tTmp.txt,sys0,0,0
if(tmCooldown.en==0) hBrightness.val=sys0
{ tmDrawCooldown.en=1
hBrightness.val=sys0 tmDrawCooldown.tim=500
}
} }
// get ColorTemp value // get ColorTemp value
spstr strCommand.txt,tTmp.txt,"~",6 spstr strCommand.txt,tTmp.txt,"~",6
if(tTmp.txt=="disable") if(tTmp.txt=="disable")
{ {
vis hTempSlider,0 vis hTempSlider,0
vis t3,0 //vis t3,0
vis t4,0 //vis t4,0
mode_temp.val=0 mode_temp.val=0
// mode == 1 is temp controls currently shown // mode == 1 is temp controls currently shown
if(mode.val==1) if(mode.val==1)
@@ -863,8 +649,8 @@ Timer tmSerial
{ {
mode_temp.val=1 mode_temp.val=1
vis hTempSlider,1 vis hTempSlider,1
vis t3,1 //vis t3,1
vis t4,1 //vis t4,1
if(tmCooldown.en==0) if(tmCooldown.en==0)
{ {
covx tTmp.txt,sys0,0,0 covx tTmp.txt,sys0,0,0
@@ -883,12 +669,12 @@ Timer tmSerial
// disable -> isn't supported // disable -> isn't supported
if(tTmp.txt=="disable") if(tTmp.txt=="disable")
{ {
vis t0,0 //vis t0,0
vis bColor,0 vis bColor,0
vis pColorWheel,0 vis pColorWheel,0
}else }else
{ {
vis t0,1 //vis t0,1
//only enable bColor button if color temp is also supported //only enable bColor button if color temp is also supported
if(mode_temp.val==1) if(mode_temp.val==1)
{ {
@@ -900,11 +686,11 @@ Timer tmSerial
} }
} }
// set t0 Color (Localization) // set t0 Color (Localization)
spstr strCommand.txt,t0.txt,"~",8 //spstr strCommand.txt,t0.txt,"~",8
// set t4 Temperature (Localization) // set t4 Temperature (Localization)
spstr strCommand.txt,t4.txt,"~",9 //spstr strCommand.txt,t4.txt,"~",9
// set t1 Brightness (Localization) // set t1 Brightness (Localization)
spstr strCommand.txt,t1.txt,"~",10 //spstr strCommand.txt,t1.txt,"~",10
// activate effect button // activate effect button
spstr strCommand.txt,tTmp.txt,"~",11 spstr strCommand.txt,tTmp.txt,"~",11
if(tTmp.txt=="enable") if(tTmp.txt=="enable")
@@ -1035,7 +821,7 @@ Timer tmSerial
Timer tmSleep Timer tmSleep
Attributes Attributes
ID : 14 ID : 7
Scope : local Scope : local
Period (ms): 1000 Period (ms): 1000
Enabled : yes Enabled : yes
@@ -1055,7 +841,7 @@ Timer tmSleep
TouchCap tc0 TouchCap tc0
Attributes Attributes
ID : 13 ID : 6
Scope: local Scope: local
Value: 0 Value: 0

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -16,13 +16,12 @@ Page popupLight
tEntity.txt=pageIcons.tTmp1.txt tEntity.txt=pageIcons.tTmp1.txt
//get entity id //get entity id
entn.txt=pageIcons.tTmp2.txt entn.txt=pageIcons.tTmp2.txt
tIcon1.txt=pageIcons.tTmp3.txt
vis p0,0
vis tSend,0 vis tSend,0
vis tTmp,0 vis tTmp,0
vis tInstruction,0 vis tInstruction,0
vis tId,0 vis tId,0
vis bEffect,0 vis bEffect,0
vis hBrightness,0
//page open event //page open event
// event,pageOpenDetail,typeOfPage,tEntityName // event,pageOpenDetail,typeOfPage,tEntityName
// craft command // craft command
@@ -39,16 +38,16 @@ Page popupLight
prints tSend.txt,0 prints tSend.txt,0
prints crcval,2 prints crcval,2
//disable brightness by default //disable brightness by default
vis t1,0 //vis t1,0
vis t2,0 //vis t2,0
vis hBrightness,0 vis hBrightness,1
//disable color temp by default //disable color temp by default
vis t4,0 //vis t4,0
vis t3,0 //vis t3,0
vis hTempSlider,0 vis hTempSlider,0
//disable color wheel components by default //disable color wheel components by default
vis bColor,0 vis bColor,0
vis t0,0 //vis t0,0
vis pColorWheel,0 vis pColorWheel,0
//vis t0,0 //vis t0,0
popupLight.bco=defaultBcoColor popupLight.bco=defaultBcoColor
@@ -67,14 +66,18 @@ Page popupLight
} }
if(defaultBcoColor==0) if(defaultBcoColor==0)
{ {
hBrightness.pic=14
hBrightness.pic1=13
hBrightness.pic2=15
hTempSlider.pic=16 hTempSlider.pic=16
hTempSlider.pic1=17 hTempSlider.pic1=16
hTempSlider.pic2=15
} }
Postinitialize Event
fill hBrightness.x,hBrightness.y,100,250,defaultBcoColor
Variable (int32) col
Attributes
Scope: local
Value: 65504
Variable (string) entn Variable (string) entn
Attributes Attributes
Scope : local Scope : local
@@ -97,56 +100,29 @@ Variable (string) strCommand
Text : Text :
Max. Text Size: 500 Max. Text Size: 500
Variable (string) tId
Attributes
Scope : local
Text :
Max. Text Size: 20
Variable (string) tInstruction
Attributes
Scope : local
Text :
Max. Text Size: 20
Variable (string) tSend Variable (string) tSend
Attributes Attributes
Scope : local Scope : local
Text : Text :
Max. Text Size: 200 Max. Text Size: 200
Text t0 Variable (string) tTmp
Attributes Attributes
Scope : local Scope : local
Dragging : 0 Text :
Send Component ID : disabled Max. Text Size: 80
Associated Keyboard: none
Text : Color
Max. Text Size : 50
Text t1
Attributes
Scope : local
Dragging : 0
Send Component ID : disabled
Associated Keyboard: none
Text : Brightness
Max. Text Size : 50
Text t2
Attributes
Scope : local
Dragging : 0
Send Component ID : disabled
Associated Keyboard: none
Text : 
Max. Text Size : 10
Text t3
Attributes
Scope : local
Dragging : 0
Send Component ID : disabled
Associated Keyboard: none
Text : 
Max. Text Size : 10
Text t4
Attributes
Scope : local
Dragging : 0
Send Component ID : disabled
Associated Keyboard: none
Text : Temperature
Max. Text Size : 50
Text tEntity Text tEntity
Attributes Attributes
@@ -157,48 +133,6 @@ Text tEntity
Text : tEntity1 Text : tEntity1
Max. Text Size : 25 Max. Text Size : 25
Text tIcon1
Attributes
Scope : local
Dragging : 0
Send Component ID : disabled
Associated Keyboard: none
Text : 
Max. Text Size : 10
Text tId
Attributes
Scope : local
Dragging : 0
Send Component ID : disabled
Associated Keyboard: none
Text :
Max. Text Size : 20
Text tInstruction
Attributes
Scope : local
Dragging : 0
Send Component ID : disabled
Associated Keyboard: none
Text :
Max. Text Size : 20
Text tTmp
Attributes
Scope : local
Dragging : 0
Send Component ID : disabled
Associated Keyboard: none
Text :
Max. Text Size : 80
Picture p0
Attributes
Scope : local
Dragging : 0
Send Component ID: disabled
Picture pColorWheel Picture pColorWheel
Attributes Attributes
Scope : local Scope : local
@@ -244,6 +178,20 @@ Slider hBrightness
Events Events
Touch Release Event Touch Release Event
//draw black background
fill hBrightness.x,hBrightness.y,100,hBrightness.val*-25/10+250,8484
//draw draw colored bar at the position of the current brightness value
fill hBrightness.x,hBrightness.val*-25/10+314,100,hBrightness.val*25/10,col.val
if(hBrightness.val>7)
{
//draw cursor
fill hBrightness.x+25,hBrightness.val*-25/10+322,50,4,WHITE
//paint corner
xstr hBrightness.x,hBrightness.val*-25/10+314,100,hBrightness.h,7,8484,0,0,0,3,"a"
}
//paint corners
xstr hBrightness.x,hBrightness.y,100,hBrightness.h,7,defaultBcoColor,0,0,0,3,"a"
xstr hBrightness.x,hBrightness.y+hBrightness.h-15,100,hBrightness.h,7,defaultBcoColor,0,0,0,3,"b"
tmCooldown.en=1 tmCooldown.en=1
tmCooldown.tim=2500 tmCooldown.tim=2500
//craft command //craft command
@@ -332,8 +280,8 @@ Button bColor
//enable color wheel //enable color wheel
vis pColorWheel,1 vis pColorWheel,1
//disable color temp //disable color temp
vis t4,0 //vis t4,0
vis t3,0 //vis t3,0
vis hTempSlider,0 vis hTempSlider,0
}else }else
{ {
@@ -343,8 +291,8 @@ Button bColor
if(mode_temp.val==1) if(mode_temp.val==1)
{ {
//enable color temp //enable color temp
vis t4,1 //vis t4,1
vis t3,1 //vis t3,1
vis hTempSlider,1 vis hTempSlider,1
} }
} }
@@ -362,7 +310,6 @@ Button bEffect
Touch Press Event Touch Press Event
pageIcons.tTmp1.txt=tEntity.txt pageIcons.tTmp1.txt=tEntity.txt
pageIcons.tTmp2.txt=entn.txt pageIcons.tTmp2.txt=entn.txt
pageIcons.tTmp3.txt=tIcon1.txt
page popupInSel page popupInSel
Dual-state Button btOnOff1 Dual-state Button btOnOff1
@@ -402,6 +349,30 @@ Timer tmCooldown
Timer Event Timer Event
tmCooldown.en=0 tmCooldown.en=0
Timer tmDrawCooldown
Attributes
Scope : local
Period (ms): 500
Enabled : no
Events
Timer Event
//draw black background
fill hBrightness.x,hBrightness.y,100,hBrightness.val*-25/10+250,8484
//draw draw colored bar at the position of the current brightness value
fill hBrightness.x,hBrightness.val*-25/10+314,100,hBrightness.val*25/10,col.val
if(hBrightness.val>7)
{
//draw cursor
fill hBrightness.x+25,hBrightness.val*-25/10+322,50,4,WHITE
//paint corner
xstr hBrightness.x,hBrightness.val*-25/10+314,100,hBrightness.h,7,8484,0,0,0,3,"a"
}
//paint corners
xstr hBrightness.x,hBrightness.y,100,hBrightness.h,7,defaultBcoColor,0,0,0,3,"a"
xstr hBrightness.x,hBrightness.y+hBrightness.h-15,100,hBrightness.h,7,defaultBcoColor,0,0,0,3,"b"
tmDrawCooldown.en=0
Timer tmSerial Timer tmSerial
Attributes Attributes
Scope : local Scope : local
@@ -458,11 +429,12 @@ Timer tmSerial
{ {
// change icon // change icon
//spstr strCommand.txt,tIcon1.txt,"~",2 //spstr strCommand.txt,tIcon1.txt,"~",2
vis tIcon1,1 //vis tIcon1,1
// change icon color // change icon color
spstr strCommand.txt,tTmp.txt,"~",3 spstr strCommand.txt,tTmp.txt,"~",3
covx tTmp.txt,sys0,0,0 covx tTmp.txt,sys0,0,0
tIcon1.pco=sys0 col.val=sys0
//tEntity.pco=sys0
// get Button State // get Button State
spstr strCommand.txt,tTmp.txt,"~",4 spstr strCommand.txt,tTmp.txt,"~",4
covx tTmp.txt,sys0,0,0 covx tTmp.txt,sys0,0,0
@@ -471,27 +443,26 @@ Timer tmSerial
spstr strCommand.txt,tTmp.txt,"~",5 spstr strCommand.txt,tTmp.txt,"~",5
if(tTmp.txt=="disable") if(tTmp.txt=="disable")
{ {
vis t1,0 //vis t1,0
vis t2,0 //vis t2,0
vis hBrightness,0 vis hBrightness,0
}else }else
{ {
vis t1,1 //vis t1,1
vis t2,1 //vis t2,1
vis hBrightness,1 vis hBrightness,1
covx tTmp.txt,sys0,0,0 covx tTmp.txt,sys0,0,0
if(tmCooldown.en==0) hBrightness.val=sys0
{ tmDrawCooldown.en=1
hBrightness.val=sys0 tmDrawCooldown.tim=500
}
} }
// get ColorTemp value // get ColorTemp value
spstr strCommand.txt,tTmp.txt,"~",6 spstr strCommand.txt,tTmp.txt,"~",6
if(tTmp.txt=="disable") if(tTmp.txt=="disable")
{ {
vis hTempSlider,0 vis hTempSlider,0
vis t3,0 //vis t3,0
vis t4,0 //vis t4,0
mode_temp.val=0 mode_temp.val=0
// mode == 1 is temp controls currently shown // mode == 1 is temp controls currently shown
if(mode.val==1) if(mode.val==1)
@@ -514,8 +485,8 @@ Timer tmSerial
{ {
mode_temp.val=1 mode_temp.val=1
vis hTempSlider,1 vis hTempSlider,1
vis t3,1 //vis t3,1
vis t4,1 //vis t4,1
if(tmCooldown.en==0) if(tmCooldown.en==0)
{ {
covx tTmp.txt,sys0,0,0 covx tTmp.txt,sys0,0,0
@@ -534,12 +505,12 @@ Timer tmSerial
// disable -> isn't supported // disable -> isn't supported
if(tTmp.txt=="disable") if(tTmp.txt=="disable")
{ {
vis t0,0 //vis t0,0
vis bColor,0 vis bColor,0
vis pColorWheel,0 vis pColorWheel,0
}else }else
{ {
vis t0,1 //vis t0,1
//only enable bColor button if color temp is also supported //only enable bColor button if color temp is also supported
if(mode_temp.val==1) if(mode_temp.val==1)
{ {
@@ -551,11 +522,11 @@ Timer tmSerial
} }
} }
// set t0 Color (Localization) // set t0 Color (Localization)
spstr strCommand.txt,t0.txt,"~",8 //spstr strCommand.txt,t0.txt,"~",8
// set t4 Temperature (Localization) // set t4 Temperature (Localization)
spstr strCommand.txt,t4.txt,"~",9 //spstr strCommand.txt,t4.txt,"~",9
// set t1 Brightness (Localization) // set t1 Brightness (Localization)
spstr strCommand.txt,t1.txt,"~",10 //spstr strCommand.txt,t1.txt,"~",10
// activate effect button // activate effect button
spstr strCommand.txt,tTmp.txt,"~",11 spstr strCommand.txt,tTmp.txt,"~",11
if(tTmp.txt=="enable") if(tTmp.txt=="enable")

View File

@@ -232,7 +232,7 @@ Button b0
Events Events
Touch Press Event Touch Press Event
tSend.txt="event,buttonPress2,popupLight,bExit" tSend.txt="event,buttonPress2,popupThermo,bExit"
//send calc crc //send calc crc
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC

View File

@@ -302,7 +302,7 @@ Button b0
Events Events
Touch Press Event Touch Press Event
tSend.txt="event,buttonPress2,popupLight,bExit" tSend.txt="event,buttonPress2,popupTimer,bExit"
//send calc crc //send calc crc
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC crcrest 1,0xffff // reset CRC

View File

@@ -389,7 +389,7 @@ Text tIcon1
Send Component ID : disabled Send Component ID : disabled
Associated Keyboard: none Associated Keyboard: none
Text : Text :
Max. Text Size : 10 Max. Text Size : 16
Text tIcon2 Text tIcon2
Attributes Attributes
@@ -398,7 +398,7 @@ Text tIcon2
Send Component ID : disabled Send Component ID : disabled
Associated Keyboard: none Associated Keyboard: none
Text : Text :
Max. Text Size : 10 Max. Text Size : 16
Text tMainIcon Text tMainIcon
Attributes Attributes