Skip to content

Commit a03767a

Browse files
hathachhathach
committed
fix blehidb build, clean up boads.txt and platform.txt
1 parent 1ab4bff commit a03767a

File tree

7 files changed

+117
-140
lines changed

7 files changed

+117
-140
lines changed

‎boards.txt

Lines changed: 58 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919
menu.softdevice=Bootloader Version
2020
menu.debug=Debug Mode
2121

22-
#**********************************************
23-
# Bluefruit Feather nRF52832 Board
24-
#**********************************************
25-
feather52832.name=Adafruit Bluefruit nRF52832 Feather
22+
# ----------------------------------
23+
# Bluefruit Feather nRF52832
24+
# ----------------------------------
25+
feather52832.name=Adafruit Bluefruit Feather nRF52832
2626
feather52832.bootloader.tool=bootburn
2727

2828
# Upload
@@ -31,6 +31,8 @@ feather52832.upload.protocol=nrfutil
3131
feather52832.upload.use_1200bps_touch=false
3232
feather52832.upload.wait_for_upload_port=false
3333
feather52832.upload.native_usb=false
34+
feather52832.upload.maximum_size=290816
35+
feather52832.upload.maximum_data_size=51072
3436

3537
# Build
3638
feather52832.build.mcu=cortex-m4
@@ -41,179 +43,161 @@ feather52832.build.variant=feather_nrf52832
4143
feather52832.build.extra_flags=-DNRF52832_XXAA -DNRF52 -DARDUINO_NRF52_FEATHER
4244

4345
# SofDevice Menu
44-
# Ram & ROM size varies depending on SoftDevice (check linker script)
45-
4646
feather52832.menu.softdevice.s132v6=0.2.9 (s132 6.1.1)
4747
feather52832.menu.softdevice.s132v6.build.sd_name=s132
4848
feather52832.menu.softdevice.s132v6.build.sd_version=6.1.1
4949
feather52832.menu.softdevice.s132v6.build.sd_fwid=0x00B7
5050
feather52832.menu.softdevice.s132v6.build.ldscript=nrf52832_s132_v6.ld
51-
feather52832.menu.softdevice.s132v6.upload.maximum_size=290816
52-
feather52832.menu.softdevice.s132v6.upload.maximum_data_size=51072
5351

5452
# Debug Menu
5553
feather52832.menu.debug.l0=Level 0 (Release)
56-
feather52832.menu.debug.l0.build.debug_flags=-DCFG_DEBUG=0 -Os
54+
feather52832.menu.debug.l0.build.debug_flags=-DCFG_DEBUG=0
5755
feather52832.menu.debug.l1=Level 1 (Error Message)
58-
feather52832.menu.debug.l1.build.debug_flags=-DCFG_DEBUG=1 -Os
56+
feather52832.menu.debug.l1.build.debug_flags=-DCFG_DEBUG=1
5957
feather52832.menu.debug.l2=Level 2 (Full Debug)
60-
feather52832.menu.debug.l2.build.debug_flags=-DCFG_DEBUG=2 -Os
58+
feather52832.menu.debug.l2.build.debug_flags=-DCFG_DEBUG=2
6159
feather52832.menu.debug.l3=Level 3 (Segger SystemView)
62-
feather52832.menu.debug.l3.build.debug_flags=-DCFG_DEBUG=3 -Os
63-
60+
feather52832.menu.debug.l3.build.debug_flags=-DCFG_DEBUG=3
6461

65-
#**********************************************
66-
# Bluefruit Feather nRF52840 Express Board
67-
#**********************************************
68-
feather52840.name=Adafruit Bluefruit nRF52840 Feather Express
62+
# ----------------------------------
63+
# Bluefruit Feather nRF52840 Express
64+
# ----------------------------------
65+
feather52840.name=Adafruit Bluefruit Feather nRF52840 Express
6966

70-
# DFU Mode with CDC + MSC (UF2)
67+
# VID/PID for bootloader with/without UF2, Arduino + Circuitpython App
7168
feather52840.vid.0=0x239A
72-
feather52840.pid.0=0x0029
73-
74-
# DFU Mode with CDC only
69+
feather52840.pid.0=0x8029
7570
feather52840.vid.1=0x239A
76-
feather52840.pid.1=0x002A
77-
78-
# Arduino Application
71+
feather52840.pid.1=0x0029
7972
feather52840.vid.2=0x239A
80-
feather52840.pid.2=0x8029
81-
82-
# CircuitPython
73+
feather52840.pid.2=0x002A
8374
feather52840.vid.3=0x239A
8475
feather52840.pid.3=0x802A
8576

86-
feather52840.bootloader.tool=bootburn
87-
8877
# Upload
78+
feather52840.bootloader.tool=bootburn
8979
feather52840.upload.tool=nrfutil
9080
feather52840.upload.protocol=nrfutil
9181
feather52840.upload.use_1200bps_touch=true
9282
feather52840.upload.wait_for_upload_port=true
83+
feather52840.upload.maximum_size=815104
84+
feather52840.upload.maximum_data_size=248832
9385

9486
# Build
9587
feather52840.build.mcu=cortex-m4
9688
feather52840.build.f_cpu=64000000
9789
feather52840.build.board=NRF52840_FEATHER
9890
feather52840.build.core=nRF5
9991
feather52840.build.variant=feather_nrf52840_express
100-
feather52840.build.extra_flags=-DARDUINO_NRF52_FEATHER {build.nrf52840_flags}
92+
feather52840.build.extra_flags=-DNRF52840_XXAA -DARDUINO_NRF52_FEATHER {build.flags.usb}
93+
feather52840.build.vid=0x239A
94+
feather52840.build.pid=0x8029
10195

10296
# SofDevice Menu
103-
# Ram & ROM size varies depending on SoftDevice (check linker script)
104-
10597
feather52840.menu.softdevice.s140v6=0.2.9 (s140 6.1.1)
10698
feather52840.menu.softdevice.s140v6.build.sd_name=s140
10799
feather52840.menu.softdevice.s140v6.build.sd_version=6.1.1
108100
feather52840.menu.softdevice.s140v6.build.sd_fwid=0x00B6
109101
feather52840.menu.softdevice.s140v6.build.ldscript=nrf52840_s140_v6.ld
110-
feather52840.menu.softdevice.s140v6.upload.maximum_size=815104
111-
feather52840.menu.softdevice.s140v6.upload.maximum_data_size=248832
112102

113103
# Debug Menu
114104
feather52840.menu.debug.l0=Level 0 (Release)
115-
feather52840.menu.debug.l0.build.debug_flags=-DCFG_DEBUG=0 -Os
105+
feather52840.menu.debug.l0.build.debug_flags=-DCFG_DEBUG=0
116106
feather52840.menu.debug.l1=Level 1 (Error Message)
117-
feather52840.menu.debug.l1.build.debug_flags=-DCFG_DEBUG=1 -Os
107+
feather52840.menu.debug.l1.build.debug_flags=-DCFG_DEBUG=1
118108
feather52840.menu.debug.l2=Level 2 (Full Debug)
119-
feather52840.menu.debug.l2.build.debug_flags=-DCFG_DEBUG=2 -Os
109+
feather52840.menu.debug.l2.build.debug_flags=-DCFG_DEBUG=2
120110
feather52840.menu.debug.l3=Level 3 (Segger SystemView)
121-
feather52840.menu.debug.l3.build.debug_flags=-DCFG_DEBUG=3 -Os
111+
feather52840.menu.debug.l3.build.debug_flags=-DCFG_DEBUG=3
122112

123-
#**********************************************
124-
# Bluefruit Metro nRF52840 Express Board
125-
#**********************************************
126-
metro52840.name=Adafruit Bluefruit nRF52840 Metro Express
127-
metro52840.bootloader.tool=bootburn
113+
# ----------------------------------
114+
# Bluefruit Metro nRF52840 Express
115+
# ----------------------------------
116+
metro52840.name=Adafruit Bluefruit Metro nRF52840 Express
128117

129-
# DFU Mode with CDC + MSC (UF2)
118+
# VID/PID for bootloader with/without UF2, Arduino + Circuitpython App
130119
metro52840.vid.0=0x239A
131-
metro52840.pid.0=0x003F
132-
133-
# DFU Mode with CDC only
120+
metro52840.pid.0=0x803F
134121
metro52840.vid.1=0x239A
135-
metro52840.pid.1=0x0040
136-
137-
# Arduino Application
122+
metro52840.pid.1=0x003F
138123
metro52840.vid.2=0x239A
139-
metro52840.pid.2=0x803F
140-
141-
# CircuitPython
124+
metro52840.pid.2=0x0040
142125
metro52840.vid.3=0x239A
143126
metro52840.pid.3=0x8040
144127

145128
# Upload
129+
metro52840.bootloader.tool=bootburn
146130
metro52840.upload.tool=nrfutil
147131
metro52840.upload.protocol=nrfutil
148132
metro52840.upload.use_1200bps_touch=true
149133
metro52840.upload.wait_for_upload_port=true
134+
metro52840.upload.maximum_size=815104
135+
metro52840.upload.maximum_data_size=248832
150136

151137
# Build
152138
metro52840.build.mcu=cortex-m4
153139
metro52840.build.f_cpu=64000000
154140
metro52840.build.board=NRF52840_METRO
155141
metro52840.build.core=nRF5
156142
metro52840.build.variant=metro_nrf52840_express
157-
metro52840.build.extra_flags=-DARDUINO_NRF52_FEATHER {build.nrf52840_flags}
143+
metro52840.build.extra_flags=-DNRF52840_XXAA -DARDUINO_NRF52_FEATHER {build.flags.usb}
144+
metro52840.build.vid=0x239A
145+
metro52840.build.pid=0x803F
158146

159147
# SofDevice Menu
160-
# Ram & ROM size varies depending on SoftDevice (check linker script)
161-
162148
metro52840.menu.softdevice.s140v6=0.2.9 (s140 6.1.1)
163149
metro52840.menu.softdevice.s140v6.build.sd_name=s140
164150
metro52840.menu.softdevice.s140v6.build.sd_version=6.1.1
165151
metro52840.menu.softdevice.s140v6.build.sd_fwid=0x00B6
166152
metro52840.menu.softdevice.s140v6.build.ldscript=nrf52840_s140_v6.ld
167-
metro52840.menu.softdevice.s140v6.upload.maximum_size=815104
168-
metro52840.menu.softdevice.s140v6.upload.maximum_data_size=248832
169153

170154
# Debug Menu
171155
metro52840.menu.debug.l0=Level 0 (Release)
172-
metro52840.menu.debug.l0.build.debug_flags=-DCFG_DEBUG=0 -Os
156+
metro52840.menu.debug.l0.build.debug_flags=-DCFG_DEBUG=0
173157
metro52840.menu.debug.l1=Level 1 (Error Message)
174-
metro52840.menu.debug.l1.build.debug_flags=-DCFG_DEBUG=1 -Os
158+
metro52840.menu.debug.l1.build.debug_flags=-DCFG_DEBUG=1
175159
metro52840.menu.debug.l2=Level 2 (Full Debug)
176-
metro52840.menu.debug.l2.build.debug_flags=-DCFG_DEBUG=2 -Os
160+
metro52840.menu.debug.l2.build.debug_flags=-DCFG_DEBUG=2
177161
metro52840.menu.debug.l3=Level 3 (Segger SystemView)
178-
metro52840.menu.debug.l3.build.debug_flags=-DCFG_DEBUG=3 -Os
162+
metro52840.menu.debug.l3.build.debug_flags=-DCFG_DEBUG=3
179163

180-
#**********************************************
164+
# ----------------------------------
181165
# Nordic nRF52840DK (PCA10056)
182-
#**********************************************
183-
pca10056.name=Adafruit Bluefruit on nRF52840DK PCA10056
166+
# ----------------------------------
167+
pca10056.name=Noridc nRF52840DK (PCA10056)
184168
pca10056.bootloader.tool=bootburn
185169

186170
# Upload
187171
pca10056.upload.tool=nrfutil
188172
pca10056.upload.protocol=nrfutil
189173
pca10056.upload.use_1200bps_touch=true
190174
pca10056.upload.wait_for_upload_port=true
175+
pca10056.upload.maximum_size=815104
176+
pca10056.upload.maximum_data_size=248832
191177

192178
# Build
193179
pca10056.build.mcu=cortex-m4
194180
pca10056.build.f_cpu=64000000
195181
pca10056.build.board=NRF52840_PCA10056
196182
pca10056.build.core=nRF5
197183
pca10056.build.variant=pca10056
198-
pca10056.build.extra_flags={build.nrf52840_flags}
184+
pca10056.build.extra_flags=-DNRF52840_XXAA {build.flags.usb}
185+
pca10056.build.vid=0x239A
186+
pca10056.build.pid=0x8029
199187

200188
# SofDevice Menu
201-
# Ram & ROM size varies depending on SoftDevice (check linker script)
202-
203189
pca10056.menu.softdevice.s140v6=0.2.9 (s140 6.1.1)
204190
pca10056.menu.softdevice.s140v6.build.sd_name=s140
205191
pca10056.menu.softdevice.s140v6.build.sd_version=6.1.1
206192
pca10056.menu.softdevice.s140v6.build.sd_fwid=0x00B6
207193
pca10056.menu.softdevice.s140v6.build.ldscript=nrf52840_s140_v6.ld
208-
pca10056.menu.softdevice.s140v6.upload.maximum_size=815104
209-
pca10056.menu.softdevice.s140v6.upload.maximum_data_size=248832
210194

211195
# Debug Menu
212196
pca10056.menu.debug.l0=Level 0 (Release)
213-
pca10056.menu.debug.l0.build.debug_flags=-DCFG_DEBUG=0 -Os
197+
pca10056.menu.debug.l0.build.debug_flags=-DCFG_DEBUG=0
214198
pca10056.menu.debug.l1=Level 1 (Error Message)
215-
pca10056.menu.debug.l1.build.debug_flags=-DCFG_DEBUG=1 -Os
199+
pca10056.menu.debug.l1.build.debug_flags=-DCFG_DEBUG=1
216200
pca10056.menu.debug.l2=Level 2 (Full Debug)
217-
pca10056.menu.debug.l2.build.debug_flags=-DCFG_DEBUG=2 -Os
201+
pca10056.menu.debug.l2.build.debug_flags=-DCFG_DEBUG=2
218202
pca10056.menu.debug.l3=Level 3 (Segger SystemView)
219-
pca10056.menu.debug.l3.build.debug_flags=-DCFG_DEBUG=3 -Os
203+
pca10056.menu.debug.l3.build.debug_flags=-DCFG_DEBUG=3

‎cores/nRF5/Adafruit_TinyUSB_Core/tinyusb/src/tusb.h

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -41,48 +41,48 @@
4141
//------------- HOST -------------//
4242
#if TUSB_OPT_HOST_ENABLED
4343
#include "host/usbh.h"
44+
#endif
4445

45-
#if HOST_CLASS_HID
46-
#include "class/hid/hid_host.h"
47-
#endif
48-
49-
#if CFG_TUH_MSC
50-
#include "class/msc/msc_host.h"
51-
#endif
46+
#if HOST_CLASS_HID
47+
#include "class/hid/hid_host.h"
48+
#endif
5249

53-
#if CFG_TUH_CDC
54-
#include "class/cdc/cdc_host.h"
55-
#endif
50+
#if CFG_TUH_MSC
51+
#include "class/msc/msc_host.h"
52+
#endif
5653

57-
#if CFG_TUSB_HOST_CUSTOM_CLASS
58-
#include "class/custom_host.h"
59-
#endif
54+
#if CFG_TUH_CDC
55+
#include "class/cdc/cdc_host.h"
56+
#endif
6057

58+
#if CFG_TUSB_HOST_CUSTOM_CLASS
59+
#include "class/custom_host.h"
6160
#endif
6261

62+
6363
//------------- DEVICE -------------//
6464
#if TUSB_OPT_DEVICE_ENABLED
6565
#include "device/usbd.h"
66+
#endif
6667

67-
#if CFG_TUD_HID
68-
#include "class/hid/hid_device.h"
69-
#endif
68+
#if CFG_TUD_HID
69+
#include "class/hid/hid_device.h"
70+
#endif
7071

71-
#if CFG_TUD_CDC
72-
#include "class/cdc/cdc_device.h"
73-
#endif
72+
#if CFG_TUD_CDC
73+
#include "class/cdc/cdc_device.h"
74+
#endif
7475

75-
#if CFG_TUD_MSC
76-
#include "class/msc/msc_device.h"
77-
#endif
76+
#if CFG_TUD_MSC
77+
#include "class/msc/msc_device.h"
78+
#endif
7879

79-
#if CFG_TUD_MIDI
80-
#include "class/midi/midi_device.h"
81-
#endif
80+
#if CFG_TUD_MIDI
81+
#include "class/midi/midi_device.h"
82+
#endif
8283

83-
#if CFG_TUD_CUSTOM_CLASS
84-
#include "class/custom/custom_device.h"
85-
#endif
84+
#if CFG_TUD_CUSTOM_CLASS
85+
#include "class/custom/custom_device.h"
8686
#endif
8787

8888

‎cores/nRF5/Adafruit_TinyUSB_Core/tinyusb/src/tusb_option.h

Lines changed: 23 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -147,25 +147,34 @@
147147
//--------------------------------------------------------------------
148148
// DEVICE OPTIONS
149149
//--------------------------------------------------------------------
150-
#if TUSB_OPT_DEVICE_ENABLED
150+
#ifndef CFG_TUD_ENDOINT0_SIZE
151+
#define CFG_TUD_ENDOINT0_SIZE 64
152+
#endif
151153

152-
#ifndef CFG_TUD_ENDOINT0_SIZE
153-
#define CFG_TUD_ENDOINT0_SIZE 64
154-
#endif
154+
#ifndef CFG_TUD_CTRL_BUFSIZE
155+
#define CFG_TUD_CTRL_BUFSIZE 256
156+
#endif
155157

156-
#ifndef CFG_TUD_CTRL_BUFSIZE
157-
#define CFG_TUD_CTRL_BUFSIZE 256
158-
#endif
158+
#ifndef CFG_TUD_CDC
159+
#define CFG_TUD_CDC 0
160+
#endif
159161

160-
#ifndef CFG_TUD_CDC
161-
#define CFG_TUD_CDC 0
162-
#endif
162+
#ifndef CFG_TUD_MSC
163+
#define CFG_TUD_MSC 0
164+
#endif
163165

164-
#ifndef CFG_TUD_MSC
165-
#define CFG_TUD_MSC 0
166-
#endif
166+
#ifndef CFG_TUD_HID
167+
#define CFG_TUD_HID 0
168+
#endif
169+
170+
#ifndef CFG_TUD_MIDI
171+
#define CFG_TUD_MIDI 0
172+
#endif
173+
174+
#ifndef CFG_TUD_CUSTOM_CLASS
175+
#define CFG_TUD_CUSTOM_CLASS 0
176+
#endif
167177

168-
#endif // TUSB_OPT_DEVICE_ENABLED
169178

170179
//--------------------------------------------------------------------
171180
// HOST OPTIONS

0 commit comments

Comments
 (0)