mirror of
https://github.com/joBr99/nspanel-lovelace-ui.git
synced 2026-02-23 13:02:14 +01:00
sync us-p (add nextion2text)
This commit is contained in:
joBr99
committed by
github-actions[bot]
github-actions[bot]
parent
54db718a0b
commit
d19a1bcb9f
@@ -1491,501 +1491,6 @@
|
||||
│ crcputs sys0,2
|
||||
│ crcputs tSend.txt,0
|
||||
│ //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/US/portrait/n2t-out/screensaver.txt
|
||||
│ @@ -28,17 +28,14 @@
|
||||
@@ -2117,33 +1622,6 @@
|
||||
│ Send Component ID : disabled
|
||||
│ Associated Keyboard: none
|
||||
│ 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 @@
|
||||
│ if(tTmp.txt!="")
|
||||
│ {
|
||||
|
||||
Reference in New Issue
Block a user