summaryrefslogtreecommitdiff
path: root/examples
diff options
context:
space:
mode:
Diffstat (limited to 'examples')
-rw-r--r--examples/device/nrf52840/src/main.c6
-rw-r--r--examples/device/nrf52840/src/tusb_descriptors.c11
2 files changed, 14 insertions, 3 deletions
diff --git a/examples/device/nrf52840/src/main.c b/examples/device/nrf52840/src/main.c
index ec574738e..00937d7d2 100644
--- a/examples/device/nrf52840/src/main.c
+++ b/examples/device/nrf52840/src/main.c
@@ -146,8 +146,8 @@ void print_greeting(void)
printf("This DEVICE demo is configured to support:");
printf(" - RTOS = %s\n", rtos_name[CFG_TUSB_OS]);
- if (CFG_TUD_HID_MOUSE ) puts(" - HID Mouse");
- if (CFG_TUD_HID_KEYBOARD ) puts(" - HID Keyboard");
- if (CFG_TUD_MSC ) puts(" - Mass Storage");
if (CFG_TUD_CDC ) puts(" - Communication Device Class");
+ if (CFG_TUD_MSC ) puts(" - Mass Storage");
+ if (CFG_TUD_HID_KEYBOARD ) puts(" - HID Keyboard");
+ if (CFG_TUD_HID_MOUSE ) puts(" - HID Mouse");
}
diff --git a/examples/device/nrf52840/src/tusb_descriptors.c b/examples/device/nrf52840/src/tusb_descriptors.c
index c088fec7f..b9d4332ee 100644
--- a/examples/device/nrf52840/src/tusb_descriptors.c
+++ b/examples/device/nrf52840/src/tusb_descriptors.c
@@ -66,6 +66,17 @@ uint16_t const * const string_desc_arr [] =
// 5: MSC Interface
TUD_DESC_STRCONV('t','u','s','b',' ','m','s','c'),
#endif
+
+#if CFG_TUD_HID_KEYBOARD
+ // 6: Keyboard
+ TUD_DESC_STRCONV('t','u','s','b',' ','k','e','y','b','o','a','r','d'),
+#endif
+
+#if CFG_TUD_HID_MOUSE
+ // 7: Mouse
+ TUD_DESC_STRCONV('t','u','s','b',' ','m', 'o','u','s','e'),
+#endif
+
};
// tud_desc_set is required by tinyusb stack