Merge pull request #640 from adafruit/rework-tinyusb-lib

Rework tinyusb lib

Author: hathach

.github/workflows/githubci.yml

@@ -62,6 +62,9 @@ jobs:
         # https://github.com/firmata/arduino/pull/438
         git clone --depth 1 https://github.com/firmata/arduino.git $HOME/Arduino/libraries/firmata
 
+        # TODO temporarily remove TinyUSB pre-1.0.0 version install by arduino-cli
+        rm -r $HOME/Arduino/libraries/Adafruit_TinyUSB_Library
+
         # Library summary
         arduino-cli lib list
 

.gitignore

@@ -20,3 +20,4 @@
 # Ignore local overrides of platform.txt and boards.txt,
 /boards.local.txt
 /platform.local.txt
+/libraries/**/build/

.gitmodules

@@ -4,3 +4,6 @@
 [submodule "libraries/Adafruit_nRFCrypto"]
 	path = libraries/Adafruit_nRFCrypto
 	url = https://github.com/adafruit/Adafruit_nRFCrypto.git
+[submodule "libraries/Adafruit_TinyUSB_Arduino"]
+	path = libraries/Adafruit_TinyUSB_Arduino
+	url = https://github.com/adafruit/Adafruit_TinyUSB_Arduino.git

cores/nRF5/Arduino.h

@@ -57,20 +57,21 @@ void resumeLoop(void);
   #include "pulse.h"
   #include "HardwarePWM.h"
   #include "utility/SoftwareTimer.h"
-
   #include "Uart.h"
 #endif
 
+#ifdef USE_TINYUSB
+// Needed for declaring Serial
+#include "Adafruit_USBD_CDC.h"
+#endif
+
 #include "delay.h"
 #include "binary.h"
 #include "common_inc.h"
 #include "utility/debug.h"
 #include "utility/utilities.h"
 #include "utility/AdaCallback.h"
 
-#ifdef USE_TINYUSB
-  #include "Adafruit_TinyUSB_Core.h"
-#endif
 
 // Include board variant
 #include "variant.h"

cores/nRF5/TinyUSB/Adafruit_TinyUSB_ArduinoCore

@@ -36,11 +36,13 @@
 #ifndef COMMON_INC_H_
 #define COMMON_INC_H_
 
+#define ATTR_PACKED   __attribute__ ((packed))
+#define ATTR_WEAK     __attribute__((weak))
+
 #include <stdint.h>
 #include <stdbool.h>
 #include <stddef.h>
 
-#include "compiler_macro.h"
 #include "common_func.h"
 #include "verify.h"
 

cores/nRF5/TinyUSB/Adafruit_TinyUSB_nRF.cpp

@@ -37,7 +37,7 @@ void delay( uint32_t ms )
 #ifdef USE_TINYUSB
   // Take chance to flush usb cdc
   uint32_t flush_tick = xTaskGetTickCount();
-  tud_cdc_write_flush();
+  TinyUSB_Device_FlushCDC();
 
   flush_tick = xTaskGetTickCount()-flush_tick;
   if (flush_tick >= ticks) return;

cores/nRF5/common_inc.h

@@ -15,10 +15,17 @@
 
 #define ARDUINO_MAIN
 #include "Arduino.h"
+
 #if (CFG_LOGGER == 2)
   #include <SEGGER_RTT.h>
 #endif
 
+// From the UI, setting debug level to 3 will enable SysView
+#if CFG_SYSVIEW
+#include "SEGGER_RTT.h"
+#include "SEGGER_SYSVIEW.h"
+#endif
+
 // DEBUG Level 1
 #if CFG_DEBUG
 // weak function to avoid compilation error with
@@ -27,15 +34,6 @@ void Bluefruit_printInfo() __attribute__((weak));
 void Bluefruit_printInfo() {}
 #endif
 
-// From the UI, setting debug level to 3 will enable SysView
-#if CFG_SYSVIEW
-#include "SEGGER_RTT.h"
-#include "SEGGER_SYSVIEW.h"
-#endif
-
-static TaskHandle_t  _loopHandle;
-
-
 // Weak empty variant initialization function.
 // May be redefined by variant files.
 void initVariant() __attribute__((weak));
@@ -44,10 +42,16 @@ void initVariant() { }
 #define LOOP_STACK_SZ       (256*4)
 #define CALLBACK_STACK_SZ   (256*3)
 
+static TaskHandle_t  _loopHandle;
+
 static void loop_task(void* arg)
 {
   (void) arg;
 
+#ifdef USE_TINYUSB
+  TinyUSB_Device_Init(0);
+#endif
+
 #if CFG_DEBUG
   // If Serial is not begin(), call it to avoid hard fault
   if(!Serial) Serial.begin(115200);
@@ -80,12 +84,8 @@ int main( void )
   SEGGER_SYSVIEW_Conf();
 #endif
 
-#ifdef USE_TINYUSB
-  Adafruit_TinyUSB_Core_init();
-#endif
-
   // Create a task for loop()
-  xTaskCreate( loop_task, "loop", LOOP_STACK_SZ, NULL, TASK_PRIO_LOW, &_loopHandle);
+  xTaskCreate(loop_task, "loop", LOOP_STACK_SZ, NULL, TASK_PRIO_LOW, &_loopHandle);
 
   // Initialize callback task
   ada_callback_init(CALLBACK_STACK_SZ);

cores/nRF5/compiler_macro.h

@@ -75,7 +75,7 @@ extern "C"
 void yield(void)
 {
 #ifdef USE_TINYUSB
-    tud_cdc_write_flush();
+  TinyUSB_Device_FlushCDC();
 #endif
 
   taskYIELD();

cores/nRF5/delay.c

@@ -40,18 +40,16 @@
 #ifndef _VERIFY_H_
 #define _VERIFY_H_
 
-#include "compiler_macro.h"
+//--------------------------------------------------------------------+
+// Compile-time Assert
+//--------------------------------------------------------------------+
+#define VERIFY_STATIC(const_expr) _Static_assert(const_expr, "Assert failed")
 
 #ifdef __cplusplus
 extern "C"
 {
 #endif
 
-//--------------------------------------------------------------------+
-// Compile-time Assert
-//--------------------------------------------------------------------+
-#define VERIFY_STATIC(const_expr) TU_VERIFY_STATIC(const_expr, "Assert failed")
-
 //--------------------------------------------------------------------+
 // VERIFY Helper
 //--------------------------------------------------------------------+
@@ -132,8 +130,6 @@ extern "C"
  */
 #define VERIFY(...)  _GET_3RD_ARG(__VA_ARGS__, VERIFY_2ARGS, VERIFY_1ARGS)(__VA_ARGS__)
 
-// TODO VERIFY with final statement
-
 #ifdef __cplusplus
 }
 #endif

cores/nRF5/main.cpp

@@ -17,6 +17,8 @@
 
  */
 
+#include <Arduino.h>
+#include <Adafruit_TinyUSB.h> // for Serial
 
 int ledPin = LED_RED;    // LED connected to digital pin 9
 

cores/nRF5/rtos.cpp

@@ -18,7 +18,8 @@
  * Note: Bluefruit nRF52832 does not support Serial1
  */
 
-#include "Arduino.h"
+#include <Arduino.h>
+#include <Adafruit_TinyUSB.h> // for Serial
 
 void setup()
 {

cores/nRF5/TinyUSB/tusb_config.h renamed to cores/nRF5/tusb_config.h

@@ -13,6 +13,7 @@
 *********************************************************************/
 
 #include <Arduino.h>
+#include <Adafruit_TinyUSB.h> // for Serial
 
 const int baudrate = 115200;