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 diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index ce3341b8..67b1d800 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 │ } @@ -233,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(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(bufferPos1) -+ { -+ bufferPos=0 -+ while(bufferPos1) + { + 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