From 946eb6b7ae9e44e984ca1377ae9de5d7a36f2a44 Mon Sep 17 00:00:00 2001 From: Kevin O'Connor Date: Fri, 1 Mar 2019 19:02:06 -0500 Subject: [PATCH] atsamd: Add definitions for SAMD21E18 chip Signed-off-by: Kevin O'Connor --- klippy/pins.py | 2 +- src/atsamd/Kconfig | 8 ++++++-- src/atsamd/sercom.c | 2 ++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/klippy/pins.py b/klippy/pins.py index f93d3aa0..62e33764 100644 --- a/klippy/pins.py +++ b/klippy/pins.py @@ -46,7 +46,7 @@ MCU_PINS = { "atmega1280": port_pins(12), "atmega2560": port_pins(12), "sam3x8e": port_pins(4, 32), "sam3x8c": port_pins(2, 32), "sam4s8c": port_pins(3, 32), "sam4e8e" : port_pins(5, 32), - "samd21g18a": port_pins(2, 32), + "samd21g18a": port_pins(2, 32), "samd21e18a": port_pins(2, 32), "samd51g19a": port_pins(2, 32), "samd51j19a": port_pins(3, 32), "samd51n19a": port_pins(3, 32), "samd51p20a": port_pins(4, 32), "stm32f103": port_pins(5, 16), diff --git a/src/atsamd/Kconfig b/src/atsamd/Kconfig index 68232acd..4832a632 100644 --- a/src/atsamd/Kconfig +++ b/src/atsamd/Kconfig @@ -21,6 +21,9 @@ choice config MACH_SAMD21G18 bool "SAMD21G18 (Arduino Zero)" select MACH_SAMD21 + config MACH_SAMD21E18 + bool "SAMD21E18 (Adafruit Trinket M0)" + select MACH_SAMD21 config MACH_SAMD51G19 bool "SAMD51G19 (Adafruit ItsyBitsy M4)" select MACH_SAMD51 @@ -43,6 +46,7 @@ config MACH_SAMD51 config MCU string default "samd21g18a" if MACH_SAMD21G18 + default "samd21e18a" if MACH_SAMD21E18 default "samd51g19a" if MACH_SAMD51G19 default "samd51j19a" if MACH_SAMD51J19 default "samd51n19a" if MACH_SAMD51N19 @@ -55,13 +59,13 @@ config CLOCK_FREQ config FLASH_SIZE hex - default 0x40000 if MACH_SAMD21G18 + default 0x40000 if MACH_SAMD21G18 || MACH_SAMD21E18 default 0x80000 if MACH_SAMD51G19 || MACH_SAMD51J19 || MACH_SAMD51N19 default 0x100000 if MACH_SAMD51P20 config RAM_SIZE hex - default 0x8000 if MACH_SAMD21G18 + default 0x8000 if MACH_SAMD21G18 || MACH_SAMD21E18 default 0x30000 if MACH_SAMD51G19 || MACH_SAMD51J19 || MACH_SAMD51N19 default 0x40000 if MACH_SAMD51P20 diff --git a/src/atsamd/sercom.c b/src/atsamd/sercom.c index 3b80f889..688a492f 100644 --- a/src/atsamd/sercom.c +++ b/src/atsamd/sercom.c @@ -25,8 +25,10 @@ static const struct sercom_bus sercoms[] = { { SERCOM1, SERCOM1_GCLK_ID_CORE, ID_SERCOM1 }, { SERCOM2, SERCOM2_GCLK_ID_CORE, ID_SERCOM2 }, { SERCOM3, SERCOM3_GCLK_ID_CORE, ID_SERCOM3 }, +#ifdef SERCOM4 { SERCOM4, SERCOM4_GCLK_ID_CORE, ID_SERCOM4 }, { SERCOM5, SERCOM5_GCLK_ID_CORE, ID_SERCOM5 }, +#endif #ifdef SERCOM6 { SERCOM6, SERCOM6_GCLK_ID_CORE, ID_SERCOM6 }, { SERCOM7, SERCOM7_GCLK_ID_CORE, ID_SERCOM7 },