diff options
| author | Dan Halbert <halbert@halwitz.org> | 2018-04-19 23:08:20 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-19 23:08:20 -0400 |
| commit | 77092f23802787f006783d37aad9c5d396bce3d9 (patch) | |
| tree | 872817e82010da1c29fc273e5b8f1ae7f02a5c5a | |
| parent | 321fa206c9a013db3b2461753a340fcb69eb32e2 (diff) | |
| parent | 898a7d92e377168d79e80c872154a863b7c7a434 (diff) | |
Merge pull request #772 from tannewt/rtc51
atmel-samd: Fix M4 RTC and ItsyBitsy M4 definition
| -rw-r--r-- | ports/atmel-samd/asf4_conf/samd51/hpl_osc32kctrl_config.h | 2 | ||||
| -rw-r--r-- | ports/atmel-samd/boards/itsybitsy_m4_express/mpconfigboard.h | 10 |
2 files changed, 7 insertions, 5 deletions
diff --git a/ports/atmel-samd/asf4_conf/samd51/hpl_osc32kctrl_config.h b/ports/atmel-samd/asf4_conf/samd51/hpl_osc32kctrl_config.h index ccb262748..d93cbf922 100644 --- a/ports/atmel-samd/asf4_conf/samd51/hpl_osc32kctrl_config.h +++ b/ports/atmel-samd/asf4_conf/samd51/hpl_osc32kctrl_config.h @@ -17,7 +17,7 @@ // <i> This defines the clock source for RTC // <id> rtc_source_oscillator #ifndef CONF_RTCCTRL_SRC -#define CONF_RTCCTRL_SRC GCLK_GENCTRL_SRC_XOSC32K +#define CONF_RTCCTRL_SRC GCLK_GENCTRL_SRC_OSCULP32K #endif // <q> Use 1 kHz output diff --git a/ports/atmel-samd/boards/itsybitsy_m4_express/mpconfigboard.h b/ports/atmel-samd/boards/itsybitsy_m4_express/mpconfigboard.h index 63fbc8cb8..95c542a43 100644 --- a/ports/atmel-samd/boards/itsybitsy_m4_express/mpconfigboard.h +++ b/ports/atmel-samd/boards/itsybitsy_m4_express/mpconfigboard.h @@ -7,10 +7,12 @@ #define MICROPY_HW_APA102_MOSI (&pin_PB03) #define MICROPY_HW_APA102_SCK (&pin_PB02) +#define CIRCUITPY_BITBANG_APA102 + // These are pins not to reset. -// QSPI Data pins and TX LED +// QSPI Data pins #define MICROPY_PORT_A (PORT_PA08 | PORT_PA09 | PORT_PA10 | PORT_PA11) -// RX LED, QSPI CS, QSPI SCK and NeoPixel pin +// DotStar pins, QSPI CS, and QSPI SCK #define MICROPY_PORT_B (PORT_PB02 | PORT_PB03 | PORT_PB10 | PORT_PB11) #define MICROPY_PORT_C (0) #define MICROPY_PORT_D (0) @@ -25,7 +27,7 @@ #include "external_flash/devices.h" -#define EXTERNAL_FLASH_DEVICE_COUNT 3 -#define EXTERNAL_FLASH_DEVICES S25FL116K, S25FL216K, GD25Q16C +#define EXTERNAL_FLASH_DEVICE_COUNT 1 +#define EXTERNAL_FLASH_DEVICES GD25Q16C #include "external_flash/external_flash.h" |