add libraries/Adafruit_TinyUSB_Arduino as submodule

hathach · hathach · commit 704450cc1c53 · 2021-05-08T01:08:31.000+07:00
include Adafruit_USBD_CDC.h from submodule
diff --git a/.gitignore b/.gitignore
@@ -2,4 +2,5 @@
 *.atsuo
 
 bootloaders/*/build/
-*~
+*~
+/libraries/**/build/
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "libraries/Adafruit_TinyUSB_Arduino"]
+	path = libraries/Adafruit_TinyUSB_Arduino
+	url = https://github.com/adafruit/Adafruit_TinyUSB_Arduino.git
diff --git a/cores/arduino/Arduino.h b/cores/arduino/Arduino.h
@@ -151,6 +151,7 @@ void loop( void ) ;
 // USB
 #ifdef USE_TINYUSB
 #ifdef __cplusplus
+  // Needed for declaring Serial
   #include "Adafruit_USBD_Interface.h"
   #include "Adafruit_USBD_CDC.h"
 #endif
diff --git a/cores/arduino/TinyUSB/Adafruit_USBD_CDC.h b/cores/arduino/TinyUSB/Adafruit_USBD_CDC.h
diff --git a/cores/arduino/TinyUSB/Adafruit_USBD_Interface.h b/cores/arduino/TinyUSB/Adafruit_USBD_Interface.h
diff --git a/cores/arduino/tusb_config.h b/cores/arduino/tusb_config.h
diff --git a/extras/build_all.py b/extras/build_all.py
@@ -27,7 +27,7 @@
     metavar='board',
     nargs='*',
     help='list of boards to be built -- Note that the fqbn is created by prepending "{}"'.format(FQBN_PREFIX),
-    default= [ 'metro_m0', 'metro_m4', 'circuitplayground_m0' ]
+    default= [ 'metro_m0', 'metro_m4', 'circuitplayground_m0', 'feather_m4_can' ]
     )
 args = parser.parse_args()
 
diff --git a/libraries/Adafruit_TinyUSB_Arduino b/libraries/Adafruit_TinyUSB_Arduino
@@ -0,0 +1 @@
+Subproject commit 2b16928b90a764b1e0b5b135d2ebad1518a329b2
diff --git a/platform.txt b/platform.txt
@@ -77,7 +77,7 @@ compiler.libraries.ldflags=
 
 # USB Flags
 # ---------
-build.usb_flags=-DUSB_VID={build.vid} -DUSB_PID={build.pid} -DUSBCON -DUSB_CONFIG_POWER={build.usb_power} '-DUSB_MANUFACTURER={build.usb_manufacturer}' '-DUSB_PRODUCT={build.usb_product}' {build.flags.usbstack} {build.flags.debug} "-I{build.core.path}/TinyUSB"
+build.usb_flags=-DUSB_VID={build.vid} -DUSB_PID={build.pid} -DUSBCON -DUSB_CONFIG_POWER={build.usb_power} '-DUSB_MANUFACTURER={build.usb_manufacturer}' '-DUSB_PRODUCT={build.usb_product}' {build.flags.usbstack} {build.flags.debug} "-I{runtime.platform.path}/libraries/Adafruit_TinyUSB_Arduino/src/arduino"
 
 # Default advertised device power setting in mA
 build.usb_power=100

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+[submodule "libraries/Adafruit_TinyUSB_Arduino"]`
	`2`	`+ path = libraries/Adafruit_TinyUSB_Arduino`
	`3`	`+ url = https://github.com/adafruit/Adafruit_TinyUSB_Arduino.git`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@`
`27`	`27`	`metavar='board',`
`28`	`28`	`nargs='*',`
`29`	`29`	`help='list of boards to be built -- Note that the fqbn is created by prepending "{}"'.format(FQBN_PREFIX),`
`30`		`- default= [ 'metro_m0', 'metro_m4', 'circuitplayground_m0' ]`
	`30`	`+ default= [ 'metro_m0', 'metro_m4', 'circuitplayground_m0', 'feather_m4_can' ]`
`31`	`31`	`)`
`32`	`32`	`args = parser.parse_args()`
`33`	`33`