summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhathach <[email protected]>2014-03-02 21:39:18 +0700
committerhathach <[email protected]>2014-03-02 21:39:18 +0700
commit90b7ead01749fe2e806ff29a91f4c2b04e4135e3 (patch)
tree09aad4c73610a8e7d53933ebe65c9479a41cc342
parentb5ce076d8d8806f4e3e93a2e6178eb33e831abff (diff)
refine keyboard host demo (added new line for enter key)
-rw-r--r--demos/host/src/cdc_serial_app.c2
-rw-r--r--demos/host/src/keyboard_app.c4
-rw-r--r--demos/host/src/tusb_config.h6
3 files changed, 7 insertions, 5 deletions
diff --git a/demos/host/src/cdc_serial_app.c b/demos/host/src/cdc_serial_app.c
index 2fe9b871d..6afcd0eed 100644
--- a/demos/host/src/cdc_serial_app.c
+++ b/demos/host/src/cdc_serial_app.c
@@ -150,7 +150,7 @@ OSAL_TASK_FUNCTION( cdc_serial_app_task ) (void* p_task_para)
if ( TUSB_ERROR_NONE == error)
{
- for(uint8_t i=0; i<received_bytes; i++) printf("%c", serial_in_buffer[i]);
+ for(uint8_t i=0; i<received_bytes; i++) putchar(serial_in_buffer[i]);
for(uint8_t dev_addr=1; dev_addr <= TUSB_CFG_HOST_DEVICE_MAX; dev_addr++)
{
diff --git a/demos/host/src/keyboard_app.c b/demos/host/src/keyboard_app.c
index 8a1beb4fd..68437195b 100644
--- a/demos/host/src/keyboard_app.c
+++ b/demos/host/src/keyboard_app.c
@@ -163,7 +163,9 @@ static inline void process_kbd_report(hid_keyboard_report_t const *p_new_report)
}else
{
// previously non-existed means key is pressed
- printf("%c", keycode_to_ascii(p_new_report->modifier, p_new_report->keycode[i]) );
+ uint8_t ch = keycode_to_ascii(p_new_report->modifier, p_new_report->keycode[i]);
+ putchar(ch);
+ if ( ch == '\r' ) putchar('\n'); // added new line for enter key
}
}
// TODO example skips key released
diff --git a/demos/host/src/tusb_config.h b/demos/host/src/tusb_config.h
index ddd56189b..09e481bbd 100644
--- a/demos/host/src/tusb_config.h
+++ b/demos/host/src/tusb_config.h
@@ -64,12 +64,12 @@
#define TUSB_CFG_HOST_ENUM_BUFFER_SIZE 255
//------------- CLASS -------------//
-#define TUSB_CFG_HOST_HUB 0
-#define TUSB_CFG_HOST_HID_KEYBOARD 0
+#define TUSB_CFG_HOST_HUB 1
+#define TUSB_CFG_HOST_HID_KEYBOARD 1
#define TUSB_CFG_HOST_HID_MOUSE 1
#define TUSB_CFG_HOST_HID_GENERIC 0
#define TUSB_CFG_HOST_MSC 1
-#define TUSB_CFG_HOST_CDC 0
+#define TUSB_CFG_HOST_CDC 1
#define TUSB_CFG_HOST_CDC_RNDIS 0
//--------------------------------------------------------------------+