From f7acec5abc405e1f0f857173d082c472733443b9 Mon Sep 17 00:00:00 2001 From: joBr99 <29555657+joBr99@users.noreply.github.com> Date: Sat, 12 Mar 2022 20:05:58 +0100 Subject: [PATCH 1/6] Create nextion2text.yml --- .github/workflows/nextion2text.yml | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 .github/workflows/nextion2text.yml diff --git a/.github/workflows/nextion2text.yml b/.github/workflows/nextion2text.yml new file mode 100644 index 00000000..a2682fb0 --- /dev/null +++ b/.github/workflows/nextion2text.yml @@ -0,0 +1,28 @@ +name: nextion2text + +on: + pull_request: + push: + branches: + - main + +jobs: + gen-nextion-to-text: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + with: + ref: ${{ github.head_ref }} + + - name: Run nextion2text + run: | + apt update && apt install -y python3 + cd HMI + wget https://raw.githubusercontent.com/joBr99/Nextion2Text/master/Nextion2Text.py + python Nextion2Text.py -i nspanel.HMI -o n2t-out + + - uses: stefanzweifel/git-auto-commit-action@v4 + with: + commit_message: Add nextion2text + file_pattern: HMI/n2t-out/*.txt From 6be36e66b56500a4275d33fb94fa9c0ace7d9af5 Mon Sep 17 00:00:00 2001 From: joBr99 <29555657+joBr99@users.noreply.github.com> Date: Sat, 12 Mar 2022 20:06:49 +0100 Subject: [PATCH 2/6] Update nextion2text.yml --- .github/workflows/nextion2text.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/nextion2text.yml b/.github/workflows/nextion2text.yml index a2682fb0..4e37ff82 100644 --- a/.github/workflows/nextion2text.yml +++ b/.github/workflows/nextion2text.yml @@ -17,7 +17,7 @@ jobs: - name: Run nextion2text run: | - apt update && apt install -y python3 + sudo apt update && sudo apt install -y python3 cd HMI wget https://raw.githubusercontent.com/joBr99/Nextion2Text/master/Nextion2Text.py python Nextion2Text.py -i nspanel.HMI -o n2t-out From 79ef12e8a30c3e4af86898e664ef821cb6bdcdb2 Mon Sep 17 00:00:00 2001 From: joBr99 <29555657+joBr99@users.noreply.github.com> Date: Sat, 12 Mar 2022 20:18:10 +0100 Subject: [PATCH 3/6] Update nextion2text.yml --- .github/workflows/nextion2text.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/nextion2text.yml b/.github/workflows/nextion2text.yml index 4e37ff82..38184d71 100644 --- a/.github/workflows/nextion2text.yml +++ b/.github/workflows/nextion2text.yml @@ -17,9 +17,8 @@ jobs: - name: Run nextion2text run: | - sudo apt update && sudo apt install -y python3 cd HMI - wget https://raw.githubusercontent.com/joBr99/Nextion2Text/master/Nextion2Text.py + wget https://raw.githubusercontent.com/joBr99/Nextion2Text/linux/Nextion2Text.py python Nextion2Text.py -i nspanel.HMI -o n2t-out - uses: stefanzweifel/git-auto-commit-action@v4 From 75a3fbaf52d388a4b81e6952e62b4e22507911d2 Mon Sep 17 00:00:00 2001 From: joBr99 <29555657+joBr99@users.noreply.github.com> Date: Sat, 12 Mar 2022 19:27:58 +0000 Subject: [PATCH 4/6] Add nextion2text --- HMI/n2t-out/cardEntities.txt | 36 ++++++++++++++++++------------------ HMI/n2t-out/cardMedia.txt | 8 ++++---- HMI/n2t-out/cardThermo.txt | 8 ++++---- HMI/n2t-out/pageIcons.txt | 2 +- HMI/n2t-out/popupLight.txt | 10 +++++----- HMI/n2t-out/popupNotify.txt | 2 +- HMI/n2t-out/popupShutter.txt | 10 +++++----- HMI/n2t-out/screensaver.txt | 8 ++++---- 8 files changed, 42 insertions(+), 42 deletions(-) diff --git a/HMI/n2t-out/cardEntities.txt b/HMI/n2t-out/cardEntities.txt index 736ca75a..fcd79c76 100644 --- a/HMI/n2t-out/cardEntities.txt +++ b/HMI/n2t-out/cardEntities.txt @@ -212,7 +212,7 @@ Text tIcon1 Disable release event after dragging: 0 Send Component ID : disabled Associated Keyboard : none - Text : î–° + Text :  Max. Text Size : 10 Text tIcon2 @@ -223,7 +223,7 @@ Text tIcon2 Disable release event after dragging: 0 Send Component ID : disabled Associated Keyboard : none - Text : î–° + Text :  Max. Text Size : 10 Text tIcon3 @@ -234,7 +234,7 @@ Text tIcon3 Disable release event after dragging: 0 Send Component ID : disabled Associated Keyboard : none - Text : î–° + Text :  Max. Text Size : 10 Text tIcon4 @@ -245,7 +245,7 @@ Text tIcon4 Disable release event after dragging: 0 Send Component ID : disabled Associated Keyboard : none - Text : î–° + Text :  Max. Text Size : 30 Text tSend @@ -308,7 +308,7 @@ Button bDown1 Disable release event after dragging: 0 Send Component ID : disabled State : unpressed - Text :  + Text :  Max. Text Size : 10 Events @@ -341,7 +341,7 @@ Button bUp1 Disable release event after dragging: 0 Send Component ID : disabled State : unpressed - Text :  + Text :  Max. Text Size : 10 Events @@ -374,7 +374,7 @@ Button bStop1 Disable release event after dragging: 0 Send Component ID : disabled State : unpressed - Text :  + Text :  Max. Text Size : 10 Events @@ -407,7 +407,7 @@ Button bStop2 Disable release event after dragging: 0 Send Component ID : disabled State : unpressed - Text :  + Text :  Max. Text Size : 10 Events @@ -440,7 +440,7 @@ Button bDown2 Disable release event after dragging: 0 Send Component ID : disabled State : unpressed - Text :  + Text :  Max. Text Size : 10 Events @@ -473,7 +473,7 @@ Button bUp2 Disable release event after dragging: 0 Send Component ID : disabled State : unpressed - Text :  + Text :  Max. Text Size : 10 Events @@ -506,7 +506,7 @@ Button bStop3 Disable release event after dragging: 0 Send Component ID : disabled State : unpressed - Text :  + Text :  Max. Text Size : 10 Events @@ -539,7 +539,7 @@ Button bDown3 Disable release event after dragging: 0 Send Component ID : disabled State : unpressed - Text :  + Text :  Max. Text Size : 10 Events @@ -572,7 +572,7 @@ Button bUp3 Disable release event after dragging: 0 Send Component ID : disabled State : unpressed - Text :  + Text :  Max. Text Size : 10 Events @@ -605,7 +605,7 @@ Button bStop4 Disable release event after dragging: 0 Send Component ID : disabled State : unpressed - Text :  + Text :  Max. Text Size : 10 Events @@ -638,7 +638,7 @@ Button bDown4 Disable release event after dragging: 0 Send Component ID : disabled State : unpressed - Text :  + Text :  Max. Text Size : 10 Events @@ -671,7 +671,7 @@ Button bUp4 Disable release event after dragging: 0 Send Component ID : disabled State : unpressed - Text :  + Text :  Max. Text Size : 10 Events @@ -704,7 +704,7 @@ Button bPrev Disable release event after dragging: 0 Send Component ID : disabled State : unpressed - Text :  + Text :  Max. Text Size : 10 Events @@ -737,7 +737,7 @@ Button bNext Disable release event after dragging: 0 Send Component ID : disabled State : unpressed - Text :  + Text :  Max. Text Size : 10 Events diff --git a/HMI/n2t-out/cardMedia.txt b/HMI/n2t-out/cardMedia.txt index 25966348..511f3306 100644 --- a/HMI/n2t-out/cardMedia.txt +++ b/HMI/n2t-out/cardMedia.txt @@ -149,7 +149,7 @@ Text t2 Disable release event after dragging: 0 Send Component ID : disabled Associated Keyboard : none - Text : î’¬ + Text :  Max. Text Size : 10 Events @@ -215,7 +215,7 @@ Text t0 Disable release event after dragging: 0 Send Component ID : disabled Associated Keyboard : none - Text : î’­ + Text :  Max. Text Size : 10 Events @@ -302,7 +302,7 @@ Button bNext Disable release event after dragging: 0 Send Component ID : disabled State : unpressed - Text :  + Text :  Max. Text Size : 10 Events @@ -335,7 +335,7 @@ Button bPrev Disable release event after dragging: 0 Send Component ID : disabled State : unpressed - Text :  + Text :  Max. Text Size : 10 Events diff --git a/HMI/n2t-out/cardThermo.txt b/HMI/n2t-out/cardThermo.txt index 14425466..67864336 100644 --- a/HMI/n2t-out/cardThermo.txt +++ b/HMI/n2t-out/cardThermo.txt @@ -207,7 +207,7 @@ Text t6 Disable release event after dragging: 0 Send Component ID : disabled Associated Keyboard : none - Text :  + Text :  Max. Text Size : 10 Text t7 @@ -229,7 +229,7 @@ Text t2 Disable release event after dragging: 0 Send Component ID : disabled Associated Keyboard : none - Text :  + Text :  Max. Text Size : 10 Picture p0 @@ -248,7 +248,7 @@ Button bNext Disable release event after dragging: 0 Send Component ID : disabled State : unpressed - Text :  + Text :  Max. Text Size : 10 Events @@ -281,7 +281,7 @@ Button bPrev Disable release event after dragging: 0 Send Component ID : disabled State : unpressed - Text :  + Text :  Max. Text Size : 10 Events diff --git a/HMI/n2t-out/pageIcons.txt b/HMI/n2t-out/pageIcons.txt index 91a6418b..41aaa8b2 100644 --- a/HMI/n2t-out/pageIcons.txt +++ b/HMI/n2t-out/pageIcons.txt @@ -30,7 +30,7 @@ Text tIcons Disable release event after dragging: 0 Send Component ID : disabled Associated Keyboard : none - Text :  + Text :  Max. Text Size : 100 Text tTmp1 diff --git a/HMI/n2t-out/popupLight.txt b/HMI/n2t-out/popupLight.txt index 90f3b7d1..14b5f5d5 100644 --- a/HMI/n2t-out/popupLight.txt +++ b/HMI/n2t-out/popupLight.txt @@ -101,7 +101,7 @@ Text tIcon1 Disable release event after dragging: 0 Send Component ID : disabled Associated Keyboard : none - Text :  + Text :  Max. Text Size : 10 Text t1 @@ -123,7 +123,7 @@ Text t2 Disable release event after dragging: 0 Send Component ID : disabled Associated Keyboard : none - Text :  + Text :  Max. Text Size : 10 Text t3 @@ -134,7 +134,7 @@ Text t3 Disable release event after dragging: 0 Send Component ID : disabled Associated Keyboard : none - Text :  + Text :  Max. Text Size : 10 Text t4 @@ -364,7 +364,7 @@ Button b0 Disable release event after dragging: 0 Send Component ID : disabled State : unpressed - Text : î…• + Text :  Max. Text Size : 10 Events @@ -379,7 +379,7 @@ Button bColor Disable release event after dragging: 0 Send Component ID : disabled State : unpressed - Text :  + Text :  Max. Text Size : 10 Events diff --git a/HMI/n2t-out/popupNotify.txt b/HMI/n2t-out/popupNotify.txt index f422d45d..ebb04f9a 100644 --- a/HMI/n2t-out/popupNotify.txt +++ b/HMI/n2t-out/popupNotify.txt @@ -123,7 +123,7 @@ Button b0 Disable release event after dragging: 0 Send Component ID : disabled State : unpressed - Text : î…• + Text :  Max. Text Size : 10 Events diff --git a/HMI/n2t-out/popupShutter.txt b/HMI/n2t-out/popupShutter.txt index f7b07e2c..4b4cfd21 100644 --- a/HMI/n2t-out/popupShutter.txt +++ b/HMI/n2t-out/popupShutter.txt @@ -71,7 +71,7 @@ Text tIcon1 Disable release event after dragging: 0 Send Component ID : disabled Associated Keyboard : none - Text : î–° + Text :  Max. Text Size : 10 Text tSend @@ -178,7 +178,7 @@ Button b0 Disable release event after dragging: 0 Send Component ID : disabled State : unpressed - Text : î…• + Text :  Max. Text Size : 10 Events @@ -193,7 +193,7 @@ Button bDown1 Disable release event after dragging: 0 Send Component ID : disabled State : unpressed - Text :  + Text :  Max. Text Size : 10 Events @@ -226,7 +226,7 @@ Button bStop1 Disable release event after dragging: 0 Send Component ID : disabled State : unpressed - Text :  + Text :  Max. Text Size : 10 Events @@ -259,7 +259,7 @@ Button bUp1 Disable release event after dragging: 0 Send Component ID : disabled State : unpressed - Text :  + Text :  Max. Text Size : 10 Events diff --git a/HMI/n2t-out/screensaver.txt b/HMI/n2t-out/screensaver.txt index c093f038..d6ac52a0 100644 --- a/HMI/n2t-out/screensaver.txt +++ b/HMI/n2t-out/screensaver.txt @@ -151,7 +151,7 @@ Text tMainIcon Disable release event after dragging: 0 Send Component ID : disabled Associated Keyboard : none - Text : î–˜ + Text :  Max. Text Size : 10 Text tMainText @@ -173,7 +173,7 @@ Text tMRIcon Disable release event after dragging: 0 Send Component ID : disabled Associated Keyboard : none - Text : î–– + Text :  Max. Text Size : 10 Text tMR @@ -217,7 +217,7 @@ Text tF1Icon Disable release event after dragging: 0 Send Component ID : disabled Associated Keyboard : none - Text : î–˜ + Text :  Max. Text Size : 10 Text tForecast2 @@ -239,7 +239,7 @@ Text tF2Icon Disable release event after dragging: 0 Send Component ID : disabled Associated Keyboard : none - Text : î–˜ + Text :  Max. Text Size : 10 Text tForecast2Val From a6d7bc883524b9b87922dd1087fffe83e49bd20e Mon Sep 17 00:00:00 2001 From: joBr99 <29555657+joBr99@users.noreply.github.com> Date: Sat, 12 Mar 2022 20:41:58 +0100 Subject: [PATCH 5/6] Update nextion2text.yml --- .github/workflows/nextion2text.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/nextion2text.yml b/.github/workflows/nextion2text.yml index 38184d71..606cafb8 100644 --- a/.github/workflows/nextion2text.yml +++ b/.github/workflows/nextion2text.yml @@ -2,9 +2,13 @@ name: nextion2text on: pull_request: + paths: + - HMI/nspanel.HMI push: branches: - main + paths: + - HMI/nspanel.HMI jobs: gen-nextion-to-text: From dc090076ab0120a92ff4ebd104b484e8b8d2d1b3 Mon Sep 17 00:00:00 2001 From: joBr99 <29555657+joBr99@users.noreply.github.com> Date: Sat, 12 Mar 2022 20:45:29 +0100 Subject: [PATCH 6/6] Update codeql-analysis.yml --- .github/workflows/codeql-analysis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 649ea7b0..6f47e2cc 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -14,9 +14,13 @@ name: "CodeQL" on: push: branches: [ main ] + paths: + - '**.py' pull_request: # The branches below must be a subset of the branches above branches: [ main ] + paths: + - '**.py' schedule: - cron: '36 14 * * 3'