Skip to content

Commit aee0e26

Browse files
committed
clean up
1 parent 49efd06 commit aee0e26

File tree

3 files changed

+33
-36
lines changed

3 files changed

+33
-36
lines changed

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
4544

46-
#if HOST_CLASS_HID
47-
#include "class/hid/hid_host.h"
48-
#endif
45+
#if HOST_CLASS_HID
46+
#include "class/hid/hid_host.h"
47+
#endif
4948

50-
#if CFG_TUH_MSC
51-
#include "class/msc/msc_host.h"
52-
#endif
49+
#if CFG_TUH_MSC
50+
#include "class/msc/msc_host.h"
51+
#endif
5352

54-
#if CFG_TUH_CDC
55-
#include "class/cdc/cdc_host.h"
56-
#endif
53+
#if CFG_TUH_CDC
54+
#include "class/cdc/cdc_host.h"
55+
#endif
5756

58-
#if CFG_TUSB_HOST_CUSTOM_CLASS
59-
#include "class/custom_host.h"
60-
#endif
57+
#if CFG_TUSB_HOST_CUSTOM_CLASS
58+
#include "class/custom_host.h"
59+
#endif
6160

61+
#endif
6262

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

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

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

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

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

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

8888

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

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -131,24 +131,21 @@
131131
#endif
132132

133133
#ifndef CFG_TUSB_MEM_ALIGN
134-
#define CFG_TUSB_MEM_ALIGN ATTR_ALIGNED(4)
134+
#define CFG_TUSB_MEM_ALIGN ATTR_ALIGNED(4)
135135
#endif
136136

137137
#ifndef CFG_TUSB_OS
138-
#define CFG_TUSB_OS OPT_OS_NONE
138+
#define CFG_TUSB_OS OPT_OS_NONE
139139
#endif
140140

141141
//--------------------------------------------------------------------
142142
// DEVICE OPTIONS
143143
//--------------------------------------------------------------------
144+
144145
#ifndef CFG_TUD_ENDOINT0_SIZE
145146
#define CFG_TUD_ENDOINT0_SIZE 64
146147
#endif
147148

148-
#ifndef CFG_TUD_CTRL_BUFSIZE
149-
#define CFG_TUD_CTRL_BUFSIZE 256
150-
#endif
151-
152149
#ifndef CFG_TUD_CDC
153150
#define CFG_TUD_CDC 0
154151
#endif

libraries/Bluefruit52Lib/src/services/BLEHidGeneric.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@
4141
#include "BLECharacteristic.h"
4242
#include "BLEService.h"
4343

44-
// for HID definitions
45-
#include "tusb.h"
44+
// include usb hid definitions
45+
#include "class/hid/hid.h"
4646

4747
enum
4848
{

0 commit comments

Comments
 (0)