diff options
| author | Reinhard Panhuber <[email protected]> | 2021-04-03 09:50:08 +0200 |
|---|---|---|
| committer | Reinhard Panhuber <[email protected]> | 2021-04-03 09:50:08 +0200 |
| commit | a1efd416491fd2deecea46cd466e31b4a02b9734 (patch) | |
| tree | dfda074b32926050da8460d79b36c34e2e696d42 /examples/device/cdc_msc/src | |
| parent | 9b2ddd9cc6401b80350179d26e842557f9b60aaf (diff) | |
| parent | ab4d30fd6bca02c73eb9b4ff82db0b2b0f403344 (diff) | |
Merge remote-tracking branch 'upstream/master' into edpt_ISO_xfer
Diffstat (limited to 'examples/device/cdc_msc/src')
| -rw-r--r-- | examples/device/cdc_msc/src/main.c | 28 | ||||
| -rw-r--r-- | examples/device/cdc_msc/src/tusb_config.h | 3 |
2 files changed, 16 insertions, 15 deletions
diff --git a/examples/device/cdc_msc/src/main.c b/examples/device/cdc_msc/src/main.c index a20a80fcd..131ae6549 100644 --- a/examples/device/cdc_msc/src/main.c +++ b/examples/device/cdc_msc/src/main.c @@ -48,7 +48,6 @@ enum { static uint32_t blink_interval_ms = BLINK_NOT_MOUNTED; void led_blinking_task(void); - void cdc_task(void); /*------------- MAIN -------------*/ @@ -112,18 +111,16 @@ void cdc_task(void) // connected and there are data available if ( tud_cdc_available() ) { - uint8_t buf[64]; - - // read and echo back + // read datas + char buf[64]; uint32_t count = tud_cdc_read(buf, sizeof(buf)); + (void) count; - for(uint32_t i=0; i<count; i++) - { - tud_cdc_write_char(buf[i]); - - if ( buf[i] == '\r' ) tud_cdc_write_char('\n'); - } - + // Echo back + // Note: Skip echo by commenting out write() and write_flush() + // for throughput test e.g + // $ dd if=/dev/zero of=/dev/ttyACM0 count=10000 + tud_cdc_write(buf, count); tud_cdc_write_flush(); } } @@ -135,12 +132,13 @@ void tud_cdc_line_state_cb(uint8_t itf, bool dtr, bool rts) (void) itf; (void) rts; - // connected + // TODO set some indicator if ( dtr ) { - // print initial message when connected - tud_cdc_write_str("\r\nTinyUSB CDC MSC device example\r\n"); - tud_cdc_write_flush(); + // Terminal connected + }else + { + // Terminal disconnected } } diff --git a/examples/device/cdc_msc/src/tusb_config.h b/examples/device/cdc_msc/src/tusb_config.h index e0099785b..9a0262d30 100644 --- a/examples/device/cdc_msc/src/tusb_config.h +++ b/examples/device/cdc_msc/src/tusb_config.h @@ -106,6 +106,9 @@ #define CFG_TUD_CDC_RX_BUFSIZE (TUD_OPT_HIGH_SPEED ? 512 : 64) #define CFG_TUD_CDC_TX_BUFSIZE (TUD_OPT_HIGH_SPEED ? 512 : 64) +// CDC Endpoint transfer buffer size, more is faster +#define CFG_TUD_CDC_EP_BUFSIZE (TUD_OPT_HIGH_SPEED ? 512 : 64) + // MSC Buffer size of Device Mass storage #define CFG_TUD_MSC_EP_BUFSIZE 512 |