diff --git a/boards.txt b/boards.txt index f2ab3f670..023b5900b 100644 --- a/boards.txt +++ b/boards.txt @@ -30,7 +30,7 @@ adafruit_feather_m0.vid.1=0x239A adafruit_feather_m0.pid.1=0x000B adafruit_feather_m0.vid.2=0x239A adafruit_feather_m0.pid.2=0x0015 -adafruit_feather_m0.upload.tool=bossac +adafruit_feather_m0.upload.tool=bossac18 adafruit_feather_m0.upload.protocol=sam-ba adafruit_feather_m0.upload.maximum_size=262144 adafruit_feather_m0.upload.offset=0x2000 @@ -77,7 +77,7 @@ adafruit_feather_m0_express.vid.0=0x239A adafruit_feather_m0_express.pid.0=0x801B adafruit_feather_m0_express.vid.1=0x239A adafruit_feather_m0_express.pid.1=0x001B -adafruit_feather_m0_express.upload.tool=bossac +adafruit_feather_m0_express.upload.tool=bossac18 adafruit_feather_m0_express.upload.protocol=sam-ba adafruit_feather_m0_express.upload.maximum_size=262144 adafruit_feather_m0_express.upload.offset=0x2000 @@ -122,7 +122,7 @@ adafruit_feather_m0_express.menu.debug.on.build.flags.debug=-g #adafruit_radio_m0.pid.0=0x8014 #adafruit_radio_m0.vid.1=0x239A #adafruit_radio_m0.pid.1=0x0014 -#adafruit_radio_m0.upload.tool=bossac +#adafruit_radio_m0.upload.tool=bossac18 #adafruit_radio_m0.upload.protocol=sam-ba #adafruit_radio_m0.upload.maximum_size=262144 #adafruit_radio_m0.upload.use_1200bps_touch=true @@ -151,7 +151,7 @@ adafruit_metro_m0.vid.0=0x239A adafruit_metro_m0.pid.0=0x8013 adafruit_metro_m0.vid.1=0x239A adafruit_metro_m0.pid.1=0x0013 -adafruit_metro_m0.upload.tool=bossac +adafruit_metro_m0.upload.tool=bossac18 adafruit_metro_m0.upload.protocol=sam-ba adafruit_metro_m0.upload.maximum_size=262144 adafruit_metro_m0.upload.offset=0x2000 @@ -198,7 +198,7 @@ adafruit_circuitplayground_m0.vid.0=0x239A adafruit_circuitplayground_m0.pid.0=0x8018 adafruit_circuitplayground_m0.vid.1=0x239A adafruit_circuitplayground_m0.pid.1=0x0019 -adafruit_circuitplayground_m0.upload.tool=bossac +adafruit_circuitplayground_m0.upload.tool=bossac18 adafruit_circuitplayground_m0.upload.protocol=sam-ba adafruit_circuitplayground_m0.upload.maximum_size=262144 adafruit_circuitplayground_m0.upload.offset=0x2000 @@ -245,7 +245,7 @@ adafruit_gemma_m0.vid.0=0x239A adafruit_gemma_m0.pid.0=0x801C adafruit_gemma_m0.vid.1=0x239A adafruit_gemma_m0.pid.1=0x001C -adafruit_gemma_m0.upload.tool=bossac +adafruit_gemma_m0.upload.tool=bossac18 adafruit_gemma_m0.upload.protocol=sam-ba adafruit_gemma_m0.upload.maximum_size=262144 adafruit_gemma_m0.upload.offset=0x2000 @@ -291,7 +291,7 @@ adafruit_trinket_m0.vid.0=0x239A adafruit_trinket_m0.pid.0=0x801E adafruit_trinket_m0.vid.1=0x239A adafruit_trinket_m0.pid.1=0x001E -adafruit_trinket_m0.upload.tool=bossac +adafruit_trinket_m0.upload.tool=bossac18 adafruit_trinket_m0.upload.protocol=sam-ba adafruit_trinket_m0.upload.maximum_size=262144 adafruit_trinket_m0.upload.offset=0x2000 @@ -339,7 +339,7 @@ adafruit_qtpy_m0.vid.1=0x239A adafruit_qtpy_m0.pid.1=0x00CB adafruit_qtpy_m0.vid.1=0x239A adafruit_qtpy_m0.pid.1=0x00CC -adafruit_qtpy_m0.upload.tool=bossac +adafruit_qtpy_m0.upload.tool=bossac18 adafruit_qtpy_m0.upload.protocol=sam-ba adafruit_qtpy_m0.upload.maximum_size=262144 adafruit_qtpy_m0.upload.offset=0x2000 @@ -387,7 +387,7 @@ adafruit_neotrinkey_m0.vid.1=0x239A adafruit_neotrinkey_m0.pid.1=0x00EF adafruit_neotrinkey_m0.vid.1=0x239A adafruit_neotrinkey_m0.pid.1=0x80F0 -adafruit_neotrinkey_m0.upload.tool=bossac +adafruit_neotrinkey_m0.upload.tool=bossac18 adafruit_neotrinkey_m0.upload.protocol=sam-ba adafruit_neotrinkey_m0.upload.maximum_size=262144 adafruit_neotrinkey_m0.upload.offset=0x2000 @@ -435,7 +435,7 @@ adafruit_rotarytrinkey_m0.vid.1=0x239A adafruit_rotarytrinkey_m0.pid.1=0x00FB adafruit_rotarytrinkey_m0.vid.1=0x239A adafruit_rotarytrinkey_m0.pid.1=0x80FC -adafruit_rotarytrinkey_m0.upload.tool=bossac +adafruit_rotarytrinkey_m0.upload.tool=bossac18 adafruit_rotarytrinkey_m0.upload.protocol=sam-ba adafruit_rotarytrinkey_m0.upload.maximum_size=262144 adafruit_rotarytrinkey_m0.upload.offset=0x2000 @@ -483,7 +483,7 @@ adafruit_neokeytrinkey_m0.vid.1=0x239A adafruit_neokeytrinkey_m0.pid.1=0x00FF adafruit_neokeytrinkey_m0.vid.1=0x239A adafruit_neokeytrinkey_m0.pid.1=0x8100 -adafruit_neokeytrinkey_m0.upload.tool=bossac +adafruit_neokeytrinkey_m0.upload.tool=bossac18 adafruit_neokeytrinkey_m0.upload.protocol=sam-ba adafruit_neokeytrinkey_m0.upload.maximum_size=262144 adafruit_neokeytrinkey_m0.upload.offset=0x2000 @@ -533,7 +533,7 @@ adafruit_slidetrinkey_m0.vid.1=0x239A adafruit_slidetrinkey_m0.pid.1=0x0101 adafruit_slidetrinkey_m0.vid.1=0x239A adafruit_slidetrinkey_m0.pid.1=0x8102 -adafruit_slidetrinkey_m0.upload.tool=bossac +adafruit_slidetrinkey_m0.upload.tool=bossac18 adafruit_slidetrinkey_m0.upload.protocol=sam-ba adafruit_slidetrinkey_m0.upload.maximum_size=262144 adafruit_slidetrinkey_m0.upload.offset=0x2000 @@ -581,7 +581,7 @@ adafruit_proxlighttrinkey_m0.vid.1=0x239A adafruit_proxlighttrinkey_m0.pid.1=0x0103 adafruit_proxlighttrinkey_m0.vid.1=0x239A adafruit_proxlighttrinkey_m0.pid.1=0x8104 -adafruit_proxlighttrinkey_m0.upload.tool=bossac +adafruit_proxlighttrinkey_m0.upload.tool=bossac18 adafruit_proxlighttrinkey_m0.upload.protocol=sam-ba adafruit_proxlighttrinkey_m0.upload.maximum_size=262144 adafruit_proxlighttrinkey_m0.upload.offset=0x2000 @@ -630,7 +630,7 @@ adafruit_itsybitsy_m0.vid.1=0x239A adafruit_itsybitsy_m0.pid.1=0x000F adafruit_itsybitsy_m0.vid.2=0x239A adafruit_itsybitsy_m0.pid.2=0x8012 -adafruit_itsybitsy_m0.upload.tool=bossac +adafruit_itsybitsy_m0.upload.tool=bossac18 adafruit_itsybitsy_m0.upload.protocol=sam-ba adafruit_itsybitsy_m0.upload.maximum_size=262144 adafruit_itsybitsy_m0.upload.offset=0x2000 @@ -677,7 +677,7 @@ adafruit_pirkey.vid.0=0x239A adafruit_pirkey.pid.0=0x801E adafruit_pirkey.vid.1=0x239A adafruit_pirkey.pid.1=0x001E -adafruit_pirkey.upload.tool=bossac +adafruit_pirkey.upload.tool=bossac18 adafruit_pirkey.upload.protocol=sam-ba adafruit_pirkey.upload.maximum_size=262144 adafruit_pirkey.upload.offset=0x2000 @@ -722,7 +722,7 @@ adafruit_hallowing.vid.1=0x239A adafruit_hallowing.pid.1=0xD1ED adafruit_hallowing.vid.1=0x239A adafruit_hallowing.pid.1=0xB000 -adafruit_hallowing.upload.tool=bossac +adafruit_hallowing.upload.tool=bossac18 adafruit_hallowing.upload.protocol=sam-ba adafruit_hallowing.upload.maximum_size=262144 adafruit_hallowing.upload.offset=0x2000 @@ -770,7 +770,7 @@ adafruit_crickit_m0.vid.1=0x239A adafruit_crickit_m0.pid.1=0x002D adafruit_crickit_m0.vid.2=0x239A adafruit_crickit_m0.pid.2=0x802D -adafruit_crickit_m0.upload.tool=bossac +adafruit_crickit_m0.upload.tool=bossac18 adafruit_crickit_m0.upload.protocol=sam-ba adafruit_crickit_m0.upload.maximum_size=262144 adafruit_crickit_m0.upload.offset=0x2000 @@ -1847,7 +1847,7 @@ adafruit_blm_badge.vid.0=0x239A adafruit_blm_badge.pid.0=0x80BF adafruit_blm_badge.vid.1=0x239A adafruit_blm_badge.pid.1=0x00BF -adafruit_blm_badge.upload.tool=bossac +adafruit_blm_badge.upload.tool=bossac18 adafruit_blm_badge.upload.protocol=sam-ba adafruit_blm_badge.upload.maximum_size=262144 adafruit_blm_badge.upload.offset=0x2000 diff --git a/platform.txt b/platform.txt index ca63d3566..8b0b3bcbe 100644 --- a/platform.txt +++ b/platform.txt @@ -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.6 +version=1.7.7 # Compile variables # ----------------- diff --git a/variants/neokeytrinkey_m0/variant.h b/variants/neokeytrinkey_m0/variant.h index e866d8afe..27e532bf4 100644 --- a/variants/neokeytrinkey_m0/variant.h +++ b/variants/neokeytrinkey_m0/variant.h @@ -98,8 +98,22 @@ static const uint8_t A1 = PIN_A1; /* * SPI Interfaces + * Fake SPI Interface just so we can compile */ -#define SPI_INTERFACES_COUNT 0 +#define SPI_INTERFACES_COUNT 1 + +#define PIN_SPI_MISO PIN_A0 +#define PIN_SPI_MOSI PIN_A0 +#define PIN_SPI_SCK PIN_A0 +#define PERIPH_SPI sercom0 +#define PAD_SPI_TX SPI_PAD_0_SCK_1 +#define PAD_SPI_RX SERCOM_RX_PAD_0 + +static const uint8_t SS = PIN_A0; +static const uint8_t MOSI = PIN_SPI_MOSI; +static const uint8_t MISO = PIN_SPI_MISO; +static const uint8_t SCK = PIN_SPI_SCK; + /* * Wire Interfaces diff --git a/variants/neotrinkey_m0/variant.h b/variants/neotrinkey_m0/variant.h index 3da948ce1..3cf172c23 100644 --- a/variants/neotrinkey_m0/variant.h +++ b/variants/neotrinkey_m0/variant.h @@ -97,8 +97,21 @@ static const uint8_t A2 = PIN_A2; /* * SPI Interfaces + * Fake SPI Interface just so we can compile */ -#define SPI_INTERFACES_COUNT 0 +#define SPI_INTERFACES_COUNT 1 + +#define PIN_SPI_MISO PIN_A0 +#define PIN_SPI_MOSI PIN_A0 +#define PIN_SPI_SCK PIN_A0 +#define PERIPH_SPI sercom0 +#define PAD_SPI_TX SPI_PAD_0_SCK_1 +#define PAD_SPI_RX SERCOM_RX_PAD_0 + +static const uint8_t SS = PIN_A0; +static const uint8_t MOSI = PIN_SPI_MOSI; +static const uint8_t MISO = PIN_SPI_MISO; +static const uint8_t SCK = PIN_SPI_SCK; /* * Wire Interfaces diff --git a/variants/proxlighttrinkey_m0/variant.cpp b/variants/proxlighttrinkey_m0/variant.cpp index da5bd8d4d..d9688d084 100644 --- a/variants/proxlighttrinkey_m0/variant.cpp +++ b/variants/proxlighttrinkey_m0/variant.cpp @@ -41,7 +41,7 @@ const PinDescription g_APinDescription[]= // Interrupt D6 { PORTA, 0, PIO_DIGITAL, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM|PIN_ATTR_TIMER), No_ADC_Channel, PWM2_CH0, TCC2_CH0, EXTERNAL_INT_0 }, - // USB pins + // USB pins D7, D8, D9 { PORTA, 28, PIO_COM, PIN_ATTR_NONE, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // USB Host enable { PORTA, 24, PIO_COM, PIN_ATTR_NONE, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // USB/DM { PORTA, 25, PIO_COM, PIN_ATTR_NONE, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE }, // USB/DP diff --git a/variants/proxlighttrinkey_m0/variant.h b/variants/proxlighttrinkey_m0/variant.h index bb9232265..93554eafc 100644 --- a/variants/proxlighttrinkey_m0/variant.h +++ b/variants/proxlighttrinkey_m0/variant.h @@ -103,8 +103,21 @@ static const uint8_t A2 = PIN_A2; /* * SPI Interfaces + * Fake SPI Interface just so we can compile */ -#define SPI_INTERFACES_COUNT 0 +#define SPI_INTERFACES_COUNT 1 + +#define PIN_SPI_MISO PIN_A0 +#define PIN_SPI_MOSI PIN_A0 +#define PIN_SPI_SCK PIN_A0 +#define PERIPH_SPI sercom0 +#define PAD_SPI_TX SPI_PAD_0_SCK_1 +#define PAD_SPI_RX SERCOM_RX_PAD_0 + +static const uint8_t SS = PIN_A0; +static const uint8_t MOSI = PIN_SPI_MOSI; +static const uint8_t MISO = PIN_SPI_MISO; +static const uint8_t SCK = PIN_SPI_SCK; /* * Wire Interfaces diff --git a/variants/rotarytrinkey_m0/variant.h b/variants/rotarytrinkey_m0/variant.h index 8490ee360..a6442918e 100644 --- a/variants/rotarytrinkey_m0/variant.h +++ b/variants/rotarytrinkey_m0/variant.h @@ -104,8 +104,21 @@ static const uint8_t A2 = PIN_A2; /* * SPI Interfaces + * Fake SPI Interface just so we can compile */ -#define SPI_INTERFACES_COUNT 0 +#define SPI_INTERFACES_COUNT 1 + +#define PIN_SPI_MISO PIN_A0 +#define PIN_SPI_MOSI PIN_A0 +#define PIN_SPI_SCK PIN_A0 +#define PERIPH_SPI sercom0 +#define PAD_SPI_TX SPI_PAD_0_SCK_1 +#define PAD_SPI_RX SERCOM_RX_PAD_0 + +static const uint8_t SS = PIN_A0; +static const uint8_t MOSI = PIN_SPI_MOSI; +static const uint8_t MISO = PIN_SPI_MISO; +static const uint8_t SCK = PIN_SPI_SCK; /* * Wire Interfaces diff --git a/variants/slidetrinkey_m0/variant.h b/variants/slidetrinkey_m0/variant.h index 88b4876f1..65d2e75e8 100644 --- a/variants/slidetrinkey_m0/variant.h +++ b/variants/slidetrinkey_m0/variant.h @@ -101,8 +101,21 @@ static const uint8_t A2 = PIN_A2; /* * SPI Interfaces + * Fake SPI Interface just so we can compile */ -#define SPI_INTERFACES_COUNT 0 +#define SPI_INTERFACES_COUNT 1 + +#define PIN_SPI_MISO PIN_A0 +#define PIN_SPI_MOSI PIN_A0 +#define PIN_SPI_SCK PIN_A0 +#define PERIPH_SPI sercom0 +#define PAD_SPI_TX SPI_PAD_0_SCK_1 +#define PAD_SPI_RX SERCOM_RX_PAD_0 + +static const uint8_t SS = PIN_A0; +static const uint8_t MOSI = PIN_SPI_MOSI; +static const uint8_t MISO = PIN_SPI_MISO; +static const uint8_t SCK = PIN_SPI_SCK; /* * Wire Interfaces