From 5201ee8240a2d1e38bf7a58325a1f7e5215c3758 Mon Sep 17 00:00:00 2001
From: Djuri Baars <dsbaars@users.noreply.github.com>
Date: Wed, 8 Nov 2023 15:49:16 +0100
Subject: [PATCH] Add GitHub workflow

---
 .github/workflows/workflow.yml | 84 ++++++++++++++++++++++++++++++++++
 src/lib/config.cpp             |  3 +-
 src/lib/config.hpp             |  3 ++
 3 files changed, 88 insertions(+), 2 deletions(-)
 create mode 100644 .github/workflows/workflow.yml

diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
new file mode 100644
index 0000000..ace6831
--- /dev/null
+++ b/.github/workflows/workflow.yml
@@ -0,0 +1,84 @@
+name: BTClock CI
+
+on: 
+  push:
+    tags:
+      - '*'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
+        with:
+          node-version: lts/*
+          cache: yarn
+          cache-dependency-path: '**/yarn.lock'
+      - uses: actions/cache@v3
+        with:
+          path: |
+            ~/.cache/pip
+            ~/.platformio/.cache
+          key: ${{ runner.os }}-pio
+      - uses: actions/setup-python@v4
+        with:
+          python-version: '3.9'
+      - name: Get current date
+        id: dateAndTime
+        # run: echo "::set-output name=dateAndTime::$(date +'%Y-%m-%d-%H:%M')"
+        run: echo "dateAndTime=$(date +'%Y-%m-%d-%H:%M')" >> $GITHUB_OUTPUT
+      - name: Install PlatformIO Core
+        run: pip install --upgrade platformio
+
+      - name: Build BTClock firmware
+        run: pio run -e default 
+
+      - name: Build BTClock filesystem
+        run: pio run -e default --target buildfs
+
+      - name: Install esptools.py
+        run: pip install --upgrade esptool
+
+      - name: Create merged firmware binary
+        run: mkdir -p output && esptool.py --chip esp32s3 merge_bin -o output/full-firmware.bin --flash_mode dio 0x0000 .pio/build/lolin_s3_mini/bootloader.bin 0x8000 .pio/build/lolin_s3_mini/partitions.bin 0xe000 ~/.platformio/packages/framework-arduinoespressif32/tools/partitions/boot_app0.bin 0x10000 .pio/build/lolin_s3_mini/firmware.bin 0x330000 .pio/build/lolin_s3_mini/littlefs.bin
+
+      - name: Create checksum for merged binary
+        run: shasum -a 256 output/full-firmware.bin | awk '{print $1}' > output/full-firmware.sha256
+
+      - name: Write commit hash to file
+        run: echo $GITHUB_SHA > output/commit.txt
+
+      - name: Write build date to file
+        run: echo "$(date -u +'%Y-%m-%dT%H:%M:%SZ')" > output/date.txt
+
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v3
+        with:
+          path: |
+            .pio/build/lolin_s3_mini/*.bin
+            output/full-firmware.bin
+            output/full-firmware.sha256
+      - name: Create release
+        uses: ncipollo/release-action@v1
+        with:
+          name: release-${{ steps.dateAndTime.outputs.dateAndTime }}
+          artifacts: "output/full-firmware.bin,output/full-firmware.sha256,.pio/build/lolin_s3_mini/*.bin"
+          allowUpdates: true
+          removeArtifacts: true
+      # - name: Pushes full-firmware.bin to web flasher
+      #   id: push_directory
+      #   uses: cpina/github-action-push-to-another-repository@main
+      #   env:
+      #     SSH_DEPLOY_KEY: ${{ secrets.SSH_DEPLOY_KEY }}
+      #   with:
+      #     source-directory: output/
+      #     target-directory: firmware_v3/
+      #     destination-github-username: 'btclock'
+      #     destination-repository-name: 'web-flasher'
+      #     target-branch: btclock
+      #     user-name: ${{github.actor}}
+      #     user-email: ${{github.actor}}@users.noreply.github.com
\ No newline at end of file
diff --git a/src/lib/config.cpp b/src/lib/config.cpp
index 13b2a0a..2f3a629 100644
--- a/src/lib/config.cpp
+++ b/src/lib/config.cpp
@@ -64,8 +64,7 @@ void tryImprovSetup()
                 x_position = 0;
             }
         }
-
-        vTaskDelay(1 / portTICK_PERIOD_MS);
+        esp_task_wdt_reset();
     }
 }
 
diff --git a/src/lib/config.hpp b/src/lib/config.hpp
index 7eeb0e2..cc836d8 100644
--- a/src/lib/config.hpp
+++ b/src/lib/config.hpp
@@ -9,6 +9,9 @@
 #include <esp_sntp.h>
 #include "epd.hpp"
 #include "improv.hpp"
+#include "hal/wdt_hal.h" 
+#include "esp_task_wdt.h"
+
 #include <map>
 
 #include "lib/screen_handler.hpp"