Merge branch 'main' of github.com:joBr99/nspanel-widget-ui

This commit is contained in:
joBr99
2022-03-12 21:43:36 +01:00
5 changed files with 10 additions and 5 deletions

View File

@@ -19,6 +19,11 @@ jobs:
with: with:
ref: ${{ github.head_ref }} ref: ${{ github.head_ref }}
- name: Get last commit message
id: last-commit-message
run: |
echo "::set-output name=msg::$(git log -1 --pretty=%s)"
- name: Run nextion2text - name: Run nextion2text
run: | run: |
cd HMI cd HMI
@@ -27,5 +32,5 @@ jobs:
- uses: stefanzweifel/git-auto-commit-action@v4 - uses: stefanzweifel/git-auto-commit-action@v4
with: with:
commit_message: Add nextion2text commit_message: ${{ steps.last-commit-message.outputs.msg }} (add nextion2text)
file_pattern: HMI/n2t-out/*.txt file_pattern: HMI/n2t-out/*.txt

View File

@@ -1563,7 +1563,7 @@ Timer tmSerial
}else }else
{ {
//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 ... //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 u[2]+3 udelete payloadLength-1
bufferPos=0 bufferPos=0
} }
if(tId.txt=="popupLight") if(tId.txt=="popupLight")

View File

@@ -469,7 +469,7 @@ Timer tmSerial
}else }else
{ {
//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 ... //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 u[2]+3 udelete payloadLength-1
bufferPos=0 bufferPos=0
} }
if(tId.txt=="cardEntities") if(tId.txt=="cardEntities")

View File

@@ -493,7 +493,7 @@ Timer tmSerial
}else }else
{ {
//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 ... //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 u[2]+3 udelete payloadLength-1
bufferPos=0 bufferPos=0
} }
if(tId.txt=="popupLight") if(tId.txt=="popupLight")

View File

@@ -303,7 +303,7 @@ Timer tmSerial
}else }else
{ {
//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 ... //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 u[2]+3 udelete payloadLength-1
bufferPos=0 bufferPos=0
} }
if(tId.txt=="popupLight") if(tId.txt=="popupLight")