diff options
| author | hathach <[email protected]> | 2021-03-18 15:23:08 +0700 |
|---|---|---|
| committer | hathach <[email protected]> | 2021-03-18 15:23:08 +0700 |
| commit | 2882390c82fc08a669093419abc69f25bc11a34f (patch) | |
| tree | 5a0a30e077e5847740e8a5543bf1c2267c6c9487 /examples | |
| parent | b221cedf80fadc4e810cca9408d91b12cf583e7e (diff) | |
clean up some examples
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/device/cdc_dual_ports/src/main.c | 6 | ||||
| -rw-r--r-- | examples/device/cdc_dual_ports/src/tusb_config.h | 2 | ||||
| -rw-r--r-- | examples/device/cdc_msc/src/main.c | 28 | ||||
| -rw-r--r-- | examples/device/cdc_msc/src/tusb_config.h | 3 | ||||
| -rw-r--r-- | examples/device/cdc_msc_freertos/src/main.c | 22 | ||||
| -rw-r--r-- | examples/device/cdc_msc_freertos/src/tusb_config.h | 3 |
6 files changed, 34 insertions, 30 deletions
diff --git a/examples/device/cdc_dual_ports/src/main.c b/examples/device/cdc_dual_ports/src/main.c index 198c4252b..34cd29edd 100644 --- a/examples/device/cdc_dual_ports/src/main.c +++ b/examples/device/cdc_dual_ports/src/main.c @@ -63,13 +63,11 @@ static void echo_serial_port(uint8_t itf, uint8_t buf[], uint32_t count) } else { - // echo back additional ports as upper case + // echo back 2nd port as upper case if (islower(buf[i])) buf[i] -= 'a' - 'A'; } tud_cdc_n_write_char(itf, buf[i]); - - if ( buf[i] == '\r' ) tud_cdc_n_write_char(itf, '\n'); } tud_cdc_n_write_flush(itf); } @@ -85,7 +83,7 @@ static void cdc_task(void) { // connected() check for DTR bit // Most but not all terminal client set this when making connection - if ( tud_cdc_n_connected(itf) ) + // if ( tud_cdc_n_connected(itf) ) { if ( tud_cdc_n_available(itf) ) { diff --git a/examples/device/cdc_dual_ports/src/tusb_config.h b/examples/device/cdc_dual_ports/src/tusb_config.h index 69001bdec..7db520dd1 100644 --- a/examples/device/cdc_dual_ports/src/tusb_config.h +++ b/examples/device/cdc_dual_ports/src/tusb_config.h @@ -104,6 +104,8 @@ #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) #ifdef __cplusplus } 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 diff --git a/examples/device/cdc_msc_freertos/src/main.c b/examples/device/cdc_msc_freertos/src/main.c index e90c3f0d9..5779b7d45 100644 --- a/examples/device/cdc_msc_freertos/src/main.c +++ b/examples/device/cdc_msc_freertos/src/main.c @@ -179,14 +179,13 @@ void cdc_task(void* params) // read and echo back 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(); } } @@ -202,12 +201,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 with FreeRTOS example\r\n"); - tud_cdc_write_flush(); + // Terminal connected + }else + { + // Terminal disconnected } } diff --git a/examples/device/cdc_msc_freertos/src/tusb_config.h b/examples/device/cdc_msc_freertos/src/tusb_config.h index fe4845a08..ff5438349 100644 --- a/examples/device/cdc_msc_freertos/src/tusb_config.h +++ b/examples/device/cdc_msc_freertos/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 |
