diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 55a1274d..5529e5c0 100644 --- a/HMI/US/landscape/diff-eu-version.txt +++ b/HMI/US/landscape/diff-eu-version.txt @@ -2,18 +2,141 @@ +++ HMI/US/landscape/n2t-out │ --- HMI/n2t-out/Program.s.txt ├── +++ HMI/US/landscape/n2t-out/Program.s.txt -│ @@ -11,10 +11,10 @@ -│ // dim value -│ int dimValue=40 +│ @@ -13,10 +13,10 @@ │ int dimValueNormal=100 │ //color vars │ int defaultFontColor=65535 │ int defaultBcoColor=6371 +│ //feature flags +│ int featNewSliders=0 │ // fix touch offset │ - lcd_dev fffb 0002 0000 0020 │ + //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/cardEntities.txt +├── +++ HMI/US/landscape/n2t-out/cardEntities.txt +│ @@ -961,21 +961,16 @@ +│ if(type1.txt=="shutter") +│ { +│ //popupShutter.tHeading.txt=tEntity1.txt +│ page popupShutter +│ } +│ if(type1.txt=="light") +│ { +│ - if(featNewSliders==1) +│ - { +│ - page popupLightNew +│ - }else +│ - { +│ - page popupLight +│ - } +│ + //popupLight.tEntity.txt=tEntity1.txt +│ + page popupLight +│ } +│ if(type1.txt=="fan") +│ { +│ page popupFan +│ } +│ if(type1.txt=="input_sel") +│ { +│ @@ -1000,21 +995,16 @@ +│ if(type2.txt=="shutter") +│ { +│ //popupShutter.tHeading.txt=tEntity2.txt +│ page popupShutter +│ } +│ if(type2.txt=="light") +│ { +│ - if(featNewSliders==1) +│ - { +│ - page popupLightNew +│ - }else +│ - { +│ - page popupLight +│ - } +│ + //popupLight.tEntity.txt=tEntity2.txt +│ + page popupLight +│ } +│ if(type2.txt=="fan") +│ { +│ page popupFan +│ } +│ if(type2.txt=="input_sel") +│ { +│ @@ -1039,21 +1029,16 @@ +│ if(type3.txt=="shutter") +│ { +│ //popupShutter.tHeading.txt=tEntity3.txt +│ page popupShutter +│ } +│ if(type3.txt=="light") +│ { +│ - if(featNewSliders==1) +│ - { +│ - page popupLightNew +│ - }else +│ - { +│ - page popupLight +│ - } +│ + //popupLight.tEntity.txt=tEntity3.txt +│ + page popupLight +│ } +│ if(type3.txt=="fan") +│ { +│ page popupFan +│ } +│ if(type3.txt=="input_sel") +│ { +│ @@ -1078,21 +1063,16 @@ +│ if(type4.txt=="shutter") +│ { +│ //popupShutter.tHeading.txt=tEntity4.txt +│ page popupShutter +│ } +│ if(type4.txt=="light") +│ { +│ - if(featNewSliders==1) +│ - { +│ - page popupLightNew +│ - }else +│ - { +│ - page popupLight +│ - } +│ + //popupLight.tEntity.txt=tEntity4.txt +│ + page popupLight +│ } +│ if(type4.txt=="fan") +│ { +│ page popupFan +│ } +│ if(type4.txt=="input_sel") +│ { +│ --- HMI/n2t-out/cardGrid.txt +├── +++ HMI/US/landscape/n2t-out/cardGrid.txt +│ @@ -601,21 +601,15 @@ +│ Period (ms): 500 +│ Enabled : no +│ +│ Events +│ Timer Event +│ if(tTmp.txt=="light") +│ { +│ - if(featNewSliders==1) +│ - { +│ - page popupLightNew +│ - }else +│ - { +│ - page popupLight +│ - } +│ + page popupLight +│ } +│ if(tTmp.txt=="fan") +│ { +│ page popupFan +│ } +│ +│ Timer tmSerial │ --- HMI/n2t-out/cardGrid2.txt ├── +++ HMI/US/landscape/n2t-out/cardGrid2.txt │ @@ -555,34 +555,34 @@ @@ -102,6 +225,29 @@ │ crcputs sys0,2 │ crcputs tSend.txt,0 │ //send cmd +│ @@ -735,21 +735,15 @@ +│ Period (ms): 500 +│ Enabled : no +│ +│ Events +│ Timer Event +│ if(tTmp.txt=="light") +│ { +│ - if(featNewSliders==1) +│ - { +│ - page popupLightNew +│ - }else +│ - { +│ - page popupLight +│ - } +│ + page popupLight +│ } +│ if(tTmp.txt=="fan") +│ { +│ page popupFan +│ } +│ +│ Timer tmSerial │ --- HMI/n2t-out/cardPower.txt ├── +++ HMI/US/landscape/n2t-out/cardPower.txt │ @@ -960,18 +960,14 @@ @@ -142,6 +288,27 @@ │ crcputs sys0,2 │ crcputs tSend.txt,0 │ //send cmd +│ @@ -275,20 +275,14 @@ +│ } +│ // get font color +│ spstr strCommand.txt,tTmp.txt,"~",4 +│ if(tTmp.txt!="") +│ { +│ covx tTmp.txt,defaultFontColor,0,0 +│ } +│ - // get feature flag popup +│ - spstr strCommand.txt,tTmp.txt,"~",5 +│ - if(tTmp.txt!="") +│ - { +│ - covx tTmp.txt,featNewSliders,0,0 +│ - } +│ } +│ if(tInstruction.txt=="timeout") +│ { +│ //set timeout to global var +│ spstr strCommand.txt,tTmp.txt,"~",1 +│ covx tTmp.txt,sleepTimeout,0,0 +│ } │ --- HMI/n2t-out/screensaver.txt ├── +++ HMI/US/landscape/n2t-out/screensaver.txt │ @@ -28,17 +28,14 @@ diff --git a/HMI/US/landscape/n2t-out-visual/Program.s.txt b/HMI/US/landscape/n2t-out-visual/Program.s.txt index 2f32f633..2c40baf1 100644 --- a/HMI/US/landscape/n2t-out-visual/Program.s.txt +++ b/HMI/US/landscape/n2t-out-visual/Program.s.txt @@ -14,6 +14,8 @@ Program.s //color vars int defaultFontColor=65535 int defaultBcoColor=6371 + //feature flags + int featNewSliders=0 // 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 diff --git a/HMI/US/landscape/n2t-out-visual/cardGrid.txt b/HMI/US/landscape/n2t-out-visual/cardGrid.txt index 9b27a970..7a37e3aa 100644 --- a/HMI/US/landscape/n2t-out-visual/cardGrid.txt +++ b/HMI/US/landscape/n2t-out-visual/cardGrid.txt @@ -259,7 +259,7 @@ Text tEntity4 Dragging : 0 Send Component ID : disabled Opacity : 127 - x coordinate : 16 + x coordinate : 22 y coordinate : 274 Width : 140 Height : 30 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 a4f3fa33..4b7e6389 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,7 @@ Program.s 0 Component(s) - 13 Line(s) of event code - 13 Unique line(s) of event code + 14 Line(s) of event code + 14 Unique line(s) of event code popupThermo 44 Component(s) 523 Line(s) of event code @@ -18,10 +18,6 @@ popupTimer 42 Component(s) 516 Line(s) of event code 257 Unique line(s) of event code -popupLight - 23 Component(s) - 410 Line(s) of event code - 209 Unique line(s) of event code cardChart 33 Component(s) 437 Line(s) of event code @@ -54,10 +50,10 @@ cardAlarm 43 Component(s) 500 Line(s) of event code 273 Unique line(s) of event code -cardGrid - 44 Component(s) - 523 Line(s) of event code - 295 Unique line(s) of event code +popupLight + 28 Component(s) + 408 Line(s) of event code + 225 Unique line(s) of event code screensaver 46 Component(s) 435 Line(s) of event code @@ -82,17 +78,25 @@ screensaver2 58 Component(s) 348 Line(s) of event code 245 Unique line(s) of event code +cardGrid + 44 Component(s) + 523 Line(s) of event code + 295 Unique line(s) of event code cardPower 54 Component(s) 527 Line(s) of event code 347 Unique line(s) of event code +popupLightNew + 23 Component(s) + 412 Line(s) of event code + 209 Unique line(s) of event code cardEntities 67 Component(s) 1170 Line(s) of event code 532 Unique line(s) of event code Total - 22 Page(s) - 847 Component(s) - 9920 Line(s) of event code - 2360 Unique line(s) of event code + 23 Page(s) + 875 Component(s) + 10331 Line(s) of event code + 2387 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 3d4fcb30..6b8bf115 100644 --- a/HMI/US/landscape/n2t-out-visual/popupLight.txt +++ b/HMI/US/landscape/n2t-out-visual/popupLight.txt @@ -24,12 +24,13 @@ 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 @@ -46,16 +47,16 @@ Page popupLight 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 @@ -74,83 +75,115 @@ Page popupLight } 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 - ID : 18 - Scope: local - Value: 65504 - Variable (string) entn Attributes - ID : 11 + ID : 20 Scope : local Text : Max. Text Size: 80 Variable (int32) mode Attributes - ID : 13 + ID : 22 Scope: local Value: 1 Variable (int32) mode_temp Attributes - ID : 14 + ID : 23 Scope: local Value: 0 Variable (string) strCommand Attributes - ID : 9 + ID : 16 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 : 16 + ID : 26 Scope : local Text : Max. Text Size: 200 -Variable (string) tTmp +Text t0 Attributes - ID : 21 - Scope : local - Text : - Max. Text Size: 80 - -Text tEntity - Attributes - ID : 2 + ID : 24 Scope : local Dragging : 0 Send Component ID : disabled Opacity : 127 - x coordinate : 108 - y coordinate : 21 - Width : 263 + x coordinate : 9 + 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 + Send Component ID : disabled + Opacity : 127 + x coordinate : 10 + 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 + Send Component ID : disabled + Opacity : 127 + x coordinate : 10 + y coordinate : 267 + Width : 45 Height : 30 Effect : load Effect Priority : 0 @@ -160,25 +193,244 @@ Text tEntity Associated Keyboard : none Font ID : 1 Back. Color : 6371 - Font Color : 65535 + Font Color : 40147 Horizontal Alignment: center Vertical Alignment : center Input Type : character + Text :  + Max. Text Size : 10 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text t3 + Attributes + ID : 10 + Scope : local + Dragging : 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 10 + y coordinate : 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 + Send Component ID : disabled + Opacity : 127 + x coordinate : 9 + 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 + +Text tEntity + Attributes + ID : 3 + Scope : local + Dragging : 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 92 + 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 -Picture pColorWheel +Text tIcon1 + Attributes + ID : 4 + Scope : local + Dragging : 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 11 + y coordinate : 21 + Width : 45 + Height : 30 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 1 + Back. Color : 6371 + Font Color : 17299 + Horizontal Alignment: center + Vertical Alignment : center + Input Type : character + Text :  + Max. Text Size : 10 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text tId + Attributes + ID : 18 + Scope : local + Dragging : 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 100 + y coordinate : 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 + Send Component ID : disabled + Opacity : 127 + x coordinate : 0 + 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 + Send Component ID : disabled + Opacity : 127 + x coordinate : 406 + 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 Send Component ID: disabled Opacity : 127 - x coordinate : 249 - y coordinate : 105 + x coordinate : 0 + y coordinate : 0 + Width : 480 + Height : 320 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Picture ID : 0 + +Picture pColorWheel + Attributes + ID : 2 + Scope : local + Dragging : 0 + Send Component ID: disabled + Opacity : 127 + x coordinate : 167 + y coordinate : 69 Width : 160 Height : 160 Effect : load @@ -216,44 +468,30 @@ Picture pColorWheel Slider hBrightness Attributes - ID : 4 + ID : 7 Scope : local Dragging : 0 Send Component ID : disabled Opacity : 127 - x coordinate : 105 - y coordinate : 64 - Width : 100 - Height : 250 + x coordinate : 61 + y coordinate : 261 + Width : 335 + Height : 43 Effect : load Effect Priority : 0 Effect Time : 300 - Direction : vertical + Direction : horizontal Fill : image Cursor width : auto - Cursor height : 1 - Back. Picture ID : 65535 - Slided Back. Picture ID: 65535 + Cursor height : 255 + Back. Picture ID : 5 + Slided Back. Picture ID: 4 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 @@ -274,24 +512,24 @@ Slider hBrightness Slider hTempSlider Attributes - ID : 10 + ID : 19 Scope : local Dragging : 0 Send Component ID : disabled Opacity : 127 - x coordinate : 279 - y coordinate : 64 - Width : 100 - Height : 250 + x coordinate : 61 + y coordinate : 178 + Width : 335 + Height : 44 Effect : load Effect Priority : 0 Effect Time : 300 - Direction : vertical + Direction : horizontal Fill : image Cursor width : auto Cursor height : 255 - Back. Picture ID : 7 - Slided Back. Picture ID: 7 + Back. Picture ID : 22 + Slided Back. Picture ID: 23 Position : 50 Upper range limit : 100 Lower range limit : 0 @@ -318,12 +556,12 @@ Slider hTempSlider Button b0 Attributes - ID : 3 + ID : 5 Scope : local Dragging : 0 Send Component ID : disabled Opacity : 127 - x coordinate : 413 + x coordinate : 397 y coordinate : 8 Width : 50 Height : 50 @@ -364,13 +602,13 @@ Button b0 Button bColor Attributes - ID : 12 + ID : 21 Scope : local Dragging : 0 Send Component ID : disabled Opacity : 127 - x coordinate : 30 - y coordinate : 146 + x coordinate : 93 + y coordinate : 68 Width : 50 Height : 50 Effect : load @@ -401,8 +639,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 { @@ -412,21 +650,21 @@ 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 : 17 + ID : 27 Scope : local Dragging : 0 Send Component ID : disabled Opacity : 127 - x coordinate : 30 - y coordinate : 213 + x coordinate : 396 + y coordinate : 95 Width : 50 Height : 50 Effect : load @@ -453,17 +691,18 @@ Button bEffect 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 : 5 + ID : 8 Scope : local Dragging : 0 Send Component ID : disabled Opacity : 127 - x coordinate : 30 - y coordinate : 77 + x coordinate : 341 + y coordinate : 95 Width : 50 Height : 50 Effect : load @@ -502,7 +741,7 @@ Dual-state Button btOnOff1 Timer tmCooldown Attributes - ID : 15 + ID : 25 Scope : local Period (ms): 100 Enabled : no @@ -511,34 +750,9 @@ 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 : 8 + ID : 15 Scope : local Period (ms): 50 Enabled : yes @@ -593,12 +807,11 @@ 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 - col.val=sys0 - //tEntity.pco=sys0 + tIcon1.pco=sys0 // get Button State spstr strCommand.txt,tTmp.txt,"~",4 covx tTmp.txt,sys0,0,0 @@ -607,26 +820,27 @@ 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 - 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) @@ -649,8 +863,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 @@ -669,12 +883,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) { @@ -686,11 +900,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") @@ -768,10 +982,6 @@ Timer tmSerial { page cardGrid } - if(tId.txt=="cardGrid2") - { - page cardGrid2 - } if(tId.txt=="popupLight") { pageIcons.tTmp1.txt=tTmp.txt @@ -825,7 +1035,7 @@ Timer tmSerial Timer tmSleep Attributes - ID : 7 + ID : 14 Scope : local Period (ms): 1000 Enabled : yes @@ -845,7 +1055,7 @@ Timer tmSleep TouchCap tc0 Attributes - ID : 6 + ID : 13 Scope: local Value: 0 diff --git a/HMI/US/landscape/n2t-out-visual/popupLightNew.txt b/HMI/US/landscape/n2t-out-visual/popupLightNew.txt new file mode 100644 index 00000000..12fd6b27 --- /dev/null +++ b/HMI/US/landscape/n2t-out-visual/popupLightNew.txt @@ -0,0 +1,855 @@ +Page popupLightNew + Attributes + 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 + dim=dimValueNormal + //get entitiy name + tEntity.txt=pageIcons.tTmp1.txt + //get entity id + entn.txt=pageIcons.tTmp2.txt + 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 + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + //disable brightness by default + //vis t1,0 + //vis t2,0 + vis hBrightness,1 + //disable color temp by default + //vis t4,0 + //vis t3,0 + vis hTempSlider,0 + //disable color wheel components by default + vis bColor,0 + //vis t0,0 + vis pColorWheel,0 + //vis t0,0 + popupLightNew.bco=defaultBcoColor + for(sys0=0;sys0<27;sys0++) + { + if(b[sys0].type==98||b[sys0].type==116) + { + b[sys0].bco=defaultBcoColor + b[sys0].pco=defaultFontColor + } + if(b[sys0].type==53&&defaultBcoColor==0) + { + b[sys0].pic=10 + b[sys0].pic2=11 + } + } + if(defaultBcoColor==0) + { + hTempSlider.pic=16 + 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 : 11 + Scope : local + Text : + Max. Text Size: 80 + +Variable (int32) mode + Attributes + ID : 13 + Scope: local + Value: 1 + +Variable (int32) mode_temp + Attributes + ID : 14 + Scope: local + Value: 0 + +Variable (string) strCommand + Attributes + 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 : 16 + Scope : local + Text : + Max. Text Size: 200 + +Variable (string) tTmp + Attributes + ID : 21 + Scope : local + Text : + Max. Text Size: 80 + +Text tEntity + Attributes + ID : 2 + Scope : local + Dragging : 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 92 + 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 : 1 + Scope : local + Dragging : 0 + Send Component ID: disabled + Opacity : 127 + x coordinate : 233 + y coordinate : 105 + Width : 160 + Height : 160 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Picture ID : 3 + + Events + Touch Press Event + //craft command + tSend.txt="event,buttonPress2,"+entn.txt+",colorWheel," + sys0=tch0 + sys0=sys0-pColorWheel.x + covx sys0,tTmp.txt,0,0 + tSend.txt+=tTmp.txt + tSend.txt+="|" + sys0=tch1 + sys0=sys0-pColorWheel.y + covx sys0,tTmp.txt,0,0 + tSend.txt+=tTmp.txt + tSend.txt+="|" + covx pColorWheel.h,tTmp.txt,0,0 + tSend.txt+=tTmp.txt + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + +Slider hBrightness + Attributes + ID : 4 + Scope : local + Dragging : 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 89 + 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 + tSend.txt="event,buttonPress2,"+entn.txt+",brightnessSlider," + covx hBrightness.val,tTmp.txt,0,0 + tSend.txt+=tTmp.txt + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + +Slider hTempSlider + Attributes + ID : 10 + Scope : local + Dragging : 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 263 + 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 + tmCooldown.en=1 + tmCooldown.tim=2500 + //craft command + tSend.txt="event,buttonPress2,"+entn.txt+",colorTempSlider," + covx hTempSlider.val,tTmp.txt,0,0 + tSend.txt+=tTmp.txt + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + +Button b0 + Attributes + ID : 3 + Scope : local + Dragging : 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 397 + 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 + 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 + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + +Button bColor + Attributes + ID : 12 + Scope : local + Dragging : 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 14 + 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 + if(mode.val==1) + { + mode.val=0 + //enable color wheel + vis pColorWheel,1 + //disable color temp + //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 hTempSlider,1 + } + } + +Button bEffect + Attributes + ID : 17 + Scope : local + Dragging : 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 14 + 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 + page popupInSel + +Dual-state Button btOnOff1 + Attributes + ID : 5 + Scope : local + Dragging : 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 14 + 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 + //craft command + tSend.txt="event,buttonPress2,"+entn.txt+","+"OnOff," + covx btOnOff1.val,tTmp.txt,0,0 + tSend.txt+=tTmp.txt + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + +Timer tmCooldown + Attributes + ID : 15 + Scope : local + Period (ms): 100 + Enabled : no + + Events + 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 : 8 + Scope : local + Period (ms): 50 + Enabled : yes + + Events + Timer Event + // data available + if(usize>1) + { + bufferPos=0 + while(bufferPos isn't supported + if(tTmp.txt=="disable") + { + //vis t0,0 + vis bColor,0 + vis pColorWheel,0 + }else + { + //vis t0,1 + //only enable bColor button if color temp is also supported + if(mode_temp.val==1) + { + vis bColor,1 + } + if(mode.val==0) + { + vis pColorWheel,1 + } + } + // set t0 Color (Localization) + //spstr strCommand.txt,t0.txt,"~",8 + // set t4 Temperature (Localization) + //spstr strCommand.txt,t4.txt,"~",9 + // set t1 Brightness (Localization) + //spstr strCommand.txt,t1.txt,"~",10 + // activate effect button + spstr strCommand.txt,tTmp.txt,"~",11 + if(tTmp.txt=="enable") + { + vis bEffect,1 + }else + { + vis bEffect,0 + } + } + if(tInstruction.txt=="time") + { + // get set time to global variable + spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 + } + if(tInstruction.txt=="date") + { + // get set date to global variable + spstr strCommand.txt,pageIcons.vaDate.txt,"~",1 + } + if(tInstruction.txt=="dimmode") + { + // get value + spstr strCommand.txt,tTmp.txt,"~",1 + covx tTmp.txt,dimValue,0,0 + // get value normal + spstr strCommand.txt,tTmp.txt,"~",2 + covx tTmp.txt,dimValueNormal,0,0 + dim=dimValueNormal + // get background color + spstr strCommand.txt,tTmp.txt,"~",3 + if(tTmp.txt!="") + { + covx tTmp.txt,defaultBcoColor,0,0 + } + // get font color + spstr strCommand.txt,tTmp.txt,"~",4 + if(tTmp.txt!="") + { + covx tTmp.txt,defaultFontColor,0,0 + } + } + if(tInstruction.txt=="timeout") + { + //set timeout to global var + spstr strCommand.txt,tTmp.txt,"~",1 + covx tTmp.txt,sleepTimeout,0,0 + } + if(tInstruction.txt=="pageType") + { + //command format pageType,specialPageName + //write name of speical page to tId + spstr strCommand.txt,tId.txt,"~",1 + //save second arg if there's one + spstr strCommand.txt,tTmp.txt,"~",2 + //save third arg if there's one + spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3 + spstr strCommand.txt,pageIcons.tTmp3.txt,"~",4 + //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ... + udelete payloadLength-1 + bufferPos=0 + if(tId.txt=="pageStartup") + { + page pageStartup + } + if(tId.txt=="screensaver") + { + page screensaver + } + if(tId.txt=="cardEntities") + { + page cardEntities + } + if(tId.txt=="cardGrid") + { + page cardGrid + } + if(tId.txt=="cardGrid2") + { + page cardGrid2 + } + if(tId.txt=="popupLight") + { + pageIcons.tTmp1.txt=tTmp.txt + page popupLight + } + if(tId.txt=="popupShutter") + { + pageIcons.tTmp1.txt=tTmp.txt + page popupShutter + } + if(tId.txt=="popupNotify") + { + page popupNotify + } + if(tId.txt=="cardThermo") + { + page cardThermo + } + if(tId.txt=="cardMedia") + { + page cardMedia + } + if(tId.txt=="cardAlarm") + { + page cardAlarm + } + if(tId.txt=="cardQR") + { + page cardQR + } + if(tId.txt=="cardPower") + { + page cardPower + } + if(tId.txt=="cardChart") + { + page cardChart + } + } + // end of user code + udelete payloadLength-1 + bufferPos=0 + } + } + } + } + // next character + bufferPos++ + } + } + +Timer tmSleep + Attributes + ID : 7 + Scope : local + Period (ms): 1000 + Enabled : yes + + Events + Timer Event + if(sleepTimeout!=0) + { + sleepValue+=1 + if(sleepTimeout<=sleepValue) + { + sleepValue=0 + click b0,1 + click b0,0 + } + } + +TouchCap tc0 + Attributes + ID : 6 + Scope: local + Value: 0 + + Events + Touch Press Event + sleepValue=0 + diff --git a/HMI/US/landscape/n2t-out/Program.s.txt b/HMI/US/landscape/n2t-out/Program.s.txt index 2f32f633..2c40baf1 100644 --- a/HMI/US/landscape/n2t-out/Program.s.txt +++ b/HMI/US/landscape/n2t-out/Program.s.txt @@ -14,6 +14,8 @@ Program.s //color vars int defaultFontColor=65535 int defaultBcoColor=6371 + //feature flags + int featNewSliders=0 // 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 diff --git a/HMI/US/landscape/n2t-out/popupLight.txt b/HMI/US/landscape/n2t-out/popupLight.txt index d52b29a9..c9a5bf42 100644 --- a/HMI/US/landscape/n2t-out/popupLight.txt +++ b/HMI/US/landscape/n2t-out/popupLight.txt @@ -16,12 +16,13 @@ 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 @@ -38,16 +39,16 @@ Page popupLight 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 @@ -66,18 +67,14 @@ Page popupLight } 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 @@ -100,29 +97,56 @@ 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 -Variable (string) tTmp +Text t0 Attributes - Scope : local - Text : - Max. Text Size: 80 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : Color + Max. Text Size : 50 + +Text t1 + Attributes + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : Brightness + Max. Text Size : 50 + +Text t2 + Attributes + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text :  + Max. Text Size : 10 + +Text t3 + Attributes + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text :  + Max. Text Size : 10 + +Text t4 + Attributes + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : Temperature + Max. Text Size : 50 Text tEntity Attributes @@ -133,6 +157,48 @@ Text tEntity 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 @@ -178,20 +244,6 @@ Slider hBrightness 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 @@ -280,8 +332,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 { @@ -291,8 +343,8 @@ 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 } } @@ -310,6 +362,7 @@ Button bEffect Touch Press Event pageIcons.tTmp1.txt=tEntity.txt pageIcons.tTmp2.txt=entn.txt + pageIcons.tTmp3.txt=tIcon1.txt page popupInSel Dual-state Button btOnOff1 @@ -349,30 +402,6 @@ 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 @@ -429,12 +458,11 @@ 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 - col.val=sys0 - //tEntity.pco=sys0 + tIcon1.pco=sys0 // get Button State spstr strCommand.txt,tTmp.txt,"~",4 covx tTmp.txt,sys0,0,0 @@ -443,26 +471,27 @@ 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 - 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) @@ -485,8 +514,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 @@ -505,12 +534,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) { @@ -522,11 +551,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") @@ -604,10 +633,6 @@ Timer tmSerial { page cardGrid } - if(tId.txt=="cardGrid2") - { - page cardGrid2 - } if(tId.txt=="popupLight") { pageIcons.tTmp1.txt=tTmp.txt diff --git a/HMI/US/landscape/n2t-out/popupLightNew.txt b/HMI/US/landscape/n2t-out/popupLightNew.txt new file mode 100644 index 00000000..cab0befe --- /dev/null +++ b/HMI/US/landscape/n2t-out/popupLightNew.txt @@ -0,0 +1,689 @@ +Page popupLightNew + 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 + + Events + Preinitialize Event + dim=dimValueNormal + //get entitiy name + tEntity.txt=pageIcons.tTmp1.txt + //get entity id + entn.txt=pageIcons.tTmp2.txt + 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 + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + //disable brightness by default + //vis t1,0 + //vis t2,0 + vis hBrightness,1 + //disable color temp by default + //vis t4,0 + //vis t3,0 + vis hTempSlider,0 + //disable color wheel components by default + vis bColor,0 + //vis t0,0 + vis pColorWheel,0 + //vis t0,0 + popupLightNew.bco=defaultBcoColor + for(sys0=0;sys0<27;sys0++) + { + if(b[sys0].type==98||b[sys0].type==116) + { + b[sys0].bco=defaultBcoColor + b[sys0].pco=defaultFontColor + } + if(b[sys0].type==53&&defaultBcoColor==0) + { + b[sys0].pic=10 + b[sys0].pic2=11 + } + } + if(defaultBcoColor==0) + { + hTempSlider.pic=16 + 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 + Text : + Max. Text Size: 80 + +Variable (int32) mode + Attributes + Scope: local + Value: 1 + +Variable (int32) mode_temp + Attributes + Scope: local + Value: 0 + +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 + Attributes + Scope : local + Text : + Max. Text Size: 80 + +Text tEntity + Attributes + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : tEntity1 + Max. Text Size : 25 + +Picture pColorWheel + Attributes + Scope : local + 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 + covx sys0,tTmp.txt,0,0 + tSend.txt+=tTmp.txt + tSend.txt+="|" + sys0=tch1 + sys0=sys0-pColorWheel.y + covx sys0,tTmp.txt,0,0 + tSend.txt+=tTmp.txt + tSend.txt+="|" + covx pColorWheel.h,tTmp.txt,0,0 + tSend.txt+=tTmp.txt + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + +Slider hBrightness + Attributes + 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 + tSend.txt="event,buttonPress2,"+entn.txt+",brightnessSlider," + covx hBrightness.val,tTmp.txt,0,0 + tSend.txt+=tTmp.txt + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + +Slider hTempSlider + Attributes + Scope : local + 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," + covx hTempSlider.val,tTmp.txt,0,0 + tSend.txt+=tTmp.txt + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + +Button b0 + Attributes + Scope : local + 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 + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + +Button bColor + Attributes + Scope : local + 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 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 hTempSlider,1 + } + } + +Button bEffect + Attributes + 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 + page popupInSel + +Dual-state Button btOnOff1 + Attributes + Scope : local + 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 + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + +Timer tmCooldown + Attributes + Scope : local + 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 + Timer Event + // data available + if(usize>1) + { + bufferPos=0 + while(bufferPos isn't supported + if(tTmp.txt=="disable") + { + //vis t0,0 + vis bColor,0 + vis pColorWheel,0 + }else + { + //vis t0,1 + //only enable bColor button if color temp is also supported + if(mode_temp.val==1) + { + vis bColor,1 + } + if(mode.val==0) + { + vis pColorWheel,1 + } + } + // set t0 Color (Localization) + //spstr strCommand.txt,t0.txt,"~",8 + // set t4 Temperature (Localization) + //spstr strCommand.txt,t4.txt,"~",9 + // set t1 Brightness (Localization) + //spstr strCommand.txt,t1.txt,"~",10 + // activate effect button + spstr strCommand.txt,tTmp.txt,"~",11 + if(tTmp.txt=="enable") + { + vis bEffect,1 + }else + { + vis bEffect,0 + } + } + if(tInstruction.txt=="time") + { + // get set time to global variable + spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 + } + if(tInstruction.txt=="date") + { + // get set date to global variable + spstr strCommand.txt,pageIcons.vaDate.txt,"~",1 + } + if(tInstruction.txt=="dimmode") + { + // get value + spstr strCommand.txt,tTmp.txt,"~",1 + covx tTmp.txt,dimValue,0,0 + // get value normal + spstr strCommand.txt,tTmp.txt,"~",2 + covx tTmp.txt,dimValueNormal,0,0 + dim=dimValueNormal + // get background color + spstr strCommand.txt,tTmp.txt,"~",3 + if(tTmp.txt!="") + { + covx tTmp.txt,defaultBcoColor,0,0 + } + // get font color + spstr strCommand.txt,tTmp.txt,"~",4 + if(tTmp.txt!="") + { + covx tTmp.txt,defaultFontColor,0,0 + } + } + if(tInstruction.txt=="timeout") + { + //set timeout to global var + spstr strCommand.txt,tTmp.txt,"~",1 + covx tTmp.txt,sleepTimeout,0,0 + } + if(tInstruction.txt=="pageType") + { + //command format pageType,specialPageName + //write name of speical page to tId + spstr strCommand.txt,tId.txt,"~",1 + //save second arg if there's one + spstr strCommand.txt,tTmp.txt,"~",2 + //save third arg if there's one + spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3 + spstr strCommand.txt,pageIcons.tTmp3.txt,"~",4 + //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ... + udelete payloadLength-1 + bufferPos=0 + if(tId.txt=="pageStartup") + { + page pageStartup + } + if(tId.txt=="screensaver") + { + page screensaver + } + if(tId.txt=="cardEntities") + { + page cardEntities + } + if(tId.txt=="cardGrid") + { + page cardGrid + } + if(tId.txt=="cardGrid2") + { + page cardGrid2 + } + if(tId.txt=="popupLight") + { + pageIcons.tTmp1.txt=tTmp.txt + page popupLight + } + if(tId.txt=="popupShutter") + { + pageIcons.tTmp1.txt=tTmp.txt + page popupShutter + } + if(tId.txt=="popupNotify") + { + page popupNotify + } + if(tId.txt=="cardThermo") + { + page cardThermo + } + if(tId.txt=="cardMedia") + { + page cardMedia + } + if(tId.txt=="cardAlarm") + { + page cardAlarm + } + if(tId.txt=="cardQR") + { + page cardQR + } + if(tId.txt=="cardPower") + { + page cardPower + } + if(tId.txt=="cardChart") + { + page cardChart + } + } + // end of user code + udelete payloadLength-1 + bufferPos=0 + } + } + } + } + // next character + bufferPos++ + } + } + +Timer tmSleep + Attributes + Scope : local + Period (ms): 1000 + Enabled : yes + + Events + Timer Event + if(sleepTimeout!=0) + { + sleepValue+=1 + if(sleepTimeout<=sleepValue) + { + sleepValue=0 + click b0,1 + click b0,0 + } + } + +TouchCap tc0 + Attributes + Scope: local + Value: 0 + + Events + Touch Press Event + sleepValue=0 + diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index 5af43d85..7899fdd5 100644 --- a/HMI/US/portrait/diff-eu-version.txt +++ b/HMI/US/portrait/diff-eu-version.txt @@ -2,14 +2,14 @@ +++ HMI/US/portrait/n2t-out │ --- HMI/n2t-out/Program.s.txt ├── +++ HMI/US/portrait/n2t-out/Program.s.txt -│ @@ -10,11 +10,11 @@ -│ int sleepValue=0 -│ // dim value +│ @@ -12,11 +12,11 @@ │ int dimValue=40 │ int dimValueNormal=100 │ //color vars │ int defaultFontColor=65535 │ int defaultBcoColor=6371 +│ //feature flags +│ int featNewSliders=0 │ - // fix touch offset │ - lcd_dev fffb 0002 0000 0020 │ + // fix touch offset (Removed for US version) @@ -65,54 +65,54 @@ │ Scope : local │ Text : │ - Max. Text Size: 80 -│ + Max. Text Size: 65 +│ + Max. Text Size: 64 │ │ Variable (string) entn2 │ Attributes │ Scope : local │ Text : │ - Max. Text Size: 80 -│ + Max. Text Size: 65 +│ + Max. Text Size: 64 │ │ Variable (string) entn3 │ Attributes │ Scope : local │ Text : │ - Max. Text Size: 80 -│ + Max. Text Size: 65 +│ + Max. Text Size: 64 │ │ Variable (string) entn4 │ Attributes │ Scope : local │ Text : │ - Max. Text Size: 80 -│ + Max. Text Size: 65 +│ + Max. Text Size: 64 │ + │ +Variable (string) entn5 │ + Attributes │ + Scope : local │ + Text : -│ + Max. Text Size: 65 +│ + Max. Text Size: 64 │ + │ +Variable (string) entn6 │ + Attributes │ + Scope : local │ + Text : -│ + Max. Text Size: 65 +│ + Max. Text Size: 64 │ │ Variable (string) nent1 │ Attributes │ Scope : local │ Text : │ - Max. Text Size: 80 -│ + Max. Text Size: 40 +│ + Max. Text Size: 38 │ │ Variable (string) nent2 │ Attributes │ Scope : local │ Text : │ - Max. Text Size: 80 -│ + Max. Text Size: 40 +│ + Max. Text Size: 38 │ │ Variable (string) strCommand │ Attributes @@ -632,7 +632,7 @@ │ Send Component ID: disabled │ │ Events -│ @@ -1079,14 +1473,82 @@ +│ @@ -1099,14 +1493,92 @@ │ page popupInSel │ } │ if(type4.txt=="timer") @@ -658,8 +658,13 @@ │ + } │ + if(type5.txt=="light") │ + { -│ + //popupLight.tEntity.txt=tEntity5.txt -│ + page popupLight +│ + if(featNewSliders==1) +│ + { +│ + page popupLightNew +│ + }else +│ + { +│ + page popupLight +│ + } │ + } │ + if(type5.txt=="fan") │ + { @@ -692,8 +697,13 @@ │ + } │ + if(type6.txt=="light") │ + { -│ + //popupLight.tEntity.txt=tEntity5.txt -│ + page popupLight +│ + if(featNewSliders==1) +│ + { +│ + page popupLightNew +│ + }else +│ + { +│ + page popupLight +│ + } │ + } │ + if(type6.txt=="fan") │ + { @@ -715,7 +725,7 @@ │ Send Component ID: disabled │ │ Events -│ @@ -1810,14 +2272,312 @@ +│ @@ -1830,14 +2302,312 @@ │ covx tTmp.txt,sys0,0,0 │ hSlider4.minval=sys0 │ //third value is max value @@ -1256,7 +1266,7 @@ │ crcputs sys0,2 │ crcputs tSend.txt,0 │ //send cmd -│ @@ -999,14 +1066,35 @@ +│ @@ -1005,14 +1072,35 @@ │ spstr strCommand.txt,tTmp.txt,"~",59 │ covx tTmp.txt,sys0,0,0 │ bEntity8.pco=sys0 @@ -1695,6 +1705,63 @@ │ crcputs sys0,2 │ crcputs tSend.txt,0 │ //send cmd +│ @@ -275,20 +269,14 @@ +│ } +│ // get font color +│ spstr strCommand.txt,tTmp.txt,"~",4 +│ if(tTmp.txt!="") +│ { +│ covx tTmp.txt,defaultFontColor,0,0 +│ } +│ - // get feature flag popup +│ - spstr strCommand.txt,tTmp.txt,"~",5 +│ - if(tTmp.txt!="") +│ - { +│ - covx tTmp.txt,featNewSliders,0,0 +│ - } +│ } +│ if(tInstruction.txt=="timeout") +│ { +│ //set timeout to global var +│ spstr strCommand.txt,tTmp.txt,"~",1 +│ covx tTmp.txt,sleepTimeout,0,0 +│ } +│ --- HMI/n2t-out/popupLight.txt +├── +++ HMI/US/portrait/n2t-out/popupLight.txt +│ @@ -48,15 +48,15 @@ +│ vis hTempSlider,0 +│ //disable color wheel components by default +│ vis bColor,0 +│ vis t0,0 +│ vis pColorWheel,0 +│ //vis t0,0 +│ popupLight.bco=defaultBcoColor +│ - for(sys0=0;sys0<27;sys0++) +│ + for(sys0=0;sys0<28;sys0++) +│ { +│ if(b[sys0].type==98||b[sys0].type==116) +│ { +│ b[sys0].bco=defaultBcoColor +│ b[sys0].pco=defaultFontColor +│ } +│ if(b[sys0].type==53&&defaultBcoColor==0) +│ @@ -66,15 +66,15 @@ +│ } +│ } +│ if(defaultBcoColor==0) +│ { +│ hBrightness.pic=14 +│ hBrightness.pic1=13 +│ hBrightness.pic2=15 +│ - hTempSlider.pic=16 +│ + hTempSlider.pic=23 +│ hTempSlider.pic1=17 +│ hTempSlider.pic2=15 +│ } +│ +│ Variable (string) entn +│ Attributes +│ Scope : local │ --- HMI/n2t-out/screensaver.txt ├── +++ HMI/US/portrait/n2t-out/screensaver.txt │ @@ -28,17 +28,14 @@ diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index 3c380e18..4704d767 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,7 +1,9 @@ -+++ /dev/fd/62 2023-06-23 18:14:46.258673287 +0000 ++++ /dev/fd/62 2023-07-31 16:25:23.356512733 +0000 +I/n2t-out/Program.s.txt ++ HMI/US/portrait/n2t-out/Program.s.txt -+1 +10,11 @@ ++1 +12,11 @@ ++eature flags ++ featNewSliders=0 +nth 00 00 00 ff ff ff 88 ff ff ff//Output power on information to serial port +I/n2t-out/cardEntities.txt ++ HMI/US/portrait/n2t-out/cardEntities.txt @@ -29,42 +31,42 @@ + Scope : local + Text : + Max. Text Size: 80 -+ Max. Text Size: 65 ++ Max. Text Size: 64 + +e (string) entn2 +ributes + Scope : local + Text : + Max. Text Size: 80 -+ Max. Text Size: 65 ++ Max. Text Size: 64 + +e (string) entn3 +ributes + Scope : local + Text : + Max. Text Size: 80 -+ Max. Text Size: 65 -+ Max. Text Size: 65 -+ Max. Text Size: 65 ++ Max. Text Size: 64 ++ Max. Text Size: 64 ++ Max. Text Size: 64 + +e (string) entn6 +ributes + Scope : local + Text : -+ Max. Text Size: 65 ++ Max. Text Size: 64 + +e (string) nent1 +ributes + Scope : local + Text : -+ Max. Text Size: 40 ++ Max. Text Size: 80 ++ Max. Text Size: 38 + +e (string) nent2 +ributes + Scope : local + Text : -+ Max. Text Size: 80 -+ Max. Text Size: 40 ++ Max. Text Size: 38 +14 +185,26 @@ +e (string) type6 +ributes @@ -376,13 +378,20 @@ + Dragging : 0 + Send Component ID: disabled +nts -+,14 +1473,82 @@ ++,14 +1493,92 @@ + page popupInSel + if(type4.txt=="timer") + page popupTimer + Scope : local + Dragging : 0 + Send Component ID: disabled ++ if(featNewSliders==1) ++ { ++ page popupLightNew ++ }else ++ { ++ page popupLight ++ } + if(type5.txt=="timer") + { + page popupTimer @@ -406,8 +415,13 @@ + } + if(type6.txt=="light") + { -+ //popupLight.tEntity.txt=tEntity5.txt -+ page popupLight ++ if(featNewSliders==1) ++ { ++ page popupLightNew ++ }else ++ { ++ page popupLight ++ } + } + if(type6.txt=="fan") + { @@ -425,7 +439,7 @@ + Dragging : 0 + Send Component ID: disabled +nts -+,14 +2272,312 @@ ++,14 +2302,312 @@ + spstr strCommand.txt,type5.txt,"~",38 + spstr strCommand.txt,entn5.txt,"~",39 + spstr strCommand.txt,tIcon5.txt,"~",40 @@ -814,7 +828,7 @@ + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd -+14 +1066,35 @@ ++,14 +1072,35 @@ + spstr strCommand.txt,tTmp.txt,"~",59 + covx tTmp.txt,sys0,0,0 + bEntity8.pco=sys0 @@ -1233,6 +1247,63 @@ + Send Component ID : disabled +15 +158,15 @@ + Max. Text Size : 10 ++20 +269,14 @@ ++ } ++ // get font color ++ spstr strCommand.txt,tTmp.txt,"~",4 ++ if(tTmp.txt!="") ++ { ++ covx tTmp.txt,defaultFontColor,0,0 ++ } ++ // get feature flag popup ++ spstr strCommand.txt,tTmp.txt,"~",5 ++ if(tTmp.txt!="") ++ { ++ covx tTmp.txt,featNewSliders,0,0 ++ } ++ } ++ if(tInstruction.txt=="timeout") ++ { ++ //set timeout to global var ++ spstr strCommand.txt,tTmp.txt,"~",1 ++ covx tTmp.txt,sleepTimeout,0,0 ++ } ++I/n2t-out/popupLight.txt +++ HMI/US/portrait/n2t-out/popupLight.txt ++5 +48,15 @@ ++ vis hTempSlider,0 ++ //disable color wheel components by default ++ vis bColor,0 ++ vis t0,0 ++ vis pColorWheel,0 ++ //vis t0,0 ++ popupLight.bco=defaultBcoColor ++ for(sys0=0;sys0<27;sys0++) ++ for(sys0=0;sys0<28;sys0++) ++ { ++ if(b[sys0].type==98||b[sys0].type==116) ++ { ++ b[sys0].bco=defaultBcoColor ++ b[sys0].pco=defaultFontColor ++ } ++ if(b[sys0].type==53&&defaultBcoColor==0) ++5 +66,15 @@ ++ } ++ } ++ if(defaultBcoColor==0) ++ { ++ hBrightness.pic=14 ++ hBrightness.pic1=13 ++ hBrightness.pic2=15 ++ hTempSlider.pic=16 ++ hTempSlider.pic=23 ++ hTempSlider.pic1=17 ++ hTempSlider.pic2=15 ++ } ++ ++e (string) entn ++ributes ++ Scope : local +I/n2t-out/screensaver.txt ++ HMI/US/portrait/n2t-out/screensaver.txt +7 +28,14 @@ diff --git a/HMI/US/portrait/n2t-out-visual/Program.s.txt b/HMI/US/portrait/n2t-out-visual/Program.s.txt index 4e8eb4c0..8b06c0f8 100644 --- a/HMI/US/portrait/n2t-out-visual/Program.s.txt +++ b/HMI/US/portrait/n2t-out-visual/Program.s.txt @@ -14,6 +14,8 @@ Program.s //color vars int defaultFontColor=65535 int defaultBcoColor=6371 + //feature flags + int featNewSliders=0 // fix touch offset (Removed for US version) //lcd_dev fffb 0002 0000 0020 printh 00 00 00 ff ff ff 88 ff ff ff//Output power on information to serial port diff --git a/HMI/US/portrait/n2t-out-visual/cardEntities.txt b/HMI/US/portrait/n2t-out-visual/cardEntities.txt index aa1d10a9..f9f6204b 100644 --- a/HMI/US/portrait/n2t-out-visual/cardEntities.txt +++ b/HMI/US/portrait/n2t-out-visual/cardEntities.txt @@ -118,56 +118,56 @@ Variable (string) entn1 ID : 48 Scope : local Text : - Max. Text Size: 65 + Max. Text Size: 64 Variable (string) entn2 Attributes ID : 49 Scope : local Text : - Max. Text Size: 65 + Max. Text Size: 64 Variable (string) entn3 Attributes ID : 50 Scope : local Text : - Max. Text Size: 65 + Max. Text Size: 64 Variable (string) entn4 Attributes ID : 51 Scope : local Text : - Max. Text Size: 65 + Max. Text Size: 64 Variable (string) entn5 Attributes ID : 61 Scope : local Text : - Max. Text Size: 65 + Max. Text Size: 64 Variable (string) entn6 Attributes ID : 88 Scope : local Text : - Max. Text Size: 65 + Max. Text Size: 64 Variable (string) nent1 Attributes ID : 90 Scope : local Text : - Max. Text Size: 40 + Max. Text Size: 38 Variable (string) nent2 Attributes ID : 89 Scope : local Text : - Max. Text Size: 40 + Max. Text Size: 38 Variable (string) strCommand Attributes @@ -2618,8 +2618,13 @@ Hotspot m0 } if(type1.txt=="light") { - //popupLight.tEntity.txt=tEntity1.txt - page popupLight + if(featNewSliders==1) + { + page popupLightNew + }else + { + page popupLight + } } if(type1.txt=="fan") { @@ -2661,8 +2666,13 @@ Hotspot m1 } if(type2.txt=="light") { - //popupLight.tEntity.txt=tEntity2.txt - page popupLight + if(featNewSliders==1) + { + page popupLightNew + }else + { + page popupLight + } } if(type2.txt=="fan") { @@ -2704,8 +2714,13 @@ Hotspot m2 } if(type3.txt=="light") { - //popupLight.tEntity.txt=tEntity3.txt - page popupLight + if(featNewSliders==1) + { + page popupLightNew + }else + { + page popupLight + } } if(type3.txt=="fan") { @@ -2747,8 +2762,13 @@ Hotspot m3 } if(type4.txt=="light") { - //popupLight.tEntity.txt=tEntity4.txt - page popupLight + if(featNewSliders==1) + { + page popupLightNew + }else + { + page popupLight + } } if(type4.txt=="fan") { @@ -2790,8 +2810,13 @@ Hotspot m4 } if(type5.txt=="light") { - //popupLight.tEntity.txt=tEntity5.txt - page popupLight + if(featNewSliders==1) + { + page popupLightNew + }else + { + page popupLight + } } if(type5.txt=="fan") { @@ -2833,8 +2858,13 @@ Hotspot m5 } if(type6.txt=="light") { - //popupLight.tEntity.txt=tEntity5.txt - page popupLight + if(featNewSliders==1) + { + page popupLightNew + }else + { + page popupLight + } } if(type6.txt=="fan") { diff --git a/HMI/US/portrait/n2t-out-visual/cardGrid.txt b/HMI/US/portrait/n2t-out-visual/cardGrid.txt index a9d56b96..f4e7cf38 100644 --- a/HMI/US/portrait/n2t-out-visual/cardGrid.txt +++ b/HMI/US/portrait/n2t-out-visual/cardGrid.txt @@ -1052,7 +1052,13 @@ Timer tmLP Timer Event if(tTmp.txt=="light") { - page popupLight + if(featNewSliders==1) + { + page popupLightNew + }else + { + page popupLight + } } if(tTmp.txt=="fan") { diff --git a/HMI/US/portrait/n2t-out-visual/cardGrid2.txt b/HMI/US/portrait/n2t-out-visual/cardGrid2.txt index 006167f6..1903e59c 100644 --- a/HMI/US/portrait/n2t-out-visual/cardGrid2.txt +++ b/HMI/US/portrait/n2t-out-visual/cardGrid2.txt @@ -1385,7 +1385,13 @@ Timer tmLP Timer Event if(tTmp.txt=="light") { - page popupLight + if(featNewSliders==1) + { + page popupLightNew + }else + { + page popupLight + } } if(tTmp.txt=="fan") { diff --git a/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt b/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt index 0f612596..537fce37 100644 --- a/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt +++ b/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt @@ -1,7 +1,7 @@ Program.s 0 Component(s) - 13 Line(s) of event code - 13 Unique line(s) of event code + 14 Line(s) of event code + 14 Unique line(s) of event code pageIcons 7 Component(s) 0 Line(s) of event code @@ -14,14 +14,18 @@ popupNotify 19 Component(s) 267 Line(s) of event code 172 Unique line(s) of event code +cardGrid + 44 Component(s) + 529 Line(s) of event code + 298 Unique line(s) of event code popupTimer 42 Component(s) 516 Line(s) of event code 257 Unique line(s) of event code -cardGrid2 - 56 Component(s) - 657 Line(s) of event code - 332 Unique line(s) of event code +popupLightNew + 23 Component(s) + 412 Line(s) of event code + 209 Unique line(s) of event code popupFan 27 Component(s) 355 Line(s) of event code @@ -43,9 +47,9 @@ cardLChart 402 Line(s) of event code 266 Unique line(s) of event code popupLight - 23 Component(s) - 410 Line(s) of event code - 209 Unique line(s) of event code + 28 Component(s) + 408 Line(s) of event code + 225 Unique line(s) of event code popupShutter 25 Component(s) 402 Line(s) of event code @@ -62,10 +66,10 @@ popupInSel 34 Component(s) 621 Line(s) of event code 297 Unique line(s) of event code -cardGrid - 44 Component(s) - 523 Line(s) of event code - 295 Unique line(s) of event code +cardGrid2 + 56 Component(s) + 663 Line(s) of event code + 335 Unique line(s) of event code cardAlarm 43 Component(s) 500 Line(s) of event code @@ -88,11 +92,11 @@ screensaver 306 Unique line(s) of event code cardEntities 91 Component(s) - 1630 Line(s) of event code - 705 Unique line(s) of event code + 1666 Line(s) of event code + 708 Unique line(s) of event code Total - 22 Page(s) - 862 Component(s) - 10360 Line(s) of event code - 2492 Unique line(s) of event code + 23 Page(s) + 890 Component(s) + 10819 Line(s) of event code + 2524 Unique line(s) of event code diff --git a/HMI/US/portrait/n2t-out-visual/popupLight.txt b/HMI/US/portrait/n2t-out-visual/popupLight.txt index 701d6290..da200f2d 100644 --- a/HMI/US/portrait/n2t-out-visual/popupLight.txt +++ b/HMI/US/portrait/n2t-out-visual/popupLight.txt @@ -24,12 +24,13 @@ 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 @@ -46,20 +47,20 @@ Page popupLight 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++) + for(sys0=0;sys0<28;sys0++) { if(b[sys0].type==98||b[sys0].type==116) { @@ -74,83 +75,115 @@ Page popupLight } if(defaultBcoColor==0) { - hTempSlider.pic=16 - hTempSlider.pic1=16 + hBrightness.pic=14 + hBrightness.pic1=13 + hBrightness.pic2=15 + hTempSlider.pic=23 + hTempSlider.pic1=17 + hTempSlider.pic2=15 } - Postinitialize Event - fill hBrightness.x,hBrightness.y,100,250,defaultBcoColor - -Variable (int32) col - Attributes - ID : 18 - Scope: local - Value: 65504 - Variable (string) entn Attributes - ID : 11 + ID : 20 Scope : local Text : Max. Text Size: 80 Variable (int32) mode Attributes - ID : 13 + ID : 22 Scope: local Value: 1 Variable (int32) mode_temp Attributes - ID : 14 + ID : 23 Scope: local Value: 0 Variable (string) strCommand Attributes - ID : 9 + ID : 16 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 : 16 + ID : 26 Scope : local Text : Max. Text Size: 200 -Variable (string) tTmp +Text t0 Attributes - ID : 21 - Scope : local - Text : - Max. Text Size: 80 - -Text tEntity - Attributes - ID : 2 + ID : 24 Scope : local Dragging : 0 Send Component ID : disabled Opacity : 127 - x coordinate : 19 - y coordinate : 21 - Width : 224 + x coordinate : 12 + y coordinate : 57 + Width : 141 + Height : 30 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 0 + Back. Color : 6371 + Font Color : 65535 + Horizontal Alignment: left + Vertical Alignment : center + Input Type : character + Text : Color + Max. Text Size : 50 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text t1 + Attributes + ID : 6 + Scope : local + Dragging : 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 60 + y coordinate : 374 + Width : 251 + Height : 30 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 0 + Back. Color : 6371 + Font Color : 65535 + Horizontal Alignment: left + Vertical Alignment : center + Input Type : character + Text : Brightness + Max. Text Size : 50 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text t2 + Attributes + ID : 9 + Scope : local + Dragging : 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 10 + y coordinate : 374 + Width : 45 Height : 30 Effect : load Effect Priority : 0 @@ -160,31 +193,250 @@ Text tEntity Associated Keyboard : none Font ID : 1 Back. Color : 6371 - Font Color : 65535 + Font Color : 40147 Horizontal Alignment: center Vertical Alignment : center Input Type : character + Text :  + Max. Text Size : 10 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text t3 + Attributes + ID : 10 + Scope : local + Dragging : 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 10 + y coordinate : 267 + Width : 45 + Height : 30 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 1 + Back. Color : 6371 + Font Color : 40147 + Horizontal Alignment: center + Vertical Alignment : center + Input Type : character + Text :  + Max. Text Size : 10 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text t4 + Attributes + ID : 11 + Scope : local + Dragging : 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 60 + y coordinate : 266 + Width : 250 + Height : 30 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 0 + Back. Color : 6371 + Font Color : 65535 + Horizontal Alignment: left + Vertical Alignment : center + Input Type : character + Text : Temperature + Max. Text Size : 50 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text tEntity + Attributes + ID : 3 + Scope : local + Dragging : 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 60 + y coordinate : 21 + Width : 200 + 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 -Picture pColorWheel +Text tIcon1 + Attributes + ID : 4 + Scope : local + Dragging : 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 11 + y coordinate : 21 + Width : 45 + Height : 30 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 1 + Back. Color : 6371 + Font Color : 17299 + Horizontal Alignment: center + Vertical Alignment : center + Input Type : character + Text :  + Max. Text Size : 10 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text tId + Attributes + ID : 18 + Scope : local + Dragging : 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 100 + y coordinate : 450 + Width : 100 + Height : 30 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 0 + Back. Color : 65535 + Font Color : 0 + Horizontal Alignment: center + Vertical Alignment : center + Input Type : character + Text : + Max. Text Size : 20 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text tInstruction + Attributes + ID : 17 + Scope : local + Dragging : 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 0 + y coordinate : 450 + Width : 100 + Height : 30 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 0 + Back. Color : 65535 + Font Color : 0 + Horizontal Alignment: center + Vertical Alignment : center + Input Type : character + Text : + Max. Text Size : 20 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text tTmp + Attributes + ID : 12 + Scope : local + Dragging : 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 282 + y coordinate : 446 + Width : 34 + Height : 30 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 0 + Back. Color : 65535 + Font Color : 0 + Horizontal Alignment: center + Vertical Alignment : center + Input Type : character + Text : + Max. Text Size : 80 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Picture p0 Attributes ID : 1 Scope : local Dragging : 0 Send Component ID: disabled Opacity : 127 - x coordinate : 150 - y coordinate : 168 - Width : 160 - Height : 160 + x coordinate : 0 + y coordinate : 1 + Width : 319 + Height : 479 Effect : load Effect Priority : 0 Effect Time : 300 - Picture ID : 3 + Picture ID : 0 + +Picture pColorWheel + Attributes + ID : 2 + Scope : local + Dragging : 0 + Send Component ID: disabled + Opacity : 127 + x coordinate : 67 + y coordinate : 89 + Width : 245 + Height : 245 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Picture ID : 20 Events Touch Press Event @@ -216,44 +468,30 @@ Picture pColorWheel Slider hBrightness Attributes - ID : 4 + ID : 7 Scope : local Dragging : 0 Send Component ID : disabled Opacity : 127 - x coordinate : 25 - y coordinate : 127 - Width : 100 - Height : 250 + x coordinate : 12 + y coordinate : 409 + Width : 300 + Height : 44 Effect : load Effect Priority : 0 Effect Time : 300 - Direction : vertical + Direction : horizontal Fill : image Cursor width : auto - Cursor height : 1 - Back. Picture ID : 65535 - Slided Back. Picture ID: 65535 + Cursor height : 255 + Back. Picture ID : 5 + Slided Back. Picture ID: 4 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 @@ -274,24 +512,24 @@ Slider hBrightness Slider hTempSlider Attributes - ID : 10 + ID : 19 Scope : local Dragging : 0 Send Component ID : disabled Opacity : 127 - x coordinate : 187 - y coordinate : 127 - Width : 100 - Height : 250 + x coordinate : 12 + y coordinate : 304 + Width : 300 + Height : 44 Effect : load Effect Priority : 0 Effect Time : 300 - Direction : vertical + Direction : horizontal Fill : image Cursor width : auto Cursor height : 255 - Back. Picture ID : 7 - Slided Back. Picture ID: 7 + Back. Picture ID : 21 + Slided Back. Picture ID: 22 Position : 50 Upper range limit : 100 Lower range limit : 0 @@ -318,13 +556,13 @@ Slider hTempSlider Button b0 Attributes - ID : 3 + ID : 5 Scope : local Dragging : 0 Send Component ID : disabled Opacity : 127 - x coordinate : 256 - y coordinate : 12 + x coordinate : 266 + y coordinate : 14 Width : 50 Height : 50 Effect : load @@ -364,13 +602,13 @@ Button b0 Button bColor Attributes - ID : 12 + ID : 21 Scope : local Dragging : 0 Send Component ID : disabled Opacity : 127 - x coordinate : 134 - y coordinate : 407 + x coordinate : 12 + y coordinate : 89 Width : 50 Height : 50 Effect : load @@ -401,8 +639,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 { @@ -412,21 +650,21 @@ 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 : 17 + ID : 27 Scope : local Dragging : 0 Send Component ID : disabled Opacity : 127 - x coordinate : 60 - y coordinate : 407 + x coordinate : 12 + y coordinate : 195 Width : 50 Height : 50 Effect : load @@ -453,17 +691,18 @@ Button bEffect 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 : 5 + ID : 8 Scope : local Dragging : 0 Send Component ID : disabled Opacity : 127 - x coordinate : 208 - y coordinate : 407 + x coordinate : 12 + y coordinate : 142 Width : 50 Height : 50 Effect : load @@ -502,7 +741,7 @@ Dual-state Button btOnOff1 Timer tmCooldown Attributes - ID : 15 + ID : 25 Scope : local Period (ms): 100 Enabled : no @@ -511,34 +750,9 @@ 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 : 8 + ID : 15 Scope : local Period (ms): 50 Enabled : yes @@ -593,12 +807,11 @@ 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 - col.val=sys0 - //tEntity.pco=sys0 + tIcon1.pco=sys0 // get Button State spstr strCommand.txt,tTmp.txt,"~",4 covx tTmp.txt,sys0,0,0 @@ -607,26 +820,27 @@ 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 - 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) @@ -649,8 +863,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 @@ -669,12 +883,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) { @@ -686,11 +900,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") @@ -768,10 +982,6 @@ Timer tmSerial { page cardGrid } - if(tId.txt=="cardGrid2") - { - page cardGrid2 - } if(tId.txt=="popupLight") { pageIcons.tTmp1.txt=tTmp.txt @@ -825,7 +1035,7 @@ Timer tmSerial Timer tmSleep Attributes - ID : 7 + ID : 14 Scope : local Period (ms): 1000 Enabled : yes @@ -845,7 +1055,7 @@ Timer tmSleep TouchCap tc0 Attributes - ID : 6 + ID : 13 Scope: local Value: 0 diff --git a/HMI/US/portrait/n2t-out-visual/popupLightNew.txt b/HMI/US/portrait/n2t-out-visual/popupLightNew.txt new file mode 100644 index 00000000..a28d8be0 --- /dev/null +++ b/HMI/US/portrait/n2t-out-visual/popupLightNew.txt @@ -0,0 +1,855 @@ +Page popupLightNew + Attributes + ID : 0 + Scope : local + Dragging : 0 + Send Component ID : disabled + Opacity : 127 + Width : 320 + 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 + dim=dimValueNormal + //get entitiy name + tEntity.txt=pageIcons.tTmp1.txt + //get entity id + entn.txt=pageIcons.tTmp2.txt + 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 + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + //disable brightness by default + //vis t1,0 + //vis t2,0 + vis hBrightness,1 + //disable color temp by default + //vis t4,0 + //vis t3,0 + vis hTempSlider,0 + //disable color wheel components by default + vis bColor,0 + //vis t0,0 + vis pColorWheel,0 + //vis t0,0 + popupLightNew.bco=defaultBcoColor + for(sys0=0;sys0<27;sys0++) + { + if(b[sys0].type==98||b[sys0].type==116) + { + b[sys0].bco=defaultBcoColor + b[sys0].pco=defaultFontColor + } + if(b[sys0].type==53&&defaultBcoColor==0) + { + b[sys0].pic=10 + b[sys0].pic2=11 + } + } + if(defaultBcoColor==0) + { + hTempSlider.pic=16 + 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 : 11 + Scope : local + Text : + Max. Text Size: 80 + +Variable (int32) mode + Attributes + ID : 13 + Scope: local + Value: 1 + +Variable (int32) mode_temp + Attributes + ID : 14 + Scope: local + Value: 0 + +Variable (string) strCommand + Attributes + 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 : 16 + Scope : local + Text : + Max. Text Size: 200 + +Variable (string) tTmp + Attributes + ID : 21 + Scope : local + Text : + Max. Text Size: 80 + +Text tEntity + Attributes + ID : 2 + Scope : local + Dragging : 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 19 + y coordinate : 21 + Width : 224 + 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 : 1 + Scope : local + Dragging : 0 + Send Component ID: disabled + Opacity : 127 + x coordinate : 150 + y coordinate : 168 + Width : 160 + Height : 160 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Picture ID : 3 + + Events + Touch Press Event + //craft command + tSend.txt="event,buttonPress2,"+entn.txt+",colorWheel," + sys0=tch0 + sys0=sys0-pColorWheel.x + covx sys0,tTmp.txt,0,0 + tSend.txt+=tTmp.txt + tSend.txt+="|" + sys0=tch1 + sys0=sys0-pColorWheel.y + covx sys0,tTmp.txt,0,0 + tSend.txt+=tTmp.txt + tSend.txt+="|" + covx pColorWheel.h,tTmp.txt,0,0 + tSend.txt+=tTmp.txt + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + +Slider hBrightness + Attributes + ID : 4 + Scope : local + Dragging : 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 25 + y coordinate : 127 + 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 + tSend.txt="event,buttonPress2,"+entn.txt+",brightnessSlider," + covx hBrightness.val,tTmp.txt,0,0 + tSend.txt+=tTmp.txt + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + +Slider hTempSlider + Attributes + ID : 10 + Scope : local + Dragging : 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 187 + y coordinate : 127 + 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 + tmCooldown.en=1 + tmCooldown.tim=2500 + //craft command + tSend.txt="event,buttonPress2,"+entn.txt+",colorTempSlider," + covx hTempSlider.val,tTmp.txt,0,0 + tSend.txt+=tTmp.txt + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + +Button b0 + Attributes + ID : 3 + Scope : local + Dragging : 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 256 + y coordinate : 12 + 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 + 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 + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + +Button bColor + Attributes + ID : 12 + Scope : local + Dragging : 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 134 + y coordinate : 407 + 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 + if(mode.val==1) + { + mode.val=0 + //enable color wheel + vis pColorWheel,1 + //disable color temp + //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 hTempSlider,1 + } + } + +Button bEffect + Attributes + ID : 17 + Scope : local + Dragging : 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 60 + y coordinate : 407 + 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 + page popupInSel + +Dual-state Button btOnOff1 + Attributes + ID : 5 + Scope : local + Dragging : 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 208 + y coordinate : 407 + 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 + //craft command + tSend.txt="event,buttonPress2,"+entn.txt+","+"OnOff," + covx btOnOff1.val,tTmp.txt,0,0 + tSend.txt+=tTmp.txt + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + +Timer tmCooldown + Attributes + ID : 15 + Scope : local + Period (ms): 100 + Enabled : no + + Events + 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 : 8 + Scope : local + Period (ms): 50 + Enabled : yes + + Events + Timer Event + // data available + if(usize>1) + { + bufferPos=0 + while(bufferPos isn't supported + if(tTmp.txt=="disable") + { + //vis t0,0 + vis bColor,0 + vis pColorWheel,0 + }else + { + //vis t0,1 + //only enable bColor button if color temp is also supported + if(mode_temp.val==1) + { + vis bColor,1 + } + if(mode.val==0) + { + vis pColorWheel,1 + } + } + // set t0 Color (Localization) + //spstr strCommand.txt,t0.txt,"~",8 + // set t4 Temperature (Localization) + //spstr strCommand.txt,t4.txt,"~",9 + // set t1 Brightness (Localization) + //spstr strCommand.txt,t1.txt,"~",10 + // activate effect button + spstr strCommand.txt,tTmp.txt,"~",11 + if(tTmp.txt=="enable") + { + vis bEffect,1 + }else + { + vis bEffect,0 + } + } + if(tInstruction.txt=="time") + { + // get set time to global variable + spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 + } + if(tInstruction.txt=="date") + { + // get set date to global variable + spstr strCommand.txt,pageIcons.vaDate.txt,"~",1 + } + if(tInstruction.txt=="dimmode") + { + // get value + spstr strCommand.txt,tTmp.txt,"~",1 + covx tTmp.txt,dimValue,0,0 + // get value normal + spstr strCommand.txt,tTmp.txt,"~",2 + covx tTmp.txt,dimValueNormal,0,0 + dim=dimValueNormal + // get background color + spstr strCommand.txt,tTmp.txt,"~",3 + if(tTmp.txt!="") + { + covx tTmp.txt,defaultBcoColor,0,0 + } + // get font color + spstr strCommand.txt,tTmp.txt,"~",4 + if(tTmp.txt!="") + { + covx tTmp.txt,defaultFontColor,0,0 + } + } + if(tInstruction.txt=="timeout") + { + //set timeout to global var + spstr strCommand.txt,tTmp.txt,"~",1 + covx tTmp.txt,sleepTimeout,0,0 + } + if(tInstruction.txt=="pageType") + { + //command format pageType,specialPageName + //write name of speical page to tId + spstr strCommand.txt,tId.txt,"~",1 + //save second arg if there's one + spstr strCommand.txt,tTmp.txt,"~",2 + //save third arg if there's one + spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3 + spstr strCommand.txt,pageIcons.tTmp3.txt,"~",4 + //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ... + udelete payloadLength-1 + bufferPos=0 + if(tId.txt=="pageStartup") + { + page pageStartup + } + if(tId.txt=="screensaver") + { + page screensaver + } + if(tId.txt=="cardEntities") + { + page cardEntities + } + if(tId.txt=="cardGrid") + { + page cardGrid + } + if(tId.txt=="cardGrid2") + { + page cardGrid2 + } + if(tId.txt=="popupLight") + { + pageIcons.tTmp1.txt=tTmp.txt + page popupLight + } + if(tId.txt=="popupShutter") + { + pageIcons.tTmp1.txt=tTmp.txt + page popupShutter + } + if(tId.txt=="popupNotify") + { + page popupNotify + } + if(tId.txt=="cardThermo") + { + page cardThermo + } + if(tId.txt=="cardMedia") + { + page cardMedia + } + if(tId.txt=="cardAlarm") + { + page cardAlarm + } + if(tId.txt=="cardQR") + { + page cardQR + } + if(tId.txt=="cardPower") + { + page cardPower + } + if(tId.txt=="cardChart") + { + page cardChart + } + } + // end of user code + udelete payloadLength-1 + bufferPos=0 + } + } + } + } + // next character + bufferPos++ + } + } + +Timer tmSleep + Attributes + ID : 7 + Scope : local + Period (ms): 1000 + Enabled : yes + + Events + Timer Event + if(sleepTimeout!=0) + { + sleepValue+=1 + if(sleepTimeout<=sleepValue) + { + sleepValue=0 + click b0,1 + click b0,0 + } + } + +TouchCap tc0 + Attributes + ID : 6 + Scope: local + Value: 0 + + Events + Touch Press Event + sleepValue=0 + diff --git a/HMI/US/portrait/n2t-out/Program.s.txt b/HMI/US/portrait/n2t-out/Program.s.txt index 4e8eb4c0..8b06c0f8 100644 --- a/HMI/US/portrait/n2t-out/Program.s.txt +++ b/HMI/US/portrait/n2t-out/Program.s.txt @@ -14,6 +14,8 @@ Program.s //color vars int defaultFontColor=65535 int defaultBcoColor=6371 + //feature flags + int featNewSliders=0 // fix touch offset (Removed for US version) //lcd_dev fffb 0002 0000 0020 printh 00 00 00 ff ff ff 88 ff ff ff//Output power on information to serial port diff --git a/HMI/US/portrait/n2t-out/cardEntities.txt b/HMI/US/portrait/n2t-out/cardEntities.txt index 0eb79452..b0172a87 100644 --- a/HMI/US/portrait/n2t-out/cardEntities.txt +++ b/HMI/US/portrait/n2t-out/cardEntities.txt @@ -109,49 +109,49 @@ Variable (string) entn1 Attributes Scope : local Text : - Max. Text Size: 65 + Max. Text Size: 64 Variable (string) entn2 Attributes Scope : local Text : - Max. Text Size: 65 + Max. Text Size: 64 Variable (string) entn3 Attributes Scope : local Text : - Max. Text Size: 65 + Max. Text Size: 64 Variable (string) entn4 Attributes Scope : local Text : - Max. Text Size: 65 + Max. Text Size: 64 Variable (string) entn5 Attributes Scope : local Text : - Max. Text Size: 65 + Max. Text Size: 64 Variable (string) entn6 Attributes Scope : local Text : - Max. Text Size: 65 + Max. Text Size: 64 Variable (string) nent1 Attributes Scope : local Text : - Max. Text Size: 40 + Max. Text Size: 38 Variable (string) nent2 Attributes Scope : local Text : - Max. Text Size: 40 + Max. Text Size: 38 Variable (string) strCommand Attributes @@ -1359,8 +1359,13 @@ Hotspot m0 } if(type1.txt=="light") { - //popupLight.tEntity.txt=tEntity1.txt - page popupLight + if(featNewSliders==1) + { + page popupLightNew + }else + { + page popupLight + } } if(type1.txt=="fan") { @@ -1393,8 +1398,13 @@ Hotspot m1 } if(type2.txt=="light") { - //popupLight.tEntity.txt=tEntity2.txt - page popupLight + if(featNewSliders==1) + { + page popupLightNew + }else + { + page popupLight + } } if(type2.txt=="fan") { @@ -1427,8 +1437,13 @@ Hotspot m2 } if(type3.txt=="light") { - //popupLight.tEntity.txt=tEntity3.txt - page popupLight + if(featNewSliders==1) + { + page popupLightNew + }else + { + page popupLight + } } if(type3.txt=="fan") { @@ -1461,8 +1476,13 @@ Hotspot m3 } if(type4.txt=="light") { - //popupLight.tEntity.txt=tEntity4.txt - page popupLight + if(featNewSliders==1) + { + page popupLightNew + }else + { + page popupLight + } } if(type4.txt=="fan") { @@ -1495,8 +1515,13 @@ Hotspot m4 } if(type5.txt=="light") { - //popupLight.tEntity.txt=tEntity5.txt - page popupLight + if(featNewSliders==1) + { + page popupLightNew + }else + { + page popupLight + } } if(type5.txt=="fan") { @@ -1529,8 +1554,13 @@ Hotspot m5 } if(type6.txt=="light") { - //popupLight.tEntity.txt=tEntity5.txt - page popupLight + if(featNewSliders==1) + { + page popupLightNew + }else + { + page popupLight + } } if(type6.txt=="fan") { diff --git a/HMI/US/portrait/n2t-out/cardGrid.txt b/HMI/US/portrait/n2t-out/cardGrid.txt index baafe618..6d8abda1 100644 --- a/HMI/US/portrait/n2t-out/cardGrid.txt +++ b/HMI/US/portrait/n2t-out/cardGrid.txt @@ -605,7 +605,13 @@ Timer tmLP Timer Event if(tTmp.txt=="light") { - page popupLight + if(featNewSliders==1) + { + page popupLightNew + }else + { + page popupLight + } } if(tTmp.txt=="fan") { diff --git a/HMI/US/portrait/n2t-out/cardGrid2.txt b/HMI/US/portrait/n2t-out/cardGrid2.txt index 4b60e256..0f7e2d9f 100644 --- a/HMI/US/portrait/n2t-out/cardGrid2.txt +++ b/HMI/US/portrait/n2t-out/cardGrid2.txt @@ -806,7 +806,13 @@ Timer tmLP Timer Event if(tTmp.txt=="light") { - page popupLight + if(featNewSliders==1) + { + page popupLightNew + }else + { + page popupLight + } } if(tTmp.txt=="fan") { diff --git a/HMI/US/portrait/n2t-out/popupLight.txt b/HMI/US/portrait/n2t-out/popupLight.txt index d52b29a9..7d2eafb2 100644 --- a/HMI/US/portrait/n2t-out/popupLight.txt +++ b/HMI/US/portrait/n2t-out/popupLight.txt @@ -16,12 +16,13 @@ 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 @@ -38,20 +39,20 @@ Page popupLight 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++) + for(sys0=0;sys0<28;sys0++) { if(b[sys0].type==98||b[sys0].type==116) { @@ -66,18 +67,14 @@ Page popupLight } if(defaultBcoColor==0) { - hTempSlider.pic=16 - hTempSlider.pic1=16 + hBrightness.pic=14 + hBrightness.pic1=13 + hBrightness.pic2=15 + hTempSlider.pic=23 + 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 @@ -100,29 +97,56 @@ 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 -Variable (string) tTmp +Text t0 Attributes - Scope : local - Text : - Max. Text Size: 80 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : Color + Max. Text Size : 50 + +Text t1 + Attributes + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : Brightness + Max. Text Size : 50 + +Text t2 + Attributes + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text :  + Max. Text Size : 10 + +Text t3 + Attributes + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text :  + Max. Text Size : 10 + +Text t4 + Attributes + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : Temperature + Max. Text Size : 50 Text tEntity Attributes @@ -133,6 +157,48 @@ Text tEntity 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 @@ -178,20 +244,6 @@ Slider hBrightness 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 @@ -280,8 +332,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 { @@ -291,8 +343,8 @@ 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 } } @@ -310,6 +362,7 @@ Button bEffect Touch Press Event pageIcons.tTmp1.txt=tEntity.txt pageIcons.tTmp2.txt=entn.txt + pageIcons.tTmp3.txt=tIcon1.txt page popupInSel Dual-state Button btOnOff1 @@ -349,30 +402,6 @@ 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 @@ -429,12 +458,11 @@ 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 - col.val=sys0 - //tEntity.pco=sys0 + tIcon1.pco=sys0 // get Button State spstr strCommand.txt,tTmp.txt,"~",4 covx tTmp.txt,sys0,0,0 @@ -443,26 +471,27 @@ 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 - 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) @@ -485,8 +514,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 @@ -505,12 +534,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) { @@ -522,11 +551,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") @@ -604,10 +633,6 @@ Timer tmSerial { page cardGrid } - if(tId.txt=="cardGrid2") - { - page cardGrid2 - } if(tId.txt=="popupLight") { pageIcons.tTmp1.txt=tTmp.txt diff --git a/HMI/US/portrait/n2t-out/popupLightNew.txt b/HMI/US/portrait/n2t-out/popupLightNew.txt new file mode 100644 index 00000000..cab0befe --- /dev/null +++ b/HMI/US/portrait/n2t-out/popupLightNew.txt @@ -0,0 +1,689 @@ +Page popupLightNew + 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 + + Events + Preinitialize Event + dim=dimValueNormal + //get entitiy name + tEntity.txt=pageIcons.tTmp1.txt + //get entity id + entn.txt=pageIcons.tTmp2.txt + 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 + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + //disable brightness by default + //vis t1,0 + //vis t2,0 + vis hBrightness,1 + //disable color temp by default + //vis t4,0 + //vis t3,0 + vis hTempSlider,0 + //disable color wheel components by default + vis bColor,0 + //vis t0,0 + vis pColorWheel,0 + //vis t0,0 + popupLightNew.bco=defaultBcoColor + for(sys0=0;sys0<27;sys0++) + { + if(b[sys0].type==98||b[sys0].type==116) + { + b[sys0].bco=defaultBcoColor + b[sys0].pco=defaultFontColor + } + if(b[sys0].type==53&&defaultBcoColor==0) + { + b[sys0].pic=10 + b[sys0].pic2=11 + } + } + if(defaultBcoColor==0) + { + hTempSlider.pic=16 + 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 + Text : + Max. Text Size: 80 + +Variable (int32) mode + Attributes + Scope: local + Value: 1 + +Variable (int32) mode_temp + Attributes + Scope: local + Value: 0 + +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 + Attributes + Scope : local + Text : + Max. Text Size: 80 + +Text tEntity + Attributes + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : tEntity1 + Max. Text Size : 25 + +Picture pColorWheel + Attributes + Scope : local + 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 + covx sys0,tTmp.txt,0,0 + tSend.txt+=tTmp.txt + tSend.txt+="|" + sys0=tch1 + sys0=sys0-pColorWheel.y + covx sys0,tTmp.txt,0,0 + tSend.txt+=tTmp.txt + tSend.txt+="|" + covx pColorWheel.h,tTmp.txt,0,0 + tSend.txt+=tTmp.txt + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + +Slider hBrightness + Attributes + 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 + tSend.txt="event,buttonPress2,"+entn.txt+",brightnessSlider," + covx hBrightness.val,tTmp.txt,0,0 + tSend.txt+=tTmp.txt + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + +Slider hTempSlider + Attributes + Scope : local + 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," + covx hTempSlider.val,tTmp.txt,0,0 + tSend.txt+=tTmp.txt + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + +Button b0 + Attributes + Scope : local + 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 + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + +Button bColor + Attributes + Scope : local + 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 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 hTempSlider,1 + } + } + +Button bEffect + Attributes + 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 + page popupInSel + +Dual-state Button btOnOff1 + Attributes + Scope : local + 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 + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + +Timer tmCooldown + Attributes + Scope : local + 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 + Timer Event + // data available + if(usize>1) + { + bufferPos=0 + while(bufferPos isn't supported + if(tTmp.txt=="disable") + { + //vis t0,0 + vis bColor,0 + vis pColorWheel,0 + }else + { + //vis t0,1 + //only enable bColor button if color temp is also supported + if(mode_temp.val==1) + { + vis bColor,1 + } + if(mode.val==0) + { + vis pColorWheel,1 + } + } + // set t0 Color (Localization) + //spstr strCommand.txt,t0.txt,"~",8 + // set t4 Temperature (Localization) + //spstr strCommand.txt,t4.txt,"~",9 + // set t1 Brightness (Localization) + //spstr strCommand.txt,t1.txt,"~",10 + // activate effect button + spstr strCommand.txt,tTmp.txt,"~",11 + if(tTmp.txt=="enable") + { + vis bEffect,1 + }else + { + vis bEffect,0 + } + } + if(tInstruction.txt=="time") + { + // get set time to global variable + spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 + } + if(tInstruction.txt=="date") + { + // get set date to global variable + spstr strCommand.txt,pageIcons.vaDate.txt,"~",1 + } + if(tInstruction.txt=="dimmode") + { + // get value + spstr strCommand.txt,tTmp.txt,"~",1 + covx tTmp.txt,dimValue,0,0 + // get value normal + spstr strCommand.txt,tTmp.txt,"~",2 + covx tTmp.txt,dimValueNormal,0,0 + dim=dimValueNormal + // get background color + spstr strCommand.txt,tTmp.txt,"~",3 + if(tTmp.txt!="") + { + covx tTmp.txt,defaultBcoColor,0,0 + } + // get font color + spstr strCommand.txt,tTmp.txt,"~",4 + if(tTmp.txt!="") + { + covx tTmp.txt,defaultFontColor,0,0 + } + } + if(tInstruction.txt=="timeout") + { + //set timeout to global var + spstr strCommand.txt,tTmp.txt,"~",1 + covx tTmp.txt,sleepTimeout,0,0 + } + if(tInstruction.txt=="pageType") + { + //command format pageType,specialPageName + //write name of speical page to tId + spstr strCommand.txt,tId.txt,"~",1 + //save second arg if there's one + spstr strCommand.txt,tTmp.txt,"~",2 + //save third arg if there's one + spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3 + spstr strCommand.txt,pageIcons.tTmp3.txt,"~",4 + //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ... + udelete payloadLength-1 + bufferPos=0 + if(tId.txt=="pageStartup") + { + page pageStartup + } + if(tId.txt=="screensaver") + { + page screensaver + } + if(tId.txt=="cardEntities") + { + page cardEntities + } + if(tId.txt=="cardGrid") + { + page cardGrid + } + if(tId.txt=="cardGrid2") + { + page cardGrid2 + } + if(tId.txt=="popupLight") + { + pageIcons.tTmp1.txt=tTmp.txt + page popupLight + } + if(tId.txt=="popupShutter") + { + pageIcons.tTmp1.txt=tTmp.txt + page popupShutter + } + if(tId.txt=="popupNotify") + { + page popupNotify + } + if(tId.txt=="cardThermo") + { + page cardThermo + } + if(tId.txt=="cardMedia") + { + page cardMedia + } + if(tId.txt=="cardAlarm") + { + page cardAlarm + } + if(tId.txt=="cardQR") + { + page cardQR + } + if(tId.txt=="cardPower") + { + page cardPower + } + if(tId.txt=="cardChart") + { + page cardChart + } + } + // end of user code + udelete payloadLength-1 + bufferPos=0 + } + } + } + } + // next character + bufferPos++ + } + } + +Timer tmSleep + Attributes + Scope : local + Period (ms): 1000 + Enabled : yes + + Events + Timer Event + if(sleepTimeout!=0) + { + sleepValue+=1 + if(sleepTimeout<=sleepValue) + { + sleepValue=0 + click b0,1 + click b0,0 + } + } + +TouchCap tc0 + Attributes + Scope: local + Value: 0 + + Events + Touch Press Event + sleepValue=0 + diff --git a/HMI/n2t-out-visual/Program.s.txt b/HMI/n2t-out-visual/Program.s.txt index 1df3bb7f..b32bdbb6 100644 --- a/HMI/n2t-out-visual/Program.s.txt +++ b/HMI/n2t-out-visual/Program.s.txt @@ -14,6 +14,8 @@ Program.s //color vars int defaultFontColor=65535 int defaultBcoColor=6371 + //feature flags + int featNewSliders=0 // 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 diff --git a/HMI/n2t-out-visual/cardEntities.txt b/HMI/n2t-out-visual/cardEntities.txt index 936c7f10..72c902a2 100644 --- a/HMI/n2t-out-visual/cardEntities.txt +++ b/HMI/n2t-out-visual/cardEntities.txt @@ -1856,8 +1856,13 @@ Hotspot m0 } if(type1.txt=="light") { - //popupLight.tEntity.txt=tEntity1.txt - page popupLight + if(featNewSliders==1) + { + page popupLightNew + }else + { + page popupLight + } } if(type1.txt=="fan") { @@ -1899,8 +1904,13 @@ Hotspot m1 } if(type2.txt=="light") { - //popupLight.tEntity.txt=tEntity2.txt - page popupLight + if(featNewSliders==1) + { + page popupLightNew + }else + { + page popupLight + } } if(type2.txt=="fan") { @@ -1942,8 +1952,13 @@ Hotspot m2 } if(type3.txt=="light") { - //popupLight.tEntity.txt=tEntity3.txt - page popupLight + if(featNewSliders==1) + { + page popupLightNew + }else + { + page popupLight + } } if(type3.txt=="fan") { @@ -1985,8 +2000,13 @@ Hotspot m3 } if(type4.txt=="light") { - //popupLight.tEntity.txt=tEntity4.txt - page popupLight + if(featNewSliders==1) + { + page popupLightNew + }else + { + page popupLight + } } if(type4.txt=="fan") { diff --git a/HMI/n2t-out-visual/cardGrid.txt b/HMI/n2t-out-visual/cardGrid.txt index dd5712b9..155f2cef 100644 --- a/HMI/n2t-out-visual/cardGrid.txt +++ b/HMI/n2t-out-visual/cardGrid.txt @@ -1052,7 +1052,13 @@ Timer tmLP Timer Event if(tTmp.txt=="light") { - page popupLight + if(featNewSliders==1) + { + page popupLightNew + }else + { + page popupLight + } } if(tTmp.txt=="fan") { diff --git a/HMI/n2t-out-visual/cardGrid2.txt b/HMI/n2t-out-visual/cardGrid2.txt index 7039d771..2c936965 100644 --- a/HMI/n2t-out-visual/cardGrid2.txt +++ b/HMI/n2t-out-visual/cardGrid2.txt @@ -1274,7 +1274,13 @@ Timer tmLP Timer Event if(tTmp.txt=="light") { - page popupLight + if(featNewSliders==1) + { + page popupLightNew + }else + { + page popupLight + } } if(tTmp.txt=="fan") { diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index d099e6e6..39a00216 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -1,7 +1,7 @@ Program.s 0 Component(s) - 14 Line(s) of event code - 14 Unique line(s) of event code + 15 Line(s) of event code + 15 Unique line(s) of event code pageIcons 7 Component(s) 0 Line(s) of event code @@ -18,30 +18,22 @@ popupFan 27 Component(s) 355 Line(s) of event code 206 Unique line(s) of event code -popupLight - 23 Component(s) - 410 Line(s) of event code - 209 Unique line(s) of event code +pageStartup + 20 Component(s) + 198 Line(s) of event code + 137 Unique line(s) of event code popupShutter 25 Component(s) 402 Line(s) of event code 220 Unique line(s) of event code -cardGrid - 44 Component(s) - 523 Line(s) of event code - 295 Unique line(s) of event code popupNotify 19 Component(s) 267 Line(s) of event code 172 Unique line(s) of event code -cardGrid2 - 52 Component(s) - 611 Line(s) of event code - 335 Unique line(s) of event code -pageStartup - 20 Component(s) - 193 Line(s) of event code - 135 Unique line(s) of event code +cardGrid + 44 Component(s) + 529 Line(s) of event code + 298 Unique line(s) of event code cardQR 34 Component(s) 410 Line(s) of event code @@ -58,6 +50,10 @@ cardAlarm 43 Component(s) 500 Line(s) of event code 273 Unique line(s) of event code +popupLight + 28 Component(s) + 408 Line(s) of event code + 225 Unique line(s) of event code screensaver 47 Component(s) 444 Line(s) of event code @@ -66,6 +62,14 @@ cardThermo 57 Component(s) 540 Line(s) of event code 319 Unique line(s) of event code +popupLightNew + 23 Component(s) + 412 Line(s) of event code + 209 Unique line(s) of event code +cardGrid2 + 52 Component(s) + 617 Line(s) of event code + 338 Unique line(s) of event code cardMedia 59 Component(s) 649 Line(s) of event code @@ -88,11 +92,11 @@ popupThermo 276 Unique line(s) of event code cardEntities 67 Component(s) - 1170 Line(s) of event code - 532 Unique line(s) of event code + 1194 Line(s) of event code + 535 Unique line(s) of event code Total - 22 Page(s) - 850 Component(s) - 9948 Line(s) of event code - 2385 Unique line(s) of event code + 23 Page(s) + 878 Component(s) + 10400 Line(s) of event code + 2416 Unique line(s) of event code diff --git a/HMI/n2t-out-visual/pageStartup.txt b/HMI/n2t-out-visual/pageStartup.txt index ed219e77..ed129d3c 100644 --- a/HMI/n2t-out-visual/pageStartup.txt +++ b/HMI/n2t-out-visual/pageStartup.txt @@ -575,6 +575,12 @@ Timer tmSerial { covx tTmp.txt,defaultFontColor,0,0 } + // get feature flag popup + spstr strCommand.txt,tTmp.txt,"~",5 + if(tTmp.txt!="") + { + covx tTmp.txt,featNewSliders,0,0 + } } if(tInstruction.txt=="timeout") { diff --git a/HMI/n2t-out-visual/popupLight.txt b/HMI/n2t-out-visual/popupLight.txt index aaf984fa..6b8bf115 100644 --- a/HMI/n2t-out-visual/popupLight.txt +++ b/HMI/n2t-out-visual/popupLight.txt @@ -24,12 +24,13 @@ 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 @@ -46,16 +47,16 @@ Page popupLight 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 @@ -74,76 +75,195 @@ Page popupLight } 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 - ID : 18 - Scope: local - Value: 65504 - Variable (string) entn Attributes - ID : 11 + ID : 20 Scope : local Text : Max. Text Size: 80 Variable (int32) mode Attributes - ID : 13 + ID : 22 Scope: local Value: 1 Variable (int32) mode_temp Attributes - ID : 14 + ID : 23 Scope: local Value: 0 Variable (string) strCommand Attributes - ID : 9 + ID : 16 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 : 16 + ID : 26 Scope : local Text : Max. Text Size: 200 -Variable (string) tTmp +Text t0 Attributes - ID : 21 - Scope : local - Text : - Max. Text Size: 80 + ID : 24 + Scope : local + Dragging : 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 9 + 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 + Send Component ID : disabled + Opacity : 127 + x coordinate : 10 + 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 + Send Component ID : disabled + Opacity : 127 + x coordinate : 10 + y coordinate : 267 + Width : 45 + Height : 30 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 1 + Back. Color : 6371 + Font Color : 40147 + Horizontal Alignment: center + Vertical Alignment : center + Input Type : character + Text :  + Max. Text Size : 10 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text t3 + Attributes + ID : 10 + Scope : local + Dragging : 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 10 + 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 + Send Component ID : disabled + Opacity : 127 + x coordinate : 9 + 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 Text tEntity Attributes - ID : 2 + ID : 3 Scope : local Dragging : 0 Send Component ID : disabled @@ -158,10 +278,10 @@ Text tEntity Fill : solid color Style : flat Associated Keyboard : none - Font ID : 2 + Font ID : 0 Back. Color : 6371 Font Color : 65535 - Horizontal Alignment: center + Horizontal Alignment: left Vertical Alignment : center Input Type : character Text : tEntity1 @@ -170,15 +290,147 @@ Text tEntity Horizontal Spacing : 0 Vertical Spacing : 0 -Picture pColorWheel +Text tIcon1 + Attributes + ID : 4 + Scope : local + Dragging : 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 11 + y coordinate : 21 + Width : 45 + Height : 30 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 1 + Back. Color : 6371 + Font Color : 17299 + Horizontal Alignment: center + Vertical Alignment : center + Input Type : character + Text :  + Max. Text Size : 10 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text tId + Attributes + ID : 18 + Scope : local + Dragging : 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 100 + y coordinate : 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 + Send Component ID : disabled + Opacity : 127 + x coordinate : 0 + 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 + Send Component ID : disabled + Opacity : 127 + x coordinate : 406 + 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 Send Component ID: disabled Opacity : 127 - x coordinate : 233 - y coordinate : 105 + x coordinate : 0 + y coordinate : 0 + Width : 480 + Height : 320 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Picture ID : 0 + +Picture pColorWheel + Attributes + ID : 2 + Scope : local + Dragging : 0 + Send Component ID: disabled + Opacity : 127 + x coordinate : 167 + y coordinate : 69 Width : 160 Height : 160 Effect : load @@ -216,44 +468,30 @@ Picture pColorWheel Slider hBrightness Attributes - ID : 4 + ID : 7 Scope : local Dragging : 0 Send Component ID : disabled Opacity : 127 - x coordinate : 89 - y coordinate : 64 - Width : 100 - Height : 250 + x coordinate : 61 + y coordinate : 261 + Width : 335 + Height : 43 Effect : load Effect Priority : 0 Effect Time : 300 - Direction : vertical + Direction : horizontal Fill : image Cursor width : auto - Cursor height : 1 - Back. Picture ID : 65535 - Slided Back. Picture ID: 65535 + Cursor height : 255 + Back. Picture ID : 5 + Slided Back. Picture ID: 4 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 @@ -274,24 +512,24 @@ Slider hBrightness Slider hTempSlider Attributes - ID : 10 + ID : 19 Scope : local Dragging : 0 Send Component ID : disabled Opacity : 127 - x coordinate : 263 - y coordinate : 64 - Width : 100 - Height : 250 + x coordinate : 61 + y coordinate : 178 + Width : 335 + Height : 44 Effect : load Effect Priority : 0 Effect Time : 300 - Direction : vertical + Direction : horizontal Fill : image Cursor width : auto Cursor height : 255 - Back. Picture ID : 7 - Slided Back. Picture ID: 7 + Back. Picture ID : 22 + Slided Back. Picture ID: 23 Position : 50 Upper range limit : 100 Lower range limit : 0 @@ -318,7 +556,7 @@ Slider hTempSlider Button b0 Attributes - ID : 3 + ID : 5 Scope : local Dragging : 0 Send Component ID : disabled @@ -364,13 +602,13 @@ Button b0 Button bColor Attributes - ID : 12 + ID : 21 Scope : local Dragging : 0 Send Component ID : disabled Opacity : 127 - x coordinate : 14 - y coordinate : 146 + x coordinate : 93 + y coordinate : 68 Width : 50 Height : 50 Effect : load @@ -401,8 +639,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 { @@ -412,21 +650,21 @@ 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 : 17 + ID : 27 Scope : local Dragging : 0 Send Component ID : disabled Opacity : 127 - x coordinate : 14 - y coordinate : 213 + x coordinate : 396 + y coordinate : 95 Width : 50 Height : 50 Effect : load @@ -453,17 +691,18 @@ Button bEffect 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 : 5 + ID : 8 Scope : local Dragging : 0 Send Component ID : disabled Opacity : 127 - x coordinate : 14 - y coordinate : 77 + x coordinate : 341 + y coordinate : 95 Width : 50 Height : 50 Effect : load @@ -502,7 +741,7 @@ Dual-state Button btOnOff1 Timer tmCooldown Attributes - ID : 15 + ID : 25 Scope : local Period (ms): 100 Enabled : no @@ -511,34 +750,9 @@ 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 : 8 + ID : 15 Scope : local Period (ms): 50 Enabled : yes @@ -593,12 +807,11 @@ 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 - col.val=sys0 - //tEntity.pco=sys0 + tIcon1.pco=sys0 // get Button State spstr strCommand.txt,tTmp.txt,"~",4 covx tTmp.txt,sys0,0,0 @@ -607,26 +820,27 @@ 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 - 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) @@ -649,8 +863,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 @@ -669,12 +883,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) { @@ -686,11 +900,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") @@ -768,10 +982,6 @@ Timer tmSerial { page cardGrid } - if(tId.txt=="cardGrid2") - { - page cardGrid2 - } if(tId.txt=="popupLight") { pageIcons.tTmp1.txt=tTmp.txt @@ -825,7 +1035,7 @@ Timer tmSerial Timer tmSleep Attributes - ID : 7 + ID : 14 Scope : local Period (ms): 1000 Enabled : yes @@ -845,7 +1055,7 @@ Timer tmSleep TouchCap tc0 Attributes - ID : 6 + ID : 13 Scope: local Value: 0 diff --git a/HMI/n2t-out-visual/popupLightNew.txt b/HMI/n2t-out-visual/popupLightNew.txt new file mode 100644 index 00000000..5bd8c650 --- /dev/null +++ b/HMI/n2t-out-visual/popupLightNew.txt @@ -0,0 +1,855 @@ +Page popupLightNew + Attributes + 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 + dim=dimValueNormal + //get entitiy name + tEntity.txt=pageIcons.tTmp1.txt + //get entity id + entn.txt=pageIcons.tTmp2.txt + 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 + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + //disable brightness by default + //vis t1,0 + //vis t2,0 + vis hBrightness,1 + //disable color temp by default + //vis t4,0 + //vis t3,0 + vis hTempSlider,0 + //disable color wheel components by default + vis bColor,0 + //vis t0,0 + vis pColorWheel,0 + //vis t0,0 + popupLightNew.bco=defaultBcoColor + for(sys0=0;sys0<27;sys0++) + { + if(b[sys0].type==98||b[sys0].type==116) + { + b[sys0].bco=defaultBcoColor + b[sys0].pco=defaultFontColor + } + if(b[sys0].type==53&&defaultBcoColor==0) + { + b[sys0].pic=10 + b[sys0].pic2=11 + } + } + if(defaultBcoColor==0) + { + hTempSlider.pic=16 + 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 : 11 + Scope : local + Text : + Max. Text Size: 80 + +Variable (int32) mode + Attributes + ID : 13 + Scope: local + Value: 1 + +Variable (int32) mode_temp + Attributes + ID : 14 + Scope: local + Value: 0 + +Variable (string) strCommand + Attributes + 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 : 16 + Scope : local + Text : + Max. Text Size: 200 + +Variable (string) tTmp + Attributes + ID : 21 + Scope : local + Text : + Max. Text Size: 80 + +Text tEntity + Attributes + ID : 2 + Scope : local + Dragging : 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 92 + 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 : 2 + 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 : 1 + Scope : local + Dragging : 0 + Send Component ID: disabled + Opacity : 127 + x coordinate : 233 + y coordinate : 105 + Width : 160 + Height : 160 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Picture ID : 3 + + Events + Touch Press Event + //craft command + tSend.txt="event,buttonPress2,"+entn.txt+",colorWheel," + sys0=tch0 + sys0=sys0-pColorWheel.x + covx sys0,tTmp.txt,0,0 + tSend.txt+=tTmp.txt + tSend.txt+="|" + sys0=tch1 + sys0=sys0-pColorWheel.y + covx sys0,tTmp.txt,0,0 + tSend.txt+=tTmp.txt + tSend.txt+="|" + covx pColorWheel.h,tTmp.txt,0,0 + tSend.txt+=tTmp.txt + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + +Slider hBrightness + Attributes + ID : 4 + Scope : local + Dragging : 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 89 + 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 + tSend.txt="event,buttonPress2,"+entn.txt+",brightnessSlider," + covx hBrightness.val,tTmp.txt,0,0 + tSend.txt+=tTmp.txt + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + +Slider hTempSlider + Attributes + ID : 10 + Scope : local + Dragging : 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 263 + 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 + tmCooldown.en=1 + tmCooldown.tim=2500 + //craft command + tSend.txt="event,buttonPress2,"+entn.txt+",colorTempSlider," + covx hTempSlider.val,tTmp.txt,0,0 + tSend.txt+=tTmp.txt + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + +Button b0 + Attributes + ID : 3 + Scope : local + Dragging : 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 397 + 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 + 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 + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + +Button bColor + Attributes + ID : 12 + Scope : local + Dragging : 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 14 + 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 + if(mode.val==1) + { + mode.val=0 + //enable color wheel + vis pColorWheel,1 + //disable color temp + //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 hTempSlider,1 + } + } + +Button bEffect + Attributes + ID : 17 + Scope : local + Dragging : 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 14 + 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 + page popupInSel + +Dual-state Button btOnOff1 + Attributes + ID : 5 + Scope : local + Dragging : 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 14 + 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 + //craft command + tSend.txt="event,buttonPress2,"+entn.txt+","+"OnOff," + covx btOnOff1.val,tTmp.txt,0,0 + tSend.txt+=tTmp.txt + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + +Timer tmCooldown + Attributes + ID : 15 + Scope : local + Period (ms): 100 + Enabled : no + + Events + 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 : 8 + Scope : local + Period (ms): 50 + Enabled : yes + + Events + Timer Event + // data available + if(usize>1) + { + bufferPos=0 + while(bufferPos isn't supported + if(tTmp.txt=="disable") + { + //vis t0,0 + vis bColor,0 + vis pColorWheel,0 + }else + { + //vis t0,1 + //only enable bColor button if color temp is also supported + if(mode_temp.val==1) + { + vis bColor,1 + } + if(mode.val==0) + { + vis pColorWheel,1 + } + } + // set t0 Color (Localization) + //spstr strCommand.txt,t0.txt,"~",8 + // set t4 Temperature (Localization) + //spstr strCommand.txt,t4.txt,"~",9 + // set t1 Brightness (Localization) + //spstr strCommand.txt,t1.txt,"~",10 + // activate effect button + spstr strCommand.txt,tTmp.txt,"~",11 + if(tTmp.txt=="enable") + { + vis bEffect,1 + }else + { + vis bEffect,0 + } + } + if(tInstruction.txt=="time") + { + // get set time to global variable + spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 + } + if(tInstruction.txt=="date") + { + // get set date to global variable + spstr strCommand.txt,pageIcons.vaDate.txt,"~",1 + } + if(tInstruction.txt=="dimmode") + { + // get value + spstr strCommand.txt,tTmp.txt,"~",1 + covx tTmp.txt,dimValue,0,0 + // get value normal + spstr strCommand.txt,tTmp.txt,"~",2 + covx tTmp.txt,dimValueNormal,0,0 + dim=dimValueNormal + // get background color + spstr strCommand.txt,tTmp.txt,"~",3 + if(tTmp.txt!="") + { + covx tTmp.txt,defaultBcoColor,0,0 + } + // get font color + spstr strCommand.txt,tTmp.txt,"~",4 + if(tTmp.txt!="") + { + covx tTmp.txt,defaultFontColor,0,0 + } + } + if(tInstruction.txt=="timeout") + { + //set timeout to global var + spstr strCommand.txt,tTmp.txt,"~",1 + covx tTmp.txt,sleepTimeout,0,0 + } + if(tInstruction.txt=="pageType") + { + //command format pageType,specialPageName + //write name of speical page to tId + spstr strCommand.txt,tId.txt,"~",1 + //save second arg if there's one + spstr strCommand.txt,tTmp.txt,"~",2 + //save third arg if there's one + spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3 + spstr strCommand.txt,pageIcons.tTmp3.txt,"~",4 + //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ... + udelete payloadLength-1 + bufferPos=0 + if(tId.txt=="pageStartup") + { + page pageStartup + } + if(tId.txt=="screensaver") + { + page screensaver + } + if(tId.txt=="cardEntities") + { + page cardEntities + } + if(tId.txt=="cardGrid") + { + page cardGrid + } + if(tId.txt=="cardGrid2") + { + page cardGrid2 + } + if(tId.txt=="popupLight") + { + pageIcons.tTmp1.txt=tTmp.txt + page popupLight + } + if(tId.txt=="popupShutter") + { + pageIcons.tTmp1.txt=tTmp.txt + page popupShutter + } + if(tId.txt=="popupNotify") + { + page popupNotify + } + if(tId.txt=="cardThermo") + { + page cardThermo + } + if(tId.txt=="cardMedia") + { + page cardMedia + } + if(tId.txt=="cardAlarm") + { + page cardAlarm + } + if(tId.txt=="cardQR") + { + page cardQR + } + if(tId.txt=="cardPower") + { + page cardPower + } + if(tId.txt=="cardChart") + { + page cardChart + } + } + // end of user code + udelete payloadLength-1 + bufferPos=0 + } + } + } + } + // next character + bufferPos++ + } + } + +Timer tmSleep + Attributes + ID : 7 + Scope : local + Period (ms): 1000 + Enabled : yes + + Events + Timer Event + if(sleepTimeout!=0) + { + sleepValue+=1 + if(sleepTimeout<=sleepValue) + { + sleepValue=0 + click b0,1 + click b0,0 + } + } + +TouchCap tc0 + Attributes + ID : 6 + Scope: local + Value: 0 + + Events + Touch Press Event + sleepValue=0 + diff --git a/HMI/n2t-out/Program.s.txt b/HMI/n2t-out/Program.s.txt index 1df3bb7f..b32bdbb6 100644 --- a/HMI/n2t-out/Program.s.txt +++ b/HMI/n2t-out/Program.s.txt @@ -14,6 +14,8 @@ Program.s //color vars int defaultFontColor=65535 int defaultBcoColor=6371 + //feature flags + int featNewSliders=0 // 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 diff --git a/HMI/n2t-out/cardEntities.txt b/HMI/n2t-out/cardEntities.txt index ee3b8c6c..5bc7d912 100644 --- a/HMI/n2t-out/cardEntities.txt +++ b/HMI/n2t-out/cardEntities.txt @@ -965,8 +965,13 @@ Hotspot m0 } if(type1.txt=="light") { - //popupLight.tEntity.txt=tEntity1.txt - page popupLight + if(featNewSliders==1) + { + page popupLightNew + }else + { + page popupLight + } } if(type1.txt=="fan") { @@ -999,8 +1004,13 @@ Hotspot m1 } if(type2.txt=="light") { - //popupLight.tEntity.txt=tEntity2.txt - page popupLight + if(featNewSliders==1) + { + page popupLightNew + }else + { + page popupLight + } } if(type2.txt=="fan") { @@ -1033,8 +1043,13 @@ Hotspot m2 } if(type3.txt=="light") { - //popupLight.tEntity.txt=tEntity3.txt - page popupLight + if(featNewSliders==1) + { + page popupLightNew + }else + { + page popupLight + } } if(type3.txt=="fan") { @@ -1067,8 +1082,13 @@ Hotspot m3 } if(type4.txt=="light") { - //popupLight.tEntity.txt=tEntity4.txt - page popupLight + if(featNewSliders==1) + { + page popupLightNew + }else + { + page popupLight + } } if(type4.txt=="fan") { diff --git a/HMI/n2t-out/cardGrid.txt b/HMI/n2t-out/cardGrid.txt index baafe618..6d8abda1 100644 --- a/HMI/n2t-out/cardGrid.txt +++ b/HMI/n2t-out/cardGrid.txt @@ -605,7 +605,13 @@ Timer tmLP Timer Event if(tTmp.txt=="light") { - page popupLight + if(featNewSliders==1) + { + page popupLightNew + }else + { + page popupLight + } } if(tTmp.txt=="fan") { diff --git a/HMI/n2t-out/cardGrid2.txt b/HMI/n2t-out/cardGrid2.txt index 3d594abf..0f5a64e7 100644 --- a/HMI/n2t-out/cardGrid2.txt +++ b/HMI/n2t-out/cardGrid2.txt @@ -739,7 +739,13 @@ Timer tmLP Timer Event if(tTmp.txt=="light") { - page popupLight + if(featNewSliders==1) + { + page popupLightNew + }else + { + page popupLight + } } if(tTmp.txt=="fan") { diff --git a/HMI/n2t-out/pageStartup.txt b/HMI/n2t-out/pageStartup.txt index 5d44f526..bbfd90ec 100644 --- a/HMI/n2t-out/pageStartup.txt +++ b/HMI/n2t-out/pageStartup.txt @@ -279,6 +279,12 @@ Timer tmSerial { covx tTmp.txt,defaultFontColor,0,0 } + // get feature flag popup + spstr strCommand.txt,tTmp.txt,"~",5 + if(tTmp.txt!="") + { + covx tTmp.txt,featNewSliders,0,0 + } } if(tInstruction.txt=="timeout") { diff --git a/HMI/n2t-out/popupLight.txt b/HMI/n2t-out/popupLight.txt index d52b29a9..c9a5bf42 100644 --- a/HMI/n2t-out/popupLight.txt +++ b/HMI/n2t-out/popupLight.txt @@ -16,12 +16,13 @@ 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 @@ -38,16 +39,16 @@ Page popupLight 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 @@ -66,18 +67,14 @@ Page popupLight } 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 @@ -100,29 +97,56 @@ 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 -Variable (string) tTmp +Text t0 Attributes - Scope : local - Text : - Max. Text Size: 80 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : Color + Max. Text Size : 50 + +Text t1 + Attributes + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : Brightness + Max. Text Size : 50 + +Text t2 + Attributes + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text :  + Max. Text Size : 10 + +Text t3 + Attributes + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text :  + Max. Text Size : 10 + +Text t4 + Attributes + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : Temperature + Max. Text Size : 50 Text tEntity Attributes @@ -133,6 +157,48 @@ Text tEntity 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 @@ -178,20 +244,6 @@ Slider hBrightness 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 @@ -280,8 +332,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 { @@ -291,8 +343,8 @@ 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 } } @@ -310,6 +362,7 @@ Button bEffect Touch Press Event pageIcons.tTmp1.txt=tEntity.txt pageIcons.tTmp2.txt=entn.txt + pageIcons.tTmp3.txt=tIcon1.txt page popupInSel Dual-state Button btOnOff1 @@ -349,30 +402,6 @@ 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 @@ -429,12 +458,11 @@ 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 - col.val=sys0 - //tEntity.pco=sys0 + tIcon1.pco=sys0 // get Button State spstr strCommand.txt,tTmp.txt,"~",4 covx tTmp.txt,sys0,0,0 @@ -443,26 +471,27 @@ 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 - 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) @@ -485,8 +514,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 @@ -505,12 +534,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) { @@ -522,11 +551,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") @@ -604,10 +633,6 @@ Timer tmSerial { page cardGrid } - if(tId.txt=="cardGrid2") - { - page cardGrid2 - } if(tId.txt=="popupLight") { pageIcons.tTmp1.txt=tTmp.txt diff --git a/HMI/n2t-out/popupLightNew.txt b/HMI/n2t-out/popupLightNew.txt new file mode 100644 index 00000000..cab0befe --- /dev/null +++ b/HMI/n2t-out/popupLightNew.txt @@ -0,0 +1,689 @@ +Page popupLightNew + 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 + + Events + Preinitialize Event + dim=dimValueNormal + //get entitiy name + tEntity.txt=pageIcons.tTmp1.txt + //get entity id + entn.txt=pageIcons.tTmp2.txt + 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 + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + //disable brightness by default + //vis t1,0 + //vis t2,0 + vis hBrightness,1 + //disable color temp by default + //vis t4,0 + //vis t3,0 + vis hTempSlider,0 + //disable color wheel components by default + vis bColor,0 + //vis t0,0 + vis pColorWheel,0 + //vis t0,0 + popupLightNew.bco=defaultBcoColor + for(sys0=0;sys0<27;sys0++) + { + if(b[sys0].type==98||b[sys0].type==116) + { + b[sys0].bco=defaultBcoColor + b[sys0].pco=defaultFontColor + } + if(b[sys0].type==53&&defaultBcoColor==0) + { + b[sys0].pic=10 + b[sys0].pic2=11 + } + } + if(defaultBcoColor==0) + { + hTempSlider.pic=16 + 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 + Text : + Max. Text Size: 80 + +Variable (int32) mode + Attributes + Scope: local + Value: 1 + +Variable (int32) mode_temp + Attributes + Scope: local + Value: 0 + +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 + Attributes + Scope : local + Text : + Max. Text Size: 80 + +Text tEntity + Attributes + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : tEntity1 + Max. Text Size : 25 + +Picture pColorWheel + Attributes + Scope : local + 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 + covx sys0,tTmp.txt,0,0 + tSend.txt+=tTmp.txt + tSend.txt+="|" + sys0=tch1 + sys0=sys0-pColorWheel.y + covx sys0,tTmp.txt,0,0 + tSend.txt+=tTmp.txt + tSend.txt+="|" + covx pColorWheel.h,tTmp.txt,0,0 + tSend.txt+=tTmp.txt + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + +Slider hBrightness + Attributes + 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 + tSend.txt="event,buttonPress2,"+entn.txt+",brightnessSlider," + covx hBrightness.val,tTmp.txt,0,0 + tSend.txt+=tTmp.txt + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + +Slider hTempSlider + Attributes + Scope : local + 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," + covx hTempSlider.val,tTmp.txt,0,0 + tSend.txt+=tTmp.txt + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + +Button b0 + Attributes + Scope : local + 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 + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + +Button bColor + Attributes + Scope : local + 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 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 hTempSlider,1 + } + } + +Button bEffect + Attributes + 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 + page popupInSel + +Dual-state Button btOnOff1 + Attributes + Scope : local + 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 + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + +Timer tmCooldown + Attributes + Scope : local + 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 + Timer Event + // data available + if(usize>1) + { + bufferPos=0 + while(bufferPos isn't supported + if(tTmp.txt=="disable") + { + //vis t0,0 + vis bColor,0 + vis pColorWheel,0 + }else + { + //vis t0,1 + //only enable bColor button if color temp is also supported + if(mode_temp.val==1) + { + vis bColor,1 + } + if(mode.val==0) + { + vis pColorWheel,1 + } + } + // set t0 Color (Localization) + //spstr strCommand.txt,t0.txt,"~",8 + // set t4 Temperature (Localization) + //spstr strCommand.txt,t4.txt,"~",9 + // set t1 Brightness (Localization) + //spstr strCommand.txt,t1.txt,"~",10 + // activate effect button + spstr strCommand.txt,tTmp.txt,"~",11 + if(tTmp.txt=="enable") + { + vis bEffect,1 + }else + { + vis bEffect,0 + } + } + if(tInstruction.txt=="time") + { + // get set time to global variable + spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 + } + if(tInstruction.txt=="date") + { + // get set date to global variable + spstr strCommand.txt,pageIcons.vaDate.txt,"~",1 + } + if(tInstruction.txt=="dimmode") + { + // get value + spstr strCommand.txt,tTmp.txt,"~",1 + covx tTmp.txt,dimValue,0,0 + // get value normal + spstr strCommand.txt,tTmp.txt,"~",2 + covx tTmp.txt,dimValueNormal,0,0 + dim=dimValueNormal + // get background color + spstr strCommand.txt,tTmp.txt,"~",3 + if(tTmp.txt!="") + { + covx tTmp.txt,defaultBcoColor,0,0 + } + // get font color + spstr strCommand.txt,tTmp.txt,"~",4 + if(tTmp.txt!="") + { + covx tTmp.txt,defaultFontColor,0,0 + } + } + if(tInstruction.txt=="timeout") + { + //set timeout to global var + spstr strCommand.txt,tTmp.txt,"~",1 + covx tTmp.txt,sleepTimeout,0,0 + } + if(tInstruction.txt=="pageType") + { + //command format pageType,specialPageName + //write name of speical page to tId + spstr strCommand.txt,tId.txt,"~",1 + //save second arg if there's one + spstr strCommand.txt,tTmp.txt,"~",2 + //save third arg if there's one + spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3 + spstr strCommand.txt,pageIcons.tTmp3.txt,"~",4 + //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ... + udelete payloadLength-1 + bufferPos=0 + if(tId.txt=="pageStartup") + { + page pageStartup + } + if(tId.txt=="screensaver") + { + page screensaver + } + if(tId.txt=="cardEntities") + { + page cardEntities + } + if(tId.txt=="cardGrid") + { + page cardGrid + } + if(tId.txt=="cardGrid2") + { + page cardGrid2 + } + if(tId.txt=="popupLight") + { + pageIcons.tTmp1.txt=tTmp.txt + page popupLight + } + if(tId.txt=="popupShutter") + { + pageIcons.tTmp1.txt=tTmp.txt + page popupShutter + } + if(tId.txt=="popupNotify") + { + page popupNotify + } + if(tId.txt=="cardThermo") + { + page cardThermo + } + if(tId.txt=="cardMedia") + { + page cardMedia + } + if(tId.txt=="cardAlarm") + { + page cardAlarm + } + if(tId.txt=="cardQR") + { + page cardQR + } + if(tId.txt=="cardPower") + { + page cardPower + } + if(tId.txt=="cardChart") + { + page cardChart + } + } + // end of user code + udelete payloadLength-1 + bufferPos=0 + } + } + } + } + // next character + bufferPos++ + } + } + +Timer tmSleep + Attributes + Scope : local + Period (ms): 1000 + Enabled : yes + + Events + Timer Event + if(sleepTimeout!=0) + { + sleepValue+=1 + if(sleepTimeout<=sleepValue) + { + sleepValue=0 + click b0,1 + click b0,0 + } + } + +TouchCap tc0 + Attributes + Scope: local + Value: 0 + + Events + Touch Press Event + sleepValue=0 +