From ded38d30b6bd9621ab5254f849f131946dfccbf4 Mon Sep 17 00:00:00 2001
From: ladyada <limor@ladyada.net>
Date: Sun, 26 Aug 2018 20:37:12 -0400
Subject: [PATCH] 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/{pin.h => nrf_pin.h}             | 0
 ports/nrf/supervisor/serial.c              | 2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename ports/nrf/{pin.h => nrf_pin.h} (100%)

diff --git a/ports/nrf/boards/nrf52_prefix.c b/ports/nrf/boards/nrf52_prefix.c
index e6c622da77..0c96eb61ef 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 66cd011da2..1694a82493 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
similarity index 100%
rename from ports/nrf/pin.h
rename to ports/nrf/nrf_pin.h
diff --git a/ports/nrf/supervisor/serial.c b/ports/nrf/supervisor/serial.c
index 4256b39f1c..a822dc9936 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 )