Skip to content

Commit 2107d4e

Browse files
hathachhathach
authored
Merge pull request #291 from aovestdipaperino/master
Add support for XIAO BLE Sense boards
2 parents da70d4a + 1bca78c commit 2107d4e

File tree

7 files changed

+181
-1
lines changed

7 files changed

+181
-1
lines changed

‎.github/workflows/githubci.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,9 @@ jobs:
5858
- 'raytac_mdbt50q_rx'
5959
- 'sparkfun_nrf52840_micromod'
6060
- 'waveshare_nrf52840_eval'
61-
61+
- 'xiao_nrf52840_ble'
62+
- 'xiao_nrf52840_ble_sense'
63+
6264
steps:
6365
- name: Setup Python
6466
uses: actions/setup-python@v3

‎src/boards/xiao_nrf52840_ble/board.h

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
/*
2+
* The MIT License (MIT)
3+
*
4+
* Copyright (c) 2018 Ha Thach for Adafruit Industries
5+
*
6+
* Permission is hereby granted, free of charge, to any person obtaining a copy
7+
* of this software and associated documentation files (the "Software"), to deal
8+
* in the Software without restriction, including without limitation the rights
9+
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
10+
* copies of the Software, and to permit persons to whom the Software is
11+
* furnished to do so, subject to the following conditions:
12+
*
13+
* The above copyright notice and this permission notice shall be included in
14+
* all copies or substantial portions of the Software.
15+
*
16+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
17+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
18+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
19+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
20+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
21+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
22+
* THE SOFTWARE.
23+
*/
24+
25+
#ifndef _XIAO_BLE
26+
#define _XIAO_BLE
27+
28+
#define _PINNUM(port, pin) ((port)*32 + (pin))
29+
30+
/*------------------------------------------------------------------*/
31+
/* LED
32+
*------------------------------------------------------------------*/
33+
// The board has 3 leds, but changing the number here causes OTA issues.
34+
#define LEDS_NUMBER 1
35+
#define LED_PRIMARY_PIN _PINNUM(0, 26)
36+
#define LED_STATE_ON 0
37+
38+
#define NEOPIXELS_NUMBER 0
39+
40+
/*------------------------------------------------------------------*/
41+
/* BUTTON
42+
*------------------------------------------------------------------*/
43+
#define BUTTONS_NUMBER 2
44+
#define BUTTON_1 _PINNUM(0, 18)
45+
// Button 2 is defined as D1 from expansion board.
46+
#define BUTTON_2 _PINNUM(0, 3)
47+
#define BUTTON_PULL NRF_GPIO_PIN_PULLUP
48+
49+
//--------------------------------------------------------------------+
50+
// BLE OTA
51+
//--------------------------------------------------------------------+
52+
#define BLEDIS_MANUFACTURER "Seeed"
53+
#define BLEDIS_MODEL "XIAO nRF52840"
54+
55+
//--------------------------------------------------------------------+
56+
// USB
57+
//--------------------------------------------------------------------+
58+
#define USB_DESC_VID 0x2886
59+
#define USB_DESC_UF2_PID 0x0044
60+
#define USB_DESC_CDC_ONLY_PID 0x0044
61+
62+
//------------- UF2 -------------//
63+
#define UF2_PRODUCT_NAME "Seeed XIAO nRF52840"
64+
#define UF2_VOLUME_LABEL "XIAO-BOOT"
65+
#define UF2_BOARD_ID "nRF52840-SeeedXiao-v1"
66+
#define UF2_INDEX_URL "https://www.seeedstudio.com/"
67+
68+
#endif // _XIAO_BLE

‎src/boards/xiao_nrf52840_ble/board.mk

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
MCU_SUB_VARIANT = nrf52840
2+
SD_VERSION = 7.3.0

‎src/boards/xiao_nrf52840_ble/pinconfig.c

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
#include "boards.h"
2+
#include "uf2/configkeys.h"
3+
4+
__attribute__((used, section(".bootloaderConfig")))
5+
const uint32_t bootloaderConfig[] =
6+
{
7+
/* CF2 START */
8+
CFG_MAGIC0, CFG_MAGIC1, // magic
9+
5, 100, // used entries, total entries
10+
11+
204, 0x100000, // FLASH_BYTES = 0x100000
12+
205, 0x40000, // RAM_BYTES = 0x40000
13+
208, (USB_DESC_VID << 16) | USB_DESC_UF2_PID, // BOOTLOADER_BOARD_ID = USB VID+PID, used for verification when updating bootloader via uf2
14+
209, 0xada52840, // UF2_FAMILY = 0xada52840
15+
210, 0x20, // PINS_PORT_SIZE = PA_32
16+
17+
0, 0, 0, 0, 0, 0, 0, 0
18+
/* CF2 END */
19+
};

‎src/boards/xiao_nrf52840_ble_sense/board.h

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
/*
2+
* The MIT License (MIT)
3+
*
4+
* Copyright (c) 2018 Ha Thach for Adafruit Industries
5+
*
6+
* Permission is hereby granted, free of charge, to any person obtaining a copy
7+
* of this software and associated documentation files (the "Software"), to deal
8+
* in the Software without restriction, including without limitation the rights
9+
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
10+
* copies of the Software, and to permit persons to whom the Software is
11+
* furnished to do so, subject to the following conditions:
12+
*
13+
* The above copyright notice and this permission notice shall be included in
14+
* all copies or substantial portions of the Software.
15+
*
16+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
17+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
18+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
19+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
20+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
21+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
22+
* THE SOFTWARE.
23+
*/
24+
25+
#ifndef _XIAO_BLE_SENSE
26+
#define _XIAO_BLE_SENSE
27+
28+
#define _PINNUM(port, pin) ((port)*32 + (pin))
29+
30+
/*------------------------------------------------------------------*/
31+
/* LED
32+
*------------------------------------------------------------------*/
33+
// The board has 3 leds, but changing the number here causes OTA issues.
34+
#define LEDS_NUMBER 1
35+
#define LED_PRIMARY_PIN _PINNUM(0, 26)
36+
#define LED_STATE_ON 0
37+
38+
#define NEOPIXELS_NUMBER 0
39+
40+
/*------------------------------------------------------------------*/
41+
/* BUTTON
42+
*------------------------------------------------------------------*/
43+
#define BUTTONS_NUMBER 2
44+
#define BUTTON_1 _PINNUM(0, 18)
45+
// Button 2 is defined as D1 from expansion board.
46+
#define BUTTON_2 _PINNUM(0, 3)
47+
#define BUTTON_PULL NRF_GPIO_PIN_PULLUP
48+
49+
//--------------------------------------------------------------------+
50+
// BLE OTA
51+
//--------------------------------------------------------------------+
52+
#define BLEDIS_MANUFACTURER "Seeed"
53+
#define BLEDIS_MODEL "XIAO nRF52840 Sense"
54+
55+
//--------------------------------------------------------------------+
56+
// USB
57+
//--------------------------------------------------------------------+
58+
#define USB_DESC_VID 0x2886
59+
#define USB_DESC_UF2_PID 0x0045
60+
#define USB_DESC_CDC_ONLY_PID 0x0045
61+
62+
//------------- UF2 -------------//
63+
#define UF2_PRODUCT_NAME "Seeed XIAO nRF52840"
64+
#define UF2_VOLUME_LABEL "XIAO-SENSE"
65+
#define UF2_BOARD_ID "nRF52840-SeeedXiaoSense-v1"
66+
#define UF2_INDEX_URL "https://www.seeedstudio.com/"
67+
68+
#endif // _XIAO_BLE_SENSE

‎src/boards/xiao_nrf52840_ble_sense/board.mk

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
MCU_SUB_VARIANT = nrf52840
2+
SD_VERSION = 7.3.0

‎src/boards/xiao_nrf52840_ble_sense/pinconfig.c

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
#include "boards.h"
2+
#include "uf2/configkeys.h"
3+
4+
__attribute__((used, section(".bootloaderConfig")))
5+
const uint32_t bootloaderConfig[] =
6+
{
7+
/* CF2 START */
8+
CFG_MAGIC0, CFG_MAGIC1, // magic
9+
5, 100, // used entries, total entries
10+
11+
204, 0x100000, // FLASH_BYTES = 0x100000
12+
205, 0x40000, // RAM_BYTES = 0x40000
13+
208, (USB_DESC_VID << 16) | USB_DESC_UF2_PID, // BOOTLOADER_BOARD_ID = USB VID+PID, used for verification when updating bootloader via uf2
14+
209, 0xada52840, // UF2_FAMILY = 0xada52840
15+
210, 0x20, // PINS_PORT_SIZE = PA_32
16+
17+
0, 0, 0, 0, 0, 0, 0, 0
18+
/* CF2 END */
19+
};

0 commit comments

Comments
 (0)