Post merge fix

Add macros.h to allow Enabled macro, also need to reference include files directly
2017-08-01 03:12:30 +01:00
parent d2fb3215da
commit b55295ad33
4 changed files with 4 additions and 2 deletions
--- a/Marlin/src/HAL/HAL_LPC1768/HAL.cpp
+++ b/Marlin/src/HAL/HAL_LPC1768/HAL.cpp
@@ -25,7 +25,7 @@
 */

 #ifdef TARGET_LPC1768
-
+#include "../../../macros.h"
 #include "../HAL.h"

 extern "C" {
--- a/Marlin/src/HAL/HAL_LPC1768/arduino.cpp
+++ b/Marlin/src/HAL/HAL_LPC1768/arduino.cpp
@@ -22,6 +22,7 @@

 #ifdef TARGET_LPC1768
 #include <lpc17xx_pinsel.h>
+#include "../../../macros.h"
 #include "HAL.h"

 // Interrupts
--- a/Marlin/src/HAL/HAL_LPC1768/pinmapping.h
+++ b/Marlin/src/HAL/HAL_LPC1768/pinmapping.h
@@ -22,6 +22,7 @@

 #ifndef __HAL_PINMAPPING_H__
 #define __HAL_PINMAPPING_H__
+#include "../../../macros.h"

 struct pin_data { uint8_t port, pin; };
 struct adc_pin_data { uint8_t port, pin, adc; };
--- a/Marlin/src/HAL/HAL_spi_pins.h
+++ b/Marlin/src/HAL/HAL_spi_pins.h
@@ -21,7 +21,7 @@
 #ifndef HAL_SPI_PINS_H_
 #define HAL_SPI_PINS_H_

-#include "MarlinConfig.h"
+#include "../../MarlinConfig.h"

 #ifdef ARDUINO_ARCH_SAM
  #include "HAL_DUE/spi_pins.h"