From 9570cc583ae411f4f85cbff31ecfac96b2e8b6eb Mon Sep 17 00:00:00 2001 From: brentru Date: Mon, 21 Oct 2024 15:14:23 -0400 Subject: [PATCH 1/6] fix offset attempt --- .github/workflows/build-clang-doxy.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-clang-doxy.yml b/.github/workflows/build-clang-doxy.yml index 1afce174e..7a85b7ada 100644 --- a/.github/workflows/build-clang-doxy.yml +++ b/.github/workflows/build-clang-doxy.yml @@ -245,13 +245,12 @@ jobs: "itsybitsy_esp32", "wippersnapper_qtpy_esp32c3", "wippersnapper_feather_esp32c6", + "wippersnapper_feather_esp32c6_debug" ] include: - offset: "0x1000" - offset: "0x0" arduino-platform: "wippersnapper_qtpy_esp32c3" - - offset: "0x0" - arduino-platform: "wippersnapper_feather_esp32c6" steps: - uses: actions/setup-python@v5 with: @@ -264,8 +263,8 @@ jobs: echo >>$GITHUB_ENV WS_VERSION=$(git describe --dirty --tags) - uses: actions/checkout@v4 with: - repository: tyeth/ci-arduino - ref: WS_ARDUINO_598-preprocessor-script-for-printing-the-library-versions-to-boot_outtxt + repository: brentru/ci-arduino + ref: debug-c6 path: ci - name: Checkout Board Definitions uses: actions/checkout@v4 @@ -290,7 +289,7 @@ jobs: run: | pip3 install esptool - name: build ESP32 platforms - run: python3 ci/build_platform.py ${{ matrix.arduino-platform }} --build_timeout 48000 --include_print_dependencies_header ./src/print_dependencies.h + run: python3 ci/build_platform.py ${{ matrix.arduino-platform }} --build_timeout 48000 - name: Check artifacts run: | ls examples/Wippersnapper_demo/build/* From 9b2255ac1ae09fe90a06015c4a712dbbce359044 Mon Sep 17 00:00:00 2001 From: brentru Date: Mon, 21 Oct 2024 15:44:41 -0400 Subject: [PATCH 2/6] add offset back for c6 and debug c6 --- .github/workflows/build-clang-doxy.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/build-clang-doxy.yml b/.github/workflows/build-clang-doxy.yml index 7a85b7ada..88d44b452 100644 --- a/.github/workflows/build-clang-doxy.yml +++ b/.github/workflows/build-clang-doxy.yml @@ -251,6 +251,10 @@ jobs: - offset: "0x1000" - offset: "0x0" arduino-platform: "wippersnapper_qtpy_esp32c3" + - offset: "0x0" + arduino-platform: "wippersnapper_feather_esp32c6" + - offset: "0x0" + arduino-platform: "wippersnapper_feather_esp32c6_debug" steps: - uses: actions/setup-python@v5 with: From a999a73e9f8d75838bdbe577799a39fab9715051 Mon Sep 17 00:00:00 2001 From: brentru Date: Mon, 21 Oct 2024 17:13:53 -0400 Subject: [PATCH 3/6] print matrix offset --- .github/workflows/build-clang-doxy.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/build-clang-doxy.yml b/.github/workflows/build-clang-doxy.yml index 88d44b452..8636c322f 100644 --- a/.github/workflows/build-clang-doxy.yml +++ b/.github/workflows/build-clang-doxy.yml @@ -329,6 +329,9 @@ jobs: echo $content echo EOF } >> "$GITHUB_OUTPUT" + - name: Print matrix offset + run: | + echo "Matrix offset: ${{ matrix.offset }}" - name: Create combined binary using Esptool merge_bin run: | echo ${{ steps.get_board_json.outputs.boardJson }} From 45ffc1e91681117be39c9d3cb8023a4c43cbd53f Mon Sep 17 00:00:00 2001 From: brentru Date: Tue, 22 Oct 2024 10:36:28 -0400 Subject: [PATCH 4/6] attempt to fill flash size --- .github/workflows/build-clang-doxy.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-clang-doxy.yml b/.github/workflows/build-clang-doxy.yml index 8636c322f..9bee40ef7 100644 --- a/.github/workflows/build-clang-doxy.yml +++ b/.github/workflows/build-clang-doxy.yml @@ -340,6 +340,7 @@ jobs: --flash_mode ${{fromJson(steps.get_board_json.outputs.boardJson).esptool.flashMode}} \ --flash_freq ${{fromJson(steps.get_board_json.outputs.boardJson).esptool.flashFreq}} \ --flash_size ${{fromJson(steps.get_board_json.outputs.boardJson).esptool.flashSize}} \ + --fill-flash-size ${{fromJson(steps.get_board_json.outputs.boardJson).esptool.flashSize}} \ -o wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.combined.bin \ ${{ matrix.offset }} wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.bootloader.bin \ 0x8000 wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.partitions.bin \ From d8bc70ad2464484a254fe8a43ac9de188e58cf2d Mon Sep 17 00:00:00 2001 From: brentru Date: Tue, 22 Oct 2024 11:16:30 -0400 Subject: [PATCH 5/6] keep --- .github/workflows/build-clang-doxy.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-clang-doxy.yml b/.github/workflows/build-clang-doxy.yml index 9bee40ef7..e6acd4ff0 100644 --- a/.github/workflows/build-clang-doxy.yml +++ b/.github/workflows/build-clang-doxy.yml @@ -337,10 +337,10 @@ jobs: echo ${{ steps.get_board_json.outputs.boardJson }} echo ${{ fromJson(steps.get_board_json.outputs.boardJson) }} python3 -m esptool --chip ${{fromJson(steps.get_board_json.outputs.boardJson).esptool.chip}} merge_bin \ - --flash_mode ${{fromJson(steps.get_board_json.outputs.boardJson).esptool.flashMode}} \ - --flash_freq ${{fromJson(steps.get_board_json.outputs.boardJson).esptool.flashFreq}} \ - --flash_size ${{fromJson(steps.get_board_json.outputs.boardJson).esptool.flashSize}} \ - --fill-flash-size ${{fromJson(steps.get_board_json.outputs.boardJson).esptool.flashSize}} \ + --flash_mode keep \ + --flash_freq keep \ + --flash_size keep \ + --fill-flash-size 4MB \ -o wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.combined.bin \ ${{ matrix.offset }} wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.bootloader.bin \ 0x8000 wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.partitions.bin \ From 5731ce2c56aef642d7550613961f156aa2bb0654 Mon Sep 17 00:00:00 2001 From: brentru Date: Tue, 22 Oct 2024 11:16:57 -0400 Subject: [PATCH 6/6] keep offset 0x0 --- .github/workflows/build-clang-doxy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-clang-doxy.yml b/.github/workflows/build-clang-doxy.yml index e6acd4ff0..91b0be09b 100644 --- a/.github/workflows/build-clang-doxy.yml +++ b/.github/workflows/build-clang-doxy.yml @@ -342,7 +342,7 @@ jobs: --flash_size keep \ --fill-flash-size 4MB \ -o wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.combined.bin \ - ${{ matrix.offset }} wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.bootloader.bin \ + 0x0 wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.bootloader.bin \ 0x8000 wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.partitions.bin \ 0xe000 wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.boot_app0.bin \ 0x10000 wippersnapper.${{ matrix.arduino-platform }}.littlefs.${{ env.WS_VERSION }}.bin