Merge remote-tracking branch 'tinyusb/master' into pr-osal-spin-deinit

Signed-off-by: HiFiPhile <[email protected]>

1 files changed, 30 insertions, 23 deletions

diff --git a/examples/device/cdc_msc/src/main.c b/examples/device/cdc_msc/src/main.c
index 4e7aa989e..b00a0e3a9 100644
--- a/examples/device/cdc_msc/src/main.c
+++ b/examples/device/cdc_msc/src/main.c
@@ -37,11 +37,12 @@
  */
 enum {
   BLINK_NOT_MOUNTED = 250,
-  BLINK_MOUNTED = 1000,
-  BLINK_SUSPENDED = 2500,
+  BLINK_MOUNTED     = 1000,
+  BLINK_SUSPENDED   = 2500,
 };
 
 static uint32_t blink_interval_ms = BLINK_NOT_MOUNTED;
+static bool     blink_enable      = true;
 
 void led_blinking_task(void);
 void cdc_task(void);
@@ -51,10 +52,7 @@ int main(void) {
   board_init();
 
   // init device stack on configured roothub port
-  tusb_rhport_init_t dev_init = {
-    .role = TUSB_ROLE_DEVICE,
-    .speed = TUSB_SPEED_AUTO
-  };
+  tusb_rhport_init_t dev_init = {.role = TUSB_ROLE_DEVICE, .speed = TUSB_SPEED_AUTO};
   tusb_init(BOARD_TUD_RHPORT, &dev_init);
 
   board_init_after_tusb();
@@ -85,7 +83,7 @@ void tud_umount_cb(void) {
 // remote_wakeup_en : if host allow us  to perform remote wakeup
 // Within 7ms, device must draw an average of current less than 2.5 mA from bus
 void tud_suspend_cb(bool remote_wakeup_en) {
-  (void) remote_wakeup_en;
+  (void)remote_wakeup_en;
   blink_interval_ms = BLINK_SUSPENDED;
 }
 
@@ -106,9 +104,9 @@ void cdc_task(void) {
     // connected and there are data available
     if (tud_cdc_available()) {
       // read data
-      char buf[64];
+      char     buf[64];
       uint32_t count = tud_cdc_read(buf, sizeof(buf));
-      (void) count;
+      (void)count;
 
       // Echo back
       // Note: Skip echo by commenting out write() and write_flush()
@@ -119,11 +117,14 @@ void cdc_task(void) {
     }
 
     // Press on-board button to send Uart status notification
+    static cdc_notify_uart_state_t uart_state = {.value = 0};
+
     static uint32_t btn_prev = 0;
-    static cdc_notify_uart_state_t uart_state = { .value = 0 };
-    const uint32_t btn = board_button_read();
-    if (!btn_prev && btn) {
+    const uint32_t  btn      = board_button_read();
+
+    if ((btn_prev == 0u) && (btn != 0u)) {
       uart_state.dsr ^= 1;
+      uart_state.dcd ^= 1;
       tud_cdc_notify_uart_state(&uart_state);
     }
     btn_prev = btn;
@@ -132,33 +133,39 @@ void cdc_task(void) {
 
 // Invoked when cdc when line state changed e.g connected/disconnected
 void tud_cdc_line_state_cb(uint8_t itf, bool dtr, bool rts) {
-  (void) itf;
-  (void) rts;
+  (void)itf;
+  (void)rts;
 
-  // TODO set some indicator
   if (dtr) {
     // Terminal connected
+    blink_enable = false;
+    board_led_write(true);
   } else {
     // Terminal disconnected
+    blink_enable = true;
   }
 }
 
 // Invoked when CDC interface received data from host
 void tud_cdc_rx_cb(uint8_t itf) {
-  (void) itf;
+  (void)itf;
 }
 
 //--------------------------------------------------------------------+
 // BLINKING TASK
 //--------------------------------------------------------------------+
 void led_blinking_task(void) {
-  static uint32_t start_ms = 0;
-  static bool led_state = false;
+  static uint32_t start_ms  = 0;
+  static bool     led_state = false;
 
-  // Blink every interval ms
-  if (board_millis() - start_ms < blink_interval_ms) return; // not enough time
-  start_ms += blink_interval_ms;
+  if (blink_enable) {
+    // Blink every interval ms
+    if (tusb_time_millis_api() - start_ms < blink_interval_ms) {
+      return; // not enough time
+    }
+    start_ms += blink_interval_ms;
 
-  board_led_write(led_state);
-  led_state = 1 - led_state; // toggle
+    board_led_write(led_state);
+    led_state = !led_state;
+  }
 }