Skip to content

Commit 80e0c15

Browse files
hathachhathach
committed
follow up to pincofig
1 parent 7bd3c54 commit 80e0c15

File tree

4 files changed

+65
-71
lines changed

4 files changed

+65
-71
lines changed

‎Makefile‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,9 @@ C_SOURCE_FILES += $(SRC_PATH)/boards.c
121121
C_SOURCE_FILES += $(SRC_PATH)/flash_nrf5x.c
122122
C_SOURCE_FILES += $(SRC_PATH)/dfu_ble_svc.c
123123
C_SOURCE_FILES += $(SRC_PATH)/dfu_init.c
124-
C_SOURCE_FILES += $(SRC_PATH)/pinconfig.c
124+
125+
# all sources files in specific board
126+
C_SOURCE_FILES += $(wildcard $(SRC_PATH)/boards/$(BOARD)/*.c)
125127

126128
# nrfx
127129
C_SOURCE_FILES += $(NRFX_PATH)/drivers/src/nrfx_power.c

‎src/boards/arcade_feather_nrf52840_express/board.h‎

Lines changed: 0 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -75,65 +75,5 @@
7575
#define UF2_BOARD_ID "nRF52840-Feather-revD"
7676
#define UF2_INDEX_URL "https://www.adafruit.com/product/4062"
7777

78-
#define BOOTLOADER_CONFIG_CF2 \
79-
/* CF2 START */ \
80-
513675505, 539130489, /* magic */ \
81-
49 , 100 , /* used entries, total entries */ \
82-
4 , 0x18 , /* PIN_BTN_A = PIN_RX */ \
83-
5 , 0xa , /* PIN_BTN_B = PIN_D2 */ \
84-
13 , 0x29 , /* PIN_LED = PIN_D13 */ \
85-
18 , 0xf , /* PIN_MISO = PA15 */ \
86-
19 , 0xd , /* PIN_MOSI = PA13 */ \
87-
20 , 0x23 , /* PIN_NEOPIXEL = PB03 */ \
88-
21 , 0x18 , /* PIN_RX = PA24 */ \
89-
23 , 0xe , /* PIN_SCK = PA14 */ \
90-
24 , 0xb , /* PIN_SCL = PA11 */ \
91-
25 , 0xc , /* PIN_SDA = PA12 */ \
92-
28 , 0x19 , /* PIN_TX = PA25 */ \
93-
32 , 0xe , /* PIN_DISPLAY_SCK = PIN_SCK */ \
94-
34 , 0xd , /* PIN_DISPLAY_MOSI = PIN_MOSI */ \
95-
35 , 0x1e , /* PIN_DISPLAY_CS = PIN_A2 */ \
96-
36 , 0x1c , /* PIN_DISPLAY_DC = PIN_A3 */ \
97-
37 , 0xa0 , /* DISPLAY_WIDTH = 160 */ \
98-
38 , 0x80 , /* DISPLAY_HEIGHT = 128 */ \
99-
39 , 0x80 , /* DISPLAY_CFG0 = 0x80 */ \
100-
40 , 0x603 , /* DISPLAY_CFG1 = 0x603 */ \
101-
41 , 0x20 , /* DISPLAY_CFG2 = 0x20 */ \
102-
43 , 0x2 , /* PIN_DISPLAY_RST = PIN_A4 */ \
103-
44 , 0x3 , /* PIN_DISPLAY_BL = PIN_A5 */ \
104-
47 , 0x6 , /* PIN_BTN_LEFT = PIN_D11 */ \
105-
48 , 0x1a , /* PIN_BTN_RIGHT = PIN_D9 */ \
106-
49 , 0x1b , /* PIN_BTN_UP = PIN_D10 */ \
107-
50 , 0x7 , /* PIN_BTN_DOWN = PIN_D6 */ \
108-
51 , 0x8 , /* PIN_BTN_MENU = PIN_D12 */ \
109-
56 , 0x2a , /* PIN_LED2 = PB10 */ \
110-
60 , 0x19 , /* PIN_JACK_TX = PIN_TX */ \
111-
100, 0x4 , /* PIN_A0 = PA04 */ \
112-
101, 0x5 , /* PIN_A1 = PA05 */ \
113-
102, 0x1e , /* PIN_A2 = PA30 */ \
114-
103, 0x1c , /* PIN_A3 = PA28 */ \
115-
104, 0x2 , /* PIN_A4 = PA02 */ \
116-
105, 0x3 , /* PIN_A5 = PA03 */ \
117-
152, 0xa , /* PIN_D2 = PA10 */ \
118-
155, 0x28 , /* PIN_D5 = PB08 */ \
119-
156, 0x7 , /* PIN_D6 = PA07 */ \
120-
159, 0x1a , /* PIN_D9 = PA26 */ \
121-
160, 0x1b , /* PIN_D10 = PA27 */ \
122-
161, 0x6 , /* PIN_D11 = PA06 */ \
123-
162, 0x8 , /* PIN_D12 = PA08 */ \
124-
163, 0x29 , /* PIN_D13 = PB09 */ \
125-
200, 0x1 , /* NUM_NEOPIXELS = 1 */ \
126-
204, 0x100000 , /* FLASH_BYTES = 0x100000 */ \
127-
205, 0x40000 , /* RAM_BYTES = 0x40000 */ \
128-
208, 0xd7688ea1, /* BOOTLOADER_BOARD_ID = 0xd7688ea1 */ \
129-
209, 0xada52840, /* UF2_FAMILY = 0xada52840 */ \
130-
210, 0x20 , /* PINS_PORT_SIZE = PA_32 */ \
131-
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, \
132-
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, \
133-
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, \
134-
0, 0, 0, 0, 0, 0 \
135-
/* CF2 END */
136-
137-
13878
#endif // _ARCARDE_FEATHER_NRF52840_H
13979

‎src/boards/arcade_feather_nrf52840_express/pinconfig.c‎

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
#include "boards.h"
2+
3+
__attribute__((used, section(".bootloaderConfig")))
4+
const uint32_t bootloaderConfig[] = {
5+
/* CF2 START */
6+
513675505, 539130489, // magic
7+
49, 100, // used entries, total entries
8+
4, 0x18, // PIN_BTN_A = PIN_RX
9+
5, 0xa, // PIN_BTN_B = PIN_D2
10+
13, 0x29, // PIN_LED = PIN_D13
11+
18, 0xf, // PIN_MISO = PA15
12+
19, 0xd, // PIN_MOSI = PA13
13+
20, 0x23, // PIN_NEOPIXEL = PB03
14+
21, 0x18, // PIN_RX = PA24
15+
23, 0xe, // PIN_SCK = PA14
16+
24, 0xb, // PIN_SCL = PA11
17+
25, 0xc, // PIN_SDA = PA12
18+
28, 0x19, // PIN_TX = PA25
19+
32, 0xe, // PIN_DISPLAY_SCK = PIN_SCK
20+
34, 0xd, // PIN_DISPLAY_MOSI = PIN_MOSI
21+
35, 0x1e, // PIN_DISPLAY_CS = PIN_A2
22+
36, 0x1c, // PIN_DISPLAY_DC = PIN_A3
23+
37, 0xa0, // DISPLAY_WIDTH = 160
24+
38, 0x80, // DISPLAY_HEIGHT = 128
25+
39, 0x80, // DISPLAY_CFG0 = 0x80
26+
40, 0x603, // DISPLAY_CFG1 = 0x603
27+
41, 0x20, // DISPLAY_CFG2 = 0x20
28+
43, 0x2, // PIN_DISPLAY_RST = PIN_A4
29+
44, 0x3, // PIN_DISPLAY_BL = PIN_A5
30+
47, 0x6, // PIN_BTN_LEFT = PIN_D11
31+
48, 0x1a, // PIN_BTN_RIGHT = PIN_D9
32+
49, 0x1b, // PIN_BTN_UP = PIN_D10
33+
50, 0x7, // PIN_BTN_DOWN = PIN_D6
34+
51, 0x8, // PIN_BTN_MENU = PIN_D12
35+
56, 0x2a, // PIN_LED2 = PB10
36+
60, 0x19, // PIN_JACK_TX = PIN_TX
37+
100, 0x4, // PIN_A0 = PA04
38+
101, 0x5, // PIN_A1 = PA05
39+
102, 0x1e, // PIN_A2 = PA30
40+
103, 0x1c, // PIN_A3 = PA28
41+
104, 0x2, // PIN_A4 = PA02
42+
105, 0x3, // PIN_A5 = PA03
43+
152, 0xa, // PIN_D2 = PA10
44+
155, 0x28, // PIN_D5 = PB08
45+
156, 0x7, // PIN_D6 = PA07
46+
159, 0x1a, // PIN_D9 = PA26
47+
160, 0x1b, // PIN_D10 = PA27
48+
161, 0x6, // PIN_D11 = PA06
49+
162, 0x8, // PIN_D12 = PA08
50+
163, 0x29, // PIN_D13 = PB09
51+
200, 0x1, // NUM_NEOPIXELS = 1
52+
204, 0x100000, // FLASH_BYTES = 0x100000
53+
205, 0x40000, // RAM_BYTES = 0x40000
54+
208, 0xd7688ea1, // BOOTLOADER_BOARD_ID = 0xd7688ea1
55+
209, 0xada52840, // UF2_FAMILY = 0xada52840
56+
210, 0x20, // PINS_PORT_SIZE = PA_32
57+
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
58+
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
59+
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
60+
0, 0, 0, 0, 0, 0,
61+
/* CF2 END */
62+
};

‎src/pinconfig.c‎

Lines changed: 0 additions & 10 deletions
This file was deleted.

0 commit comments

Comments
 (0)