Skip to content

Commit 3791f93

Browse files
committed
remove TUSB_DESC_CONFIG_ATT_REMOTE_WAKEUP from config descriptor
1 parent 0f052bc commit 3791f93

File tree

3 files changed

+5
-16
lines changed

3 files changed

+5
-16
lines changed

src/boards/electronut_labs_papyr/board.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,8 @@
6060
#define UF2_BOARD_ID "nRF52840-Papyr-v1"
6161
#define UF2_INDEX_URL "https://docs.electronut.in/papyr"
6262

63-
#define USB_DESC_VID 0x239A
64-
#define USB_DESC_UF2_PID 0x003B
63+
#define USB_DESC_VID 0x239A
64+
#define USB_DESC_UF2_PID 0x003B
65+
#define USB_DESC_CDC_ONLY_PID 0x003B
6566

6667
#endif // PPAPYR_H

src/usb/usb_desc.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ enum {
8787
uint8_t const desc_configuration_cdc_msc[] =
8888
{
8989
// Interface count, string index, total length, attribute, power in mA
90-
TUD_CONFIG_DESCRIPTOR(1, ITF_NUM_TOTAL, 0, TUD_CONFIG_DESC_LEN + TUD_CDC_DESC_LEN + TUD_MSC_DESC_LEN, TUSB_DESC_CONFIG_ATT_REMOTE_WAKEUP, 100),
90+
TUD_CONFIG_DESCRIPTOR(1, ITF_NUM_TOTAL, 0, TUD_CONFIG_DESC_LEN + TUD_CDC_DESC_LEN + TUD_MSC_DESC_LEN, 0, 100),
9191

9292
// Interface number, string index, EP notification address and size, EP data address (out, in) and size.
9393
TUD_CDC_DESCRIPTOR(ITF_NUM_CDC, ITF_STR_CDC, 0x81, 8, 0x02, 0x82, 64),
@@ -99,7 +99,7 @@ uint8_t const desc_configuration_cdc_msc[] =
9999
uint8_t const desc_configuration_cdc_only[] =
100100
{
101101
// Interface count, string index, total length, attribute, power in mA
102-
TUD_CONFIG_DESCRIPTOR(1, ITF_NUM_TOTAL-1, 0, TUD_CONFIG_DESC_LEN + TUD_CDC_DESC_LEN, TUSB_DESC_CONFIG_ATT_REMOTE_WAKEUP, 100),
102+
TUD_CONFIG_DESCRIPTOR(1, ITF_NUM_TOTAL-1, 0, TUD_CONFIG_DESC_LEN + TUD_CDC_DESC_LEN, 0, 100),
103103

104104
// Interface number, string index, EP notification address and size, EP data address (out, in) and size.
105105
TUD_CDC_DESCRIPTOR(ITF_NUM_CDC, ITF_STR_CDC, 0x81, 8, 0x02, 0x82, 64),

src/usb/usb_desc.h

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -30,16 +30,4 @@
3030

3131
void usb_desc_init(bool cdc_only);
3232

33-
#ifndef USB_DESC_VID
34-
#define USB_DESC_VID 0x239A
35-
#endif
36-
37-
#ifndef USB_DESC_UF2_PID
38-
#define USB_DESC_UF2_PID 0x0029
39-
#endif
40-
41-
#ifndef USB_DESC_CDC_ONLY_PID
42-
#define USB_DESC_CDC_ONLY_PID 0x002A
43-
#endif
44-
4533
#endif /* USB_DESC_H_ */

0 commit comments

Comments
 (0)