Skip to content

Commit 3dcc986

Browse files
authored
Merge pull request #921 from microbit-foundation/microbit-macros
microbit: Set CDC ACM default baud rate for micro:bit v1 and v2.0.
2 parents 8dff8e0 + 1776d33 commit 3dcc986

File tree

4 files changed

+2
-7
lines changed

4 files changed

+2
-7
lines changed

records/board/microbit.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ common:
44
- CDC_LED_DEF=GPIO_LED_ON
55
- MSC_LED_DEF=GPIO_LED_ON
66
- USB_PROD_STR="BBC micro:bit CMSIS-DAP"
7+
- CDC_ACM_DEFAULT_BAUDRATE=115200
78
sources:
89
board:
910
- source/board/microbit.c

records/board/microbitv2.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ common:
88
- DELAY_FAST_CYCLES=2U # Fast delay needed to reach 8MHz SWD clock speed
99
- DAP_DEFAULT_SWJ_CLOCK=8000000
1010
- BOARD_USB_BMAXPOWER=0x96
11-
- BOARD_EXTRA_BUFFER=100
11+
- CDC_ACM_DEFAULT_BAUDRATE=115200
1212
includes:
1313
- source/board/microbitv2/
1414
- source/board/microbitv2/kl27z/

records/board/microbitv2_nrf52820.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ common:
66
- USB_PROD_STR="BBC micro:bit CMSIS-DAP"
77
# - DELAY_FAST_CYCLES=2U # Fast delay needed to reach 8MHz SWD clock speed
88
# - DAP_DEFAULT_SWJ_CLOCK=8000000
9-
- BOARD_EXTRA_BUFFER=100
109
- CDC_ACM_DEFAULT_BAUDRATE=115200
1110
includes:
1211
- source/board/microbitv2/

source/daplink/drag-n-drop/vfs_user.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,6 @@
4545
//! device. This is to accomodate for hex file programming.
4646
#define VFS_DISK_SIZE (MB(64))
4747

48-
// Additional buffer space to display more than 512 bytes in DETAILS.TXT
49-
#if !defined(BOARD_EXTRA_BUFFER)
50-
#define BOARD_EXTRA_BUFFER 0
51-
#endif
52-
5348
//! @brief Constants for magic action or config files.
5449
//!
5550
//! The "magic files" are files with a special name that if created on the USB MSC volume, will

0 commit comments

Comments
 (0)