From b883a15d82c156a0abf8aabf61bc9445ddf97f39 Mon Sep 17 00:00:00 2001 From: Scott Shawcroft Date: Sun, 28 Aug 2016 00:02:05 -0700 Subject: [PATCH] atmel-samd: Rename module classes so they don't conflict with names from ASF. --- atmel-samd/Makefile | 6 +++--- atmel-samd/boards/arduino_zero/pins.h | 2 +- atmel-samd/boards/feather_m0_ble/pins.h | 2 +- atmel-samd/main.c | 2 +- atmel-samd/modmachine.c | 6 +++--- atmel-samd/{adc.c => modmachine_adc.c} | 4 ++-- atmel-samd/{adc.h => modmachine_adc.h} | 0 atmel-samd/{mpdac.c => modmachine_dac.c} | 8 +------- atmel-samd/{mpdac.h => modmachine_dac.h} | 0 atmel-samd/{pin.c => modmachine_pin.c} | 2 +- atmel-samd/{pin.h => modmachine_pin.h} | 0 atmel-samd/pin_named_pins.c | 2 +- 12 files changed, 14 insertions(+), 20 deletions(-) rename atmel-samd/{adc.c => modmachine_adc.c} (98%) rename atmel-samd/{adc.h => modmachine_adc.h} (100%) rename atmel-samd/{mpdac.c => modmachine_dac.c} (97%) rename atmel-samd/{mpdac.h => modmachine_dac.h} (100%) rename atmel-samd/{pin.c => modmachine_pin.c} (99%) rename atmel-samd/{pin.h => modmachine_pin.h} (100%) diff --git a/atmel-samd/Makefile b/atmel-samd/Makefile index ef363ef43d..6ce1d0d1b3 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 2a1dbbf93f..7856557e94 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 2a1dbbf93f..7856557e94 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 2e7cc48a55..5c9c75546a 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 6a8256753c..4abe1c7421 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 similarity index 98% rename from atmel-samd/adc.c rename to atmel-samd/modmachine_adc.c index 1a7c5cbf98..ac5e6a6f64 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 similarity index 100% rename from atmel-samd/adc.h rename to atmel-samd/modmachine_adc.h diff --git a/atmel-samd/mpdac.c b/atmel-samd/modmachine_dac.c similarity index 97% rename from atmel-samd/mpdac.c rename to atmel-samd/modmachine_dac.c index 5f3308b936..0b5c74d354 100644 --- a/atmel-samd/mpdac.c +++ b/atmel-samd/modmachine_dac.c @@ -28,14 +28,8 @@ #include #include -// -// #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 similarity index 100% rename from atmel-samd/mpdac.h rename to atmel-samd/modmachine_dac.h diff --git a/atmel-samd/pin.c b/atmel-samd/modmachine_pin.c similarity index 99% rename from atmel-samd/pin.c rename to atmel-samd/modmachine_pin.c index 5866c8bf09..14c809057e 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 similarity index 100% rename from atmel-samd/pin.h rename to atmel-samd/modmachine_pin.h diff --git a/atmel-samd/pin_named_pins.c b/atmel-samd/pin_named_pins.c index c05f59903b..24406f1905 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;