From d5aa040d055168a3b508b21949c980f16fe2146e Mon Sep 17 00:00:00 2001 From: joBr99 Date: Tue, 18 Apr 2023 22:17:49 +0000 Subject: [PATCH] slider ver 2 (add nextion2text) --- HMI/US/landscape/diff-eu-version.txt | 178 ++++++++++++++---- HMI/US/portrait/diff-eu-version.txt | 178 ++++++++++++++---- HMI/US/portrait/diff-filtered.txt | 166 ++++++++++++++--- HMI/n2t-out-visual/nspanel_Stats.txt | 28 +-- HMI/n2t-out-visual/pageIcons.txt | 268 ++++++++++++++++----------- HMI/n2t-out-visual/popupLight.txt | 91 ++++----- HMI/n2t-out/pageIcons.txt | 81 ++++---- HMI/n2t-out/popupLight.txt | 39 ++-- 8 files changed, 707 insertions(+), 322 deletions(-) diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 67731ada..3c21fd22 100644 --- a/HMI/US/landscape/diff-eu-version.txt +++ b/HMI/US/landscape/diff-eu-version.txt @@ -410,6 +410,116 @@ │ crcputs sys0,2 │ crcputs tSend.txt,0 │ //send cmd +│ --- HMI/n2t-out/pageIcons.txt +├── +++ HMI/US/landscape/n2t-out/pageIcons.txt +│ @@ -1,17 +1,18 @@ +│ Page pageIcons +│ Attributes +│ - Scope : local +│ - Dragging : 0 +│ - Send Component ID : disabled +│ - Locked : no +│ - Swide up page ID : disabled +│ - Swide down page ID : disabled +│ - Swide left page ID : disabled +│ - Swide right page ID: disabled +│ + Scope : local +│ + Dragging : 0 +│ + Disable release event after dragging: 0 +│ + Send Component ID : disabled +│ + Locked : no +│ + Swide up page ID : disabled +│ + Swide down page ID : disabled +│ + Swide left page ID : disabled +│ + Swide right page ID : disabled +│ +│ Variable (string) vaDate +│ Attributes +│ Scope : global +│ Text : +│ Max. Text Size: 35 +│ +│ @@ -19,56 +20,42 @@ +│ Attributes +│ Scope : global +│ Text : +│ Max. Text Size: 15 +│ +│ Text tTmp1 +│ Attributes +│ - Scope : global +│ - Dragging : 0 +│ - Send Component ID : disabled +│ - Associated Keyboard: none +│ - Text : +│ - Max. Text Size : 80 +│ + Scope : global +│ + Dragging : 0 +│ + Disable release event after dragging: 0 +│ + Send Component ID : disabled +│ + Associated Keyboard : none +│ + Text : +│ + Max. Text Size : 80 +│ +│ Text tTmp2 +│ Attributes +│ - Scope : global +│ - Dragging : 0 +│ - Send Component ID : disabled +│ - Associated Keyboard: none +│ - Text : +│ - Max. Text Size : 80 +│ + Scope : global +│ + Dragging : 0 +│ + Disable release event after dragging: 0 +│ + Send Component ID : disabled +│ + Associated Keyboard : none +│ + Text : +│ + Max. Text Size : 80 +│ +│ Text tTmp3 +│ Attributes +│ - Scope : global +│ - Dragging : 0 +│ - Send Component ID : disabled +│ - Associated Keyboard: none +│ - Text : +│ - Max. Text Size : 10 +│ + Scope : global +│ + Dragging : 0 +│ + Disable release event after dragging: 0 +│ + Send Component ID : disabled +│ + Associated Keyboard : none +│ + Text : +│ + Max. Text Size : 10 +│ +│ Picture p0 +│ Attributes +│ - Scope : local +│ - Dragging : 0 +│ - Send Component ID: disabled +│ - +│ -Slider h0 +│ - Attributes +│ - Scope : local +│ - Dragging : 0 +│ - Send Component ID: disabled +│ - Position : 50 +│ - Upper range limit: 100 +│ - Lower range limit: 0 +│ - +│ -Slider hBrightness +│ - Attributes +│ - Scope : local +│ - Dragging : 0 +│ - Send Component ID: disabled +│ - Position : 50 +│ - Upper range limit: 100 +│ - Lower range limit: 0 +│ + Scope : local +│ + Dragging : 0 +│ + Disable release event after dragging: 0 +│ + Send Component ID : disabled │ --- HMI/n2t-out/pageStartup.txt ├── +++ HMI/US/landscape/n2t-out/pageStartup.txt │ @@ -1,17 +1,18 @@ @@ -730,7 +840,7 @@ │ //send cmd │ --- HMI/n2t-out/popupLight.txt ├── +++ HMI/US/landscape/n2t-out/popupLight.txt -│ @@ -1,25 +1,27 @@ +│ @@ -1,31 +1,33 @@ │ Page popupLight │ Attributes │ - Scope : local @@ -759,13 +869,20 @@ │ //get entity id │ entn.txt=pageIcons.tTmp2.txt │ + tIcon1.txt=pageIcons.tTmp3.txt -│ vis p0,0 +│ + vis p0,0 │ vis tSend,0 │ vis tTmp,0 │ vis tInstruction,0 │ vis tId,0 │ vis bEffect,0 +│ - vis hBrightness,0 │ //page open event +│ // event,pageOpenDetail,typeOfPage,tEntityName +│ // craft command +│ tSend.txt="event,pageOpenDetail,popupLight,"+entn.txt +│ //send calc crc +│ btlen tSend.txt,sys0 +│ crcrest 1,0xffff // reset CRC │ @@ -34,24 +36,24 @@ │ crcputs tSend.txt,0 │ //send cmd @@ -815,7 +932,7 @@ │ } │ │ - Postinitialize Event -│ - //xstr hBrightness.x,hBrightness.y,100,250,7,BLACK,6371,0,0,1,"a" +│ - fill hBrightness.x,hBrightness.y,100,250,defaultBcoColor │ - │ -Variable (int32) col │ - Attributes @@ -829,7 +946,7 @@ │ Max. Text Size: 80 │ │ Variable (int32) mode -│ @@ -96,58 +94,133 @@ +│ @@ -96,52 +94,133 @@ │ │ Variable (string) strCommand │ Attributes @@ -964,12 +1081,9 @@ │ + Associated Keyboard : none │ + Text : │ + Max. Text Size : 80 -│ -│ Picture p0 -│ Attributes -│ - Scope : local -│ - Dragging : 0 -│ - Send Component ID: disabled +│ + +│ +Picture p0 +│ + Attributes │ + Scope : local │ + Dragging : 0 │ + Disable release event after dragging: 0 @@ -991,7 +1105,7 @@ │ tSend.txt="event,buttonPress2,"+entn.txt+",colorWheel," │ sys0=tch0 │ sys0=sys0-pColorWheel.x -│ @@ -171,38 +244,24 @@ +│ @@ -165,37 +244,24 @@ │ printh 55 bb │ prints sys0,2 │ prints tSend.txt,0 @@ -1016,20 +1130,19 @@ │ Events │ Touch Release Event │ - //draw black background -│ - //xstr hBrightness.x,hBrightness.y,100,hBrightness.h,7,GREEN,6371,0,0,1,"a" -│ - xstr hBrightness.x,hBrightness.y,100,hBrightness.val*-25/10+250,7,8484,6371,0,0,1,"a" +│ - fill hBrightness.x,hBrightness.y,100,hBrightness.val*-25/10+250,8484 │ - //draw draw colored bar at the position of the current brightness value -│ - xstr hBrightness.x,hBrightness.val*-25/10+314,100,hBrightness.val*25/10,7,col.val,8484,2,4,1,"a" -│ - //paint an inverse of the character over everything, this rounds the corner at the bottom -│ - xstr hBrightness.x,hBrightness.y+1,100,hBrightness.h,7,defaultBcoColor,0,0,0,3,"b" +│ - 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" │ - } -│ - //draw black strip to the right of the slider -│ - //force a redraw of the slider, to ensure it is on top -│ - //vis hBrightness,1 +│ - //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 @@ -1037,7 +1150,7 @@ │ covx hBrightness.val,tTmp.txt,0,0 │ tSend.txt+=tTmp.txt │ //send calc crc -│ @@ -215,20 +274,21 @@ +│ @@ -208,20 +274,21 @@ │ printh 55 bb │ prints sys0,2 │ prints tSend.txt,0 @@ -1065,7 +1178,7 @@ │ tmCooldown.tim=2500 │ //craft command │ tSend.txt="event,buttonPress2,"+entn.txt+",colorTempSlider," -│ @@ -244,20 +304,21 @@ +│ @@ -237,20 +304,21 @@ │ printh 55 bb │ prints sys0,2 │ prints tSend.txt,0 @@ -1093,7 +1206,7 @@ │ //send calc crc │ btlen tSend.txt,sys0 │ crcrest 1,0xffff // reset CRC -│ @@ -268,69 +329,73 @@ +│ @@ -261,69 +329,73 @@ │ printh 55 bb │ prints sys0,2 │ prints tSend.txt,0 @@ -1189,7 +1302,7 @@ │ tSend.txt="event,buttonPress2,"+entn.txt+","+"OnOff," │ covx btOnOff1.val,tTmp.txt,0,0 │ tSend.txt+=tTmp.txt -│ @@ -408,61 +473,48 @@ +│ @@ -401,63 +473,48 @@ │ // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default) │ spstr strCommand.txt,tInstruction.txt,"~",0 │ spstr strCommand.txt,tTmp.txt,"~",1 @@ -1226,21 +1339,24 @@ │ + vis t2,1 │ vis hBrightness,1 │ covx tTmp.txt,sys0,0,0 -│ if(tmCooldown.en==0) +│ - if(tmCooldown.en==0&&hBrightness.val!=sys0) +│ + if(tmCooldown.en==0) │ { │ hBrightness.val=sys0 │ - //draw black background -│ - //xstr hBrightness.x,hBrightness.y,100,hBrightness.h,7,GREEN,6371,0,0,1,"a" -│ - xstr hBrightness.x,hBrightness.y,100,hBrightness.val*-25/10+250,7,8484,6371,0,0,1,"a" +│ - fill hBrightness.x,hBrightness.y,100,hBrightness.val*-25/10+250,8484 │ - //draw draw colored bar at the position of the current brightness value -│ - xstr hBrightness.x,hBrightness.val*-25/10+314,100,hBrightness.val*25/10,7,col.val,8484,2,4,1,"a" -│ - //paint an inverse of the character over everything, this rounds the corner at the bottom -│ - xstr hBrightness.x,hBrightness.y+1,100,hBrightness.h,7,defaultBcoColor,0,0,0,3,"b" +│ - 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" │ } │ } │ // get ColorTemp value @@ -1259,7 +1375,7 @@ │ // switch mode │ click bColor,1 │ click bColor,0 -│ @@ -477,16 +529,16 @@ +│ @@ -472,16 +529,16 @@ │ click bColor,1 │ click bColor,0 │ } @@ -1278,7 +1394,7 @@ │ } │ // mode == 0 is rgb controls currently shown │ if(mode.val==0) -│ @@ -497,36 +549,36 @@ +│ @@ -492,36 +549,36 @@ │ } │ } │ // get Color value diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index 45abd9da..451cad84 100644 --- a/HMI/US/portrait/diff-eu-version.txt +++ b/HMI/US/portrait/diff-eu-version.txt @@ -1777,6 +1777,116 @@ │ crcputs sys0,2 │ crcputs tSend.txt,0 │ //send cmd +│ --- HMI/n2t-out/pageIcons.txt +├── +++ HMI/US/portrait/n2t-out/pageIcons.txt +│ @@ -1,17 +1,18 @@ +│ Page pageIcons +│ Attributes +│ - Scope : local +│ - Dragging : 0 +│ - Send Component ID : disabled +│ - Locked : no +│ - Swide up page ID : disabled +│ - Swide down page ID : disabled +│ - Swide left page ID : disabled +│ - Swide right page ID: disabled +│ + Scope : local +│ + Dragging : 0 +│ + Disable release event after dragging: 0 +│ + Send Component ID : disabled +│ + Locked : no +│ + Swide up page ID : disabled +│ + Swide down page ID : disabled +│ + Swide left page ID : disabled +│ + Swide right page ID : disabled +│ +│ Variable (string) vaDate +│ Attributes +│ Scope : global +│ Text : +│ Max. Text Size: 35 +│ +│ @@ -19,56 +20,42 @@ +│ Attributes +│ Scope : global +│ Text : +│ Max. Text Size: 15 +│ +│ Text tTmp1 +│ Attributes +│ - Scope : global +│ - Dragging : 0 +│ - Send Component ID : disabled +│ - Associated Keyboard: none +│ - Text : +│ - Max. Text Size : 80 +│ + Scope : global +│ + Dragging : 0 +│ + Disable release event after dragging: 0 +│ + Send Component ID : disabled +│ + Associated Keyboard : none +│ + Text : +│ + Max. Text Size : 80 +│ +│ Text tTmp2 +│ Attributes +│ - Scope : global +│ - Dragging : 0 +│ - Send Component ID : disabled +│ - Associated Keyboard: none +│ - Text : +│ - Max. Text Size : 80 +│ + Scope : global +│ + Dragging : 0 +│ + Disable release event after dragging: 0 +│ + Send Component ID : disabled +│ + Associated Keyboard : none +│ + Text : +│ + Max. Text Size : 80 +│ +│ Text tTmp3 +│ Attributes +│ - Scope : global +│ - Dragging : 0 +│ - Send Component ID : disabled +│ - Associated Keyboard: none +│ - Text : +│ - Max. Text Size : 10 +│ + Scope : global +│ + Dragging : 0 +│ + Disable release event after dragging: 0 +│ + Send Component ID : disabled +│ + Associated Keyboard : none +│ + Text : +│ + Max. Text Size : 10 +│ +│ Picture p0 +│ Attributes +│ - Scope : local +│ - Dragging : 0 +│ - Send Component ID: disabled +│ - +│ -Slider h0 +│ - Attributes +│ - Scope : local +│ - Dragging : 0 +│ - Send Component ID: disabled +│ - Position : 50 +│ - Upper range limit: 100 +│ - Lower range limit: 0 +│ - +│ -Slider hBrightness +│ - Attributes +│ - Scope : local +│ - Dragging : 0 +│ - Send Component ID: disabled +│ - Position : 50 +│ - Upper range limit: 100 +│ - Lower range limit: 0 +│ + Scope : local +│ + Dragging : 0 +│ + Disable release event after dragging: 0 +│ + Send Component ID : disabled │ --- HMI/n2t-out/pageStartup.txt ├── +++ HMI/US/portrait/n2t-out/pageStartup.txt │ @@ -1,17 +1,18 @@ @@ -2105,7 +2215,7 @@ │ //send cmd │ --- HMI/n2t-out/popupLight.txt ├── +++ HMI/US/portrait/n2t-out/popupLight.txt -│ @@ -1,25 +1,27 @@ +│ @@ -1,31 +1,33 @@ │ Page popupLight │ Attributes │ - Scope : local @@ -2134,13 +2244,20 @@ │ //get entity id │ entn.txt=pageIcons.tTmp2.txt │ + tIcon1.txt=pageIcons.tTmp3.txt -│ vis p0,0 +│ + vis p0,0 │ vis tSend,0 │ vis tTmp,0 │ vis tInstruction,0 │ vis tId,0 │ vis bEffect,0 +│ - vis hBrightness,0 │ //page open event +│ // event,pageOpenDetail,typeOfPage,tEntityName +│ // craft command +│ tSend.txt="event,pageOpenDetail,popupLight,"+entn.txt +│ //send calc crc +│ btlen tSend.txt,sys0 +│ crcrest 1,0xffff // reset CRC │ @@ -34,24 +36,24 @@ │ crcputs tSend.txt,0 │ //send cmd @@ -2190,7 +2307,7 @@ │ } │ │ - Postinitialize Event -│ - //xstr hBrightness.x,hBrightness.y,100,250,7,BLACK,6371,0,0,1,"a" +│ - fill hBrightness.x,hBrightness.y,100,250,defaultBcoColor │ - │ -Variable (int32) col │ - Attributes @@ -2204,7 +2321,7 @@ │ Max. Text Size: 80 │ │ Variable (int32) mode -│ @@ -96,58 +94,133 @@ +│ @@ -96,52 +94,133 @@ │ │ Variable (string) strCommand │ Attributes @@ -2339,12 +2456,9 @@ │ + Associated Keyboard : none │ + Text : │ + Max. Text Size : 80 -│ -│ Picture p0 -│ Attributes -│ - Scope : local -│ - Dragging : 0 -│ - Send Component ID: disabled +│ + +│ +Picture p0 +│ + Attributes │ + Scope : local │ + Dragging : 0 │ + Disable release event after dragging: 0 @@ -2366,7 +2480,7 @@ │ tSend.txt="event,buttonPress2,"+entn.txt+",colorWheel," │ sys0=tch0 │ sys0=sys0-pColorWheel.x -│ @@ -171,38 +244,24 @@ +│ @@ -165,37 +244,24 @@ │ printh 55 bb │ prints sys0,2 │ prints tSend.txt,0 @@ -2391,20 +2505,19 @@ │ Events │ Touch Release Event │ - //draw black background -│ - //xstr hBrightness.x,hBrightness.y,100,hBrightness.h,7,GREEN,6371,0,0,1,"a" -│ - xstr hBrightness.x,hBrightness.y,100,hBrightness.val*-25/10+250,7,8484,6371,0,0,1,"a" +│ - fill hBrightness.x,hBrightness.y,100,hBrightness.val*-25/10+250,8484 │ - //draw draw colored bar at the position of the current brightness value -│ - xstr hBrightness.x,hBrightness.val*-25/10+314,100,hBrightness.val*25/10,7,col.val,8484,2,4,1,"a" -│ - //paint an inverse of the character over everything, this rounds the corner at the bottom -│ - xstr hBrightness.x,hBrightness.y+1,100,hBrightness.h,7,defaultBcoColor,0,0,0,3,"b" +│ - 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" │ - } -│ - //draw black strip to the right of the slider -│ - //force a redraw of the slider, to ensure it is on top -│ - //vis hBrightness,1 +│ - //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 @@ -2412,7 +2525,7 @@ │ covx hBrightness.val,tTmp.txt,0,0 │ tSend.txt+=tTmp.txt │ //send calc crc -│ @@ -215,20 +274,21 @@ +│ @@ -208,20 +274,21 @@ │ printh 55 bb │ prints sys0,2 │ prints tSend.txt,0 @@ -2440,7 +2553,7 @@ │ tmCooldown.tim=2500 │ //craft command │ tSend.txt="event,buttonPress2,"+entn.txt+",colorTempSlider," -│ @@ -244,20 +304,21 @@ +│ @@ -237,20 +304,21 @@ │ printh 55 bb │ prints sys0,2 │ prints tSend.txt,0 @@ -2468,7 +2581,7 @@ │ //send calc crc │ btlen tSend.txt,sys0 │ crcrest 1,0xffff // reset CRC -│ @@ -268,69 +329,73 @@ +│ @@ -261,69 +329,73 @@ │ printh 55 bb │ prints sys0,2 │ prints tSend.txt,0 @@ -2564,7 +2677,7 @@ │ tSend.txt="event,buttonPress2,"+entn.txt+","+"OnOff," │ covx btOnOff1.val,tTmp.txt,0,0 │ tSend.txt+=tTmp.txt -│ @@ -408,61 +473,48 @@ +│ @@ -401,63 +473,48 @@ │ // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default) │ spstr strCommand.txt,tInstruction.txt,"~",0 │ spstr strCommand.txt,tTmp.txt,"~",1 @@ -2601,21 +2714,24 @@ │ + vis t2,1 │ vis hBrightness,1 │ covx tTmp.txt,sys0,0,0 -│ if(tmCooldown.en==0) +│ - if(tmCooldown.en==0&&hBrightness.val!=sys0) +│ + if(tmCooldown.en==0) │ { │ hBrightness.val=sys0 │ - //draw black background -│ - //xstr hBrightness.x,hBrightness.y,100,hBrightness.h,7,GREEN,6371,0,0,1,"a" -│ - xstr hBrightness.x,hBrightness.y,100,hBrightness.val*-25/10+250,7,8484,6371,0,0,1,"a" +│ - fill hBrightness.x,hBrightness.y,100,hBrightness.val*-25/10+250,8484 │ - //draw draw colored bar at the position of the current brightness value -│ - xstr hBrightness.x,hBrightness.val*-25/10+314,100,hBrightness.val*25/10,7,col.val,8484,2,4,1,"a" -│ - //paint an inverse of the character over everything, this rounds the corner at the bottom -│ - xstr hBrightness.x,hBrightness.y+1,100,hBrightness.h,7,defaultBcoColor,0,0,0,3,"b" +│ - 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" │ } │ } │ // get ColorTemp value @@ -2634,7 +2750,7 @@ │ // switch mode │ click bColor,1 │ click bColor,0 -│ @@ -477,16 +529,16 @@ +│ @@ -472,16 +529,16 @@ │ click bColor,1 │ click bColor,0 │ } @@ -2653,7 +2769,7 @@ │ } │ // mode == 0 is rgb controls currently shown │ if(mode.val==0) -│ @@ -497,36 +549,36 @@ +│ @@ -492,36 +549,36 @@ │ } │ } │ // get Color value diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index 784ef4d3..063af9f8 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,4 +1,4 @@ -+++ /dev/fd/62 2023-04-17 17:53:22.299449942 +0000 ++++ /dev/fd/62 2023-04-18 22:17:40.643093312 +0000 +I/n2t-out/Program.s.txt ++ HMI/US/portrait/n2t-out/Program.s.txt +1 +10,10 @@ @@ -1198,6 +1198,116 @@ + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd ++I/n2t-out/pageIcons.txt +++ HMI/US/portrait/n2t-out/pageIcons.txt ++ +1,18 @@ ++geIcons ++ributes ++ Scope : local ++ Dragging : 0 ++ Send Component ID : disabled ++ Locked : no ++ Swide up page ID : disabled ++ Swide down page ID : disabled ++ Swide left page ID : disabled ++ Swide right page ID: disabled ++ Scope : local ++ Dragging : 0 ++ Disable release event after dragging: 0 ++ Send Component ID : disabled ++ Locked : no ++ Swide up page ID : disabled ++ Swide down page ID : disabled ++ Swide left page ID : disabled ++ Swide right page ID : disabled ++ ++e (string) vaDate ++ributes ++ Scope : global ++ Text : ++ Max. Text Size: 35 ++ ++6 +20,42 @@ ++ributes ++ Scope : global ++ Text : ++ Max. Text Size: 15 ++ ++mp1 ++ributes ++ Scope : global ++ Dragging : 0 ++ Send Component ID : disabled ++ Associated Keyboard: none ++ Text : ++ Max. Text Size : 80 ++ Scope : global ++ Dragging : 0 ++ Disable release event after dragging: 0 ++ Send Component ID : disabled ++ Associated Keyboard : none ++ Text : ++ Max. Text Size : 80 ++ ++mp2 ++ributes ++ Scope : global ++ Dragging : 0 ++ Send Component ID : disabled ++ Associated Keyboard: none ++ Text : ++ Max. Text Size : 80 ++ Scope : global ++ Dragging : 0 ++ Disable release event after dragging: 0 ++ Send Component ID : disabled ++ Associated Keyboard : none ++ Text : ++ Max. Text Size : 80 ++ ++mp3 ++ributes ++ Scope : global ++ Dragging : 0 ++ Send Component ID : disabled ++ Associated Keyboard: none ++ Text : ++ Max. Text Size : 10 ++ Scope : global ++ Dragging : 0 ++ Disable release event after dragging: 0 ++ Send Component ID : disabled ++ Associated Keyboard : none ++ Text : ++ Max. Text Size : 10 ++ ++ p0 ++ributes ++ Scope : local ++ Dragging : 0 ++ Send Component ID: disabled ++ ++h0 ++ributes ++ Scope : local ++ Dragging : 0 ++ Send Component ID: disabled ++ Position : 50 ++ Upper range limit: 100 ++ Lower range limit: 0 ++ ++hBrightness ++ributes ++ Scope : local ++ Dragging : 0 ++ Send Component ID: disabled ++ Position : 50 ++ Upper range limit: 100 ++ Lower range limit: 0 ++ Scope : local ++ Dragging : 0 ++ Disable release event after dragging: 0 ++ Send Component ID : disabled +I/n2t-out/pageStartup.txt ++ HMI/US/portrait/n2t-out/pageStartup.txt + +1,18 @@ @@ -1373,6 +1483,9 @@ + Associated Keyboard: none + Text : newtxt + Max. Text Size : 100 ++ Scope : local ++ Dragging : 0 ++ Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : newtxt @@ -1428,9 +1541,6 @@ + State : unpressed + Text : startup + Max. Text Size : 10 -+ Scope : local -+ Dragging : 0 -+ Disable release event after dragging: 0 + Send Component ID : disabled + State : unpressed + Text : startup @@ -1495,7 +1605,7 @@ + //send cmd +I/n2t-out/popupLight.txt ++ HMI/US/portrait/n2t-out/popupLight.txt -+ +1,27 @@ ++ +1,33 @@ +pupLight +ributes + Scope : local @@ -1530,7 +1640,14 @@ + vis tInstruction,0 + vis tId,0 + vis bEffect,0 ++ vis hBrightness,0 + //page open event ++ // event,pageOpenDetail,typeOfPage,tEntityName ++ // craft command ++ tSend.txt="event,pageOpenDetail,popupLight,"+entn.txt ++ //send calc crc ++ btlen tSend.txt,sys0 ++ crcrest 1,0xffff // reset CRC +4 +36,24 @@ + crcputs tSend.txt,0 + //send cmd @@ -1580,7 +1697,7 @@ + } + + Postinitialize Event -+ //xstr hBrightness.x,hBrightness.y,100,250,7,BLACK,6371,0,0,1,"a" ++ fill hBrightness.x,hBrightness.y,100,250,defaultBcoColor + +e (int32) col +ributes @@ -1594,7 +1711,7 @@ + Max. Text Size: 80 + +e (int32) mode -+8 +94,133 @@ ++2 +94,133 @@ + +e (string) strCommand +ributes @@ -1732,9 +1849,6 @@ + + p0 +ributes -+ Scope : local -+ Dragging : 0 -+ Send Component ID: disabled + Scope : local + Dragging : 0 + Disable release event after dragging: 0 @@ -1756,7 +1870,7 @@ + tSend.txt="event,buttonPress2,"+entn.txt+",colorWheel," + sys0=tch0 + sys0=sys0-pColorWheel.x -+38 +244,24 @@ ++37 +244,24 @@ + printh 55 bb + prints sys0,2 + prints tSend.txt,0 @@ -1781,20 +1895,19 @@ +nts + Touch Release Event + //draw black background -+ //xstr hBrightness.x,hBrightness.y,100,hBrightness.h,7,GREEN,6371,0,0,1,"a" -+ xstr hBrightness.x,hBrightness.y,100,hBrightness.val*-25/10+250,7,8484,6371,0,0,1,"a" ++ fill hBrightness.x,hBrightness.y,100,hBrightness.val*-25/10+250,8484 + //draw draw colored bar at the position of the current brightness value -+ xstr hBrightness.x,hBrightness.val*-25/10+314,100,hBrightness.val*25/10,7,col.val,8484,2,4,1,"a" -+ //paint an inverse of the character over everything, this rounds the corner at the bottom -+ xstr hBrightness.x,hBrightness.y+1,100,hBrightness.h,7,defaultBcoColor,0,0,0,3,"b" ++ 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" + } -+ //draw black strip to the right of the slider -+ //force a redraw of the slider, to ensure it is on top -+ //vis hBrightness,1 ++ //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 @@ -1954,7 +2067,7 @@ + tSend.txt="event,buttonPress2,"+entn.txt+","+"OnOff," + covx btOnOff1.val,tTmp.txt,0,0 + tSend.txt+=tTmp.txt -+61 +473,48 @@ ++63 +473,48 @@ + // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default) + spstr strCommand.txt,tInstruction.txt,"~",0 + spstr strCommand.txt,tTmp.txt,"~",1 @@ -1991,21 +2104,24 @@ + vis t2,1 + vis hBrightness,1 + covx tTmp.txt,sys0,0,0 ++ if(tmCooldown.en==0&&hBrightness.val!=sys0) + if(tmCooldown.en==0) + { + hBrightness.val=sys0 + //draw black background -+ //xstr hBrightness.x,hBrightness.y,100,hBrightness.h,7,GREEN,6371,0,0,1,"a" -+ xstr hBrightness.x,hBrightness.y,100,hBrightness.val*-25/10+250,7,8484,6371,0,0,1,"a" ++ fill hBrightness.x,hBrightness.y,100,hBrightness.val*-25/10+250,8484 + //draw draw colored bar at the position of the current brightness value -+ xstr hBrightness.x,hBrightness.val*-25/10+314,100,hBrightness.val*25/10,7,col.val,8484,2,4,1,"a" -+ //paint an inverse of the character over everything, this rounds the corner at the bottom -+ xstr hBrightness.x,hBrightness.y+1,100,hBrightness.h,7,defaultBcoColor,0,0,0,3,"b" ++ 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" + } + } + // get ColorTemp value diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index 633465d6..9c7fb7b7 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -3,9 +3,17 @@ Program.s 14 Line(s) of event code 14 Unique line(s) of event code pageIcons - 7 Component(s) - 0 Line(s) of event code - 0 Unique line(s) of event code + 9 Component(s) + 9 Line(s) of event code + 9 Unique line(s) of event code +pageTest + 27 Component(s) + 68 Line(s) of event code + 66 Unique line(s) of event code +popupLight + 22 Component(s) + 406 Line(s) of event code + 214 Unique line(s) of event code popupNotify 19 Component(s) 263 Line(s) of event code @@ -26,18 +34,10 @@ screensaver2 59 Component(s) 354 Line(s) of event code 251 Unique line(s) of event code -popupLight - 23 Component(s) - 399 Line(s) of event code - 208 Unique line(s) of event code cardChart 33 Component(s) 433 Line(s) of event code 294 Unique line(s) of event code -pageTest - 27 Component(s) - 68 Line(s) of event code - 66 Unique line(s) of event code cardAlarm 43 Component(s) 496 Line(s) of event code @@ -89,6 +89,6 @@ cardEntities Total 21 Page(s) - 798 Component(s) - 9246 Line(s) of event code - 2336 Unique line(s) of event code + 799 Component(s) + 9262 Line(s) of event code + 2348 Unique line(s) of event code diff --git a/HMI/n2t-out-visual/pageIcons.txt b/HMI/n2t-out-visual/pageIcons.txt index a5989d55..60b0974c 100644 --- a/HMI/n2t-out-visual/pageIcons.txt +++ b/HMI/n2t-out-visual/pageIcons.txt @@ -1,22 +1,21 @@ Page pageIcons Attributes - ID : 0 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - Width : 480 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Locked : no - Swide up page ID : disabled - Swide down page ID : disabled - Swide left page ID : disabled - Swide right page ID : disabled - Fill : solid color - Back. Color : 65535 + 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 : 65535 Variable (string) vaDate Attributes @@ -34,108 +33,153 @@ Variable (string) vaTime Text tTmp1 Attributes - ID : 2 - Scope : global - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 302 - y coordinate : 8 - Width : 146 - Height : 69 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Fill : solid color - Style : flat - Associated Keyboard : none - Font ID : 1 - 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 + ID : 2 + Scope : global + Dragging : 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 302 + y coordinate : 8 + Width : 146 + Height : 69 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 1 + 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 Text tTmp2 Attributes - ID : 3 - Scope : global - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 302 - y coordinate : 82 - Width : 146 - Height : 69 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Fill : solid color - Style : flat - Associated Keyboard : none - Font ID : 1 - 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 + ID : 3 + Scope : global + Dragging : 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 302 + y coordinate : 82 + Width : 146 + Height : 69 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 1 + 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 Text tTmp3 Attributes - ID : 6 - Scope : global - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 302 - y coordinate : 154 - Width : 146 - Height : 69 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Fill : solid color - Style : flat - Associated Keyboard : none - Font ID : 1 - Back. Color : 65535 - Font Color : 0 - Horizontal Alignment : center - Vertical Alignment : center - Input Type : character - Text : - Max. Text Size : 10 - Word wrap : disabled - Horizontal Spacing : 0 - Vertical Spacing : 0 + ID : 6 + Scope : global + Dragging : 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 302 + y coordinate : 154 + Width : 146 + Height : 69 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 1 + Back. Color : 65535 + Font Color : 0 + Horizontal Alignment: center + Vertical Alignment : center + Input Type : character + Text : + Max. Text Size : 10 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 Picture p0 Attributes - ID : 1 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 0 - y coordinate : 0 - Width : 479 - Height : 319 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Picture ID : 0 + ID : 1 + Scope : local + Dragging : 0 + Send Component ID: disabled + Opacity : 127 + x coordinate : 0 + y coordinate : 0 + Width : 479 + Height : 319 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Picture ID : 0 + +Slider h0 + Attributes + ID : 8 + Scope : local + Dragging : 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 197 + y coordinate : 249 + Width : 200 + Height : 25 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Direction : horizontal + Fill : solid color + Cursor width : auto + Cursor height : 255 + Back. Color : 1024 + Slided Back. Color: 64235 + Font Color : 16384 + Position : 50 + Upper range limit : 100 + Lower range limit : 0 + +Slider hBrightness + Attributes + ID : 7 + Scope : local + Dragging : 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 16 + 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 diff --git a/HMI/n2t-out-visual/popupLight.txt b/HMI/n2t-out-visual/popupLight.txt index 4ff122ec..474796ee 100644 --- a/HMI/n2t-out-visual/popupLight.txt +++ b/HMI/n2t-out-visual/popupLight.txt @@ -24,12 +24,12 @@ Page popupLight tEntity.txt=pageIcons.tTmp1.txt //get entity id entn.txt=pageIcons.tTmp2.txt - vis p0,0 vis tSend,0 vis tTmp,0 vis tInstruction,0 vis tId,0 vis bEffect,0 + vis hBrightness,0 //page open event // event,pageOpenDetail,typeOfPage,tEntityName // craft command @@ -79,71 +79,71 @@ Page popupLight } Postinitialize Event - //xstr hBrightness.x,hBrightness.y,100,250,7,BLACK,6371,0,0,1,"a" + fill hBrightness.x,hBrightness.y,100,250,defaultBcoColor Variable (int32) col Attributes - ID : 19 + ID : 18 Scope: local Value: 65504 Variable (string) entn Attributes - ID : 12 + ID : 11 Scope : local Text : Max. Text Size: 80 Variable (int32) mode Attributes - ID : 14 + ID : 13 Scope: local Value: 1 Variable (int32) mode_temp Attributes - ID : 15 + ID : 14 Scope: local Value: 0 Variable (string) strCommand Attributes - ID : 10 + ID : 9 Scope : local Text : Max. Text Size: 500 Variable (string) tId Attributes - ID : 21 + ID : 20 Scope : local Text : Max. Text Size: 20 Variable (string) tInstruction Attributes - ID : 20 + ID : 19 Scope : local Text : Max. Text Size: 20 Variable (string) tSend Attributes - ID : 17 + ID : 16 Scope : local Text : Max. Text Size: 200 Variable (string) tTmp Attributes - ID : 22 + ID : 21 Scope : local Text : Max. Text Size: 80 Text tEntity Attributes - ID : 3 + ID : 2 Scope : local Dragging : 0 Send Component ID : disabled @@ -170,25 +170,9 @@ Text tEntity Horizontal Spacing : 0 Vertical Spacing : 0 -Picture p0 - Attributes - ID : 1 - Scope : local - Dragging : 0 - Send Component ID: disabled - Opacity : 127 - x coordinate : 0 - y coordinate : 0 - Width : 480 - Height : 320 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Picture ID : 0 - Picture pColorWheel Attributes - ID : 2 + ID : 1 Scope : local Dragging : 0 Send Component ID: disabled @@ -232,7 +216,7 @@ Picture pColorWheel Slider hBrightness Attributes - ID : 5 + ID : 4 Scope : local Dragging : 0 Send Component ID : disabled @@ -257,20 +241,19 @@ Slider hBrightness Events Touch Release Event //draw black background - //xstr hBrightness.x,hBrightness.y,100,hBrightness.h,7,GREEN,6371,0,0,1,"a" - xstr hBrightness.x,hBrightness.y,100,hBrightness.val*-25/10+250,7,8484,6371,0,0,1,"a" + fill hBrightness.x,hBrightness.y,100,hBrightness.val*-25/10+250,8484 //draw draw colored bar at the position of the current brightness value - xstr hBrightness.x,hBrightness.val*-25/10+314,100,hBrightness.val*25/10,7,col.val,8484,2,4,1,"a" - //paint an inverse of the character over everything, this rounds the corner at the bottom - xstr hBrightness.x,hBrightness.y+1,100,hBrightness.h,7,defaultBcoColor,0,0,0,3,"b" + 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" } - //draw black strip to the right of the slider - //force a redraw of the slider, to ensure it is on top - //vis hBrightness,1 + //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 @@ -291,7 +274,7 @@ Slider hBrightness Slider hTempSlider Attributes - ID : 11 + ID : 10 Scope : local Dragging : 0 Send Component ID : disabled @@ -335,7 +318,7 @@ Slider hTempSlider Button b0 Attributes - ID : 4 + ID : 3 Scope : local Dragging : 0 Send Component ID : disabled @@ -381,7 +364,7 @@ Button b0 Button bColor Attributes - ID : 13 + ID : 12 Scope : local Dragging : 0 Send Component ID : disabled @@ -437,7 +420,7 @@ Button bColor Button bEffect Attributes - ID : 18 + ID : 17 Scope : local Dragging : 0 Send Component ID : disabled @@ -474,7 +457,7 @@ Button bEffect Dual-state Button btOnOff1 Attributes - ID : 6 + ID : 5 Scope : local Dragging : 0 Send Component ID : disabled @@ -519,7 +502,7 @@ Dual-state Button btOnOff1 Timer tmCooldown Attributes - ID : 16 + ID : 15 Scope : local Period (ms): 100 Enabled : no @@ -530,7 +513,7 @@ Timer tmCooldown Timer tmSerial Attributes - ID : 9 + ID : 8 Scope : local Period (ms): 50 Enabled : yes @@ -608,21 +591,23 @@ Timer tmSerial //vis t2,1 vis hBrightness,1 covx tTmp.txt,sys0,0,0 - if(tmCooldown.en==0) + if(tmCooldown.en==0&&hBrightness.val!=sys0) { hBrightness.val=sys0 //draw black background - //xstr hBrightness.x,hBrightness.y,100,hBrightness.h,7,GREEN,6371,0,0,1,"a" - xstr hBrightness.x,hBrightness.y,100,hBrightness.val*-25/10+250,7,8484,6371,0,0,1,"a" + fill hBrightness.x,hBrightness.y,100,hBrightness.val*-25/10+250,8484 //draw draw colored bar at the position of the current brightness value - xstr hBrightness.x,hBrightness.val*-25/10+314,100,hBrightness.val*25/10,7,col.val,8484,2,4,1,"a" - //paint an inverse of the character over everything, this rounds the corner at the bottom - xstr hBrightness.x,hBrightness.y+1,100,hBrightness.h,7,defaultBcoColor,0,0,0,3,"b" + 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" } } // get ColorTemp value @@ -826,7 +811,7 @@ Timer tmSerial Timer tmSleep Attributes - ID : 8 + ID : 7 Scope : local Period (ms): 1000 Enabled : yes @@ -846,7 +831,7 @@ Timer tmSleep TouchCap tc0 Attributes - ID : 7 + ID : 6 Scope: local Value: 0 diff --git a/HMI/n2t-out/pageIcons.txt b/HMI/n2t-out/pageIcons.txt index 873de61c..233bfcd8 100644 --- a/HMI/n2t-out/pageIcons.txt +++ b/HMI/n2t-out/pageIcons.txt @@ -1,14 +1,13 @@ Page pageIcons Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Locked : no - Swide up page ID : disabled - Swide down page ID : disabled - Swide left page ID : disabled - Swide right page ID : disabled + Scope : local + Dragging : 0 + Send Component ID : disabled + Locked : no + Swide up page ID : disabled + Swide down page ID : disabled + Swide left page ID : disabled + Swide right page ID: disabled Variable (string) vaDate Attributes @@ -24,38 +23,52 @@ Variable (string) vaTime Text tTmp1 Attributes - Scope : global - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Text : - Max. Text Size : 80 + Scope : global + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 80 Text tTmp2 Attributes - Scope : global - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Text : - Max. Text Size : 80 + Scope : global + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 80 Text tTmp3 Attributes - Scope : global - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Text : - Max. Text Size : 10 + Scope : global + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 10 Picture p0 Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled + Scope : local + Dragging : 0 + Send Component ID: disabled + +Slider h0 + Attributes + Scope : local + Dragging : 0 + Send Component ID: disabled + Position : 50 + Upper range limit: 100 + Lower range limit: 0 + +Slider hBrightness + Attributes + Scope : local + Dragging : 0 + Send Component ID: disabled + Position : 50 + Upper range limit: 100 + Lower range limit: 0 diff --git a/HMI/n2t-out/popupLight.txt b/HMI/n2t-out/popupLight.txt index e3f4c7e1..520fd095 100644 --- a/HMI/n2t-out/popupLight.txt +++ b/HMI/n2t-out/popupLight.txt @@ -16,12 +16,12 @@ Page popupLight tEntity.txt=pageIcons.tTmp1.txt //get entity id entn.txt=pageIcons.tTmp2.txt - vis p0,0 vis tSend,0 vis tTmp,0 vis tInstruction,0 vis tId,0 vis bEffect,0 + vis hBrightness,0 //page open event // event,pageOpenDetail,typeOfPage,tEntityName // craft command @@ -71,7 +71,7 @@ Page popupLight } Postinitialize Event - //xstr hBrightness.x,hBrightness.y,100,250,7,BLACK,6371,0,0,1,"a" + fill hBrightness.x,hBrightness.y,100,250,defaultBcoColor Variable (int32) col Attributes @@ -133,12 +133,6 @@ Text tEntity Text : tEntity1 Max. Text Size : 25 -Picture p0 - Attributes - Scope : local - Dragging : 0 - Send Component ID: disabled - Picture pColorWheel Attributes Scope : local @@ -185,20 +179,19 @@ Slider hBrightness Events Touch Release Event //draw black background - //xstr hBrightness.x,hBrightness.y,100,hBrightness.h,7,GREEN,6371,0,0,1,"a" - xstr hBrightness.x,hBrightness.y,100,hBrightness.val*-25/10+250,7,8484,6371,0,0,1,"a" + fill hBrightness.x,hBrightness.y,100,hBrightness.val*-25/10+250,8484 //draw draw colored bar at the position of the current brightness value - xstr hBrightness.x,hBrightness.val*-25/10+314,100,hBrightness.val*25/10,7,col.val,8484,2,4,1,"a" - //paint an inverse of the character over everything, this rounds the corner at the bottom - xstr hBrightness.x,hBrightness.y+1,100,hBrightness.h,7,defaultBcoColor,0,0,0,3,"b" + 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" } - //draw black strip to the right of the slider - //force a redraw of the slider, to ensure it is on top - //vis hBrightness,1 + //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 @@ -435,21 +428,23 @@ Timer tmSerial //vis t2,1 vis hBrightness,1 covx tTmp.txt,sys0,0,0 - if(tmCooldown.en==0) + if(tmCooldown.en==0&&hBrightness.val!=sys0) { hBrightness.val=sys0 //draw black background - //xstr hBrightness.x,hBrightness.y,100,hBrightness.h,7,GREEN,6371,0,0,1,"a" - xstr hBrightness.x,hBrightness.y,100,hBrightness.val*-25/10+250,7,8484,6371,0,0,1,"a" + fill hBrightness.x,hBrightness.y,100,hBrightness.val*-25/10+250,8484 //draw draw colored bar at the position of the current brightness value - xstr hBrightness.x,hBrightness.val*-25/10+314,100,hBrightness.val*25/10,7,col.val,8484,2,4,1,"a" - //paint an inverse of the character over everything, this rounds the corner at the bottom - xstr hBrightness.x,hBrightness.y+1,100,hBrightness.h,7,defaultBcoColor,0,0,0,3,"b" + 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" } } // get ColorTemp value