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/common-hal/microcontroller/Pin.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ports/nrf/common-hal/microcontroller/Pin.h') 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 -- cgit v1.2.3