Browse Source

Post merge fix


Add macros.h to allow Enabled macro, also need to reference include files directly
Christopher Pepper 8 years ago
parent
commit
b55295ad33

+ 1
- 1
Marlin/src/HAL/HAL_LPC1768/HAL.cpp View File

25
  */
25
  */
26
 
26
 
27
 #ifdef TARGET_LPC1768
27
 #ifdef TARGET_LPC1768
28
-
28
+#include "../../../macros.h"
29
 #include "../HAL.h"
29
 #include "../HAL.h"
30
 
30
 
31
 extern "C" {
31
 extern "C" {

+ 1
- 0
Marlin/src/HAL/HAL_LPC1768/arduino.cpp View File

22
 
22
 
23
 #ifdef TARGET_LPC1768
23
 #ifdef TARGET_LPC1768
24
 #include <lpc17xx_pinsel.h>
24
 #include <lpc17xx_pinsel.h>
25
+#include "../../../macros.h"
25
 #include "HAL.h"
26
 #include "HAL.h"
26
 
27
 
27
 // Interrupts
28
 // Interrupts

+ 1
- 0
Marlin/src/HAL/HAL_LPC1768/pinmapping.h View File

22
 
22
 
23
 #ifndef __HAL_PINMAPPING_H__
23
 #ifndef __HAL_PINMAPPING_H__
24
 #define __HAL_PINMAPPING_H__
24
 #define __HAL_PINMAPPING_H__
25
+#include "../../../macros.h"
25
 
26
 
26
 struct pin_data { uint8_t port, pin; };
27
 struct pin_data { uint8_t port, pin; };
27
 struct adc_pin_data { uint8_t port, pin, adc; };
28
 struct adc_pin_data { uint8_t port, pin, adc; };

+ 1
- 1
Marlin/src/HAL/HAL_spi_pins.h View File

21
 #ifndef HAL_SPI_PINS_H_
21
 #ifndef HAL_SPI_PINS_H_
22
 #define HAL_SPI_PINS_H_
22
 #define HAL_SPI_PINS_H_
23
 
23
 
24
-#include "MarlinConfig.h"
24
+#include "../../MarlinConfig.h"
25
 
25
 
26
 #ifdef ARDUINO_ARCH_SAM
26
 #ifdef ARDUINO_ARCH_SAM
27
   #include "HAL_DUE/spi_pins.h"
27
   #include "HAL_DUE/spi_pins.h"

Loading…
Cancel
Save