atmel-samd: Make UART REPL Arduino Zero specific. Most will use USB REPL.

tannewt · tannewt · commit 284d3414e155 · 2016-10-07T15:06:07.000-07:00
diff --git a/atmel-samd/Makefile b/atmel-samd/Makefile
@@ -148,7 +148,6 @@ SRC_C = \
 	rom_fs.c \
 	samdneopixel.c \
 	storage.c \
-	uart.c \
 	asf/common/services/sleepmgr/samd/sleepmgr.c \
 	asf/common/services/storage/ctrl_access/ctrl_access.c  \
 	asf/common/services/usb/class/cdc/device/udi_cdc.c \
diff --git a/atmel-samd/boards/arduino_zero/init.c b/atmel-samd/boards/arduino_zero/init.c
@@ -11,8 +11,29 @@
 #include "board.h"
 #include "conf_board.h"
 #include "mpconfigboard.h"
+#include "asf/sam0/drivers/sercom/usart/usart.h"
 #include "asf/sam0/drivers/port/port.h"
 
+extern struct usart_module usart_instance;
+
+void configure_usart(void)
+{
+  struct usart_config config_usart;
+
+  usart_get_config_defaults(&config_usart);
+
+  config_usart.baudrate    = 115200;
+  config_usart.mux_setting = EDBG_CDC_SERCOM_MUX_SETTING;
+  config_usart.pinmux_pad0 = EDBG_CDC_SERCOM_PINMUX_PAD0;
+  config_usart.pinmux_pad1 = EDBG_CDC_SERCOM_PINMUX_PAD1;
+  config_usart.pinmux_pad2 = EDBG_CDC_SERCOM_PINMUX_PAD2;
+  config_usart.pinmux_pad3 = EDBG_CDC_SERCOM_PINMUX_PAD3;
+
+  while (usart_init(&usart_instance, EDBG_CDC_MODULE, &config_usart) != STATUS_OK) {
+  }
+  usart_enable(&usart_instance);
+}
+
 void board_init(void)
 {
     /* This function is meant to contain board-specific initialization code
@@ -28,4 +49,9 @@ void board_init(void)
 
     port_pin_set_config(MICROPY_HW_LED_RX, &pin_conf);
     port_pin_set_output_level(MICROPY_HW_LED_RX, true);
+
+    // TODO(tannewt): Switch to proper pyb based UARTs.
+    #ifdef UART_REPL
+        configure_usart();
+    #endif
 }
diff --git a/atmel-samd/boards/feather_m0_bluefruit_le/conf_board.h b/atmel-samd/boards/feather_m0_bluefruit_le/conf_board.h
@@ -11,12 +11,4 @@
 #ifndef CONF_BOARD_H
 #define CONF_BOARD_H
 
-#define EDBG_CDC_SERCOM_MUX_SETTING  USART_RX_3_TX_2_XCK_3
-#define EDBG_CDC_SERCOM_PINMUX_PAD0  PINMUX_UNUSED
-#define EDBG_CDC_SERCOM_PINMUX_PAD1  PINMUX_UNUSED
-#define EDBG_CDC_SERCOM_PINMUX_PAD2  PINMUX_PB22D_SERCOM5_PAD2
-#define EDBG_CDC_SERCOM_PINMUX_PAD3  PINMUX_PB23D_SERCOM5_PAD3
-
-#define EDBG_CDC_MODULE              SERCOM5
-
 #endif // CONF_BOARD_H
diff --git a/atmel-samd/main.c b/atmel-samd/main.c
@@ -24,7 +24,6 @@
 #include "mpconfigboard.h"
 #include "modmachine_pin.h"
 #include "storage.h"
-#include "uart.h"
 
 fs_user_mount_t fs_user_mount_flash;
 
@@ -328,11 +327,6 @@ void samd21_init(void) {
     #ifdef USB_REPL
         udc_start();
     #endif
-
-    // TODO(tannewt): Switch to proper pyb based UARTs.
-    #ifdef UART_REPL
-        configure_usart();
-    #endif
 }
 
 #endif
diff --git a/atmel-samd/uart.c b/atmel-samd/uart.c
diff --git a/atmel-samd/uart.h b/atmel-samd/uart.h
