atmel-samd: Rename module classes so they don't conflict with names from ASF.

12 files changed, 14 insertions, 20 deletions

diff --git a/atmel-samd/Makefile b/atmel-samd/Makefile
index ef363ef43..6ce1d0d1b 100644
--- a/atmel-samd/Makefile
+++ b/atmel-samd/Makefile
@@ -113,13 +113,13 @@ SRC_ASF = $(addprefix asf/sam0/,\
 	)
 
 SRC_C = \
-	adc.c \
 	main.c \
 	modmachine.c \
+	modmachine_adc.c \
+	modmachine_dac.c \
+	modmachine_pin.c \
 	modutime.c \
-	mpdac.c \
 	mphalport.c \
-	pin.c \
 	pin_named_pins.c \
 	uart.c \
 	asf/common/services/sleepmgr/samd/sleepmgr.c \
diff --git a/atmel-samd/boards/arduino_zero/pins.h b/atmel-samd/boards/arduino_zero/pins.h
index 2a1dbbf93..7856557e9 100644
--- a/atmel-samd/boards/arduino_zero/pins.h
+++ b/atmel-samd/boards/arduino_zero/pins.h
@@ -2,7 +2,7 @@
 #ifndef __MICROPY_INCLUDED_ATMEL_SAMD_BOARDS_FEATHER_M0_BLE_PINS_H__
 #define __MICROPY_INCLUDED_ATMEL_SAMD_BOARDS_FEATHER_M0_BLE_PINS_H__
 
-#include "pin.h"
+#include "modmachine_pin.h"
 
 extern const pin_obj_t pin_PA02;
 extern const pin_obj_t pin_PB08;
diff --git a/atmel-samd/boards/feather_m0_ble/pins.h b/atmel-samd/boards/feather_m0_ble/pins.h
index 2a1dbbf93..7856557e9 100644
--- a/atmel-samd/boards/feather_m0_ble/pins.h
+++ b/atmel-samd/boards/feather_m0_ble/pins.h
@@ -2,7 +2,7 @@
 #ifndef __MICROPY_INCLUDED_ATMEL_SAMD_BOARDS_FEATHER_M0_BLE_PINS_H__
 #define __MICROPY_INCLUDED_ATMEL_SAMD_BOARDS_FEATHER_M0_BLE_PINS_H__
 
-#include "pin.h"
+#include "modmachine_pin.h"
 
 extern const pin_obj_t pin_PA02;
 extern const pin_obj_t pin_PB08;
diff --git a/atmel-samd/main.c b/atmel-samd/main.c
index 2e7cc48a5..5c9c75546 100644
--- a/atmel-samd/main.c
+++ b/atmel-samd/main.c
@@ -18,7 +18,7 @@
 #include "asf/sam0/drivers/system/system.h"
 
 #include "mpconfigboard.h"
-#include "pin.h"
+#include "modmachine_pin.h"
 #include "uart.h"
 
 void do_str(const char *src, mp_parse_input_kind_t input_kind) {
diff --git a/atmel-samd/modmachine.c b/atmel-samd/modmachine.c
index 6a8256753..4abe1c742 100644
--- a/atmel-samd/modmachine.c
+++ b/atmel-samd/modmachine.c
@@ -31,9 +31,9 @@
 #include "py/obj.h"
 #include "py/runtime.h"
 
-#include "adc.h"
-#include "mpdac.h"
-#include "pin.h"
+#include "modmachine_adc.h"
+#include "modmachine_dac.h"
+#include "modmachine_pin.h"
 
 #if MICROPY_PY_MACHINE
 
diff --git a/atmel-samd/adc.c b/atmel-samd/modmachine_adc.c
index 1a7c5cbf9..ac5e6a6f6 100644
--- a/atmel-samd/adc.c
+++ b/atmel-samd/modmachine_adc.c
@@ -31,8 +31,8 @@
 #include "py/runtime.h"
 #include "py/binary.h"
 #include "py/mphal.h"
-#include "adc.h"
-#include "pin.h"
+#include "modmachine_adc.h"
+#include "modmachine_pin.h"
 
 #include "asf/sam0/drivers/adc/adc.h"
 
diff --git a/atmel-samd/adc.h b/atmel-samd/modmachine_adc.h
index ed01f20c8..ed01f20c8 100644
--- a/atmel-samd/adc.h
+++ b/atmel-samd/modmachine_adc.h
diff --git a/atmel-samd/mpdac.c b/atmel-samd/modmachine_dac.c
index 5f3308b93..0b5c74d35 100644
--- a/atmel-samd/mpdac.c
+++ b/atmel-samd/modmachine_dac.c
@@ -28,14 +28,8 @@
 #include <stdint.h>
 #include <string.h>
 
-//
-// #include "py/nlr.h"
 #include "py/runtime.h"
-// #include "timer.h"
-#include "mpdac.h"
-// #include "dma.h"
-// #include "pin.h"
-// #include "genhdr/pins.h"
+#include "modmachine_dac.h"
 
 #include "asf/sam0/drivers/dac/dac.h"
 
diff --git a/atmel-samd/mpdac.h b/atmel-samd/modmachine_dac.h
index 931987cd9..931987cd9 100644
--- a/atmel-samd/mpdac.h
+++ b/atmel-samd/modmachine_dac.h
diff --git a/atmel-samd/pin.c b/atmel-samd/modmachine_pin.c
index 5866c8bf0..14c809057 100644
--- a/atmel-samd/pin.c
+++ b/atmel-samd/modmachine_pin.c
@@ -31,7 +31,7 @@
 #include "py/nlr.h"
 #include "py/runtime.h"
 #include "py/mphal.h"
-#include "pin.h"
+#include "modmachine_pin.h"
 
 #include "asf/sam0/drivers/port/port.h"
 
diff --git a/atmel-samd/pin.h b/atmel-samd/modmachine_pin.h
index 4a02f41db..4a02f41db 100644
--- a/atmel-samd/pin.h
+++ b/atmel-samd/modmachine_pin.h
diff --git a/atmel-samd/pin_named_pins.c b/atmel-samd/pin_named_pins.c
index c05f59903..24406f190 100644
--- a/atmel-samd/pin_named_pins.c
+++ b/atmel-samd/pin_named_pins.c
@@ -29,7 +29,7 @@
 
 #include "py/runtime.h"
 #include "py/mphal.h"
-#include "pin.h"
+#include "modmachine_pin.h"
 
 STATIC void pin_named_pins_obj_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     pin_named_pins_obj_t *self = self_in;