From 0e3cc72cf116ca288da1436b2118a0b3c949c7b8 Mon Sep 17 00:00:00 2001 From: Jocke4f <39942694+Jocke4f@users.noreply.github.com> Date: Sat, 13 Apr 2024 11:43:13 +0200 Subject: [PATCH 1/5] Remove TFT_eSPI specific dependency Removed the TFT_eSPI specific dependency to v2.5.33. Now latest version can be used. Was verified with v2.5.43. This is a solution to https://github.com/josephdadams/TallyArbiter/issues/618. --- .github/workflows/build-listener-clients.yaml | 2 +- listener_clients/TTGO_T-listener/TTGO_T-listener.ino | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-listener-clients.yaml b/.github/workflows/build-listener-clients.yaml index 8ac29cb7..9cd5196d 100644 --- a/.github/workflows/build-listener-clients.yaml +++ b/.github/workflows/build-listener-clients.yaml @@ -117,7 +117,7 @@ jobs: - uses: actions/checkout@v4 - name: Setup TFT_eSPI and select User Setup run: | - git clone --branch v2.5.33 https://github.com/Bodmer/TFT_eSPI/ + git clone https://github.com/Bodmer/TFT_eSPI/ cd TFT_eSPI sed -i 's/#include /\/\/#include /g' User_Setup_Select.h sed -i 's/\/\/#include /#include /g' User_Setup_Select.h diff --git a/listener_clients/TTGO_T-listener/TTGO_T-listener.ino b/listener_clients/TTGO_T-listener/TTGO_T-listener.ino index f948e5f3..2ac981ea 100644 --- a/listener_clients/TTGO_T-listener/TTGO_T-listener.ino +++ b/listener_clients/TTGO_T-listener/TTGO_T-listener.ino @@ -14,9 +14,9 @@ Modify User_Setup_Select.h in libraryY TFT_eSPI #include #include #include +#include #include #include -#include #include #include #include From 442439661d91fa9296f57b396632d21eb310b05c Mon Sep 17 00:00:00 2001 From: Jocke4f <39942694+Jocke4f@users.noreply.github.com> Date: Sat, 13 Apr 2024 12:04:17 +0200 Subject: [PATCH 2/5] Update build-listener-clients.yaml Changed include order. --- .github/workflows/build-listener-clients.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-listener-clients.yaml b/.github/workflows/build-listener-clients.yaml index 9cd5196d..1af03455 100644 --- a/.github/workflows/build-listener-clients.yaml +++ b/.github/workflows/build-listener-clients.yaml @@ -131,8 +131,8 @@ jobs: - name: WebSockets - name: WiFiManager - name: MultiButton - - name: Arduino_JSON - source-path: TFT_eSPI + - name: Arduino_JSON cli-compile-flags: | - --export-binaries sketch-paths: | From 81b330a4f2aa4ee5b4af55f8d83ca809fac92fa5 Mon Sep 17 00:00:00 2001 From: Jocke4f <39942694+Jocke4f@users.noreply.github.com> Date: Sat, 13 Apr 2024 12:25:13 +0200 Subject: [PATCH 3/5] Update build-listener-clients.yaml Revert workflow build file for testing. --- .github/workflows/build-listener-clients.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-listener-clients.yaml b/.github/workflows/build-listener-clients.yaml index 1af03455..e2174439 100644 --- a/.github/workflows/build-listener-clients.yaml +++ b/.github/workflows/build-listener-clients.yaml @@ -117,7 +117,7 @@ jobs: - uses: actions/checkout@v4 - name: Setup TFT_eSPI and select User Setup run: | - git clone https://github.com/Bodmer/TFT_eSPI/ + git clone --branch v2.5.33 https://github.com/Bodmer/TFT_eSPI/ cd TFT_eSPI sed -i 's/#include /\/\/#include /g' User_Setup_Select.h sed -i 's/\/\/#include /#include /g' User_Setup_Select.h From da7744da958d605c32529a534214c384ac2c66bc Mon Sep 17 00:00:00 2001 From: Jocke4f <39942694+Jocke4f@users.noreply.github.com> Date: Sat, 13 Apr 2024 12:49:44 +0200 Subject: [PATCH 4/5] Update build-listener-clients.yaml Re-revert. --- .github/workflows/build-listener-clients.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-listener-clients.yaml b/.github/workflows/build-listener-clients.yaml index e2174439..8c9541e9 100644 --- a/.github/workflows/build-listener-clients.yaml +++ b/.github/workflows/build-listener-clients.yaml @@ -117,7 +117,7 @@ jobs: - uses: actions/checkout@v4 - name: Setup TFT_eSPI and select User Setup run: | - git clone --branch v2.5.33 https://github.com/Bodmer/TFT_eSPI/ + git clone https://github.com/Bodmer/TFT_eSPI/ cd TFT_eSPI sed -i 's/#include /\/\/#include /g' User_Setup_Select.h sed -i 's/\/\/#include /#include /g' User_Setup_Select.h @@ -129,10 +129,10 @@ jobs: fqbn: ${{ matrix.board.fqbn }} libraries: | - name: WebSockets - - name: WiFiManager - - name: MultiButton - source-path: TFT_eSPI + - name: MultiButton - name: Arduino_JSON + - name: WiFiManager cli-compile-flags: | - --export-binaries sketch-paths: | From 71bb2e9bc85e6817c0f2d533e761ffc515c700bc Mon Sep 17 00:00:00 2001 From: Jocke4f <39942694+Jocke4f@users.noreply.github.com> Date: Sat, 13 Apr 2024 14:32:36 +0200 Subject: [PATCH 5/5] Update build-listener-clients.yaml Reverted back to original fix since the build failure is due to a test in the build to check the size difference with the previous build. --- .github/workflows/build-listener-clients.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-listener-clients.yaml b/.github/workflows/build-listener-clients.yaml index 8c9541e9..9cd5196d 100644 --- a/.github/workflows/build-listener-clients.yaml +++ b/.github/workflows/build-listener-clients.yaml @@ -129,10 +129,10 @@ jobs: fqbn: ${{ matrix.board.fqbn }} libraries: | - name: WebSockets - - source-path: TFT_eSPI + - name: WiFiManager - name: MultiButton - name: Arduino_JSON - - name: WiFiManager + - source-path: TFT_eSPI cli-compile-flags: | - --export-binaries sketch-paths: |