From ded38d30b6bd9621ab5254f849f131946dfccbf4 Mon Sep 17 00:00:00 2001 From: ladyada Date: Sun, 26 Aug 2018 20:37:12 -0400 Subject: rename pin.h to nrf_pin.h to avoid conflict with Pin.h --- ports/nrf/boards/nrf52_prefix.c | 2 +- ports/nrf/common-hal/microcontroller/Pin.h | 2 +- ports/nrf/nrf_pin.h | 43 ++++++++++++++++++++++++++++++ ports/nrf/pin.h | 43 ------------------------------ ports/nrf/supervisor/serial.c | 2 +- 5 files changed, 46 insertions(+), 46 deletions(-) create mode 100644 ports/nrf/nrf_pin.h delete mode 100644 ports/nrf/pin.h diff --git a/ports/nrf/boards/nrf52_prefix.c b/ports/nrf/boards/nrf52_prefix.c index e6c622da7..0c96eb61e 100644 --- a/ports/nrf/boards/nrf52_prefix.c +++ b/ports/nrf/boards/nrf52_prefix.c @@ -4,7 +4,7 @@ #include "py/obj.h" #include "py/mphal.h" -#include "pin.h" +#include "nrf_pin.h" #define PIN(p_name, p_port, p_pin, p_adc_channel) \ { \ diff --git a/ports/nrf/common-hal/microcontroller/Pin.h b/ports/nrf/common-hal/microcontroller/Pin.h index 66cd011da..1694a8249 100644 --- a/ports/nrf/common-hal/microcontroller/Pin.h +++ b/ports/nrf/common-hal/microcontroller/Pin.h @@ -27,7 +27,7 @@ #ifndef MICROPY_INCLUDED_NRF_COMMON_HAL_MICROCONTROLLER_PIN_H #define MICROPY_INCLUDED_NRF_COMMON_HAL_MICROCONTROLLER_PIN_H -#include "pin.h" +#include "nrf_pin.h" #include "py/mphal.h" #define mcu_pin_obj_t pin_obj_t diff --git a/ports/nrf/nrf_pin.h b/ports/nrf/nrf_pin.h new file mode 100644 index 000000000..7a0ebea78 --- /dev/null +++ b/ports/nrf/nrf_pin.h @@ -0,0 +1,43 @@ +/* + * This file is part of the MicroPython project, http://micropython.org/ + * + * The MIT License (MIT) + * + * Copyright (c) 2013, 2014 Damien P. George + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +#ifndef __MICROPY_INCLUDED_NRF5_PIN_H__ +#define __MICROPY_INCLUDED_NRF5_PIN_H__ + +#include "py/obj.h" + +typedef struct { + mp_obj_base_t base; + qstr name; + + uint32_t port : 1; + uint32_t pin : 5; // Some ARM processors use 32 bits/PORT + uint32_t adc_channel : 4; // 0 is no ADC, ADC channel from 1 to 8 +} pin_obj_t; + +extern const mp_obj_type_t mcu_pin_type; + +#endif // __MICROPY_INCLUDED_NRF5_PIN_H__ diff --git a/ports/nrf/pin.h b/ports/nrf/pin.h deleted file mode 100644 index 7a0ebea78..000000000 --- a/ports/nrf/pin.h +++ /dev/null @@ -1,43 +0,0 @@ -/* - * This file is part of the MicroPython project, http://micropython.org/ - * - * The MIT License (MIT) - * - * Copyright (c) 2013, 2014 Damien P. George - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ - -#ifndef __MICROPY_INCLUDED_NRF5_PIN_H__ -#define __MICROPY_INCLUDED_NRF5_PIN_H__ - -#include "py/obj.h" - -typedef struct { - mp_obj_base_t base; - qstr name; - - uint32_t port : 1; - uint32_t pin : 5; // Some ARM processors use 32 bits/PORT - uint32_t adc_channel : 4; // 0 is no ADC, ADC channel from 1 to 8 -} pin_obj_t; - -extern const mp_obj_type_t mcu_pin_type; - -#endif // __MICROPY_INCLUDED_NRF5_PIN_H__ diff --git a/ports/nrf/supervisor/serial.c b/ports/nrf/supervisor/serial.c index 4256b39f1..a822dc993 100644 --- a/ports/nrf/supervisor/serial.c +++ b/ports/nrf/supervisor/serial.c @@ -30,7 +30,7 @@ #include "ble_uart.h" #else #include "nrf_gpio.h" -#include "pin.h" +#include "nrf_pin.h" #endif #if !defined( NRF52840_XXAA) || ( defined(CFG_HWUART_FOR_SERIAL) && CFG_HWUART_FOR_SERIAL == 1 ) -- cgit v1.2.3