# HG changeset patch # User Tero Koskinen # Date 1467913864 -10800 # Thu Jul 07 20:51:04 2016 +0300 # Node ID b6a6155be7a631ac13b42186a69643b5768bd2e9 # Parent 0bce7b588dbbd7ed50960142e28d15c6d0fb0845 Rename the board to "Adafruit Feather M0 Basic". diff --git a/adafruit-feather-m0-basic-template.hzp b/adafruit-feather-m0-basic-template.hzp new file mode 100644 --- /dev/null +++ b/adafruit-feather-m0-basic-template.hzp @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/adafruit-feather-m0-dev-template.hzp b/adafruit-feather-m0-dev-template.hzp deleted file mode 100644 --- a/adafruit-feather-m0-dev-template.hzp +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/packages/Adafruit_Feather_M0_Basic_package.xml b/packages/Adafruit_Feather_M0_Basic_package.xml new file mode 100644 --- /dev/null +++ b/packages/Adafruit_Feather_M0_Basic_package.xml @@ -0,0 +1,12 @@ + + + + + Initial Release. + + + + + + + diff --git a/packages/Adafruit_Feather_M0_DEV_package.xml b/packages/Adafruit_Feather_M0_DEV_package.xml deleted file mode 100644 --- a/packages/Adafruit_Feather_M0_DEV_package.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - Initial Release. - - - - - - - diff --git a/targets/Adafruit_Feather_M0_DEV/ctl_board.c b/targets/Adafruit_Feather_M0_Basic/ctl_board.c rename from targets/Adafruit_Feather_M0_DEV/ctl_board.c rename to targets/Adafruit_Feather_M0_Basic/ctl_board.c --- a/targets/Adafruit_Feather_M0_DEV/ctl_board.c +++ b/targets/Adafruit_Feather_M0_Basic/ctl_board.c @@ -6,8 +6,8 @@ // THIS FILE IS PROVIDED AS IS WITH NO WARRANTY OF ANY KIND, INCLUDING THE // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. -// Sparkfun ATSAMD21G board -// https://www.sparkfun.com/products/13672 +// Adafruit Feather M0 Basic Proto board +// https://www.adafruit.com/products/2772 #include #include @@ -25,13 +25,13 @@ #define SERCOM_MISO_PAD_3 3 #define SERCOM_MOSI_CLK_PAD_0_1 0 -#define SPARKFUN_M0_SPI_AMOUNT 5 +#define ADAFRUIT_M0_SPI_AMOUNT 5 #define LED_PORT SAMD_PORT(ARDUINO_D13) #define LED_PIN SAMD_PIN(ARDUINO_D13) -static const struct SPI_Settings sparkfun_m0_spis[SPARKFUN_M0_SPI_AMOUNT] = { +static const struct SPI_Settings adafruit_m0_spis[ADAFRUIT_M0_SPI_AMOUNT] = { { .dev = SERCOM0, .sercom = 0, .dopo = SERCOM_MOSI_CLK_PAD_2_3, @@ -79,8 +79,7 @@ } }; -static const struct UART_Pin_Settings sparkfun_uarts[6] = { -#if 1 +static const struct UART_Pin_Settings adafruit_uarts[6] = { { .dev = SERCOM0, .port = 0, @@ -90,17 +89,6 @@ .txpo = SERCOM_UART_TXPO_PAD_2, .rxpo = SERCOM_UART_RXPO_PAD_3 }, -#else - { - .dev = SERCOM0, - .port = 0, - .tx_pin = PIN_PA04, - .rx_pin = PIN_PA05, - .peripheral_func = 3, // func D - .txpo = 0x0, // pad 0 = tx, rts = n/a, cts = n/a - .rxpo = 0x1 // pad 1 = rx - }, -#endif { .dev = SERCOM1, .port = 0, @@ -155,8 +143,8 @@ CTL_UART_t *uart, *uart5; CTL_SPI_BUS_t *spi_bus; - d21_uart_set_pin_config(sparkfun_uarts, 6); - d21_spi_set_pin_config(sparkfun_m0_spis, SPARKFUN_M0_SPI_AMOUNT); + d21_uart_set_pin_config(adafruit_uarts, 6); + d21_spi_set_pin_config(adafruit_m0_spis, ADAFRUIT_M0_SPI_AMOUNT); d2x_eic_init(); d21_configure_i2c1_bus(); diff --git a/targets/Adafruit_Feather_M0_DEV/pin_mapping.h b/targets/Adafruit_Feather_M0_Basic/pin_mapping.h rename from targets/Adafruit_Feather_M0_DEV/pin_mapping.h rename to targets/Adafruit_Feather_M0_Basic/pin_mapping.h diff --git a/targets/Adafruit_Feather_M0_DEV/project_templates_Adafruit_Feather_M0_DEV.xml b/targets/Adafruit_Feather_M0_Basic/project_templates_Adafruit_Feather_M0_Basic.xml rename from targets/Adafruit_Feather_M0_DEV/project_templates_Adafruit_Feather_M0_DEV.xml rename to targets/Adafruit_Feather_M0_Basic/project_templates_Adafruit_Feather_M0_Basic.xml --- a/targets/Adafruit_Feather_M0_DEV/project_templates_Adafruit_Feather_M0_DEV.xml +++ b/targets/Adafruit_Feather_M0_Basic/project_templates_Adafruit_Feather_M0_Basic.xml @@ -1,6 +1,6 @@ - - + + @@ -54,8 +54,8 @@ - - + + @@ -96,8 +96,8 @@ - - + + @@ -120,12 +120,12 @@ - - + + - + @@ -160,7 +160,7 @@ - + @@ -170,29 +170,29 @@ - + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + @@ -221,8 +221,8 @@ - - + +