rename tusb_tick_get to hal_tick_get

4 files changed, 25 insertions, 5 deletions

diff --git a/examples/device/device_virtual_com/src/main.c b/examples/device/device_virtual_com/src/main.c
index c576b2f4f..c512f7c05 100644
--- a/examples/device/device_virtual_com/src/main.c
+++ b/examples/device/device_virtual_com/src/main.c
@@ -65,7 +65,6 @@ int main(void)
   tusb_init();
 
   //------------- application task init -------------//
-  led_blinking_init();
   cdc_serial_app_init();
 
   while (1)
@@ -93,6 +92,25 @@ void tud_umount_cb(uint8_t coreid)
 }
 
 //--------------------------------------------------------------------+
+// BLINKING TASK
+//--------------------------------------------------------------------+
+void led_blinking_task(void)
+{
+  enum { BLINK_INTEVAL = 1000 };
+
+  static uint32_t led_on_mask = 0;
+  static uint32_t last_blink = 0;
+
+  // not enough time
+  if ( last_blink + BLINK_INTEVAL > hal_tick_get() ) return;
+
+  last_blink += BLINK_INTEVAL;
+
+  board_leds(led_on_mask, 1 - led_on_mask);
+  led_on_mask = 1 - led_on_mask; // toggle
+}
+
+//--------------------------------------------------------------------+
 // HELPER FUNCTION
 //--------------------------------------------------------------------+
 void print_greeting(void)
diff --git a/hw/bsp/board.c b/hw/bsp/board.c
index 91c6afc23..c0d7c25b5 100644
--- a/hw/bsp/board.c
+++ b/hw/bsp/board.c
@@ -48,14 +48,14 @@ void SysTick_Handler (void)
   system_ticks++;
 }
 
-uint32_t tusb_tick_get(void)
+uint32_t hal_tick_get(void)
 {
   return system_ticks;
 }
 
 #endif
 
-#if 1
+#if 0
 //--------------------------------------------------------------------+
 // BLINKING TASK
 //--------------------------------------------------------------------+
diff --git a/hw/bsp/board.h b/hw/bsp/board.h
index fe3ae75c1..ca494f63f 100644
--- a/hw/bsp/board.h
+++ b/hw/bsp/board.h
@@ -154,6 +154,7 @@ void board_uart_putchar(uint8_t c);
 
 /** @} */
 
+#if 0
 //------------- Board Application  -------------//
 void led_blinking_task(void* param);
 
@@ -164,6 +165,7 @@ void led_blinking_init(void);
  * \param[in]  ms The interval between on and off.
  */
 void led_blinking_set_interval(uint32_t ms);
+#endif
 
 #ifdef __cplusplus
  }
diff --git a/tinyusb/osal/osal_none.h b/tinyusb/osal/osal_none.h
index f2a5bc714..eebc34489 100644
--- a/tinyusb/osal/osal_none.h
+++ b/tinyusb/osal/osal_none.h
@@ -53,8 +53,8 @@
 //--------------------------------------------------------------------+

 // TICK API

 //--------------------------------------------------------------------+

-uint32_t tusb_tick_get(void);

-#define osal_tick_get tusb_tick_get

+uint32_t hal_tick_get(void);

+#define osal_tick_get hal_tick_get

 

 //--------------------------------------------------------------------+

 // TASK API