xobs/simmel-bootloader
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

follow up to pincofig

Browse Source
This commit is contained in:
hathach 2020-03-01 00:49:52 +07:00
parent 7bd3c5489f
commit 80e0c1501e
4 changed files with 65 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -121,7 +121,9 @@ C_SOURCE_FILES += $(SRC_PATH)/boards.c
C_SOURCE_FILES += $(SRC_PATH)/flash_nrf5x.c C_SOURCE_FILES += $(SRC_PATH)/flash_nrf5x.c
C_SOURCE_FILES += $(SRC_PATH)/dfu_ble_svc.c C_SOURCE_FILES += $(SRC_PATH)/dfu_ble_svc.c
C_SOURCE_FILES += $(SRC_PATH)/dfu_init.c C_SOURCE_FILES += $(SRC_PATH)/dfu_init.c
C_SOURCE_FILES += $(SRC_PATH)/pinconfig.c
# all sources files in specific board
C_SOURCE_FILES += $(wildcard $(SRC_PATH)/boards/$(BOARD)/*.c)
# nrfx # nrfx
C_SOURCE_FILES += $(NRFX_PATH)/drivers/src/nrfx_power.c C_SOURCE_FILES += $(NRFX_PATH)/drivers/src/nrfx_power.c

60
src/boards/arcade_feather_nrf52840_express/board.h
View File

@ -75,65 +75,5 @@
#define UF2_BOARD_ID "nRF52840-Feather-revD" #define UF2_BOARD_ID "nRF52840-Feather-revD"
#define UF2_INDEX_URL "https://www.adafruit.com/product/4062" #define UF2_INDEX_URL "https://www.adafruit.com/product/4062"
#define BOOTLOADER_CONFIG_CF2 \
/* CF2 START */ \
513675505, 539130489, /* magic */ \
49 , 100 , /* used entries, total entries */ \
4 , 0x18 , /* PIN_BTN_A = PIN_RX */ \
5 , 0xa , /* PIN_BTN_B = PIN_D2 */ \
13 , 0x29 , /* PIN_LED = PIN_D13 */ \
18 , 0xf , /* PIN_MISO = PA15 */ \
19 , 0xd , /* PIN_MOSI = PA13 */ \
20 , 0x23 , /* PIN_NEOPIXEL = PB03 */ \
21 , 0x18 , /* PIN_RX = PA24 */ \
23 , 0xe , /* PIN_SCK = PA14 */ \
24 , 0xb , /* PIN_SCL = PA11 */ \
25 , 0xc , /* PIN_SDA = PA12 */ \
28 , 0x19 , /* PIN_TX = PA25 */ \
32 , 0xe , /* PIN_DISPLAY_SCK = PIN_SCK */ \
34 , 0xd , /* PIN_DISPLAY_MOSI = PIN_MOSI */ \
35 , 0x1e , /* PIN_DISPLAY_CS = PIN_A2 */ \
36 , 0x1c , /* PIN_DISPLAY_DC = PIN_A3 */ \
37 , 0xa0 , /* DISPLAY_WIDTH = 160 */ \
38 , 0x80 , /* DISPLAY_HEIGHT = 128 */ \
39 , 0x80 , /* DISPLAY_CFG0 = 0x80 */ \
40 , 0x603 , /* DISPLAY_CFG1 = 0x603 */ \
41 , 0x20 , /* DISPLAY_CFG2 = 0x20 */ \
43 , 0x2 , /* PIN_DISPLAY_RST = PIN_A4 */ \
44 , 0x3 , /* PIN_DISPLAY_BL = PIN_A5 */ \
47 , 0x6 , /* PIN_BTN_LEFT = PIN_D11 */ \
48 , 0x1a , /* PIN_BTN_RIGHT = PIN_D9 */ \
49 , 0x1b , /* PIN_BTN_UP = PIN_D10 */ \
50 , 0x7 , /* PIN_BTN_DOWN = PIN_D6 */ \
51 , 0x8 , /* PIN_BTN_MENU = PIN_D12 */ \
56 , 0x2a , /* PIN_LED2 = PB10 */ \
60 , 0x19 , /* PIN_JACK_TX = PIN_TX */ \
100, 0x4 , /* PIN_A0 = PA04 */ \
101, 0x5 , /* PIN_A1 = PA05 */ \
102, 0x1e , /* PIN_A2 = PA30 */ \
103, 0x1c , /* PIN_A3 = PA28 */ \
104, 0x2 , /* PIN_A4 = PA02 */ \
105, 0x3 , /* PIN_A5 = PA03 */ \
152, 0xa , /* PIN_D2 = PA10 */ \
155, 0x28 , /* PIN_D5 = PB08 */ \
156, 0x7 , /* PIN_D6 = PA07 */ \
159, 0x1a , /* PIN_D9 = PA26 */ \
160, 0x1b , /* PIN_D10 = PA27 */ \
161, 0x6 , /* PIN_D11 = PA06 */ \
162, 0x8 , /* PIN_D12 = PA08 */ \
163, 0x29 , /* PIN_D13 = PB09 */ \
200, 0x1 , /* NUM_NEOPIXELS = 1 */ \
204, 0x100000 , /* FLASH_BYTES = 0x100000 */ \
205, 0x40000 , /* RAM_BYTES = 0x40000 */ \
208, 0xd7688ea1, /* BOOTLOADER_BOARD_ID = 0xd7688ea1 */ \
209, 0xada52840, /* UF2_FAMILY = 0xada52840 */ \
210, 0x20 , /* PINS_PORT_SIZE = PA_32 */ \
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, \
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, \
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, \
0, 0, 0, 0, 0, 0 \
/* CF2 END */
#endif // _ARCARDE_FEATHER_NRF52840_H #endif // _ARCARDE_FEATHER_NRF52840_H

62
src/boards/arcade_feather_nrf52840_express/pinconfig.c Normal file
View File

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

10
src/pinconfig.c
View File

@ -1,10 +0,0 @@
#include "boards.h"
#ifdef BOOTLOADER_CONFIG_CF2
__attribute__((used, section(".bootloaderConfig")))
const uint32_t bootloaderConfig[] = {
BOOTLOADER_CONFIG_CF2
};
#endif