Update tinyusb library to compatible with 1.2.0 (arduino#303)

* more Adafruit_TinyUSB include

* add metro m0 m4 with tinyusb to ci

* correct fqbn

* support ci with tinyusb variant

bump zeroDMA and fix warnings with USBHost library example

* install missing libraries

* more libraries

* update tinyusb library to 1.2.0

increase version to 1.7.3

Author: hathach

.github/workflows/githubci.yml

@@ -19,6 +19,8 @@ jobs:
           - 'pyportal_m4'
           - 'pyportal_m4_titano'
           - 'feather_m4_can'
+          - 'metro_m0:usbstack=tinyusb'
+          - 'metro_m4:speed=120,usbstack=tinyusb'
 
     runs-on: ubuntu-latest
 
@@ -30,14 +32,9 @@ jobs:
 
     - name: Checkout code
       uses: actions/checkout@v2
+      with:
+        submodules: 'true'
 
-    - name: Checkout submodules
-      shell: bash
-      run: |
-        auth_header="$(git config --local --get http.https://github.com/.extraheader)"
-        git submodule sync --recursive
-        git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive      
-        
     - name: Install Arduino CLI and Tools
       run: |
         # make all our directories we need for files and libraries
@@ -52,7 +49,6 @@ jobs:
       env:
         BSP_URL: https://adafruit.github.io/arduino-board-index/package_adafruit_index.json
         BSP_PATH: .arduino15/packages/adafruit/hardware/samd
-        LIB_DEPS: FlashStorage SD
       run: |
         arduino-cli config init
         arduino-cli core update-index
@@ -63,7 +59,7 @@ jobs:
         BSP_VERSION=`eval ls $HOME/$BSP_PATH`
         rm -r $HOME/$BSP_PATH/*
         ln -s $GITHUB_WORKSPACE $HOME/$BSP_PATH/$BSP_VERSION
-        arduino-cli lib install $LIB_DEPS
+        arduino-cli lib install "Adafruit NeoPixel" "Adafruit seesaw Library" "Adafruit SPIFlash" "FlashStorage" "MIDI Library" "SD" "SdFat - Adafruit Fork"
 
     - name: Build examples
       run: python3 extras/build_all.py ${{ matrix.board }}

cores/arduino/tusb_config.h

@@ -15,12 +15,13 @@
 fail_count = 0
 skip_count = 0
 
-build_format = '| {:20} | {:35} | {:18} | {:6} |'
-build_separator = '-' * 83
+build_format = '| {:25} | {:35} | {:18} | {:6} |'
+build_separator = '-' * 88
 
 FQBN_PREFIX='adafruit:samd:adafruit_'
 
-default_boards = [ 'metro_m0', 'metro_m4', 'circuitplayground_m0', 'feather_m4_can' ]
+#default_boards = [ 'metro_m0', 'metro_m4', 'circuitplayground_m0', 'feather_m4_can', 'metro_m0:usbstack=tinyusb', 'metro_m4:speed=120,usbstack=tinyusb' ]
+default_boards = [ 'metro_m0', 'metro_m0:usbstack=tinyusb' ]
 build_boards = []
 
 # build all variants if input not existed
@@ -37,18 +38,14 @@ def build_examples(variant):
 
     print('\n')
     print(build_separator)
-    print('| {:^79} |'.format('Board ' + variant))
+    print('| {:^84} |'.format('Board ' + variant))
     print(build_separator)
     print(build_format.format('Library', 'Example', '\033[39mResult\033[0m', 'Time'))
     print(build_separator)
 
     fqbn = "{}{}".format(FQBN_PREFIX, variant)
 
     for sketch in all_examples:
-        # TODO skip TinyUSB library examples for now
-        if "libraries/Adafruit_TinyUSB_Arduino" in sketch:
-            continue
-
         start_time = time.monotonic()
 
         # Skip if contains: ".board.test.skip" or ".all.test.skip"
@@ -60,6 +57,14 @@ def build_examples(variant):
         elif glob.glob(sketchdir+"/.*.test.only") and not os.path.exists(sketchdir + '/.' + variant + '.test.only'):
             success = SKIPPED
             skip_count += 1
+        elif 'usbstack=tinyusb' not in variant and "libraries/Adafruit_TinyUSB_Arduino" in sketch:
+            # skip non-tinyusb variant for tinyusb examples
+            success = SKIPPED
+            skip_count += 1
+        elif 'usbstack=tinyusb' in variant and "libraries/USBHost" in sketch:
+            # skip -tinyusb variant for USBHost examples
+            success = SKIPPED
+            skip_count += 1
         else:
             build_result = subprocess.run("arduino-cli compile --warnings all --fqbn {} {}".format(fqbn, sketch), shell=True, stdout=PIPE, stderr=PIPE)
 

extras/build_all.py

@@ -37,6 +37,12 @@ static I2SDevice_SAMD21G18x i2sd(*I2S);
 
 #include "I2S.h"
 
+#ifdef USE_TINYUSB
+// For Serial when selecting TinyUSB
+#include <Adafruit_TinyUSB.h>
+#endif
+
+
 int I2SClass::_beginCount = 0;
 
 I2SClass::I2SClass(uint8_t deviceIndex, uint8_t clockGenerator, uint8_t sdPin, uint8_t sckPin, uint8_t fsPin) :

libraries/Adafruit_TinyUSB_Arduino

@@ -21,6 +21,11 @@
 #include <Arduino.h>
 #include <Servo.h>
 
+#ifdef USE_TINYUSB
+// For Serial when selecting TinyUSB
+#include <Adafruit_TinyUSB.h>
+#endif
+
 #if defined(__SAMD51__)
  // Different prescalers depending on FCPU (avoid overflowing 16-bit counter)
  #if(F_CPU > 200000000)

libraries/Adafruit_ZeroDMA

@@ -216,6 +216,7 @@ byte getconfdescr( byte addr, byte conf )
   uint16_t total_length;
   // FIXME -- no check of return code from usb.getConfDescr()
   rcode = usb.getConfDescr( addr, 0, 4, conf, buf );  //get total length
+  (void) rcode;
   LOBYTE( total_length ) = buf[ 2 ];
   HIBYTE( total_length ) = buf[ 3 ];
   if( total_length > sizeof(buf)) {    //check if total length is larger than buffer
@@ -224,6 +225,7 @@ byte getconfdescr( byte addr, byte conf )
   }
   // FIXME -- no check of return code from usb.getConfDescr()
   rcode = usb.getConfDescr( addr, 0, total_length, conf, buf ); //get the whole descriptor
+  (void) rcode;
   while( buf_ptr < buf + total_length ) {  //parsing descriptors
     descr_length = *( buf_ptr );
     descr_type = *( buf_ptr + 1 );

libraries/I2S/src/I2S.cpp

@@ -20,7 +20,7 @@
 # https://github.com/arduino/Arduino/wiki/Arduino-IDE-1.5---3rd-party-Hardware-specification
 
 name=Adafruit SAMD (32-bits ARM Cortex-M0+ and Cortex-M4) Boards
-version=1.7.2
+version=1.7.3
 
 # Compile variables
 # -----------------