Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Toggle built-in USB core #668

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Toggle built-in USB core #668

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
79 changes: 79 additions & 0 deletions boards.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
# License along with this library; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA

menu.usbstack=Arduino USB Stack

# Arduino Zero (Prorgamming Port)
# ---------------------------------------
arduino_zero_edbg.name=Arduino Zero (Programming Port)
Expand All @@ -38,6 +40,7 @@ arduino_zero_edbg.build.usb_product="Arduino Zero"
arduino_zero_edbg.build.usb_manufacturer="Arduino LLC"
arduino_zero_edbg.build.board=SAMD_ZERO
arduino_zero_edbg.build.core=arduino
arduino_zero_edbg.build.flags.usbstack=-DUSBCON
arduino_zero_edbg.build.extra_flags=-D__SAMD21G18A__ {build.usb_flags}
arduino_zero_edbg.build.ldscript=linker_scripts/gcc/flash_with_bootloader.ld
arduino_zero_edbg.build.openocdscript=openocd_scripts/arduino_zero.cfg
Expand Down Expand Up @@ -96,6 +99,11 @@ arduino_zero_native.bootloader.tool=openocd
arduino_zero_native.bootloader.tool.default=openocd
arduino_zero_native.bootloader.file=zero/samd21_sam_ba.bin

arduino_zero_native.menu.usbstack.enabled=Enabled
arduino_zero_native.menu.usbstack.enabled.build.flags.usbstack=-DUSBCON
arduino_zero_native.menu.usbstack.disabled=Disabled
arduino_zero_native.menu.usbstack.disabled.build.flags.usbstack=-DCDC_DISABLED

# Arduino MKR1000
# -----------------------
mkr1000.name=Arduino MKR1000
Expand Down Expand Up @@ -142,6 +150,11 @@ mkr1000.bootloader.tool=openocd
mkr1000.bootloader.tool.default=openocd
mkr1000.bootloader.file=mkr1000/samd21_sam_ba_arduino_mkr1000.bin

mkr1000.menu.usbstack.enabled=Enabled
mkr1000.menu.usbstack.enabled.build.flags.usbstack=-DUSBCON
mkr1000.menu.usbstack.disabled=Disabled
mkr1000.menu.usbstack.disabled.build.flags.usbstack=-DCDC_DISABLED

# Arduino MKRZero
# ---------------
mkrzero.name=Arduino MKRZERO
Expand Down Expand Up @@ -180,6 +193,11 @@ mkrzero.bootloader.tool=openocd
mkrzero.bootloader.tool.default=openocd
mkrzero.bootloader.file=mkrzero/samd21_sam_ba_arduino_mkrzero.bin

mkrzero.menu.usbstack.enabled=Enabled
mkrzero.menu.usbstack.enabled.build.flags.usbstack=-DUSBCON
mkrzero.menu.usbstack.disabled=Disabled
mkrzero.menu.usbstack.disabled.build.flags.usbstack=-DCDC_DISABLED

# Arduino MKR WiFi 1010
# --------------------
mkrwifi1010.name=Arduino MKR WiFi 1010
Expand Down Expand Up @@ -219,6 +237,11 @@ mkrwifi1010.bootloader.tool.default=openocd
mkrwifi1010.bootloader.file=mkrwifi1010/samd21_sam_ba_arduino_mkrwifi1010.bin
#mkrwifi1010.arduinoota.extraflags=-d

mkrwifi1010.menu.usbstack.enabled=Enabled
mkrwifi1010.menu.usbstack.enabled.build.flags.usbstack=-DUSBCON
mkrwifi1010.menu.usbstack.disabled=Disabled
mkrwifi1010.menu.usbstack.disabled.build.flags.usbstack=-DCDC_DISABLED

# Arduino NANO 33 IoT
# --------------------
nano_33_iot.name=Arduino NANO 33 IoT
Expand Down Expand Up @@ -257,6 +280,11 @@ nano_33_iot.bootloader.tool=openocd
nano_33_iot.bootloader.tool.default=openocd
nano_33_iot.bootloader.file=nano_33_iot/samd21_sam_ba_arduino_nano_33_iot.bin

nano_33_iot.menu.usbstack.enabled=Enabled
nano_33_iot.menu.usbstack.enabled.build.flags.usbstack=-DUSBCON
nano_33_iot.menu.usbstack.disabled=Disabled
nano_33_iot.menu.usbstack.disabled.build.flags.usbstack=-DCDC_DISABLED

# Arduino MKR FOX 1200
# --------------------
mkrfox1200.name=Arduino MKR FOX 1200
Expand Down Expand Up @@ -295,6 +323,11 @@ mkrfox1200.bootloader.tool=openocd
mkrfox1200.bootloader.tool.default=openocd
mkrfox1200.bootloader.file=mkrfox1200/samd21_sam_ba_arduino_mkrfox1200.bin

mkrfox1200.menu.usbstack.enabled=Enabled
mkrfox1200.menu.usbstack.enabled.build.flags.usbstack=-DUSBCON
mkrfox1200.menu.usbstack.disabled=Disabled
mkrfox1200.menu.usbstack.disabled.build.flags.usbstack=-DCDC_DISABLED

# Arduino MKR WAN 1300
# --------------------
mkrwan1300.name=Arduino MKR WAN 1300
Expand Down Expand Up @@ -333,6 +366,11 @@ mkrwan1300.bootloader.tool=openocd
mkrwan1300.bootloader.tool.default=openocd
mkrwan1300.bootloader.file=mkrwan1300/samd21_sam_ba_arduino_mkrwan1300.bin

mkrwan1300.menu.usbstack.enabled=Enabled
mkrwan1300.menu.usbstack.enabled.build.flags.usbstack=-DUSBCON
mkrwan1300.menu.usbstack.disabled=Disabled
mkrwan1300.menu.usbstack.disabled.build.flags.usbstack=-DCDC_DISABLED

# Arduino MKR WAN 1310
# --------------------
mkrwan1310.name=Arduino MKR WAN 1310
Expand Down Expand Up @@ -371,6 +409,11 @@ mkrwan1310.bootloader.tool=openocd
mkrwan1310.bootloader.tool.default=openocd
mkrwan1310.bootloader.file=mkrwan1300/samd21_sam_ba_arduino_mkrwan1310.bin

mkrwan1310.menu.usbstack.enabled=Enabled
mkrwan1310.menu.usbstack.enabled.build.flags.usbstack=-DUSBCON
mkrwan1310.menu.usbstack.disabled=Disabled
mkrwan1310.menu.usbstack.disabled.build.flags.usbstack=-DCDC_DISABLED

# Arduino MKR GSM 1400
# --------------------
mkrgsm1400.name=Arduino MKR GSM 1400
Expand Down Expand Up @@ -409,6 +452,11 @@ mkrgsm1400.bootloader.tool=openocd
mkrgsm1400.bootloader.tool.default=openocd
mkrgsm1400.bootloader.file=mkrgsm1400/samd21_sam_ba_arduino_mkrgsm1400.bin

mkrgsm1400.menu.usbstack.enabled=Enabled
mkrgsm1400.menu.usbstack.enabled.build.flags.usbstack=-DUSBCON
mkrgsm1400.menu.usbstack.disabled=Disabled
mkrgsm1400.menu.usbstack.disabled.build.flags.usbstack=-DCDC_DISABLED

# Arduino MKR NB 1500
# --------------------
mkrnb1500.name=Arduino MKR NB 1500
Expand Down Expand Up @@ -447,6 +495,11 @@ mkrnb1500.bootloader.tool=openocd
mkrnb1500.bootloader.tool.default=openocd
mkrnb1500.bootloader.file=mkrnb1500/samd21_sam_ba_arduino_mkrnb1500.bin

mkrnb1500.menu.usbstack.enabled=Enabled
mkrnb1500.menu.usbstack.enabled.build.flags.usbstack=-DUSBCON
mkrnb1500.menu.usbstack.disabled=Disabled
mkrnb1500.menu.usbstack.disabled.build.flags.usbstack=-DCDC_DISABLED

# Arduino MKR Vidor 4000
# --------------------
mkrvidor4000.name=Arduino MKR Vidor 4000
Expand Down Expand Up @@ -485,6 +538,11 @@ mkrvidor4000.bootloader.tool=openocd
mkrvidor4000.bootloader.tool.default=openocd
mkrvidor4000.bootloader.file=mkrvidor4000/samd21_sam_ba_arduino_mkrvidor4000.bin

mkrvidor4000.menu.usbstack.enabled=Enabled
mkrvidor4000.menu.usbstack.enabled.build.flags.usbstack=-DUSBCON
mkrvidor4000.menu.usbstack.disabled=Disabled
mkrvidor4000.menu.usbstack.disabled.build.flags.usbstack=-DCDC_DISABLED

# Adafruit Circuit Playground M0
# ------------------------------
adafruit_circuitplayground_m0.name=Adafruit Circuit Playground Express
Expand Down Expand Up @@ -523,6 +581,11 @@ adafruit_circuitplayground_m0.bootloader.tool=openocd
adafruit_circuitplayground_m0.bootloader.tool.default=openocd
adafruit_circuitplayground_m0.bootloader.file=circuitplay/circuitplay_m0_samd21g18_sam_ba.bin

adafruit_circuitplayground_m0.menu.usbstack.enabled=Enabled
adafruit_circuitplayground_m0.menu.usbstack.enabled.build.flags.usbstack=-DUSBCON
adafruit_circuitplayground_m0.menu.usbstack.disabled=Disabled
adafruit_circuitplayground_m0.menu.usbstack.disabled.build.flags.usbstack=-DCDC_DISABLED

# Arduino M0 PRO (with) bootloader - Programming port
# ---------------------------------------------------
mzero_pro_bl_dbg.name=Arduino M0 Pro (Programming Port)
Expand All @@ -543,6 +606,7 @@ mzero_pro_bl_dbg.build.f_cpu=48000000L
mzero_pro_bl_dbg.build.usb_product="Arduino M0 Pro"
mzero_pro_bl_dbg.build.board=SAM_ZERO
mzero_pro_bl_dbg.build.core=arduino
mzero_pro_bl_dbg.build.flags.usbstack=-DUSBCON
mzero_pro_bl_dbg.build.extra_flags=-D__SAMD21G18A__ -mthumb {build.usb_flags}
mzero_pro_bl_dbg.build.ldscript=linker_scripts/gcc/flash_with_bootloader.ld
mzero_pro_bl_dbg.build.openocdscript=openocd_scripts/arduino_zero.cfg
Expand Down Expand Up @@ -610,6 +674,11 @@ mzero_pro_bl.bootloader.tool.default=openocd-withbootsize
mzero_pro_bl.bootloader.file=mzero/Bootloader_D21_M0_Pro_150427.hex
mzero_pro_bl.bootloader.low_fuses=0xff

mzero_pro_bl.menu.usbstack.enabled=Enabled
mzero_pro_bl.menu.usbstack.enabled.build.flags.usbstack=-DUSBCON
mzero_pro_bl.menu.usbstack.disabled=Disabled
mzero_pro_bl.menu.usbstack.disabled.build.flags.usbstack=-DCDC_DISABLED

# Arduino M0 (with) Bootloader
# ----------------------------
mzero_bl.name=Arduino M0
Expand Down Expand Up @@ -660,6 +729,11 @@ mzero_bl.bootloader.tool.default=openocd-withbootsize
mzero_bl.bootloader.low_fuses=0xff
mzero_bl.bootloader.file=mzero/Bootloader_D21_M0_150515.hex

mzero_bl.menu.usbstack.enabled=Enabled
mzero_bl.menu.usbstack.enabled.build.flags.usbstack=-DUSBCON
mzero_bl.menu.usbstack.disabled=Disabled
mzero_bl.menu.usbstack.disabled.build.flags.usbstack=-DCDC_DISABLED

# Arduino Tian (with) Bootloader
# ------------------------------
tian.name=Arduino Tian
Expand Down Expand Up @@ -703,6 +777,11 @@ tian.bootloader.low_fuses=0xff
tian.bootloader.file=sofia/Sofia_Tian_151118.hex
tian.drivers=SiliconLabs-CP2105/Silicon Labs VCP Driver.pkg

tian.menu.usbstack.enabled=Enabled
tian.menu.usbstack.enabled.build.flags.usbstack=-DUSBCON
tian.menu.usbstack.disabled=Disabled
tian.menu.usbstack.disabled.build.flags.usbstack=-DCDC_DISABLED

# Arduino Tian Console port (not for upload)
# ------------------------------------------
tian_cons.name=Arduino Tian (MIPS Console port)
Expand Down
2 changes: 2 additions & 0 deletions cores/arduino/Arduino.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,11 +106,13 @@ extern void analogOutputInit( void ) ;
}
#endif

#if defined(USBCON)
// USB Device
#include "USB/USBDesc.h"
#include "USB/USBCore.h"
#include "USB/USBAPI.h"
#include "USB/USB_host.h"
#endif

// ARM toolchain doesn't provide itoa etc, provide them
#include "api/itoa.h"
Expand Down
3 changes: 3 additions & 0 deletions cores/arduino/USB/samd21_host.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/

#ifdef USBCON

#include <stdio.h>
#include <stdint.h>
Expand Down Expand Up @@ -516,3 +517,5 @@ uint32_t UHD_Pipe_Is_Transfer_Complete(uint32_t ul_pipe, uint32_t ul_token_type)
// }

#endif // HOST_DEFINED

#endif
2 changes: 2 additions & 0 deletions cores/arduino/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,9 @@
void initVariant() __attribute__((weak));
void initVariant() { }

#if defined(USBCON)
extern USBDeviceClass USBDevice;
#endif

// Initialize C library
extern "C" void __libc_init_array(void);
Expand Down
2 changes: 1 addition & 1 deletion platform.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ compiler.libraries.ldflags=

# USB Flags
# ---------
build.usb_flags=-DUSB_VID={build.vid} -DUSB_PID={build.pid} -DUSBCON '-DUSB_MANUFACTURER={build.usb_manufacturer}' '-DUSB_PRODUCT={build.usb_product}'
build.usb_flags=-DUSB_VID={build.vid} -DUSB_PID={build.pid} '-DUSB_MANUFACTURER={build.usb_manufacturer}' '-DUSB_PRODUCT={build.usb_product}' {build.flags.usbstack}

# Default usb manufacturer will be replaced at compile time using
# numeric vendor ID if available or by board's specific value.
Expand Down