From 32072a3b25b9dac5a36c97c197da558fd4c96ff4 Mon Sep 17 00:00:00 2001 From: Jonas Niesner Date: Sun, 29 Sep 2024 18:49:30 +0200 Subject: [PATCH] Fix T-Panel AP builds (#373) * Update release.yml * Update conditional-build-test.yml * fix builds for linux * Update platformio.ini --- .github/workflows/conditional-build-test.yml | 4 +- .github/workflows/release.yml | 141 +++++++++++++------ ESP32_AP-Flasher/platformio.ini | 34 ++--- 3 files changed, 109 insertions(+), 70 deletions(-) diff --git a/.github/workflows/conditional-build-test.yml b/.github/workflows/conditional-build-test.yml index 1025789a6..15d9b209b 100644 --- a/.github/workflows/conditional-build-test.yml +++ b/.github/workflows/conditional-build-test.yml @@ -66,8 +66,8 @@ jobs: strategy: matrix: environment: - - OpenEPaperLink_Mini_AP - - OpenEPaperLink_AP_and_Flasher + #- OpenEPaperLink_Mini_AP + #- OpenEPaperLink_AP_and_Flasher - ESP32_S3_16_8_YELLOW_AP - OpenEPaperLink_Mini_AP_v4 runs-on: ubuntu-22.04 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 758cec459..446127a83 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -41,56 +41,71 @@ jobs: run: | mkdir espbinaries - - name: esp-idf build - uses: espressif/esp-idf-ci-action@v1 - with: - esp_idf_version: latest - target: esp32c6 - path: 'ARM_Tag_FW/OpenEPaperLink_esp32_C6_AP/' + #- name: esp-idf build + # uses: espressif/esp-idf-ci-action@v1 + # with: + # esp_idf_version: latest + # target: esp32c6 + # path: 'ARM_Tag_FW/OpenEPaperLink_esp32_C6_AP/' + + # - name: esp-idf build + # uses: espressif/esp-idf-ci-action@v1 + # with: + # esp_idf_version: latest + # target: esp32h2 + # path: 'ARM_Tag_FW/OpenEPaperLink_esp32_H2_AP/' + + #- name: Add C6 files to release + # run: | + # cp /home/runner/work/OpenEPaperLink/OpenEPaperLink/ARM_Tag_FW/OpenEPaperLink_esp32_C6_AP/build/OpenEPaperLink_esp32_C6.bin espbinaries/OpenEPaperLink_esp32_C6.bin + + #- name: Add H2 files to release + # run: | + # cd ARM_Tag_FW/OpenEPaperLink_esp32_H2_AP/ + # dir build + # esptool.py --chip esp32h2 merge_bin -o merged-firmware.bin --flash_mode dio --flash_size 4MB --flash_freq 48m 0x0 build/bootloader/bootloader.bin 0x8000 build/partition_table/partition-table.bin 0x10000 build/OpenEPaperLink_esp32_C6.bin + # cp merged-firmware.bin ../../espbinaries/OpenEPaperLink_esp32_H2.bin - - name: Add C6 files to release - run: | - cp /home/runner/work/OpenEPaperLink/OpenEPaperLink/ARM_Tag_FW/OpenEPaperLink_esp32_C6_AP/build/OpenEPaperLink_esp32_C6.bin espbinaries/OpenEPaperLink_esp32_C6.bin # - name: Zip web files # run: | # cd /home/runner/work/OpenEPaperLink/OpenEPaperLink/ESP32_AP-Flasher # python gzip_wwwfiles.py - - - name: Build firmware for OpenEPaperLink_Mini_AP - run: | - cd ESP32_AP-Flasher - export PLATFORMIO_BUILD_FLAGS="-D BUILD_VERSION=${{ github.ref_name }} -D SHA=$GITHUB_SHA" - pio run --environment OpenEPaperLink_Mini_AP - pio run --target buildfs --environment OpenEPaperLink_Mini_AP - mkdir /home/runner/work/OpenEPaperLink/OpenEPaperLink/OpenEPaperLink_Mini_AP - cp ~/.platformio/packages/framework-arduinoespressif32/tools/partitions/boot_app0.bin /home/runner/work/OpenEPaperLink/OpenEPaperLink/OpenEPaperLink_Mini_AP/boot_app0.bin - cp .pio/build/OpenEPaperLink_Mini_AP/firmware.bin /home/runner/work/OpenEPaperLink/OpenEPaperLink/OpenEPaperLink_Mini_AP/firmware.bin - cp .pio/build/OpenEPaperLink_Mini_AP/bootloader.bin /home/runner/work/OpenEPaperLink/OpenEPaperLink/OpenEPaperLink_Mini_AP/bootloader.bin - cp .pio/build/OpenEPaperLink_Mini_AP/partitions.bin /home/runner/work/OpenEPaperLink/OpenEPaperLink/OpenEPaperLink_Mini_AP/partitions.bin - cp .pio/build/OpenEPaperLink_Mini_AP/littlefs.bin /home/runner/work/OpenEPaperLink/OpenEPaperLink/OpenEPaperLink_Mini_AP/littlefs.bin - cd /home/runner/work/OpenEPaperLink/OpenEPaperLink/OpenEPaperLink_Mini_AP - 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 OpenEPaperLink_Mini_AP/firmware.bin espbinaries/OpenEPaperLink_Mini_AP.bin - cp OpenEPaperLink_Mini_AP/merged-firmware.bin espbinaries/OpenEPaperLink_Mini_AP_full.bin - - - name: Build firmware for OpenEPaperLink_Nano_AP - run: | - cd ESP32_AP-Flasher - export PLATFORMIO_BUILD_FLAGS="-D BUILD_VERSION=${{ github.ref_name }} -D SHA=$GITHUB_SHA" - pio run --environment OpenEPaperLink_Nano_AP - pio run --target buildfs --environment OpenEPaperLink_Nano_AP - mkdir /home/runner/work/OpenEPaperLink/OpenEPaperLink/OpenEPaperLink_Nano_AP - cp ~/.platformio/packages/framework-arduinoespressif32/tools/partitions/boot_app0.bin /home/runner/work/OpenEPaperLink/OpenEPaperLink/OpenEPaperLink_Nano_AP/boot_app0.bin - cp .pio/build/OpenEPaperLink_Nano_AP/firmware.bin /home/runner/work/OpenEPaperLink/OpenEPaperLink/OpenEPaperLink_Nano_AP/firmware.bin - cp .pio/build/OpenEPaperLink_Nano_AP/bootloader.bin /home/runner/work/OpenEPaperLink/OpenEPaperLink/OpenEPaperLink_Nano_AP/bootloader.bin - cp .pio/build/OpenEPaperLink_Nano_AP/partitions.bin /home/runner/work/OpenEPaperLink/OpenEPaperLink/OpenEPaperLink_Nano_AP/partitions.bin - cp .pio/build/OpenEPaperLink_Nano_AP/littlefs.bin /home/runner/work/OpenEPaperLink/OpenEPaperLink/OpenEPaperLink_Nano_AP/littlefs.bin - cd /home/runner/work/OpenEPaperLink/OpenEPaperLink/OpenEPaperLink_Nano_AP - 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 OpenEPaperLink_Nano_AP/firmware.bin espbinaries/OpenEPaperLink_Nano_AP.bin - cp OpenEPaperLink_Nano_AP/merged-firmware.bin espbinaries/OpenEPaperLink_Nano_AP_full.bin +# +# - name: Build firmware for OpenEPaperLink_Mini_AP +# run: | +# cd ESP32_AP-Flasher +# export PLATFORMIO_BUILD_FLAGS="-D BUILD_VERSION=${{ github.ref_name }} -D SHA=$GITHUB_SHA" +# pio run --environment OpenEPaperLink_Mini_AP +# pio run --target buildfs --environment OpenEPaperLink_Mini_AP +# mkdir /home/runner/work/OpenEPaperLink/OpenEPaperLink/OpenEPaperLink_Mini_AP +# cp ~/.platformio/packages/framework-arduinoespressif32/tools/partitions/boot_app0.bin /home/runner/work/OpenEPaperLink/OpenEPaperLink/OpenEPaperLink_Mini_AP/boot_app0.bin +# cp .pio/build/OpenEPaperLink_Mini_AP/firmware.bin /home/runner/work/OpenEPaperLink/OpenEPaperLink/OpenEPaperLink_Mini_AP/firmware.bin +# cp .pio/build/OpenEPaperLink_Mini_AP/bootloader.bin /home/runner/work/OpenEPaperLink/OpenEPaperLink/OpenEPaperLink_Mini_AP/bootloader.bin +# cp .pio/build/OpenEPaperLink_Mini_AP/partitions.bin /home/runner/work/OpenEPaperLink/OpenEPaperLink/OpenEPaperLink_Mini_AP/partitions.bin +# cp .pio/build/OpenEPaperLink_Mini_AP/littlefs.bin /home/runner/work/OpenEPaperLink/OpenEPaperLink/OpenEPaperLink_Mini_AP/littlefs.bin +# cd /home/runner/work/OpenEPaperLink/OpenEPaperLink/OpenEPaperLink_Mini_AP +# 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 OpenEPaperLink_Mini_AP/firmware.bin espbinaries/OpenEPaperLink_Mini_AP.bin +# cp OpenEPaperLink_Mini_AP/merged-firmware.bin espbinaries/OpenEPaperLink_Mini_AP_full.bin +# +# - name: Build firmware for OpenEPaperLink_Nano_AP +# run: | +# cd ESP32_AP-Flasher +# export PLATFORMIO_BUILD_FLAGS="-D BUILD_VERSION=${{ github.ref_name }} -D SHA=$GITHUB_SHA" +# pio run --environment OpenEPaperLink_Nano_AP +# pio run --target buildfs --environment OpenEPaperLink_Nano_AP +# mkdir /home/runner/work/OpenEPaperLink/OpenEPaperLink/OpenEPaperLink_Nano_AP +# cp ~/.platformio/packages/framework-arduinoespressif32/tools/partitions/boot_app0.bin /home/runner/work/OpenEPaperLink/OpenEPaperLink/OpenEPaperLink_Nano_AP/boot_app0.bin +# cp .pio/build/OpenEPaperLink_Nano_AP/firmware.bin /home/runner/work/OpenEPaperLink/OpenEPaperLink/OpenEPaperLink_Nano_AP/firmware.bin +# cp .pio/build/OpenEPaperLink_Nano_AP/bootloader.bin /home/runner/work/OpenEPaperLink/OpenEPaperLink/OpenEPaperLink_Nano_AP/bootloader.bin +# cp .pio/build/OpenEPaperLink_Nano_AP/partitions.bin /home/runner/work/OpenEPaperLink/OpenEPaperLink/OpenEPaperLink_Nano_AP/partitions.bin +# cp .pio/build/OpenEPaperLink_Nano_AP/littlefs.bin /home/runner/work/OpenEPaperLink/OpenEPaperLink/OpenEPaperLink_Nano_AP/littlefs.bin +# cd /home/runner/work/OpenEPaperLink/OpenEPaperLink/OpenEPaperLink_Nano_AP +# 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 OpenEPaperLink_Nano_AP/firmware.bin espbinaries/OpenEPaperLink_Nano_AP.bin +# cp OpenEPaperLink_Nano_AP/merged-firmware.bin espbinaries/OpenEPaperLink_Nano_AP_full.bin # - name: move files for big APs # run: | @@ -149,6 +164,42 @@ jobs: cd /home/runner/work/OpenEPaperLink/OpenEPaperLink cp ESP32_S3_C6_NANO_AP/firmware.bin espbinaries/ESP32_S3_C6_NANO_AP.bin cp ESP32_S3_C6_NANO_AP/merged-firmware.bin espbinaries/ESP32_S3_C6_NANO_AP_full.bin + + - name: Build firmware for ESP32_S3_16_8_LILYGO_AP + run: | + cd ESP32_AP-Flasher + export PLATFORMIO_BUILD_FLAGS="-D BUILD_VERSION=${{ github.ref_name }} -D SHA=$GITHUB_SHA" + pio run --environment ESP32_S3_16_8_LILYGO_AP + pio run --target buildfs --environment ESP32_S3_16_8_LILYGO_AP + mkdir /home/runner/work/OpenEPaperLink/OpenEPaperLink/ESP32_S3_16_8_LILYGO_AP + cp ~/.platformio/packages/framework-arduinoespressif32/tools/partitions/boot_app0.bin /home/runner/work/OpenEPaperLink/OpenEPaperLink/ESP32_S3_16_8_LILYGO_AP/boot_app0.bin + cp .pio/build/ESP32_S3_16_8_LILYGO_AP/firmware.bin /home/runner/work/OpenEPaperLink/OpenEPaperLink/ESP32_S3_16_8_LILYGO_AP/firmware.bin + cp .pio/build/ESP32_S3_16_8_LILYGO_AP/bootloader.bin /home/runner/work/OpenEPaperLink/OpenEPaperLink/ESP32_S3_16_8_LILYGO_AP/bootloader.bin + cp .pio/build/ESP32_S3_16_8_LILYGO_AP/partitions.bin /home/runner/work/OpenEPaperLink/OpenEPaperLink/ESP32_S3_16_8_LILYGO_AP/partitions.bin + cp .pio/build/ESP32_S3_16_8_LILYGO_AP/littlefs.bin /home/runner/work/OpenEPaperLink/OpenEPaperLink/ESP32_S3_16_8_LILYGO_AP/littlefs.bin + cd /home/runner/work/OpenEPaperLink/OpenEPaperLink/ESP32_S3_16_8_LILYGO_AP + esptool.py --chip esp32-s3 merge_bin -o merged-firmware.bin --flash_mode dio --flash_freq 80m --flash_size 16MB 0x0000 bootloader.bin 0x8000 partitions.bin 0xe000 boot_app0.bin 0x10000 firmware.bin 0x00910000 littlefs.bin + cd /home/runner/work/OpenEPaperLink/OpenEPaperLink + cp ESP32_S3_16_8_LILYGO_AP/firmware.bin espbinaries/ESP32_S3_16_8_LILYGO_AP.bin + cp ESP32_S3_16_8_LILYGO_AP/merged-firmware.bin espbinaries/ESP32_S3_16_8_LILYGO_AP_full.bin + + - name: Build firmware for OpenEPaperLink_Nano_TLSR + run: | + cd ESP32_AP-Flasher + export PLATFORMIO_BUILD_FLAGS="-D BUILD_VERSION=${{ github.ref_name }} -D SHA=$GITHUB_SHA" + pio run --environment OpenEPaperLink_Nano_TLSR + pio run --target buildfs --environment OpenEPaperLink_Nano_TLSR + mkdir /home/runner/work/OpenEPaperLink/OpenEPaperLink/OpenEPaperLink_Nano_TLSR + cp ~/.platformio/packages/framework-arduinoespressif32/tools/partitions/boot_app0.bin /home/runner/work/OpenEPaperLink/OpenEPaperLink/OpenEPaperLink_Nano_TLSR/boot_app0.bin + cp .pio/build/OpenEPaperLink_Nano_TLSR/firmware.bin /home/runner/work/OpenEPaperLink/OpenEPaperLink/OpenEPaperLink_Nano_TLSR/firmware.bin + cp .pio/build/OpenEPaperLink_Nano_TLSR/bootloader.bin /home/runner/work/OpenEPaperLink/OpenEPaperLink/OpenEPaperLink_Nano_TLSR/bootloader.bin + cp .pio/build/OpenEPaperLink_Nano_TLSR/partitions.bin /home/runner/work/OpenEPaperLink/OpenEPaperLink/OpenEPaperLink_Nano_TLSR/partitions.bin + cp .pio/build/OpenEPaperLink_Nano_TLSR/littlefs.bin /home/runner/work/OpenEPaperLink/OpenEPaperLink/OpenEPaperLink_Nano_TLSR/littlefs.bin + cd /home/runner/work/OpenEPaperLink/OpenEPaperLink/OpenEPaperLink_Nano_TLSR + esptool.py --chip esp32-s3 merge_bin -o merged-firmware.bin --flash_mode dio --flash_freq 80m --flash_size 16MB 0x0000 bootloader.bin 0x8000 partitions.bin 0xe000 boot_app0.bin 0x10000 firmware.bin 0x00910000 littlefs.bin + cd /home/runner/work/OpenEPaperLink/OpenEPaperLink + cp OpenEPaperLink_Nano_TLSR/firmware.bin espbinaries/OpenEPaperLink_Nano_TLSR.bin + cp OpenEPaperLink_Nano_TLSR/merged-firmware.bin espbinaries/OpenEPaperLink_Nano_TLSR_full.bin - name: Build firmware for OpenEPaperLink_PoE_AP run: | diff --git a/ESP32_AP-Flasher/platformio.ini b/ESP32_AP-Flasher/platformio.ini index bba916679..583d59cff 100644 --- a/ESP32_AP-Flasher/platformio.ini +++ b/ESP32_AP-Flasher/platformio.ini @@ -260,24 +260,27 @@ board_build.psram_type=qspi_opi board_upload.maximum_size = 16777216 board_upload.maximum_ram_size = 327680 board_upload.flash_size = 16MB +; ---------------------------------------------------------------------------------------- +; !!! this configuration expects an ESP32-S3 16MB Flash 8MB RAM +; ---------------------------------------------------------------------------------------- [env:ESP32_S3_16_8_LILYGO_AP] board = esp32-s3-devkitc-1 board_build.partitions = large_spiffs_16MB.csv +monitor_dtr = 0 +monitor_rts = 0 build_unflags = -std=gnu++11 - -D ARDUINO_USB_MODE=1 -D CONFIG_MBEDTLS_INTERNAL_MEM_ALLOC=y ;-D ILI9341_DRIVER -lib_deps = - ${env.lib_deps} - lib2\Arduino_GFX-1.3.7 +lib_deps = ${env.lib_deps} +lib_extra_dirs = lib2/Arduino_GFX-1.3.7 build_flags = -std=gnu++17 ${env.build_flags} -D HAS_TFT -D HAS_LILYGO_TPANEL - -D CORE_DEBUG_LEVEL=0 - -D ARDUINO_USB_MODE=0 + -D CORE_DEBUG_LEVEL=1 + -D ARDUINO_USB_CDC_ON_BOOT=1 -D CONFIG_ESP32S3_SPIRAM_SUPPORT=1 -D CONFIG_SPIRAM_USE_MALLOC=1 -D POWER_NO_SOFT_POWER @@ -291,34 +294,19 @@ build_flags = -D FLASHER_AP_RESET=34 -D FLASHER_AP_POWER={-1} -D FLASHER_AP_TEST=-1 - -D FLASHER_AP_TXD=48 -D FLASHER_AP_RXD=47 - -D FLASHER_DEBUG_TXD=43 -D FLASHER_DEBUG_RXD=44 -D FLASHER_DEBUG_PROG=33 -D FLASHER_LED=-1 - ;-D HAS_RGB_LED - ;-D FLASHER_RGB_LED=48 - ;-D ST7789_DRIVER - -D TFT_WIDTH=480 -D TFT_HEIGHT=480 - ;-D TFT_MISO=-1 - ;-D TFT_MOSI=13 - ;-D TFT_SCLK=12 - ;-D TFT_CS=10 - ;-D TFT_DC=11 - ;-D TFT_RST=1 - ;-D TFT_RGB_ORDER=TFT_BGR -D USE_HSPI_PORT -D LOAD_FONT2 -D MD5_ENABLED=1 -D SERIAL_FLASHER_INTERFACE_UART=1 - -D SERIAL_FLASHER_BOOT_HOLD_TIME_MS=50 - -D SERIAL_FLASHER_RESET_HOLD_TIME_MS=100 - ;-D C6_OTA_FLASHING - ;-D HAS_SUBGHZ + -D SERIAL_FLASHER_BOOT_HOLD_TIME_MS=200 + -D SERIAL_FLASHER_RESET_HOLD_TIME_MS=200 build_src_filter = +<*>--- board_build.flash_mode=qio