Skip to content

Commit a73fe20

Browse files
authored
Merge pull request #328 from adafruit/feather840-revE
add neopixl power pin for Feather840 revE
2 parents e745002 + ea3bb73 commit a73fe20

File tree

3 files changed

+8
-16
lines changed

3 files changed

+8
-16
lines changed

.github/workflows/githubci.yml

+5-14
Original file line numberDiff line numberDiff line change
@@ -65,40 +65,31 @@ jobs:
6565

6666
steps:
6767
- name: Setup Python
68-
uses: actions/setup-python@v3
68+
uses: actions/setup-python@v5
69+
with:
70+
python-version: '3.x'
6971

7072
- name: Checkout Code
7173
uses: actions/checkout@v4
7274
with:
7375
fetch-depth: 0
7476
submodules: true
7577

76-
- name: Checkout linkermap
77-
uses: actions/checkout@v4
78-
with:
79-
repository: hathach/linkermap
80-
path: linkermap
81-
8278
- name: Install ARM GCC
8379
uses: carlosperate/arm-none-eabi-gcc-action@v1
8480
with:
85-
release: '10-2020-q4'
81+
release: '12.3.Rel1'
8682

8783
- name: Install Tools
8884
run: |
8985
pip3 install adafruit-nrfutil uritemplate requests intelhex setuptools
90-
pip3 install linkermap/
9186
9287
- name: Build
9388
run: |
94-
arm-none-eabi-gcc --version
9589
make BOARD=${{ matrix.board }} all
9690
make BOARD=${{ matrix.board }} copy-artifact
9791
98-
- name: Linker Map
99-
run: make BOARD=${{ matrix.board }} linkermap
100-
101-
- uses: actions/upload-artifact@v3
92+
- uses: actions/upload-artifact@v4
10293
with:
10394
name: ${{ matrix.board }}
10495
path: _bin/${{ matrix.board }}

CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ target_compile_options(bootloader PUBLIC
167167
-Wno-endif-labels
168168
-Wunreachable-code
169169
# Suppress warning caused by SDK
170-
-Wno-unused-parameter -Wno-expansion-to-defined
170+
-Wno-unused-parameter -Wno-expansion-to-defined -Wno-array-bounds
171171
)
172172
target_compile_definitions(bootloader PUBLIC
173173
SOFTDEVICE_PRESENT

src/boards/feather_nrf52840_express/board.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
#define LED_STATE_ON 1
3737

3838
#define LED_NEOPIXEL _PINNUM(0, 16)
39+
#define NEOPIXEL_POWER_PIN _PINNUM(1, 14)
3940
#define NEOPIXELS_NUMBER 1
4041
#define BOARD_RGB_BRIGHTNESS 0x040404
4142

@@ -63,7 +64,7 @@
6364
//------------- UF2 -------------//
6465
#define UF2_PRODUCT_NAME "Adafruit Feather nRF52840 Express"
6566
#define UF2_VOLUME_LABEL "FTHR840BOOT"
66-
#define UF2_BOARD_ID "nRF52840-Feather-revD"
67+
#define UF2_BOARD_ID "nRF52840-Feather-revE"
6768
#define UF2_INDEX_URL "https://www.adafruit.com/product/4062"
6869

6970
#endif // _FEATHER_NRF52840_H

0 commit comments

Comments
 (0)