diff options
| author | ladyada <limor@ladyada.net> | 2018-08-26 20:37:12 -0400 |
|---|---|---|
| committer | ladyada <limor@ladyada.net> | 2018-08-26 20:37:12 -0400 |
| commit | ded38d30b6bd9621ab5254f849f131946dfccbf4 (patch) | |
| tree | 848e2e830cedc5388bed15f30b3acc11f74bdb41 | |
| parent | 5c3fcc7490343d89151d15ba7135d9bdd87f6d32 (diff) | |
rename pin.h to nrf_pin.h to avoid conflict with Pin.h
| -rw-r--r-- | ports/nrf/boards/nrf52_prefix.c | 2 | ||||
| -rw-r--r-- | ports/nrf/common-hal/microcontroller/Pin.h | 2 | ||||
| -rw-r--r-- | ports/nrf/nrf_pin.h (renamed from ports/nrf/pin.h) | 0 | ||||
| -rw-r--r-- | ports/nrf/supervisor/serial.c | 2 |
4 files changed, 3 insertions, 3 deletions
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/pin.h b/ports/nrf/nrf_pin.h index 7a0ebea78..7a0ebea78 100644 --- a/ports/nrf/pin.h +++ b/ports/nrf/nrf_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 ) |