From cc6afe7b1da883a3af822f2652e879db8cb1ce72 Mon Sep 17 00:00:00 2001 From: joBr99 <29555657+joBr99@users.noreply.github.com> Date: Sat, 8 Oct 2022 21:13:38 +0000 Subject: [PATCH 1/3] implement cardPower for US-P and US-L (add nextion2text) --- HMI/US/landscape/diff-eu-version.txt | 33 +- HMI/US/landscape/n2t-out-visual/cardPower.txt | 1378 +++++++++++++++++ .../n2t-out-visual/nspanel_US_L_Stats.txt | 12 +- HMI/US/landscape/n2t-out/cardPower.txt | 870 +++++++++++ HMI/US/portrait/diff-eu-version.txt | 33 +- HMI/US/portrait/diff-filtered.txt | 18 +- HMI/US/portrait/n2t-out-visual/cardPower.txt | 1378 +++++++++++++++++ HMI/US/portrait/n2t-out-visual/cardQR.txt | 4 +- .../n2t-out-visual/nspanel_US_P_Stats.txt | 12 +- HMI/US/portrait/n2t-out/cardPower.txt | 870 +++++++++++ HMI/n2t-out-visual/cardPower.txt | 11 + HMI/n2t-out-visual/cardQR.txt | 1 + HMI/n2t-out-visual/nspanel_Stats.txt | 12 +- HMI/n2t-out/cardPower.txt | 11 + HMI/n2t-out/cardQR.txt | 1 + 15 files changed, 4595 insertions(+), 49 deletions(-) create mode 100644 HMI/US/landscape/n2t-out-visual/cardPower.txt create mode 100644 HMI/US/landscape/n2t-out/cardPower.txt create mode 100644 HMI/US/portrait/n2t-out-visual/cardPower.txt create mode 100644 HMI/US/portrait/n2t-out/cardPower.txt diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index ce3341b8..6b31a3c9 100644 --- a/HMI/US/landscape/diff-eu-version.txt +++ b/HMI/US/landscape/diff-eu-version.txt @@ -1,20 +1,5 @@ --- HMI/n2t-out +++ HMI/US/landscape/n2t-out -├── file list -│ @@ -1,13 +1,12 @@ -│ Program.s.txt -│ cardAlarm.txt -│ cardEntities.txt -│ cardGrid.txt -│ cardMedia.txt -│ -cardPower.txt -│ cardQR.txt -│ cardThermo.txt -│ pageIcons.txt -│ pageStartup.txt -│ pageTest.txt -│ popupFan.txt -│ popupLight.txt ├── Program.s.txt │ @@ -10,10 +10,7 @@ │ int sleepValue=0 @@ -176,7 +161,23 @@ │ } │ } ├── cardQR.txt -│ @@ -702,18 +702,14 @@ +│ @@ -653,15 +653,14 @@ +│ //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 +│ } +│ @@ -703,18 +702,14 @@ │ { │ page cardAlarm │ } diff --git a/HMI/US/landscape/n2t-out-visual/cardPower.txt b/HMI/US/landscape/n2t-out-visual/cardPower.txt new file mode 100644 index 00000000..bcf0d424 --- /dev/null +++ b/HMI/US/landscape/n2t-out-visual/cardPower.txt @@ -0,0 +1,1378 @@ +Page cardPower + Attributes + ID : 0 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + Width : 480 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Locked : no + Swide up page ID : disabled + Swide down page ID : disabled + Swide left page ID : disabled + Swide right page ID : disabled + Fill : solid color + Back. Color : 6371 + + Events + Preinitialize Event + dim=dimValueNormal + vis p0,0 + vis tSend,0 + vis tInstruction,0 + vis tTmp,0 + vis tId,0 + vis bPrev,0 + vis bNext,0 + tsw h0,0 + tsw h1,0 + tsw h2,0 + tsw h3,0 + tsw h4,0 + tsw h5,0 + vis h0,0 + vis h1,0 + vis h2,0 + vis h3,0 + vis h4,0 + vis h5,0 + vis t0Icon,0 + vis t1Icon,0 + vis t2Icon,0 + vis t3Icon,0 + vis t4Icon,0 + vis t5Icon,0 + cardPower.bco=defaultBcoColor + for(sys0=0;sys0<43;sys0++) + { + if(b[sys0].type==98||b[sys0].type==116) + { + b[sys0].bco=defaultBcoColor + b[sys0].pco=defaultFontColor + } + if(b[sys0].type==1) + { + b[sys0].pic=19 + b[sys0].pic1=19 + b[sys0].pic2=15 + } + } + +Variable (string) strCommand + Attributes + ID : 5 + Scope : local + Text : + Max. Text Size: 275 + +Variable (string) tSend + Attributes + ID : 8 + Scope : local + Text : + Max. Text Size: 200 + +Variable (string) tTmp + Attributes + ID : 12 + Scope : local + Text : + Max. Text Size: 10 + +Variable (string) tId + Attributes + ID : 13 + Scope : local + Text : + Max. Text Size: 20 + +Variable (string) tInstruction + Attributes + ID : 14 + Scope : local + Text : + Max. Text Size: 20 + +Variable (int32) t0Speed + Attributes + ID : 36 + Scope: local + Value: 0 + +Variable (int32) t1Speed + Attributes + ID : 37 + Scope: local + Value: 0 + +Variable (int32) t3Speed + Attributes + ID : 38 + Scope: local + Value: 0 + +Variable (int32) t4Speed + Attributes + ID : 39 + Scope: local + Value: 0 + +Variable (int32) t5Speed + Attributes + ID : 40 + Scope: local + Value: 0 + +Variable (int32) t2Speed + Attributes + ID : 41 + Scope: local + Value: 0 + +Text tHeading + Attributes + ID : 15 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 66 + y coordinate : 26 + Width : 320 + Height : 30 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 1 + Back. Color : 6371 + Font Color : 65535 + Horizontal Alignment : center + Vertical Alignment : center + Input Type : character + Text : + Max. Text Size : 40 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text t4Icon + Attributes + ID : 16 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 378 + y coordinate : 156 + Width : 60 + Height : 60 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : border + Associated Keyboard : none + Border Color : 17299 + Border Width : 2 + Font ID : 3 + Back. Color : 6371 + Font Color : 17299 + Horizontal Alignment : center + Vertical Alignment : center + Input Type : character + Text : î´½ + Max. Text Size : 5 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text t5Icon + Attributes + ID : 17 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 378 + y coordinate : 232 + Width : 60 + Height : 60 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : border + Associated Keyboard : none + Border Color : 17299 + Border Width : 2 + Font ID : 3 + Back. Color : 6371 + Font Color : 17299 + Horizontal Alignment : center + Vertical Alignment : center + Input Type : character + Text :  + Max. Text Size : 5 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text t0Icon + Attributes + ID : 18 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 18 + y coordinate : 80 + Width : 60 + Height : 60 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : border + Associated Keyboard : none + Border Color : 17299 + Border Width : 2 + Font ID : 3 + Back. Color : 6371 + Font Color : 1024 + Horizontal Alignment : center + Vertical Alignment : center + Input Type : character + Text :  + Max. Text Size : 5 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text t2Icon + Attributes + ID : 19 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 18 + y coordinate : 232 + Width : 60 + Height : 60 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : border + Associated Keyboard : none + Border Color : 17299 + Border Width : 2 + Font ID : 3 + Back. Color : 6371 + Font Color : 17299 + Horizontal Alignment : center + Vertical Alignment : center + Input Type : character + Text : î ° + Max. Text Size : 5 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text t1Icon + Attributes + ID : 21 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 18 + y coordinate : 156 + Width : 60 + Height : 60 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : border + Associated Keyboard : none + Border Color : 17299 + Border Width : 2 + Font ID : 3 + Back. Color : 6371 + Font Color : 65504 + Horizontal Alignment : center + Vertical Alignment : center + Input Type : character + Text :  + Max. Text Size : 5 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text t1 + Attributes + ID : 23 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 198 + y coordinate : 70 + Width : 60 + Height : 230 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : border + Associated Keyboard : none + Border Color : 17299 + Border Width : 2 + Font ID : 3 + Back. Color : 6371 + Font Color : 17299 + Horizontal Alignment : center + Vertical Alignment : center + Input Type : character + Text :  + Max. Text Size : 5 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text t3Icon + Attributes + ID : 26 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 378 + y coordinate : 80 + Width : 60 + Height : 60 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : border + Associated Keyboard : none + Border Color : 17299 + Border Width : 2 + Font ID : 3 + Back. Color : 6371 + Font Color : 17299 + Horizontal Alignment : center + Vertical Alignment : center + Input Type : character + Text : î ° + Max. Text Size : 5 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text t0u + Attributes + ID : 30 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 82 + y coordinate : 132 + Width : 108 + 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 : center + Vertical Alignment : center + Input Type : character + Text : + Max. Text Size : 20 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text t1u + Attributes + ID : 31 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 82 + y coordinate : 209 + Width : 108 + 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 : center + Vertical Alignment : center + Input Type : character + Text : + Max. Text Size : 20 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text t2u + Attributes + ID : 32 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 82 + y coordinate : 285 + Width : 108 + 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 : center + Vertical Alignment : center + Input Type : character + Text : + Max. Text Size : 20 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text t5u + Attributes + ID : 33 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 262 + y coordinate : 285 + Width : 108 + 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 : center + Vertical Alignment : center + Input Type : character + Text : + Max. Text Size : 20 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text t4u + Attributes + ID : 34 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 262 + y coordinate : 209 + Width : 108 + 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 : center + Vertical Alignment : center + Input Type : character + Text : + Max. Text Size : 20 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text t3u + Attributes + ID : 35 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 262 + y coordinate : 132 + Width : 108 + 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 : center + Vertical Alignment : center + Input Type : character + Text : + Max. Text Size : 20 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text tHome + Attributes + ID : 42 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 200 + y coordinate : 214 + Width : 56 + Height : 81 + 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 : center + Vertical Alignment : center + Input Type : character + Text : + Max. Text Size : 20 + Word wrap : enabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Picture p0 + Attributes + ID : 1 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 0 + y coordinate : 0 + Width : 480 + Height : 320 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Picture ID : 0 + +Slider h1 + Attributes + ID : 20 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 78 + y coordinate : 165 + Width : 120 + Height : 44 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Direction : horizontal + Fill : image + Cursor width : auto + Cursor height : 255 + Back. Picture ID : 18 + Slided Back. Picture ID : 18 + Position : 50 + Upper range limit : 100 + Lower range limit : 0 + +Slider h4 + Attributes + ID : 22 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 258 + y coordinate : 165 + Width : 120 + Height : 44 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Direction : horizontal + Fill : image + Cursor width : auto + Cursor height : 255 + Back. Picture ID : 18 + Slided Back. Picture ID : 18 + Position : 50 + Upper range limit : 100 + Lower range limit : 0 + +Slider h0 + Attributes + ID : 25 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 78 + y coordinate : 88 + Width : 120 + Height : 44 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Direction : horizontal + Fill : image + Cursor width : auto + Cursor height : 255 + Back. Picture ID : 18 + Slided Back. Picture ID : 18 + Position : 50 + Upper range limit : 100 + Lower range limit : 0 + +Slider h2 + Attributes + ID : 27 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 78 + y coordinate : 241 + Width : 120 + Height : 44 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Direction : horizontal + Fill : image + Cursor width : auto + Cursor height : 255 + Back. Picture ID : 18 + Slided Back. Picture ID : 18 + Position : 50 + Upper range limit : 100 + Lower range limit : 0 + +Slider h5 + Attributes + ID : 28 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 258 + y coordinate : 241 + Width : 120 + Height : 44 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Direction : horizontal + Fill : image + Cursor width : auto + Cursor height : 255 + Back. Picture ID : 18 + Slided Back. Picture ID : 18 + Position : 50 + Upper range limit : 100 + Lower range limit : 0 + +Slider h3 + Attributes + ID : 29 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 258 + y coordinate : 88 + Width : 120 + Height : 44 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Direction : horizontal + Fill : image + Cursor width : auto + Cursor height : 255 + Back. Picture ID : 18 + Slided Back. Picture ID : 18 + Position : 50 + Upper range limit : 100 + Lower range limit : 0 + +Button bNext + Attributes + ID : 2 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 391 + y coordinate : 16 + Width : 50 + Height : 50 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Font ID : 3 + Back. Color : 6371 + Back. Picture ID (Pressed) : 65535 + Back. Color (Pressed) : 14823 + Font Color (Unpressed) : 65535 + Font Color (Pressed) : 65535 + Horizontal Alignment : center + Vertical Alignment : center + State : unpressed + Text :  + Max. Text Size : 10 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + + Events + Touch Press Event + tSend.txt="event,buttonPress2,cardAlarm,bNext" + //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 bPrev + Attributes + ID : 3 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 9 + y coordinate : 16 + Width : 50 + Height : 50 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Font ID : 3 + Back. Color : 6371 + Back. Picture ID (Pressed) : 65535 + Back. Color (Pressed) : 14823 + Font Color (Unpressed) : 65535 + Font Color (Pressed) : 65535 + Horizontal Alignment : center + Vertical Alignment : center + State : unpressed + Text :  + Max. Text Size : 10 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + + Events + Touch Press Event + tSend.txt="event,buttonPress2,cardAlarm," + if(bPrev.txt=="") + { + tSend.txt+="bUp" + }else + { + tSend.txt+="bPrev" + } + //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 + +Hotspot mSwipeNext + Attributes + ID : 9 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 440 + y coordinate : 5 + Width : 39 + Height : 310 + Effect : load + Effect Priority : 0 + Effect Time : 300 + + Events + Touch Press Event + click bNext,1 + +Hotspot mSwipeUp + Attributes + ID : 10 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 12 + y coordinate : 0 + Width : 426 + Height : 9 + Effect : load + Effect Priority : 0 + Effect Time : 300 + + Events + Touch Press Event + click bPrev,1 + +Hotspot mSwipePrev + Attributes + ID : 11 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 0 + y coordinate : 5 + Width : 9 + Height : 310 + Effect : load + Effect Priority : 0 + Effect Time : 300 + + Events + Touch Press Event + click bPrev,1 + +Timer tmSerial + Attributes + ID : 4 + Scope : local + Period (ms): 50 + Enabled : yes + + Events + Timer Event + // data available + if(usize>1) + { + bufferPos=0 + while(bufferPosh0.maxval) + { + h0.val=h0.minval + } + if(sys0h1.maxval) + { + h1.val=h1.minval + } + if(sys0h2.maxval) + { + h2.val=h2.minval + } + if(sys0h3.maxval) + { + h3.val=h3.minval + } + if(sys0h4.maxval) + { + h4.val=h4.minval + } + if(sys0h5.maxval) + { + h5.val=h5.minval + } + if(sys01) + { + bufferPos=0 + while(bufferPosh0.maxval) + { + h0.val=h0.minval + } + if(sys0h1.maxval) + { + h1.val=h1.minval + } + if(sys0h2.maxval) + { + h2.val=h2.minval + } + if(sys0h3.maxval) + { + h3.val=h3.minval + } + if(sys0h4.maxval) + { + h4.val=h4.minval + } + if(sys0h5.maxval) + { + h5.val=h5.minval + } + if(sys01) + { + bufferPos=0 + while(bufferPosh0.maxval) + { + h0.val=h0.minval + } + if(sys0h1.maxval) + { + h1.val=h1.minval + } + if(sys0h2.maxval) + { + h2.val=h2.minval + } + if(sys0h3.maxval) + { + h3.val=h3.minval + } + if(sys0h4.maxval) + { + h4.val=h4.minval + } + if(sys0h5.maxval) + { + h5.val=h5.minval + } + if(sys01) + { + bufferPos=0 + while(bufferPosh0.maxval) + { + h0.val=h0.minval + } + if(sys0h1.maxval) + { + h1.val=h1.minval + } + if(sys0h2.maxval) + { + h2.val=h2.minval + } + if(sys0h3.maxval) + { + h3.val=h3.minval + } + if(sys0h4.maxval) + { + h4.val=h4.minval + } + if(sys0h5.maxval) + { + h5.val=h5.minval + } + if(sys0 Date: Sat, 8 Oct 2022 23:19:09 +0200 Subject: [PATCH 2/3] Update nextion2text.yml --- .github/workflows/nextion2text.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/nextion2text.yml b/.github/workflows/nextion2text.yml index dcb8f4c2..34b1511c 100644 --- a/.github/workflows/nextion2text.yml +++ b/.github/workflows/nextion2text.yml @@ -56,7 +56,7 @@ jobs: echo portrait python Nextion2Text.py -c ignore-id.py -p font -d -i HMI/US/portrait/nspanel_US_P.HMI -o HMI/US/portrait/n2t-out - diffoscope --exclude-directory-metadata=recursive HMI/n2t-out HMI/US/portrait/n2t-out > HMI/US/portrait/diff-eu-version.txt + diffoscope --exclude=pageTest.txt --exclude-directory-metadata=recursive HMI/n2t-out HMI/US/portrait/n2t-out > HMI/US/portrait/diff-eu-version.txt #diff -bur HMI/n2t-out HMI/US/portrait/n2t-out > HMI/US/portrait/diff-eu-version.txt - name: Run n2t US P DIFF DIFF @@ -71,7 +71,7 @@ jobs: echo landscape python Nextion2Text.py -c ignore-id.py -p font -d -i HMI/US/landscape/nspanel_US_L.HMI -o HMI/US/landscape/n2t-out #diff -bur HMI/n2t-out HMI/US/landscape/n2t-out > HMI/US/landscape/diff-eu-version.txt - diffoscope --exclude-directory-metadata=recursive HMI/n2t-out HMI/US/landscape/n2t-out > HMI/US/landscape/diff-eu-version.txt + diffoscope --exclude=pageTest.txt --exclude-directory-metadata=recursive HMI/n2t-out HMI/US/landscape/n2t-out > HMI/US/landscape/diff-eu-version.txt - name: Display txt files continue-on-error: true From 9c57c96647636a1454d3c471df5f82f9aaea9f7c Mon Sep 17 00:00:00 2001 From: joBr99 <29555657+joBr99@users.noreply.github.com> Date: Sat, 8 Oct 2022 21:23:03 +0000 Subject: [PATCH 3/3] Update nextion2text.yml (add nextion2text) --- HMI/US/landscape/diff-eu-version.txt | 148 -------------------------- HMI/US/portrait/diff-eu-version.txt | 148 -------------------------- HMI/US/portrait/diff-filtered.txt | 150 +-------------------------- 3 files changed, 1 insertion(+), 445 deletions(-) diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 6b31a3c9..67b1d800 100644 --- a/HMI/US/landscape/diff-eu-version.txt +++ b/HMI/US/landscape/diff-eu-version.txt @@ -234,154 +234,6 @@ │ crcputs sys0,2 │ crcputs tSend.txt,0 │ //send cmd -├── pageTest.txt -│ @@ -9,45 +9,15 @@ -│ Swide down page ID : disabled -│ Swide left page ID : disabled -│ Swide right page ID : disabled -│ -│ Events -│ Preinitialize Event -│ vis p0,0 -│ - recmod=1 -│ - bauds=115200 -│ -│ -Variable (string) tInstruction -│ - Attributes -│ - Scope : local -│ - Text : -│ - Max. Text Size: 30 -│ - -│ -Variable (string) strCommand -│ - Attributes -│ - Scope : local -│ - Text : -│ - Max. Text Size: 20 -│ - -│ -Variable (string) tSend -│ - Attributes -│ - Scope : local -│ - Text : -│ - Max. Text Size: 40 -│ - -│ -Text tBench -│ - Attributes -│ - Scope : local -│ - Dragging : 0 -│ - Disable release event after dragging: 0 -│ - Send Component ID : disabled -│ - Associated Keyboard : none -│ - Text : -│ - Max. Text Size : 20 -│ - -│ Picture p0 -│ Attributes -│ Scope : local -│ Dragging : 0 -│ Disable release event after dragging: 0 -│ Send Component ID : disabled -│ -│ @@ -216,100 +186,7 @@ -│ Text : qr -│ Max. Text Size : 10 -│ -│ Events -│ Touch Press Event -│ page cardQR -│ -│ -Button b12 -│ - Attributes -│ - Scope : local -│ - Dragging : 0 -│ - Disable release event after dragging: 0 -│ - Send Component ID : disabled -│ - State : unpressed -│ - Text : power -│ - Max. Text Size : 10 -│ - -│ - Events -│ - Touch Press Event -│ - page cardPower -│ - -│ -Timer tmSerial -│ - Attributes -│ - Scope : local -│ - Period (ms): 50 -│ - Enabled : yes -│ - -│ - Events -│ - Timer Event -│ - // data available -│ - if(usize>1) -│ - { -│ - bufferPos=0 -│ - while(bufferPos1) -│ - { -│ - bufferPos=0 -│ - while(bufferPos1) -+ { -+ bufferPos=0 -+ while(bufferPos