From 78b39b4347fdc6bfb96d07a32b97b20c9c936e5d Mon Sep 17 00:00:00 2001 From: hathach Date: Thu, 9 May 2024 19:56:52 +0700 Subject: [PATCH 1/3] bump up gcc to 12.3Rel1 --- .github/workflows/githubci.yml | 2 +- CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/githubci.yml b/.github/workflows/githubci.yml index 5d8b275a..8ed72ee3 100644 --- a/.github/workflows/githubci.yml +++ b/.github/workflows/githubci.yml @@ -82,7 +82,7 @@ jobs: - name: Install ARM GCC uses: carlosperate/arm-none-eabi-gcc-action@v1 with: - release: '10-2020-q4' + release: '12.3.Rel1' - name: Install Tools run: | diff --git a/CMakeLists.txt b/CMakeLists.txt index 08ff5c2b..c0ae6f21 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -167,7 +167,7 @@ target_compile_options(bootloader PUBLIC -Wno-endif-labels -Wunreachable-code # Suppress warning caused by SDK - -Wno-unused-parameter -Wno-expansion-to-defined + -Wno-unused-parameter -Wno-expansion-to-defined -Wno-array-bounds ) target_compile_definitions(bootloader PUBLIC SOFTDEVICE_PRESENT From 0bc8a8993f6b7b9a175bc1ba9aafa26f5e534122 Mon Sep 17 00:00:00 2001 From: hathach Date: Thu, 9 May 2024 20:15:16 +0700 Subject: [PATCH 2/3] - add P1.14 as NEOPIXEL_POWER_PIN for feather nrf52840 revE - remove linkermap from ci --- .github/workflows/githubci.yml | 15 ++------------- src/boards/feather_nrf52840_express/board.h | 3 ++- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/.github/workflows/githubci.yml b/.github/workflows/githubci.yml index 8ed72ee3..a31f84e8 100644 --- a/.github/workflows/githubci.yml +++ b/.github/workflows/githubci.yml @@ -65,7 +65,7 @@ jobs: steps: - name: Setup Python - uses: actions/setup-python@v3 + uses: actions/setup-python@v5 - name: Checkout Code uses: actions/checkout@v4 @@ -73,12 +73,6 @@ jobs: fetch-depth: 0 submodules: true - - name: Checkout linkermap - uses: actions/checkout@v4 - with: - repository: hathach/linkermap - path: linkermap - - name: Install ARM GCC uses: carlosperate/arm-none-eabi-gcc-action@v1 with: @@ -87,18 +81,13 @@ jobs: - name: Install Tools run: | pip3 install adafruit-nrfutil uritemplate requests intelhex setuptools - pip3 install linkermap/ - name: Build run: | - arm-none-eabi-gcc --version make BOARD=${{ matrix.board }} all make BOARD=${{ matrix.board }} copy-artifact - - name: Linker Map - run: make BOARD=${{ matrix.board }} linkermap - - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: name: ${{ matrix.board }} path: _bin/${{ matrix.board }} diff --git a/src/boards/feather_nrf52840_express/board.h b/src/boards/feather_nrf52840_express/board.h index 3be5593b..49994f0c 100644 --- a/src/boards/feather_nrf52840_express/board.h +++ b/src/boards/feather_nrf52840_express/board.h @@ -36,6 +36,7 @@ #define LED_STATE_ON 1 #define LED_NEOPIXEL _PINNUM(0, 16) +#define NEOPIXEL_POWER_PIN _PINNUM(1, 14) #define NEOPIXELS_NUMBER 1 #define BOARD_RGB_BRIGHTNESS 0x040404 @@ -63,7 +64,7 @@ //------------- UF2 -------------// #define UF2_PRODUCT_NAME "Adafruit Feather nRF52840 Express" #define UF2_VOLUME_LABEL "FTHR840BOOT" -#define UF2_BOARD_ID "nRF52840-Feather-revD" +#define UF2_BOARD_ID "nRF52840-Feather-revE" #define UF2_INDEX_URL "https://www.adafruit.com/product/4062" #endif // _FEATHER_NRF52840_H From ea3bb737deda02e554e7a9f77e3367b16ebd7036 Mon Sep 17 00:00:00 2001 From: hathach Date: Thu, 9 May 2024 20:17:33 +0700 Subject: [PATCH 3/3] fix ci warning --- .github/workflows/githubci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/githubci.yml b/.github/workflows/githubci.yml index a31f84e8..7174e41a 100644 --- a/.github/workflows/githubci.yml +++ b/.github/workflows/githubci.yml @@ -66,6 +66,8 @@ jobs: steps: - name: Setup Python uses: actions/setup-python@v5 + with: + python-version: '3.x' - name: Checkout Code uses: actions/checkout@v4