Preliminary cleanup of #include structure (#9763)

Marlin/src/HAL/HAL_LPC1768/HAL.h

@@ -55,9 +55,9 @@ extern "C" volatile uint32_t _millis;
 #define B01 1
 #define B10 2
 
-#include "include/Arduino.h"
+#include <Arduino.h>
+#include <pinmapping.h>
 
-#include "pinmapping.h"
 #include "fastio.h"
 #include "watchdog.h"
 #include "serial.h"

Marlin/src/HAL/HAL_LPC1768/HAL_spi.cpp

@@ -26,7 +26,6 @@
  */
 
 /**
- *
  * For TARGET_LPC1768
  */
 
@@ -47,16 +46,15 @@
  * https://github.com/MarlinFirmware/Marlin/tree/071c7a78f27078fd4aee9a3ef365fcf5e143531e
  */
 
-#include "../../inc/MarlinConfig.h"
-
 #ifdef TARGET_LPC1768
 
+#include "../../inc/MarlinConfig.h"
+
 // --------------------------------------------------------------------------
 // Includes
 // --------------------------------------------------------------------------
 
-#include "LPC_SPI.h"
-#include "../SPI.h"
+#include <SPI.h>
 
 // --------------------------------------------------------------------------
 // Public functions

Marlin/src/HAL/HAL_LPC1768/LPC1768_PWM.cpp

@@ -74,7 +74,7 @@
 #include "../../inc/MarlinConfig.h"
 #include <lpc17xx_pinsel.h>
 #include "LPC1768_PWM.h"
-#include "Arduino.h"
+#include <Arduino.h>
 
 #define NUM_ISR_PWMS 20
 

Marlin/src/HAL/HAL_LPC1768/LPC1768_PWM.h

@@ -63,7 +63,7 @@
 #ifndef _LPC1768_PWM_H_
 #define _LPC1768_PWM_H_
 
-#include "pinmapping.h"
+#include <pinmapping.h>
 #include <lpc17xx_clkpwr.h>
 
 #define LPC_PWM1_MR0 19999  // base repetition rate minus one count - 20mS

Marlin/src/HAL/HAL_LPC1768/SanityCheck.h

@@ -68,4 +68,4 @@
       #error "SPINDLE_LASER_PWM_PIN is used by CONTROLLERFAN_PIN."
     #endif
   #endif
-#endif // SPINDLE_LASER_ENABLE
+#endif // SPINDLE_LASER_ENABLE

Marlin/src/HAL/HAL_LPC1768/SoftwareSPI.h

@@ -23,7 +23,7 @@
 #ifndef _SOFTWARE_SPI_H_
 #define _SOFTWARE_SPI_H_
 
-#include "pinmapping.h"
+#include <pinmapping.h>
 
 // --------------------------------------------------------------------------
 // Software SPI

Marlin/src/HAL/HAL_LPC1768/SoftwareSerial.cpp

@@ -39,8 +39,8 @@
 #include "../../inc/MarlinConfig.h"
 #include <stdint.h>
 #include <stdarg.h>
-#include "include/Arduino.h"
-#include "pinmapping.h"
+#include <Arduino.h>
+#include <pinmapping.h>
 #include "fastio.h"
 #include "SoftwareSerial.h"
 

Marlin/src/HAL/HAL_LPC1768/SoftwareSerial.h

@@ -33,7 +33,7 @@
 #ifndef SOFTWARESERIAL_H
 #define SOFTWARESERIAL_H
 
-#include "include/Arduino.h"
+#include <Arduino.h>
 #include <stdint.h>
 //#include "serial.h"
 #include <Stream.h>

Marlin/src/HAL/HAL_LPC1768/WInterrupts.cpp

@@ -19,8 +19,8 @@
 #ifdef TARGET_LPC1768
 
 #include "../../inc/MarlinConfig.h"
-#include "include/Arduino.h"
-#include "pinmapping.h"
+#include <Arduino.h>
+#include <pinmapping.h>
 //#include "HAL_timers.h"
 #include "fastio.h"
 

Marlin/src/HAL/HAL_LPC1768/fastio.h

@@ -36,8 +36,8 @@
 #define _FASTIO_LPC1768_H
 
 #include <LPC17xx.h>
-#include "include/Arduino.h"
-#include "pinmapping.h"
+#include <Arduino.h>
+#include <pinmapping.h>
 
 bool useable_hardware_PWM(pin_t pin);
 #define USEABLE_HARDWARE_PWM(pin) useable_hardware_PWM(pin)

Marlin/src/HAL/HAL_LPC1768/include/Arduino.h

@@ -26,7 +26,7 @@
 #include <stdint.h>
 #include <math.h>
 
-#include "../pinmapping.h"
+#include <pinmapping.h>
 
 #define HIGH         0x01
 #define LOW          0x00

Marlin/src/HAL/HAL_LPC1768/include/SPI.h

@@ -21,7 +21,9 @@
  */
 
 #pragma once
-#ifdef TARGET_LPC1768
+
+#include "../../HAL_SPI.h"
+
 #include <stdint.h>
 
 #define MSBFIRST 1
@@ -42,4 +44,3 @@ class SPIClass {
 };
 
 extern SPIClass SPI;
-#endif

Marlin/src/HAL/HAL_LPC1768/include/Wire.cpp

@@ -28,7 +28,7 @@ extern "C" {
   #include <lpc17xx_libcfg_default.h>
 }
 
-#include "Wire.h"
+#include <Wire.h>
 
 #define USEDI2CDEV_M 1
 

Marlin/src/HAL/HAL_LPC1768/include/pinmapping.cpp

@@ -22,9 +22,9 @@
 
 #ifdef TARGET_LPC1768
 
-#include "pinmapping.h"
+#include <pinmapping.h>
 
-#include "../../gcode/parser.h"
+#include "../../../gcode/parser.h"
 
 // Get the digital pin for an analog index
 pin_t analogInputToDigitalPin(const int8_t p) {

Marlin/src/HAL/HAL_LPC1768/include/pinmapping.h

@@ -23,7 +23,7 @@
 #ifndef _PINMAPPING_H_
 #define _PINMAPPING_H_
 
-#include "../../inc/MarlinConfigPre.h"
+#include "../../../inc/MarlinConfigPre.h"
 
 #include <stdint.h>
 

Marlin/src/HAL/HAL_LPC1768/lpc1768_flag_script.py

@@ -17,9 +17,12 @@ if __name__ == "__main__":
                     "--specs=nano.specs",
                     "--specs=nosys.specs",
 
-                    "-IMarlin/src/HAL",
+                    # For external libraries
                     "-IMarlin/src/HAL/HAL_LPC1768/include",
 
+                    # For MarlinFirmware/U8glib-HAL
+                    "-IMarlin/src/HAL/HAL_LPC1768/u8g",
+
                     "-MMD",
                     "-MP",
                     "-DTARGET_LPC1768"

Marlin/src/HAL/HAL_LPC1768/main.cpp

@@ -30,7 +30,7 @@ extern "C" {
 #include "HAL_timers.h"
 #include <stdio.h>
 #include <stdarg.h>
-#include "include/Arduino.h"
+#include <Arduino.h>
 #include "serial.h"
 #include "LPC1768_PWM.h"
 

Marlin/src/HAL/HAL_LPC1768/u8g/HAL_LCD_defines.h

@@ -24,12 +24,6 @@
  * LPC1768 LCD-specific defines
  */
 
-// pointers to low level routines - must always supply these
-//#define U8G_HAL_LINKS
-#define HAL_LCD_pin_routines "HAL_LPC1768/HAL_LCD_pin_routines.h"
-#define HAL_LCD_I2C_routines  "HAL_LPC1768/HAL_LCD_I2C_routines.h"
-#define HAL_LCD_delay "HAL_LPC1768/HAL_LCD_delay.h"
-
 // The following are optional depending on the platform.
 
 // definitions of HAL specific com and device drivers.

Marlin/src/HAL/HAL_LPC1768/u8g/HAL_LCD_pin_routines.c

@@ -34,8 +34,8 @@
 
 #include <LPC17xx.h>
 #include <lpc17xx_pinsel.h>
-#include "../core/macros.h"
-//#include "pinmapping.h"
+#include "../../../core/macros.h"
+//#include <pinmapping.h>
 
 #define LPC_PORT_OFFSET         (0x0020)
 #define LPC_PIN(pin)            (1UL << pin)

Marlin/src/HAL/HAL_LPC1768/u8g_com_HAL_LPC1768_st7920_hw_spi.cpp

@@ -57,10 +57,9 @@
 
 #ifdef TARGET_LPC1768
 
-//  #include <inttypes.h>
-
-//  #include "src/core/macros.h"
-//  #include "Configuration.h"
+  //#include <inttypes.h>
+  //#include "src/core/macros.h"
+  //#include "Configuration.h"
 
   #include <U8glib.h>