Merge pull request #1145 from ladyada/master

rename pin.h to nrf_pin.h to avoid conflict with Pin.h

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) \
 { \

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

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 )