From 1890f2e38e272e7bfaf7ea7aeedf1e283ebea3c7 Mon Sep 17 00:00:00 2001 From: joBr99 Date: Mon, 17 Apr 2023 17:53:32 +0000 Subject: [PATCH] slider fix 1 (add nextion2text) --- HMI/US/landscape/diff-eu-version.txt | 38 ++++++++++++++++++---------- HMI/US/portrait/diff-eu-version.txt | 38 ++++++++++++++++++---------- HMI/US/portrait/diff-filtered.txt | 30 +++++++++++++++------- HMI/n2t-out-visual/nspanel_Stats.txt | 8 +++--- HMI/n2t-out-visual/popupLight.txt | 24 +++++++++++++----- HMI/n2t-out/popupLight.txt | 24 +++++++++++++----- 6 files changed, 111 insertions(+), 51 deletions(-) diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 18873a1f..67731ada 100644 --- a/HMI/US/landscape/diff-eu-version.txt +++ b/HMI/US/landscape/diff-eu-version.txt @@ -815,7 +815,7 @@ │ } │ │ - Postinitialize Event -│ - xstr hBrightness.x,hBrightness.y,100,250,7,BLACK,6371,0,0,1,"a" +│ - //xstr hBrightness.x,hBrightness.y,100,250,7,BLACK,6371,0,0,1,"a" │ - │ -Variable (int32) col │ - Attributes @@ -991,7 +991,7 @@ │ tSend.txt="event,buttonPress2,"+entn.txt+",colorWheel," │ sys0=tch0 │ sys0=sys0-pColorWheel.x -│ @@ -171,37 +244,24 @@ +│ @@ -171,38 +244,24 @@ │ printh 55 bb │ prints sys0,2 │ prints tSend.txt,0 @@ -1016,11 +1016,12 @@ │ Events │ Touch Release Event │ - //draw black background -│ - xstr hBrightness.x,hBrightness.y,100,hBrightness.h,7,BLACK,6371,0,0,1,"a" +│ - //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" │ - //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,BLACK,2,4,1,"a" +│ - 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,100,hBrightness.h,7,6371,0,0,0,3,"b" +│ - xstr hBrightness.x,hBrightness.y+1,100,hBrightness.h,7,defaultBcoColor,0,0,0,3,"b" │ - if(hBrightness.val>7) │ - { │ - //draw cursor @@ -1028,7 +1029,7 @@ │ - } │ - //draw black strip to the right of the slider │ - //force a redraw of the slider, to ensure it is on top -│ - vis hBrightness,1 +│ - //vis hBrightness,1 │ tmCooldown.en=1 │ tmCooldown.tim=2500 │ //craft command @@ -1036,7 +1037,7 @@ │ covx hBrightness.val,tTmp.txt,0,0 │ tSend.txt+=tTmp.txt │ //send calc crc -│ @@ -214,20 +274,21 @@ +│ @@ -215,20 +274,21 @@ │ printh 55 bb │ prints sys0,2 │ prints tSend.txt,0 @@ -1064,7 +1065,7 @@ │ tmCooldown.tim=2500 │ //craft command │ tSend.txt="event,buttonPress2,"+entn.txt+",colorTempSlider," -│ @@ -243,20 +304,21 @@ +│ @@ -244,20 +304,21 @@ │ printh 55 bb │ prints sys0,2 │ prints tSend.txt,0 @@ -1092,7 +1093,7 @@ │ //send calc crc │ btlen tSend.txt,sys0 │ crcrest 1,0xffff // reset CRC -│ @@ -267,69 +329,73 @@ +│ @@ -268,69 +329,73 @@ │ printh 55 bb │ prints sys0,2 │ prints tSend.txt,0 @@ -1188,7 +1189,7 @@ │ tSend.txt="event,buttonPress2,"+entn.txt+","+"OnOff," │ covx btOnOff1.val,tTmp.txt,0,0 │ tSend.txt+=tTmp.txt -│ @@ -407,50 +473,48 @@ +│ @@ -408,61 +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 @@ -1202,7 +1203,6 @@ │ spstr strCommand.txt,tTmp.txt,"~",3 │ covx tTmp.txt,sys0,0,0 │ - col.val=sys0 -│ - click hBrightness,0 │ - //tEntity.pco=sys0 │ + tIcon1.pco=sys0 │ // get Button State @@ -1229,6 +1229,18 @@ │ 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" +│ - //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" +│ - if(hBrightness.val>7) +│ - { +│ - //draw cursor +│ - fill hBrightness.x+25,hBrightness.val*-25/10+322,50,4,WHITE +│ - } │ } │ } │ // get ColorTemp value @@ -1247,7 +1259,7 @@ │ // switch mode │ click bColor,1 │ click bColor,0 -│ @@ -465,16 +529,16 @@ +│ @@ -477,16 +529,16 @@ │ click bColor,1 │ click bColor,0 │ } @@ -1266,7 +1278,7 @@ │ } │ // mode == 0 is rgb controls currently shown │ if(mode.val==0) -│ @@ -485,36 +549,36 @@ +│ @@ -497,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 5c775210..45abd9da 100644 --- a/HMI/US/portrait/diff-eu-version.txt +++ b/HMI/US/portrait/diff-eu-version.txt @@ -2190,7 +2190,7 @@ │ } │ │ - Postinitialize Event -│ - xstr hBrightness.x,hBrightness.y,100,250,7,BLACK,6371,0,0,1,"a" +│ - //xstr hBrightness.x,hBrightness.y,100,250,7,BLACK,6371,0,0,1,"a" │ - │ -Variable (int32) col │ - Attributes @@ -2366,7 +2366,7 @@ │ tSend.txt="event,buttonPress2,"+entn.txt+",colorWheel," │ sys0=tch0 │ sys0=sys0-pColorWheel.x -│ @@ -171,37 +244,24 @@ +│ @@ -171,38 +244,24 @@ │ printh 55 bb │ prints sys0,2 │ prints tSend.txt,0 @@ -2391,11 +2391,12 @@ │ Events │ Touch Release Event │ - //draw black background -│ - xstr hBrightness.x,hBrightness.y,100,hBrightness.h,7,BLACK,6371,0,0,1,"a" +│ - //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" │ - //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,BLACK,2,4,1,"a" +│ - 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,100,hBrightness.h,7,6371,0,0,0,3,"b" +│ - xstr hBrightness.x,hBrightness.y+1,100,hBrightness.h,7,defaultBcoColor,0,0,0,3,"b" │ - if(hBrightness.val>7) │ - { │ - //draw cursor @@ -2403,7 +2404,7 @@ │ - } │ - //draw black strip to the right of the slider │ - //force a redraw of the slider, to ensure it is on top -│ - vis hBrightness,1 +│ - //vis hBrightness,1 │ tmCooldown.en=1 │ tmCooldown.tim=2500 │ //craft command @@ -2411,7 +2412,7 @@ │ covx hBrightness.val,tTmp.txt,0,0 │ tSend.txt+=tTmp.txt │ //send calc crc -│ @@ -214,20 +274,21 @@ +│ @@ -215,20 +274,21 @@ │ printh 55 bb │ prints sys0,2 │ prints tSend.txt,0 @@ -2439,7 +2440,7 @@ │ tmCooldown.tim=2500 │ //craft command │ tSend.txt="event,buttonPress2,"+entn.txt+",colorTempSlider," -│ @@ -243,20 +304,21 @@ +│ @@ -244,20 +304,21 @@ │ printh 55 bb │ prints sys0,2 │ prints tSend.txt,0 @@ -2467,7 +2468,7 @@ │ //send calc crc │ btlen tSend.txt,sys0 │ crcrest 1,0xffff // reset CRC -│ @@ -267,69 +329,73 @@ +│ @@ -268,69 +329,73 @@ │ printh 55 bb │ prints sys0,2 │ prints tSend.txt,0 @@ -2563,7 +2564,7 @@ │ tSend.txt="event,buttonPress2,"+entn.txt+","+"OnOff," │ covx btOnOff1.val,tTmp.txt,0,0 │ tSend.txt+=tTmp.txt -│ @@ -407,50 +473,48 @@ +│ @@ -408,61 +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 @@ -2577,7 +2578,6 @@ │ spstr strCommand.txt,tTmp.txt,"~",3 │ covx tTmp.txt,sys0,0,0 │ - col.val=sys0 -│ - click hBrightness,0 │ - //tEntity.pco=sys0 │ + tIcon1.pco=sys0 │ // get Button State @@ -2604,6 +2604,18 @@ │ 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" +│ - //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" +│ - if(hBrightness.val>7) +│ - { +│ - //draw cursor +│ - fill hBrightness.x+25,hBrightness.val*-25/10+322,50,4,WHITE +│ - } │ } │ } │ // get ColorTemp value @@ -2622,7 +2634,7 @@ │ // switch mode │ click bColor,1 │ click bColor,0 -│ @@ -465,16 +529,16 @@ +│ @@ -477,16 +529,16 @@ │ click bColor,1 │ click bColor,0 │ } @@ -2641,7 +2653,7 @@ │ } │ // mode == 0 is rgb controls currently shown │ if(mode.val==0) -│ @@ -485,36 +549,36 @@ +│ @@ -497,36 +549,36 @@ │ } │ } │ // get Color value diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index c75df95d..784ef4d3 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,4 +1,4 @@ -+++ /dev/fd/62 2023-04-16 20:10:37.417588148 +0000 ++++ /dev/fd/62 2023-04-17 17:53:22.299449942 +0000 +I/n2t-out/Program.s.txt ++ HMI/US/portrait/n2t-out/Program.s.txt +1 +10,10 @@ @@ -1580,7 +1580,7 @@ + } + + Postinitialize Event -+ xstr hBrightness.x,hBrightness.y,100,250,7,BLACK,6371,0,0,1,"a" ++ //xstr hBrightness.x,hBrightness.y,100,250,7,BLACK,6371,0,0,1,"a" + +e (int32) col +ributes @@ -1756,7 +1756,7 @@ + tSend.txt="event,buttonPress2,"+entn.txt+",colorWheel," + sys0=tch0 + sys0=sys0-pColorWheel.x -+37 +244,24 @@ ++38 +244,24 @@ + printh 55 bb + prints sys0,2 + prints tSend.txt,0 @@ -1781,11 +1781,12 @@ +nts + Touch Release Event + //draw black background -+ xstr hBrightness.x,hBrightness.y,100,hBrightness.h,7,BLACK,6371,0,0,1,"a" ++ //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" + //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,BLACK,2,4,1,"a" ++ 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,100,hBrightness.h,7,6371,0,0,0,3,"b" ++ xstr hBrightness.x,hBrightness.y+1,100,hBrightness.h,7,defaultBcoColor,0,0,0,3,"b" + if(hBrightness.val>7) + { + //draw cursor @@ -1793,7 +1794,7 @@ + } + //draw black strip to the right of the slider + //force a redraw of the slider, to ensure it is on top -+ vis hBrightness,1 ++ //vis hBrightness,1 + tmCooldown.en=1 + tmCooldown.tim=2500 + //craft command @@ -1953,7 +1954,7 @@ + tSend.txt="event,buttonPress2,"+entn.txt+","+"OnOff," + covx btOnOff1.val,tTmp.txt,0,0 + tSend.txt+=tTmp.txt -+50 +473,48 @@ ++61 +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 @@ -1967,7 +1968,6 @@ + spstr strCommand.txt,tTmp.txt,"~",3 + covx tTmp.txt,sys0,0,0 + col.val=sys0 -+ click hBrightness,0 + //tEntity.pco=sys0 + tIcon1.pco=sys0 + // get Button State @@ -1994,6 +1994,18 @@ + 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" ++ //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" ++ if(hBrightness.val>7) ++ { ++ //draw cursor ++ fill hBrightness.x+25,hBrightness.val*-25/10+322,50,4,WHITE ++ } + } + } + // get ColorTemp value diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index eec553cd..633465d6 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -28,8 +28,8 @@ screensaver2 251 Unique line(s) of event code popupLight 23 Component(s) - 395 Line(s) of event code - 204 Unique line(s) of event code + 399 Line(s) of event code + 208 Unique line(s) of event code cardChart 33 Component(s) 433 Line(s) of event code @@ -90,5 +90,5 @@ cardEntities Total 21 Page(s) 798 Component(s) - 9242 Line(s) of event code - 2334 Unique line(s) of event code + 9246 Line(s) of event code + 2336 Unique line(s) of event code diff --git a/HMI/n2t-out-visual/popupLight.txt b/HMI/n2t-out-visual/popupLight.txt index 43eb6bd8..4ff122ec 100644 --- a/HMI/n2t-out-visual/popupLight.txt +++ b/HMI/n2t-out-visual/popupLight.txt @@ -79,7 +79,7 @@ Page popupLight } Postinitialize Event - xstr hBrightness.x,hBrightness.y,100,250,7,BLACK,6371,0,0,1,"a" + //xstr hBrightness.x,hBrightness.y,100,250,7,BLACK,6371,0,0,1,"a" Variable (int32) col Attributes @@ -257,11 +257,12 @@ Slider hBrightness Events Touch Release Event //draw black background - xstr hBrightness.x,hBrightness.y,100,hBrightness.h,7,BLACK,6371,0,0,1,"a" + //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" //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,BLACK,2,4,1,"a" + 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,100,hBrightness.h,7,6371,0,0,0,3,"b" + xstr hBrightness.x,hBrightness.y+1,100,hBrightness.h,7,defaultBcoColor,0,0,0,3,"b" if(hBrightness.val>7) { //draw cursor @@ -269,7 +270,7 @@ Slider hBrightness } //draw black strip to the right of the slider //force a redraw of the slider, to ensure it is on top - vis hBrightness,1 + //vis hBrightness,1 tmCooldown.en=1 tmCooldown.tim=2500 //craft command @@ -589,7 +590,6 @@ Timer tmSerial spstr strCommand.txt,tTmp.txt,"~",3 covx tTmp.txt,sys0,0,0 col.val=sys0 - click hBrightness,0 //tEntity.pco=sys0 // get Button State spstr strCommand.txt,tTmp.txt,"~",4 @@ -611,6 +611,18 @@ Timer tmSerial 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" + //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" + if(hBrightness.val>7) + { + //draw cursor + fill hBrightness.x+25,hBrightness.val*-25/10+322,50,4,WHITE + } } } // get ColorTemp value diff --git a/HMI/n2t-out/popupLight.txt b/HMI/n2t-out/popupLight.txt index 2282a7c3..e3f4c7e1 100644 --- a/HMI/n2t-out/popupLight.txt +++ b/HMI/n2t-out/popupLight.txt @@ -71,7 +71,7 @@ Page popupLight } Postinitialize Event - xstr hBrightness.x,hBrightness.y,100,250,7,BLACK,6371,0,0,1,"a" + //xstr hBrightness.x,hBrightness.y,100,250,7,BLACK,6371,0,0,1,"a" Variable (int32) col Attributes @@ -185,11 +185,12 @@ Slider hBrightness Events Touch Release Event //draw black background - xstr hBrightness.x,hBrightness.y,100,hBrightness.h,7,BLACK,6371,0,0,1,"a" + //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" //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,BLACK,2,4,1,"a" + 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,100,hBrightness.h,7,6371,0,0,0,3,"b" + xstr hBrightness.x,hBrightness.y+1,100,hBrightness.h,7,defaultBcoColor,0,0,0,3,"b" if(hBrightness.val>7) { //draw cursor @@ -197,7 +198,7 @@ Slider hBrightness } //draw black strip to the right of the slider //force a redraw of the slider, to ensure it is on top - vis hBrightness,1 + //vis hBrightness,1 tmCooldown.en=1 tmCooldown.tim=2500 //craft command @@ -416,7 +417,6 @@ Timer tmSerial spstr strCommand.txt,tTmp.txt,"~",3 covx tTmp.txt,sys0,0,0 col.val=sys0 - click hBrightness,0 //tEntity.pco=sys0 // get Button State spstr strCommand.txt,tTmp.txt,"~",4 @@ -438,6 +438,18 @@ Timer tmSerial 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" + //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" + if(hBrightness.val>7) + { + //draw cursor + fill hBrightness.x+25,hBrightness.val*-25/10+322,50,4,WHITE + } } } // get ColorTemp value