From fb3920de32b7c68b590496ce5c6aa2c4757710cd Mon Sep 17 00:00:00 2001 From: joBr99 Date: Tue, 25 Apr 2023 21:43:12 +0000 Subject: [PATCH] Merge branch 'main' of github.com:joBr99/nspanel-lovelace-ui (add nextion2text) --- HMI/US/landscape/diff-eu-version.txt | 1008 +---------------- HMI/US/landscape/n2t-out-visual/Program.s.txt | 1 + HMI/US/landscape/n2t-out-visual/cardQR.txt | 780 +++++++------ .../n2t-out-visual/nspanel_US_L_Stats.txt | 24 +- .../landscape/n2t-out-visual/popupLight.txt | 857 +++++--------- HMI/US/landscape/n2t-out/Program.s.txt | 1 + HMI/US/landscape/n2t-out/cardQR.txt | 206 ++-- HMI/US/landscape/n2t-out/popupLight.txt | 340 +++--- HMI/US/portrait/diff-filtered.txt | 2 +- 9 files changed, 951 insertions(+), 2268 deletions(-) diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index fefae546..fccda75c 100644 --- a/HMI/US/landscape/diff-eu-version.txt +++ b/HMI/US/landscape/diff-eu-version.txt @@ -2,7 +2,7 @@ +++ HMI/US/landscape/n2t-out │ --- HMI/n2t-out/Program.s.txt ├── +++ HMI/US/landscape/n2t-out/Program.s.txt -│ @@ -11,10 +11,9 @@ +│ @@ -11,10 +11,10 @@ │ // dim value │ int dimValue=40 │ int dimValueNormal=100 @@ -11,389 +11,12 @@ │ int defaultBcoColor=6371 │ // fix touch offset │ - lcd_dev fffb 0002 0000 0020 -│ - printh 00 00 00 ff ff ff 88 ff ff ff//Output power on information to serial port │ + //lcd_dev fffb 0002 0000 0020 +│ printh 00 00 00 ff ff ff 88 ff ff ff//Output power on information to serial port │ page pageStartup │ --- HMI/n2t-out/cardQR.txt ├── +++ HMI/US/landscape/n2t-out/cardQR.txt -│ @@ -1,17 +1,18 @@ -│ Page cardQR -│ Attributes -│ - Scope : local -│ - Dragging : 0 -│ - Send Component ID : disabled -│ - Locked : no -│ - Swide up page ID : disabled -│ - Swide down page ID : disabled -│ - Swide left page ID : disabled -│ - Swide right page ID: disabled -│ + Scope : local -│ + Dragging : 0 -│ + Disable release event after dragging: 0 -│ + Send Component ID : disabled -│ + Locked : no -│ + Swide up page ID : disabled -│ + Swide down page ID : disabled -│ + Swide left page ID : disabled -│ + Swide right page ID : disabled -│ -│ Events -│ Preinitialize Event -│ dim=dimValueNormal -│ vis p0,0 -│ vis tSend,0 -│ vis tInstruction,0 -│ @@ -127,71 +128,78 @@ -│ Attributes -│ Scope : local -│ Text : -│ Max. Text Size: 80 -│ -│ Text tEntity1 -│ Attributes -│ - Scope : local -│ - Dragging : 0 -│ - Send Component ID : disabled -│ - Associated Keyboard: none -│ - Text : tEntity1 -│ - Max. Text Size : 30 -│ + Scope : local -│ + Dragging : 0 -│ + Disable release event after dragging: 0 -│ + Send Component ID : disabled -│ + Associated Keyboard : none -│ + Text : tEntity1 -│ + Max. Text Size : 30 -│ -│ Text tEntity2 -│ Attributes -│ - Scope : local -│ - Dragging : 0 -│ - Send Component ID : disabled -│ - Associated Keyboard: none -│ - Text : tEntity1 -│ - Max. Text Size : 30 -│ + Scope : local -│ + Dragging : 0 -│ + Disable release event after dragging: 0 -│ + Send Component ID : disabled -│ + Associated Keyboard : none -│ + Text : tEntity1 -│ + Max. Text Size : 30 -│ -│ Text tHeading -│ Attributes -│ - Scope : local -│ - Dragging : 0 -│ - Send Component ID : disabled -│ - Associated Keyboard: none -│ - Text : -│ - Max. Text Size : 40 -│ + Scope : local -│ + Dragging : 0 -│ + Disable release event after dragging: 0 -│ + Send Component ID : disabled -│ + Associated Keyboard : none -│ + Text : -│ + Max. Text Size : 40 -│ -│ Text tIcon1 -│ Attributes -│ - Scope : local -│ - Dragging : 0 -│ - Send Component ID : disabled -│ - Associated Keyboard: none -│ - Text :  -│ - Max. Text Size : 5 -│ + Scope : local -│ + Dragging : 0 -│ + Disable release event after dragging: 0 -│ + Send Component ID : disabled -│ + Associated Keyboard : none -│ + Text :  -│ + Max. Text Size : 5 -│ -│ Text tIcon2 -│ Attributes -│ - Scope : local -│ - Dragging : 0 -│ - Send Component ID : disabled -│ - Associated Keyboard: none -│ - Text :  -│ - Max. Text Size : 5 -│ + 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 -│ - Dragging : 0 -│ - Send Component ID: disabled -│ + Scope : local -│ + Dragging : 0 -│ + Disable release event after dragging: 0 -│ + Send Component ID : disabled -│ -│ Button bNext -│ Attributes -│ - Scope : local -│ - Dragging : 0 -│ - Send Component ID: disabled -│ - State : unpressed -│ - Text :  -│ - Max. Text Size : 10 -│ + 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,"+nent2.txt+",button" -│ //send calc crc -│ btlen tSend.txt,sys0 -│ crcrest 1,0xffff // reset CRC -│ @@ -202,20 +210,21 @@ -│ printh 55 bb -│ prints sys0,2 -│ prints tSend.txt,0 -│ prints crcval,2 -│ -│ Button bPrev -│ Attributes -│ - Scope : local -│ - Dragging : 0 -│ - Send Component ID: disabled -│ - State : unpressed -│ - Text :  -│ - Max. Text Size : 10 -│ + 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,"+nent1.txt+",button" -│ //send calc crc -│ btlen tSend.txt,sys0 -│ crcrest 1,0xffff // reset CRC -│ @@ -226,20 +235,21 @@ -│ printh 55 bb -│ prints sys0,2 -│ prints tSend.txt,0 -│ prints crcval,2 -│ -│ Button bText1 -│ Attributes -│ - Scope : local -│ - Dragging : 0 -│ - Send Component ID: disabled -│ - State : unpressed -│ - Text : -│ - Max. Text Size : 30 -│ + Scope : local -│ + Dragging : 0 -│ + Disable release event after dragging: 0 -│ + Send Component ID : disabled -│ + State : unpressed -│ + Text : -│ + Max. Text Size : 30 -│ -│ Events -│ Touch Press Event -│ tSend.txt="event,buttonPress2,"+entn1.txt+",button" -│ //send calc crc -│ btlen tSend.txt,sys0 -│ crcrest 1,0xffff // reset CRC -│ @@ -250,20 +260,21 @@ -│ printh 55 bb -│ prints sys0,2 -│ prints tSend.txt,0 -│ prints crcval,2 -│ -│ Button bText2 -│ Attributes -│ - Scope : local -│ - Dragging : 0 -│ - Send Component ID: disabled -│ - State : unpressed -│ - Text : -│ - Max. Text Size : 30 -│ + Scope : local -│ + Dragging : 0 -│ + Disable release event after dragging: 0 -│ + Send Component ID : disabled -│ + State : unpressed -│ + Text : -│ + Max. Text Size : 30 -│ -│ Events -│ Touch Press Event -│ tSend.txt="event,buttonPress2,"+entn1.txt+",button" -│ //send calc crc -│ btlen tSend.txt,sys0 -│ crcrest 1,0xffff // reset CRC -│ @@ -274,20 +285,21 @@ -│ printh 55 bb -│ prints sys0,2 -│ prints tSend.txt,0 -│ prints crcval,2 -│ -│ Dual-state Button btOnOff1 -│ Attributes -│ - Scope : local -│ - Dragging : 0 -│ - Send Component ID: disabled -│ - State : unpressed -│ - Text : -│ - Max. Text Size : 10 -│ + 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,"+entn1.txt+",OnOff," -│ covx btOnOff1.val,tTmp.txt,0,0 -│ tSend.txt+=tTmp.txt -│ //send calc crc -│ @@ -300,20 +312,21 @@ -│ printh 55 bb -│ prints sys0,2 -│ prints tSend.txt,0 -│ prints crcval,2 -│ -│ Dual-state Button btOnOff2 -│ Attributes -│ - Scope : local -│ - Dragging : 0 -│ - Send Component ID: disabled -│ - State : unpressed -│ - Text : -│ - Max. Text Size : 10 -│ + 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,"+entn2.txt+",OnOff," -│ covx btOnOff2.val,tTmp.txt,0,0 -│ tSend.txt+=tTmp.txt -│ //send calc crc -│ @@ -326,49 +339,54 @@ -│ printh 55 bb -│ prints sys0,2 -│ prints tSend.txt,0 -│ prints crcval,2 -│ -│ Hotspot m0 -│ Attributes -│ - Scope : local -│ - Dragging : 0 -│ - Send Component ID: disabled -│ + Scope : local -│ + Dragging : 0 -│ + Disable release event after dragging: 0 -│ + Send Component ID : disabled -│ -│ Hotspot m1 -│ Attributes -│ - Scope : local -│ - Dragging : 0 -│ - Send Component ID: disabled -│ + Scope : local -│ + Dragging : 0 -│ + Disable release event after dragging: 0 -│ + Send Component ID : disabled -│ -│ Hotspot mSwipeNext -│ Attributes -│ - Scope : local -│ - Dragging : 0 -│ - Send Component ID: disabled -│ + Scope : local -│ + Dragging : 0 -│ + Disable release event after dragging: 0 -│ + Send Component ID : disabled -│ -│ Events -│ Touch Press Event -│ click bNext,1 -│ -│ Hotspot mSwipePrev -│ Attributes -│ - Scope : local -│ - Dragging : 0 -│ - Send Component ID: disabled -│ + Scope : local -│ + Dragging : 0 -│ + Disable release event after dragging: 0 -│ + Send Component ID : disabled -│ -│ Events -│ Touch Press Event -│ click bPrev,1 -│ -│ Hotspot mSwipeUp -│ Attributes -│ - Scope : local -│ - Dragging : 0 -│ - Send Component ID: disabled -│ + Scope : local -│ + Dragging : 0 -│ + Disable release event after dragging: 0 -│ + Send Component ID : disabled -│ -│ Events -│ Touch Press Event -│ click bPrev,1 -│ -│ Timer tmSerial -│ Attributes -│ @@ -584,19 +602,19 @@ -│ // get Text (optional Value) -│ spstr strCommand.txt,bText2.txt,"~",26 -│ } -│ if(type2.txt=="delete"||type2.txt=="") -│ { -│ if(type1.txt=="delete"||type1.txt=="") -│ { -│ - qrcode m1.x,m1.y,200,65535,defaultBcoColor,-1,8,vaQR.txt -│ + qrcode m1.x,m1.y,200,65535,defaultBcoColor,-1,vaQR.txt -│ } -│ }else -│ { -│ - qrcode m0.x,m0.y,200,65535,defaultBcoColor,-1,8,vaQR.txt -│ + qrcode m0.x,m0.y,200,65535,defaultBcoColor,-1,vaQR.txt -│ } -│ } -│ if(tInstruction.txt=="time") -│ { -│ // get set time to global variable -│ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 -│ } -│ @@ -733,15 +751,15 @@ +│ @@ -733,15 +733,15 @@ │ if(sleepTimeout!=0&&dimValue!=dim) │ { │ sleepValue+=1 @@ -838,631 +461,6 @@ │ crcputs sys0,2 │ crcputs tSend.txt,0 │ //send cmd -│ --- HMI/n2t-out/popupLight.txt -├── +++ HMI/US/landscape/n2t-out/popupLight.txt -│ @@ -1,31 +1,33 @@ -│ Page popupLight -│ Attributes -│ - Scope : local -│ - Dragging : 0 -│ - Send Component ID : disabled -│ - Locked : no -│ - Swide up page ID : disabled -│ - Swide down page ID : disabled -│ - Swide left page ID : disabled -│ - Swide right page ID: disabled -│ + Scope : local -│ + Dragging : 0 -│ + Disable release event after dragging: 0 -│ + Send Component ID : disabled -│ + Locked : no -│ + Swide up page ID : disabled -│ + Swide down page ID : disabled -│ + Swide left page ID : disabled -│ + Swide right page ID : disabled -│ -│ 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 +36,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 +64,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,52 +94,133 @@ -│ -│ Variable (string) strCommand -│ Attributes -│ Scope : local -│ Text : -│ 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 -│ Attributes -│ Scope : local -│ Text : -│ Max. Text Size: 200 -│ -│ -Variable (string) tTmp -│ +Text t0 -│ Attributes -│ - Scope : local -│ - Text : -│ - Max. Text Size: 80 -│ + Scope : local -│ + Dragging : 0 -│ + Disable release event after dragging: 0 -│ + Send Component ID : disabled -│ + Associated Keyboard : none -│ + Text : Color -│ + Max. Text Size : 50 -│ + -│ +Text t1 -│ + Attributes -│ + Scope : local -│ + Dragging : 0 -│ + Disable release event after dragging: 0 -│ + Send Component ID : disabled -│ + Associated Keyboard : none -│ + Text : Brightness -│ + Max. Text Size : 50 -│ + -│ +Text t2 -│ + Attributes -│ + Scope : local -│ + Dragging : 0 -│ + Disable release event after dragging: 0 -│ + Send Component ID : disabled -│ + Associated Keyboard : none -│ + Text :  -│ + Max. Text Size : 10 -│ + -│ +Text t3 -│ + Attributes -│ + Scope : local -│ + Dragging : 0 -│ + Disable release event after dragging: 0 -│ + Send Component ID : disabled -│ + Associated Keyboard : none -│ + Text :  -│ + Max. Text Size : 10 -│ + -│ +Text t4 -│ + Attributes -│ + Scope : local -│ + Dragging : 0 -│ + Disable release event after 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 -│ + Scope : local -│ + Dragging : 0 -│ + Disable release event after dragging: 0 -│ + Send Component ID : disabled -│ + Associated Keyboard : none -│ + Text : tEntity1 -│ + Max. Text Size : 25 -│ + -│ +Text tIcon1 -│ + Attributes -│ + Scope : local -│ + Dragging : 0 -│ + Disable release event after dragging: 0 -│ + Send Component ID : disabled -│ + Associated Keyboard : none -│ + Text :  -│ + Max. Text Size : 10 -│ + -│ +Text tId -│ + Attributes -│ + Scope : local -│ + Dragging : 0 -│ + Disable release event after dragging: 0 -│ + Send Component ID : disabled -│ + Associated Keyboard : none -│ + Text : -│ + Max. Text Size : 20 -│ + -│ +Text tInstruction -│ + Attributes -│ + Scope : local -│ + Dragging : 0 -│ + Disable release event after dragging: 0 -│ + Send Component ID : disabled -│ + Associated Keyboard : none -│ + Text : -│ + Max. Text Size : 20 -│ + -│ +Text tTmp -│ + Attributes -│ + Scope : local -│ + Dragging : 0 -│ + Disable release event after dragging: 0 -│ + Send Component ID : disabled -│ + Associated Keyboard : none -│ + Text : -│ + Max. Text Size : 80 -│ + -│ +Picture p0 -│ + Attributes -│ + Scope : local -│ + Dragging : 0 -│ + Disable release event after dragging: 0 -│ + Send Component ID : disabled -│ -│ Picture pColorWheel -│ Attributes -│ - Scope : local -│ - Dragging : 0 -│ - Send Component ID: disabled -│ + Scope : local -│ + Dragging : 0 -│ + Disable release event after dragging: 0 -│ + Send Component ID : disabled -│ -│ Events -│ Touch Press Event -│ //craft command -│ tSend.txt="event,buttonPress2,"+entn.txt+",colorWheel," -│ sys0=tch0 -│ sys0=sys0-pColorWheel.x -│ @@ -165,37 +244,24 @@ -│ printh 55 bb -│ prints sys0,2 -│ prints tSend.txt,0 -│ prints crcval,2 -│ -│ Slider hBrightness -│ Attributes -│ - Scope : local -│ - Dragging : 0 -│ - Send Component ID: disabled -│ - Position : 50 -│ - Upper range limit: 100 -│ - Lower range limit: 0 -│ + 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 -│ - //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 -│ @@ -208,20 +274,21 @@ -│ printh 55 bb -│ prints sys0,2 -│ prints tSend.txt,0 -│ prints crcval,2 -│ -│ Slider hTempSlider -│ Attributes -│ - Scope : local -│ - Dragging : 0 -│ - Send Component ID: disabled -│ - Position : 50 -│ - Upper range limit: 100 -│ - Lower range limit: 0 -│ + 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 -│ tmCooldown.en=1 -│ tmCooldown.tim=2500 -│ //craft command -│ tSend.txt="event,buttonPress2,"+entn.txt+",colorTempSlider," -│ @@ -237,20 +304,21 @@ -│ printh 55 bb -│ prints sys0,2 -│ prints tSend.txt,0 -│ prints crcval,2 -│ -│ Button b0 -│ Attributes -│ - Scope : local -│ - Dragging : 0 -│ - Send Component ID: disabled -│ - State : unpressed -│ - Text :  -│ - Max. Text Size : 10 -│ + 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,popupLight,bExit" -│ //send calc crc -│ btlen tSend.txt,sys0 -│ crcrest 1,0xffff // reset CRC -│ @@ -261,69 +329,73 @@ -│ printh 55 bb -│ prints sys0,2 -│ prints tSend.txt,0 -│ prints crcval,2 -│ -│ Button bColor -│ Attributes -│ - Scope : local -│ - Dragging : 0 -│ - Send Component ID: disabled -│ - State : unpressed -│ - Text :  -│ - Max. Text Size : 10 -│ + 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 -│ 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 -│ - Dragging : 0 -│ - Send Component ID: disabled -│ - State : unpressed -│ - Text :  -│ - Max. Text Size : 10 -│ + 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 -│ 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 -│ - State : unpressed -│ - Text : -│ - Max. Text Size : 10 -│ + 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 -│ //craft command -│ tSend.txt="event,buttonPress2,"+entn.txt+","+"OnOff," -│ covx btOnOff1.val,tTmp.txt,0,0 -│ tSend.txt+=tTmp.txt -│ @@ -345,38 +417,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 +473,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 +529,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 +549,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/landscape/n2t-out/popupThermo.txt │ @@ -236,15 +236,15 @@ diff --git a/HMI/US/landscape/n2t-out-visual/Program.s.txt b/HMI/US/landscape/n2t-out-visual/Program.s.txt index f98bc1b6..2f32f633 100644 --- a/HMI/US/landscape/n2t-out-visual/Program.s.txt +++ b/HMI/US/landscape/n2t-out-visual/Program.s.txt @@ -16,4 +16,5 @@ Program.s int defaultBcoColor=6371 // fix touch offset //lcd_dev fffb 0002 0000 0020 + printh 00 00 00 ff ff ff 88 ff ff ff//Output power on information to serial port page pageStartup diff --git a/HMI/US/landscape/n2t-out-visual/cardQR.txt b/HMI/US/landscape/n2t-out-visual/cardQR.txt index 436919f6..a73cf0a5 100644 --- a/HMI/US/landscape/n2t-out-visual/cardQR.txt +++ b/HMI/US/landscape/n2t-out-visual/cardQR.txt @@ -1,22 +1,21 @@ Page cardQR Attributes - ID : 0 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - Width : 480 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Locked : no - Swide up page ID : disabled - Swide down page ID : disabled - Swide left page ID : disabled - Swide right page ID : disabled - Fill : solid color - Back. Color : 6371 + ID : 0 + Scope : local + Dragging : 0 + Send Component ID : disabled + Opacity : 127 + Width : 480 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Locked : no + Swide up page ID : disabled + Swide down page ID : disabled + Swide left page ID : disabled + Swide right page ID: disabled + Fill : solid color + Back. Color : 6371 Events Preinitialize Event @@ -153,202 +152,195 @@ Variable (string) vaQR Text tEntity1 Attributes - ID : 17 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 286 - y coordinate : 97 - Width : 170 - 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 : tEntity1 - Max. Text Size : 30 - Word wrap : disabled - Horizontal Spacing : 0 - Vertical Spacing : 0 + ID : 17 + Scope : local + Dragging : 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 286 + y coordinate : 97 + Width : 170 + 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 : tEntity1 + Max. Text Size : 30 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 Text tEntity2 Attributes - ID : 21 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 287 - y coordinate : 204 - Width : 170 - 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 : tEntity1 - Max. Text Size : 30 - Word wrap : disabled - Horizontal Spacing : 0 - Vertical Spacing : 0 + ID : 21 + Scope : local + Dragging : 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 287 + y coordinate : 204 + Width : 170 + 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 : tEntity1 + Max. Text Size : 30 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 Text tHeading Attributes - ID : 24 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 81 - y coordinate : 26 - Width : 320 - Height : 30 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Fill : solid color - Style : flat - Associated Keyboard : none - Font ID : 2 - Back. Color : 6371 - Font Color : 65535 - Horizontal Alignment : center - Vertical Alignment : center - Input Type : character - Text : - Max. Text Size : 40 - Word wrap : disabled - Horizontal Spacing : 0 - Vertical Spacing : 0 + ID : 24 + Scope : local + Dragging : 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 81 + y coordinate : 26 + Width : 320 + Height : 30 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 2 + Back. Color : 6371 + Font Color : 65535 + Horizontal Alignment: center + Vertical Alignment : center + Input Type : character + Text : + Max. Text Size : 40 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 Text tIcon1 Attributes - ID : 18 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 234 - y coordinate : 96 - 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 : 5 - Word wrap : disabled - Horizontal Spacing : 0 - Vertical Spacing : 0 + ID : 18 + Scope : local + Dragging : 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 234 + y coordinate : 96 + 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 : 5 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 Text tIcon2 Attributes - ID : 22 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 235 - y coordinate : 203 - 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 : 5 - Word wrap : disabled - Horizontal Spacing : 0 - Vertical Spacing : 0 + ID : 22 + Scope : local + Dragging : 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 235 + y coordinate : 203 + 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 : 5 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 Picture p0 Attributes - ID : 1 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 0 - y coordinate : 0 - Width : 480 - Height : 320 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Picture ID : 0 + ID : 1 + Scope : local + Dragging : 0 + Send Component ID: disabled + Opacity : 127 + x coordinate : 0 + y coordinate : 0 + Width : 480 + Height : 320 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Picture ID : 0 Button bNext Attributes - ID : 3 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 406 - y coordinate : 16 - Width : 50 - Height : 50 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Fill : solid color - Style : flat - Font ID : 3 - Back. Color : 6371 - Back. Picture ID (Pressed) : 65535 - Back. Color (Pressed) : 14823 - Font Color (Unpressed) : 65535 - Font Color (Pressed) : 65535 - Horizontal Alignment : center - Vertical Alignment : center - State : unpressed - Text :  - Max. Text Size : 10 - Word wrap : disabled - Horizontal Spacing : 0 - Vertical Spacing : 0 + ID : 3 + Scope : local + Dragging : 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 406 + y coordinate : 16 + Width : 50 + Height : 50 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Font ID : 3 + Back. Color : 6371 + Back. Picture ID (Pressed): 65535 + Back. Color (Pressed) : 14823 + Font Color (Unpressed) : 65535 + Font Color (Pressed) : 65535 + Horizontal Alignment : center + Vertical Alignment : center + State : unpressed + Text :  + Max. Text Size : 10 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 Events Touch Press Event @@ -367,35 +359,34 @@ Button bNext Button bPrev Attributes - ID : 4 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 24 - y coordinate : 16 - Width : 50 - Height : 50 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Fill : solid color - Style : flat - Font ID : 3 - Back. Color : 6371 - Back. Picture ID (Pressed) : 65535 - Back. Color (Pressed) : 14823 - Font Color (Unpressed) : 65535 - Font Color (Pressed) : 65535 - Horizontal Alignment : center - Vertical Alignment : center - State : unpressed - Text :  - Max. Text Size : 10 - Word wrap : disabled - Horizontal Spacing : 0 - Vertical Spacing : 0 + ID : 4 + Scope : local + Dragging : 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 24 + y coordinate : 16 + Width : 50 + Height : 50 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Font ID : 3 + Back. Color : 6371 + Back. Picture ID (Pressed): 65535 + Back. Color (Pressed) : 14823 + Font Color (Unpressed) : 65535 + Font Color (Pressed) : 65535 + Horizontal Alignment : center + Vertical Alignment : center + State : unpressed + Text :  + Max. Text Size : 10 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 Events Touch Press Event @@ -414,35 +405,34 @@ Button bPrev Button bText1 Attributes - ID : 19 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 235 - y coordinate : 146 - Width : 214 - Height : 30 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Fill : solid color - Style : flat - Font ID : 0 - Back. Color : 6371 - Back. Picture ID (Pressed) : 65535 - Back. Color (Pressed) : 14823 - Font Color (Unpressed) : 65535 - Font Color (Pressed) : 65535 - Horizontal Alignment : center - Vertical Alignment : center - State : unpressed - Text : - Max. Text Size : 30 - Word wrap : disabled - Horizontal Spacing : 0 - Vertical Spacing : 0 + ID : 19 + Scope : local + Dragging : 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 235 + y coordinate : 146 + Width : 214 + Height : 30 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Font ID : 0 + Back. Color : 6371 + Back. Picture ID (Pressed): 65535 + Back. Color (Pressed) : 14823 + Font Color (Unpressed) : 65535 + Font Color (Pressed) : 65535 + Horizontal Alignment : center + Vertical Alignment : center + State : unpressed + Text : + Max. Text Size : 30 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 Events Touch Press Event @@ -461,35 +451,34 @@ Button bText1 Button bText2 Attributes - ID : 23 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 237 - y coordinate : 253 - Width : 213 - Height : 30 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Fill : solid color - Style : flat - Font ID : 0 - Back. Color : 6371 - Back. Picture ID (Pressed) : 65535 - Back. Color (Pressed) : 14823 - Font Color (Unpressed) : 65535 - Font Color (Pressed) : 65535 - Horizontal Alignment : center - Vertical Alignment : center - State : unpressed - Text : - Max. Text Size : 30 - Word wrap : disabled - Horizontal Spacing : 0 - Vertical Spacing : 0 + ID : 23 + Scope : local + Dragging : 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 237 + y coordinate : 253 + Width : 213 + Height : 30 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Font ID : 0 + Back. Color : 6371 + Back. Picture ID (Pressed): 65535 + Back. Color (Pressed) : 14823 + Font Color (Unpressed) : 65535 + Font Color (Pressed) : 65535 + Horizontal Alignment : center + Vertical Alignment : center + State : unpressed + Text : + Max. Text Size : 30 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 Events Touch Press Event @@ -508,31 +497,30 @@ Button bText2 Dual-state Button btOnOff1 Attributes - ID : 2 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 399 - y coordinate : 137 - Width : 50 - Height : 50 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Fill : image - Font ID : 0 - Background Picture ID (Unpressed) : 1 - Back. Picture ID (Pressed) : 2 - Horizontal Alignment : center - Vertical Alignment : center - State : unpressed - Text : - Max. Text Size : 10 - Word wrap : disabled - Horizontal Spacing : 0 - Vertical Spacing : 0 + ID : 2 + Scope : local + Dragging : 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 399 + y coordinate : 137 + Width : 50 + Height : 50 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : image + Font ID : 0 + Background Picture ID (Unpressed): 1 + Back. Picture ID (Pressed) : 2 + Horizontal Alignment : center + Vertical Alignment : center + State : unpressed + Text : + Max. Text Size : 10 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 Events Touch Press Event @@ -553,31 +541,30 @@ Dual-state Button btOnOff1 Dual-state Button btOnOff2 Attributes - ID : 20 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 400 - y coordinate : 244 - Width : 50 - Height : 50 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Fill : image - Font ID : 0 - Background Picture ID (Unpressed) : 1 - Back. Picture ID (Pressed) : 2 - Horizontal Alignment : center - Vertical Alignment : center - State : unpressed - Text : - Max. Text Size : 10 - Word wrap : disabled - Horizontal Spacing : 0 - Vertical Spacing : 0 + ID : 20 + Scope : local + Dragging : 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 400 + y coordinate : 244 + Width : 50 + Height : 50 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : image + Font ID : 0 + Background Picture ID (Unpressed): 1 + Back. Picture ID (Pressed) : 2 + Horizontal Alignment : center + Vertical Alignment : center + State : unpressed + Text : + Max. Text Size : 10 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 Events Touch Press Event @@ -598,51 +585,48 @@ Dual-state Button btOnOff2 Hotspot m0 Attributes - ID : 29 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 28 - y coordinate : 91 - Width : 200 - Height : 200 - Effect : load - Effect Priority : 0 - Effect Time : 300 + ID : 29 + Scope : local + Dragging : 0 + Send Component ID: disabled + Opacity : 127 + x coordinate : 28 + y coordinate : 91 + Width : 200 + Height : 200 + Effect : load + Effect Priority : 0 + Effect Time : 300 Hotspot m1 Attributes - ID : 30 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 143 - y coordinate : 91 - Width : 200 - Height : 200 - Effect : load - Effect Priority : 0 - Effect Time : 300 + ID : 30 + Scope : local + Dragging : 0 + Send Component ID: disabled + Opacity : 127 + x coordinate : 143 + y coordinate : 91 + Width : 200 + Height : 200 + Effect : load + Effect Priority : 0 + Effect Time : 300 Hotspot mSwipeNext Attributes - ID : 11 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 471 - y coordinate : 5 - Width : 9 - Height : 310 - Effect : load - Effect Priority : 0 - Effect Time : 300 + ID : 11 + Scope : local + Dragging : 0 + Send Component ID: disabled + Opacity : 127 + x coordinate : 471 + y coordinate : 5 + Width : 9 + Height : 310 + Effect : load + Effect Priority : 0 + Effect Time : 300 Events Touch Press Event @@ -650,19 +634,18 @@ Hotspot mSwipeNext Hotspot mSwipePrev Attributes - ID : 13 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 0 - y coordinate : 0 - Width : 7 - Height : 315 - Effect : load - Effect Priority : 0 - Effect Time : 300 + ID : 13 + Scope : local + Dragging : 0 + Send Component ID: disabled + Opacity : 127 + x coordinate : 0 + y coordinate : 0 + Width : 7 + Height : 315 + Effect : load + Effect Priority : 0 + Effect Time : 300 Events Touch Press Event @@ -670,19 +653,18 @@ Hotspot mSwipePrev Hotspot mSwipeUp Attributes - ID : 12 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 12 - y coordinate : 0 - Width : 426 - Height : 9 - Effect : load - Effect Priority : 0 - Effect Time : 300 + ID : 12 + Scope : local + Dragging : 0 + Send Component ID: disabled + Opacity : 127 + x coordinate : 12 + y coordinate : 0 + Width : 426 + Height : 9 + Effect : load + Effect Priority : 0 + Effect Time : 300 Events Touch Press Event @@ -907,11 +889,11 @@ Timer tmSerial { if(type1.txt=="delete"||type1.txt=="") { - qrcode m1.x,m1.y,200,65535,defaultBcoColor,-1,vaQR.txt + qrcode m1.x,m1.y,200,65535,defaultBcoColor,-1,8,vaQR.txt } }else { - qrcode m0.x,m0.y,200,65535,defaultBcoColor,-1,vaQR.txt + qrcode m0.x,m0.y,200,65535,defaultBcoColor,-1,8,vaQR.txt } } if(tInstruction.txt=="time") diff --git a/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt b/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt index 487e7b0d..09db2dcd 100644 --- a/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt +++ b/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt @@ -1,7 +1,11 @@ Program.s 0 Component(s) - 12 Line(s) of event code - 12 Unique line(s) of event code + 13 Line(s) of event code + 13 Unique line(s) of event code +cardQR + 34 Component(s) + 406 Line(s) of event code + 236 Unique line(s) of event code pageIcons 7 Component(s) 0 Line(s) of event code @@ -54,10 +58,6 @@ cardMedia 59 Component(s) 645 Line(s) of event code 320 Unique line(s) of event code -popupLight - 28 Component(s) - 408 Line(s) of event code - 225 Unique line(s) of event code popupTimer 42 Component(s) 512 Line(s) of event code @@ -78,10 +78,10 @@ screensaver2 58 Component(s) 344 Line(s) of event code 243 Unique line(s) of event code -cardQR - 34 Component(s) +popupLight + 23 Component(s) 406 Line(s) of event code - 236 Unique line(s) of event code + 207 Unique line(s) of event code cardEntities 67 Component(s) 1166 Line(s) of event code @@ -89,6 +89,6 @@ cardEntities Total 21 Page(s) - 800 Component(s) - 9224 Line(s) of event code - 2331 Unique line(s) of event code + 795 Component(s) + 9223 Line(s) of event code + 2322 Unique line(s) of event code diff --git a/HMI/US/landscape/n2t-out-visual/popupLight.txt b/HMI/US/landscape/n2t-out-visual/popupLight.txt index 3c992d12..8456940f 100644 --- a/HMI/US/landscape/n2t-out-visual/popupLight.txt +++ b/HMI/US/landscape/n2t-out-visual/popupLight.txt @@ -1,22 +1,21 @@ Page popupLight Attributes - ID : 0 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - Width : 480 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Locked : no - Swide up page ID : disabled - Swide down page ID : disabled - Swide left page ID : disabled - Swide right page ID : disabled - Fill : solid color - Back. Color : 6371 + ID : 0 + Scope : local + Dragging : 0 + Send Component ID : disabled + Opacity : 127 + Width : 480 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Locked : no + Swide up page ID : disabled + Swide down page ID : disabled + Swide left page ID : disabled + Swide right page ID: disabled + Fill : solid color + Back. Color : 6371 Events Preinitialize Event @@ -25,13 +24,12 @@ Page popupLight 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 @@ -48,16 +46,16 @@ Page popupLight prints tSend.txt,0 prints crcval,2 //disable brightness by default - vis t1,0 - vis t2,0 - vis hBrightness,0 + //vis t1,0 + //vis t2,0 + vis hBrightness,1 //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 @@ -76,380 +74,117 @@ Page popupLight } if(defaultBcoColor==0) { - hBrightness.pic=14 - hBrightness.pic1=13 - hBrightness.pic2=15 hTempSlider.pic=16 - hTempSlider.pic1=17 - hTempSlider.pic2=15 + hTempSlider.pic1=16 } + Postinitialize Event + fill hBrightness.x,hBrightness.y,100,250,defaultBcoColor + +Variable (int32) col + Attributes + ID : 18 + Scope: local + Value: 65504 + Variable (string) entn Attributes - ID : 20 + ID : 11 Scope : local Text : Max. Text Size: 80 Variable (int32) mode Attributes - ID : 22 + ID : 13 Scope: local Value: 1 Variable (int32) mode_temp Attributes - ID : 23 + ID : 14 Scope: local Value: 0 Variable (string) strCommand Attributes - ID : 16 + ID : 9 Scope : local Text : 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 Attributes - ID : 26 + ID : 16 Scope : local Text : Max. Text Size: 200 -Text t0 +Variable (string) tTmp Attributes - ID : 24 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 24 - y coordinate : 80 - Width : 64 - 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 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 25 - y coordinate : 226 - Width : 211 - 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 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 25 - 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 t3 - Attributes - ID : 10 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 25 - y coordinate : 181 - 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 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 24 - y coordinate : 143 - Width : 242 - 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 + ID : 21 + Scope : local + Text : + Max. Text Size: 80 Text tEntity Attributes - ID : 3 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 107 - y coordinate : 21 - Width : 263 - 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 : tEntity1 - Max. Text Size : 25 - Word wrap : disabled - Horizontal Spacing : 0 - Vertical Spacing : 0 - -Text tIcon1 - Attributes - ID : 4 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 26 - 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 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 115 - y coordinate : 290 - 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 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 15 - y coordinate : 290 - 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 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 421 - y coordinate : 277 - 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 - ID : 1 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 0 - y coordinate : 0 - Width : 480 - Height : 320 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Picture ID : 0 + ID : 2 + Scope : local + Dragging : 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 108 + y coordinate : 21 + Width : 263 + 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 : 65535 + Horizontal Alignment: center + Vertical Alignment : center + Input Type : character + Text : tEntity1 + Max. Text Size : 25 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 Picture pColorWheel Attributes - ID : 2 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 182 - y coordinate : 69 - Width : 160 - Height : 160 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Picture ID : 3 + ID : 1 + Scope : local + Dragging : 0 + Send Component ID: disabled + Opacity : 127 + x coordinate : 249 + y coordinate : 105 + Width : 160 + Height : 160 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Picture ID : 3 Events Touch Press Event @@ -481,31 +216,44 @@ Picture pColorWheel Slider hBrightness Attributes - ID : 7 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 76 - y coordinate : 261 - Width : 335 - Height : 43 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Direction : horizontal - Fill : image - Cursor width : auto - Cursor height : 255 - Back. Picture ID : 5 - Slided Back. Picture ID : 4 - Position : 50 - Upper range limit : 100 - Lower range limit : 0 + ID : 4 + Scope : local + Dragging : 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 105 + y coordinate : 64 + Width : 100 + Height : 250 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Direction : vertical + Fill : image + Cursor width : auto + Cursor height : 1 + Back. Picture ID : 65535 + Slided Back. Picture ID: 65535 + 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 @@ -526,28 +274,27 @@ Slider hBrightness Slider hTempSlider Attributes - ID : 19 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 76 - y coordinate : 178 - Width : 335 - Height : 44 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Direction : horizontal - Fill : image - Cursor width : auto - Cursor height : 255 - Back. Picture ID : 7 - Slided Back. Picture ID : 8 - Position : 50 - Upper range limit : 100 - Lower range limit : 0 + ID : 10 + Scope : local + Dragging : 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 279 + y coordinate : 64 + Width : 100 + Height : 250 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Direction : vertical + Fill : image + Cursor width : auto + Cursor height : 255 + Back. Picture ID : 7 + Slided Back. Picture ID: 7 + Position : 50 + Upper range limit : 100 + Lower range limit : 0 Events Touch Release Event @@ -571,35 +318,34 @@ Slider hTempSlider Button b0 Attributes - ID : 5 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 412 - y coordinate : 8 - Width : 50 - Height : 50 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Fill : solid color - Style : flat - Font ID : 1 - Back. Color : 6371 - Back. Picture ID (Pressed) : 65535 - Back. Color (Pressed) : 14823 - Font Color (Unpressed) : 65535 - Font Color (Pressed) : 65535 - Horizontal Alignment : center - Vertical Alignment : center - State : unpressed - Text :  - Max. Text Size : 10 - Word wrap : disabled - Horizontal Spacing : 0 - Vertical Spacing : 0 + ID : 3 + Scope : local + Dragging : 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 413 + y coordinate : 8 + Width : 50 + Height : 50 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Font ID : 1 + Back. Color : 6371 + Back. Picture ID (Pressed): 65535 + Back. Color (Pressed) : 14823 + Font Color (Unpressed) : 65535 + Font Color (Pressed) : 65535 + Horizontal Alignment : center + Vertical Alignment : center + State : unpressed + Text :  + Max. Text Size : 10 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 Events Touch Press Event @@ -618,35 +364,34 @@ Button b0 Button bColor Attributes - ID : 21 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 108 - y coordinate : 68 - Width : 50 - Height : 50 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Fill : solid color - Style : flat - Font ID : 1 - Back. Color : 6371 - Back. Picture ID (Pressed) : 65535 - Back. Color (Pressed) : 14823 - Font Color (Unpressed) : 65535 - Font Color (Pressed) : 65535 - Horizontal Alignment : center - Vertical Alignment : center - State : unpressed - Text :  - Max. Text Size : 10 - Word wrap : disabled - Horizontal Spacing : 0 - Vertical Spacing : 0 + ID : 12 + Scope : local + Dragging : 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 30 + y coordinate : 146 + Width : 50 + Height : 50 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Font ID : 1 + Back. Color : 6371 + Back. Picture ID (Pressed): 65535 + Back. Color (Pressed) : 14823 + Font Color (Unpressed) : 65535 + Font Color (Pressed) : 65535 + Horizontal Alignment : center + Vertical Alignment : center + State : unpressed + Text :  + Max. Text Size : 10 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 Events Touch Press Event @@ -656,8 +401,8 @@ Button bColor //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 { @@ -667,78 +412,75 @@ Button bColor 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 - ID : 27 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 411 - y coordinate : 95 - Width : 50 - Height : 50 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Fill : solid color - Style : flat - Font ID : 1 - Back. Color : 6371 - Back. Picture ID (Pressed) : 65535 - Back. Color (Pressed) : 14823 - Font Color (Unpressed) : 65535 - Font Color (Pressed) : 65535 - Horizontal Alignment : center - Vertical Alignment : center - State : unpressed - Text :  - Max. Text Size : 10 - Word wrap : disabled - Horizontal Spacing : 0 - Vertical Spacing : 0 + ID : 17 + Scope : local + Dragging : 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 30 + y coordinate : 213 + Width : 50 + Height : 50 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Font ID : 1 + Back. Color : 6371 + Back. Picture ID (Pressed): 65535 + Back. Color (Pressed) : 14823 + Font Color (Unpressed) : 65535 + Font Color (Pressed) : 65535 + Horizontal Alignment : center + Vertical Alignment : center + State : unpressed + Text :  + Max. Text Size : 10 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 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 - ID : 8 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 356 - y coordinate : 95 - Width : 50 - Height : 50 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Fill : image - Font ID : 0 - Background Picture ID (Unpressed) : 1 - Back. Picture ID (Pressed) : 2 - Horizontal Alignment : center - Vertical Alignment : center - State : unpressed - Text : - Max. Text Size : 10 - Word wrap : disabled - Horizontal Spacing : 0 - Vertical Spacing : 0 + ID : 5 + Scope : local + Dragging : 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 30 + y coordinate : 77 + Width : 50 + Height : 50 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : image + Font ID : 0 + Background Picture ID (Unpressed): 1 + Back. Picture ID (Pressed) : 2 + Horizontal Alignment : center + Vertical Alignment : center + State : unpressed + Text : + Max. Text Size : 10 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 Events Touch Press Event @@ -760,7 +502,7 @@ Dual-state Button btOnOff1 Timer tmCooldown Attributes - ID : 25 + ID : 15 Scope : local Period (ms): 100 Enabled : no @@ -769,9 +511,34 @@ Timer tmCooldown Timer Event 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 Attributes - ID : 15 + ID : 8 Scope : local Period (ms): 50 Enabled : yes @@ -826,11 +593,12 @@ Timer tmSerial { // 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 - tIcon1.pco=sys0 + col.val=sys0 + //tEntity.pco=sys0 // get Button State spstr strCommand.txt,tTmp.txt,"~",4 covx tTmp.txt,sys0,0,0 @@ -839,27 +607,26 @@ Timer tmSerial 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 - if(tmCooldown.en==0) - { - hBrightness.val=sys0 - } + hBrightness.val=sys0 + tmDrawCooldown.en=1 + tmDrawCooldown.tim=500 } // 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) @@ -882,8 +649,8 @@ Timer tmSerial { 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 @@ -902,12 +669,12 @@ Timer tmSerial // 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) { @@ -919,11 +686,11 @@ Timer tmSerial } } // 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") @@ -1054,7 +821,7 @@ Timer tmSerial Timer tmSleep Attributes - ID : 14 + ID : 7 Scope : local Period (ms): 1000 Enabled : yes @@ -1074,7 +841,7 @@ Timer tmSleep TouchCap tc0 Attributes - ID : 13 + ID : 6 Scope: local Value: 0 diff --git a/HMI/US/landscape/n2t-out/Program.s.txt b/HMI/US/landscape/n2t-out/Program.s.txt index f98bc1b6..2f32f633 100644 --- a/HMI/US/landscape/n2t-out/Program.s.txt +++ b/HMI/US/landscape/n2t-out/Program.s.txt @@ -16,4 +16,5 @@ Program.s int defaultBcoColor=6371 // fix touch offset //lcd_dev fffb 0002 0000 0020 + printh 00 00 00 ff ff ff 88 ff ff ff//Output power on information to serial port page pageStartup diff --git a/HMI/US/landscape/n2t-out/cardQR.txt b/HMI/US/landscape/n2t-out/cardQR.txt index 484830cd..aa139561 100644 --- a/HMI/US/landscape/n2t-out/cardQR.txt +++ b/HMI/US/landscape/n2t-out/cardQR.txt @@ -1,14 +1,13 @@ Page cardQR Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Locked : no - Swide up page ID : disabled - Swide down page ID : disabled - Swide left page ID : disabled - Swide right page ID : disabled + Scope : local + Dragging : 0 + Send Component ID : disabled + Locked : no + Swide up page ID : disabled + Swide down page ID : disabled + Swide left page ID : disabled + Swide right page ID: disabled Events Preinitialize Event @@ -132,70 +131,63 @@ Variable (string) vaQR Text tEntity1 Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Text : tEntity1 - Max. Text Size : 30 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : tEntity1 + Max. Text Size : 30 Text tEntity2 Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Text : tEntity1 - Max. Text Size : 30 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : tEntity1 + Max. Text Size : 30 Text tHeading Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Text : - Max. Text Size : 40 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 40 Text tIcon1 Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Text :  - Max. Text Size : 5 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text :  + Max. Text Size : 5 Text tIcon2 Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Text :  - Max. Text Size : 5 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text :  + Max. Text Size : 5 Picture p0 Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled + Scope : local + Dragging : 0 + Send Component ID: disabled Button bNext Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - State : unpressed - Text :  - Max. Text Size : 10 + Scope : local + Dragging : 0 + Send Component ID: disabled + State : unpressed + Text :  + Max. Text Size : 10 Events Touch Press Event @@ -214,13 +206,12 @@ Button bNext Button bPrev Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - State : unpressed - Text :  - Max. Text Size : 10 + Scope : local + Dragging : 0 + Send Component ID: disabled + State : unpressed + Text :  + Max. Text Size : 10 Events Touch Press Event @@ -239,13 +230,12 @@ Button bPrev Button bText1 Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - State : unpressed - Text : - Max. Text Size : 30 + Scope : local + Dragging : 0 + Send Component ID: disabled + State : unpressed + Text : + Max. Text Size : 30 Events Touch Press Event @@ -264,13 +254,12 @@ Button bText1 Button bText2 Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - State : unpressed - Text : - Max. Text Size : 30 + Scope : local + Dragging : 0 + Send Component ID: disabled + State : unpressed + Text : + Max. Text Size : 30 Events Touch Press Event @@ -289,13 +278,12 @@ Button bText2 Dual-state Button btOnOff1 Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - State : unpressed - Text : - Max. Text Size : 10 + Scope : local + Dragging : 0 + Send Component ID: disabled + State : unpressed + Text : + Max. Text Size : 10 Events Touch Press Event @@ -316,13 +304,12 @@ Dual-state Button btOnOff1 Dual-state Button btOnOff2 Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - State : unpressed - Text : - Max. Text Size : 10 + Scope : local + Dragging : 0 + Send Component ID: disabled + State : unpressed + Text : + Max. Text Size : 10 Events Touch Press Event @@ -343,24 +330,21 @@ Dual-state Button btOnOff2 Hotspot m0 Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled + Scope : local + Dragging : 0 + Send Component ID: disabled Hotspot m1 Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled + Scope : local + Dragging : 0 + Send Component ID: disabled Hotspot mSwipeNext Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled + Scope : local + Dragging : 0 + Send Component ID: disabled Events Touch Press Event @@ -368,10 +352,9 @@ Hotspot mSwipeNext Hotspot mSwipePrev Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled + Scope : local + Dragging : 0 + Send Component ID: disabled Events Touch Press Event @@ -379,10 +362,9 @@ Hotspot mSwipePrev Hotspot mSwipeUp Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled + Scope : local + Dragging : 0 + Send Component ID: disabled Events Touch Press Event @@ -606,11 +588,11 @@ Timer tmSerial { if(type1.txt=="delete"||type1.txt=="") { - qrcode m1.x,m1.y,200,65535,defaultBcoColor,-1,vaQR.txt + qrcode m1.x,m1.y,200,65535,defaultBcoColor,-1,8,vaQR.txt } }else { - qrcode m0.x,m0.y,200,65535,defaultBcoColor,-1,vaQR.txt + qrcode m0.x,m0.y,200,65535,defaultBcoColor,-1,8,vaQR.txt } } if(tInstruction.txt=="time") diff --git a/HMI/US/landscape/n2t-out/popupLight.txt b/HMI/US/landscape/n2t-out/popupLight.txt index 62684594..59e30822 100644 --- a/HMI/US/landscape/n2t-out/popupLight.txt +++ b/HMI/US/landscape/n2t-out/popupLight.txt @@ -1,14 +1,13 @@ Page popupLight Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Locked : no - Swide up page ID : disabled - Swide down page ID : disabled - Swide left page ID : disabled - Swide right page ID : disabled + Scope : local + Dragging : 0 + Send Component ID : disabled + Locked : no + Swide up page ID : disabled + Swide down page ID : disabled + Swide left page ID : disabled + Swide right page ID: disabled Events Preinitialize Event @@ -17,13 +16,12 @@ Page popupLight 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 @@ -40,16 +38,16 @@ Page popupLight prints tSend.txt,0 prints crcval,2 //disable brightness by default - vis t1,0 - vis t2,0 - vis hBrightness,0 + //vis t1,0 + //vis t2,0 + vis hBrightness,1 //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 @@ -68,14 +66,18 @@ Page popupLight } if(defaultBcoColor==0) { - hBrightness.pic=14 - hBrightness.pic1=13 - hBrightness.pic2=15 hTempSlider.pic=16 - hTempSlider.pic1=17 - hTempSlider.pic2=15 + hTempSlider.pic1=16 } + Postinitialize Event + fill hBrightness.x,hBrightness.y,100,250,defaultBcoColor + +Variable (int32) col + Attributes + Scope: local + Value: 65504 + Variable (string) entn Attributes Scope : local @@ -98,125 +100,44 @@ Variable (string) strCommand Text : 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 Attributes Scope : local Text : Max. Text Size: 200 -Text t0 +Variable (string) tTmp Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Text : Color - Max. Text Size : 50 - -Text t1 - Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Text : Brightness - Max. Text Size : 50 - -Text t2 - Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Text :  - Max. Text Size : 10 - -Text t3 - Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Text :  - Max. Text Size : 10 - -Text t4 - Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Text : Temperature - Max. Text Size : 50 + Scope : local + Text : + Max. Text Size: 80 Text tEntity Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Text : tEntity1 - Max. Text Size : 25 - -Text tIcon1 - Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Text :  - Max. Text Size : 10 - -Text tId - Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Text : - Max. Text Size : 20 - -Text tInstruction - Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Text : - Max. Text Size : 20 - -Text tTmp - Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Text : - Max. Text Size : 80 - -Picture p0 - Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : tEntity1 + Max. Text Size : 25 Picture pColorWheel Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled + Scope : local + Dragging : 0 + Send Component ID: disabled Events Touch Press Event @@ -248,16 +169,29 @@ Picture pColorWheel Slider hBrightness 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 + Scope : local + Dragging : 0 + 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 @@ -278,13 +212,12 @@ Slider hBrightness Slider hTempSlider 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 + Scope : local + Dragging : 0 + Send Component ID: disabled + Position : 50 + Upper range limit: 100 + Lower range limit: 0 Events Touch Release Event @@ -308,13 +241,12 @@ Slider hTempSlider Button b0 Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - State : unpressed - Text :  - Max. Text Size : 10 + Scope : local + Dragging : 0 + Send Component ID: disabled + State : unpressed + Text :  + Max. Text Size : 10 Events Touch Press Event @@ -333,13 +265,12 @@ Button b0 Button bColor Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - State : unpressed - Text :  - Max. Text Size : 10 + Scope : local + Dragging : 0 + Send Component ID: disabled + State : unpressed + Text :  + Max. Text Size : 10 Events Touch Press Event @@ -349,8 +280,8 @@ Button bColor //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 { @@ -360,38 +291,35 @@ Button bColor 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 - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - State : unpressed - Text :  - Max. Text Size : 10 + Scope : local + Dragging : 0 + Send Component ID: disabled + State : unpressed + 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 - Disable release event after dragging: 0 - Send Component ID : disabled - State : unpressed - Text : - Max. Text Size : 10 + Scope : local + Dragging : 0 + Send Component ID: disabled + State : unpressed + Text : + Max. Text Size : 10 Events Touch Press Event @@ -421,6 +349,30 @@ Timer tmCooldown 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 @@ -477,11 +429,12 @@ Timer tmSerial { // 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 - tIcon1.pco=sys0 + col.val=sys0 + //tEntity.pco=sys0 // get Button State spstr strCommand.txt,tTmp.txt,"~",4 covx tTmp.txt,sys0,0,0 @@ -490,27 +443,26 @@ Timer tmSerial 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 - if(tmCooldown.en==0) - { - hBrightness.val=sys0 - } + hBrightness.val=sys0 + tmDrawCooldown.en=1 + tmDrawCooldown.tim=500 } // 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) @@ -533,8 +485,8 @@ Timer tmSerial { 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 @@ -553,12 +505,12 @@ Timer tmSerial // 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) { @@ -570,11 +522,11 @@ Timer tmSerial } } // 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") diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index 3091b496..91a089b3 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,4 +1,4 @@ -+++ /dev/fd/62 2023-04-19 16:16:22.100652931 +0000 ++++ /dev/fd/62 2023-04-25 21:43:04.277460634 +0000 +I/n2t-out/Program.s.txt ++ HMI/US/portrait/n2t-out/Program.s.txt +1 +10,10 @@