From 70b4bd197c5acb3260e68a4d785ce82e8acbc803 Mon Sep 17 00:00:00 2001 From: Jonas Niesner Date: Sat, 2 Sep 2023 15:18:16 +0200 Subject: [PATCH 1/6] Update release.yml --- .github/workflows/release.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 344e5b11..7bfef8b3 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -32,6 +32,14 @@ jobs: # git config --global user.email "bot@openepaperlink.de" # git commit -am "Zipped web files" # git push origin HEAD:master + + - name: Build NRF firmware + run: | + cd ARM_Tag_FW/Newton_M3_nRF52811 + pio run --environment Newton_M3_29_BWR + pio run --environment Newton_M3_75_BWR + cp .pio/build/Newton_M3_29_BWR/firmware.hex /home/runner/work/OpenEPaperLink/OpenEPaperLink/binaries/Newton_M3_29_BWR.hex + cp .pio/build/Newton_M3_75_BWR/firmware.hex //home/runner/work/OpenEPaperLink/OpenEPaperLink/binaries/Newton_M3_75_BWR.hex - name: Install PlatformIO Core run: pip install --upgrade platformio From 6a58d0143c7d09be8328f71b80747549231b5278 Mon Sep 17 00:00:00 2001 From: Jonas Niesner Date: Sat, 2 Sep 2023 15:20:46 +0200 Subject: [PATCH 2/6] Update release.yml --- .github/workflows/release.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7bfef8b3..9406caa5 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -32,6 +32,9 @@ jobs: # git config --global user.email "bot@openepaperlink.de" # git commit -am "Zipped web files" # git push origin HEAD:master + + - name: Install PlatformIO Core + run: pip install --upgrade platformio - name: Build NRF firmware run: | @@ -40,9 +43,6 @@ jobs: pio run --environment Newton_M3_75_BWR cp .pio/build/Newton_M3_29_BWR/firmware.hex /home/runner/work/OpenEPaperLink/OpenEPaperLink/binaries/Newton_M3_29_BWR.hex cp .pio/build/Newton_M3_75_BWR/firmware.hex //home/runner/work/OpenEPaperLink/OpenEPaperLink/binaries/Newton_M3_75_BWR.hex - - - name: Install PlatformIO Core - run: pip install --upgrade platformio - name: Install esptool run: pip install esptool From 12f5add21be17844d7a892c75cddf6bb36bfb722 Mon Sep 17 00:00:00 2001 From: Jonas Niesner Date: Sat, 2 Sep 2023 17:57:12 +0200 Subject: [PATCH 3/6] Add files via upload --- Tag_Flasher/ESP32_Flasher/data/test.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 Tag_Flasher/ESP32_Flasher/data/test.txt diff --git a/Tag_Flasher/ESP32_Flasher/data/test.txt b/Tag_Flasher/ESP32_Flasher/data/test.txt new file mode 100644 index 00000000..8d1c8b69 --- /dev/null +++ b/Tag_Flasher/ESP32_Flasher/data/test.txt @@ -0,0 +1 @@ + From 76345fa794f9f62793e2a56e3623225bffe5562a Mon Sep 17 00:00:00 2001 From: Jonas Niesner Date: Sat, 2 Sep 2023 17:59:30 +0200 Subject: [PATCH 4/6] Update release.yml --- .github/workflows/release.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9406caa5..a94c24b1 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -50,6 +50,24 @@ jobs: - name: create folders run: | mkdir espbinaries + + - name: Build firmware for Tag_Flasher + run: | + cd Tag_Flasher/ESP32_Flasher + export PLATFORMIO_BUILD_FLAGS="-D BUILD_VERSION=${{ github.ref_name }} -D SHA=$GITHUB_SHA" + pio run --environment S2_Tag_Flasher + pio run --target buildfs --environment S2_Tag_Flasher + mkdir /home/runner/work/OpenEPaperLink/OpenEPaperLink/S2_Tag_Flasher + cp ~/.platformio/packages/framework-arduinoespressif32/tools/partitions/boot_app0.bin /home/runner/work/OpenEPaperLink/OpenEPaperLink/S2_Tag_Flasher/boot_app0.bin + cp .pio/build/S2_Tag_Flasher/firmware.bin /home/runner/work/OpenEPaperLink/OpenEPaperLink/S2_Tag_Flasher/firmware.bin + cp .pio/build/S2_Tag_Flasher/bootloader.bin /home/runner/work/OpenEPaperLink/OpenEPaperLink/S2_Tag_Flasher/bootloader.bin + cp .pio/build/S2_Tag_Flasher/partitions.bin /home/runner/work/OpenEPaperLink/OpenEPaperLink/S2_Tag_Flasher/partitions.bin + cp .pio/build/S2_Tag_Flasher/littlefs.bin /home/runner/work/OpenEPaperLink/OpenEPaperLink/S2_Tag_Flasher/littlefs.bin + cd /home/runner/work/OpenEPaperLink/OpenEPaperLink/S2_Tag_Flasher + esptool.py --chip esp32-s2 merge_bin -o merged-firmware.bin --flash_mode dio --flash_freq 80m --flash_size 4MB 0x1000 bootloader.bin 0x8000 partitions.bin 0xe000 boot_app0.bin 0x10000 firmware.bin 0x290000 littlefs.bin + cd /home/runner/work/OpenEPaperLink/OpenEPaperLink + cp S2_Tag_Flasher/firmware.bin espbinaries/S2_Tag_Flasher.bin + cp S2_Tag_Flasher/merged-firmware.bin espbinaries/S2_Tag_Flasher_full.bin - name: Build firmware for Simple_AP run: | From 52fd9f12326dc940fa6ca88354408c8920e18629 Mon Sep 17 00:00:00 2001 From: Jonas Niesner Date: Sat, 2 Sep 2023 18:38:42 +0200 Subject: [PATCH 5/6] Update main.cpp --- Tag_Flasher/ESP32_Flasher/src/main.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Tag_Flasher/ESP32_Flasher/src/main.cpp b/Tag_Flasher/ESP32_Flasher/src/main.cpp index 7c6ade60..dd645150 100644 --- a/Tag_Flasher/ESP32_Flasher/src/main.cpp +++ b/Tag_Flasher/ESP32_Flasher/src/main.cpp @@ -6,7 +6,6 @@ #include "flasher.h" #include "leds.h" #include "settings.h" -#include "udp.h" #include "usbflasher.h" #include "powermgt.h" @@ -48,4 +47,4 @@ void setup() { void loop() { vTaskDelay(10000 / portTICK_PERIOD_MS); -} \ No newline at end of file +} From 65431e587eb06a3da87adb407b23c586c8251ab5 Mon Sep 17 00:00:00 2001 From: Jonas Niesner Date: Sat, 2 Sep 2023 18:57:55 +0200 Subject: [PATCH 6/6] Update release.yml --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a94c24b1..5f2e0041 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -42,7 +42,7 @@ jobs: pio run --environment Newton_M3_29_BWR pio run --environment Newton_M3_75_BWR cp .pio/build/Newton_M3_29_BWR/firmware.hex /home/runner/work/OpenEPaperLink/OpenEPaperLink/binaries/Newton_M3_29_BWR.hex - cp .pio/build/Newton_M3_75_BWR/firmware.hex //home/runner/work/OpenEPaperLink/OpenEPaperLink/binaries/Newton_M3_75_BWR.hex + cp .pio/build/Newton_M3_75_BWR/firmware.hex /home/runner/work/OpenEPaperLink/OpenEPaperLink/binaries/Newton_M3_75_BWR.hex - name: Install esptool run: pip install esptool