Skip to content

Commit d364bab

Browse files
thinkyheadthinkyhead
authored
🧑‍💻 Change HAL_PATH macro for easier HAL relocation (MarlinFirmware#25743)
1 parent 1771d7a commit d364bab

15 files changed

+36
-35
lines changed

‎Marlin/src/HAL/HAL.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
#define GCC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__)
2828
#endif
2929

30-
#include HAL_PATH(.,HAL.h)
30+
#include HAL_PATH(..,HAL.h)
3131
extern MarlinHAL hal;
3232

3333
#define HAL_ADC_RANGE _BV(HAL_ADC_RESOLUTION)

‎Marlin/src/HAL/platforms.h

+13-13
Original file line numberDiff line numberDiff line change
@@ -24,34 +24,34 @@
2424
#define XSTR(V...) #V
2525

2626
#ifdef __AVR__
27-
#define HAL_PATH(PATH, NAME) XSTR(PATH/AVR/NAME)
27+
#define HAL_PATH(PATH, NAME) XSTR(PATH/HAL/AVR/NAME)
2828
#elif defined(ARDUINO_ARCH_SAM)
29-
#define HAL_PATH(PATH, NAME) XSTR(PATH/DUE/NAME)
29+
#define HAL_PATH(PATH, NAME) XSTR(PATH/HAL/DUE/NAME)
3030
#elif defined(__MK20DX256__)
31-
#define HAL_PATH(PATH, NAME) XSTR(PATH/TEENSY31_32/NAME)
31+
#define HAL_PATH(PATH, NAME) XSTR(PATH/HAL/TEENSY31_32/NAME)
3232
#elif defined(__MK64FX512__) || defined(__MK66FX1M0__)
33-
#define HAL_PATH(PATH, NAME) XSTR(PATH/TEENSY35_36/NAME)
33+
#define HAL_PATH(PATH, NAME) XSTR(PATH/HAL/TEENSY35_36/NAME)
3434
#elif defined(__IMXRT1062__)
35-
#define HAL_PATH(PATH, NAME) XSTR(PATH/TEENSY40_41/NAME)
35+
#define HAL_PATH(PATH, NAME) XSTR(PATH/HAL/TEENSY40_41/NAME)
3636
#elif defined(TARGET_LPC1768)
37-
#define HAL_PATH(PATH, NAME) XSTR(PATH/LPC1768/NAME)
37+
#define HAL_PATH(PATH, NAME) XSTR(PATH/HAL/LPC1768/NAME)
3838
#elif defined(__STM32F1__) || defined(TARGET_STM32F1)
39-
#define HAL_PATH(PATH, NAME) XSTR(PATH/STM32F1/NAME)
39+
#define HAL_PATH(PATH, NAME) XSTR(PATH/HAL/STM32F1/NAME)
4040
#elif defined(ARDUINO_ARCH_STM32)
4141
#ifndef HAL_STM32
4242
#define HAL_STM32
4343
#endif
44-
#define HAL_PATH(PATH, NAME) XSTR(PATH/STM32/NAME)
44+
#define HAL_PATH(PATH, NAME) XSTR(PATH/HAL/STM32/NAME)
4545
#elif defined(ARDUINO_ARCH_ESP32)
46-
#define HAL_PATH(PATH, NAME) XSTR(PATH/ESP32/NAME)
46+
#define HAL_PATH(PATH, NAME) XSTR(PATH/HAL/ESP32/NAME)
4747
#elif defined(__PLAT_LINUX__)
48-
#define HAL_PATH(PATH, NAME) XSTR(PATH/LINUX/NAME)
48+
#define HAL_PATH(PATH, NAME) XSTR(PATH/HAL/LINUX/NAME)
4949
#elif defined(__PLAT_NATIVE_SIM__)
50-
#define HAL_PATH(PATH, NAME) XSTR(PATH/NATIVE_SIM/NAME)
50+
#define HAL_PATH(PATH, NAME) XSTR(PATH/HAL/NATIVE_SIM/NAME)
5151
#elif defined(__SAMD51__)
52-
#define HAL_PATH(PATH, NAME) XSTR(PATH/SAMD51/NAME)
52+
#define HAL_PATH(PATH, NAME) XSTR(PATH/HAL/SAMD51/NAME)
5353
#elif defined(__SAMD21__)
54-
#define HAL_PATH(PATH, NAME) XSTR(PATH/SAMD21/NAME)
54+
#define HAL_PATH(PATH, NAME) XSTR(PATH/HAL/SAMD21/NAME)
5555
#else
5656
#error "Unsupported Platform!"
5757
#endif

‎Marlin/src/inc/MarlinConfig.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -34,21 +34,21 @@
3434
#include "../pins/pins.h"
3535

3636
#ifndef __MARLIN_DEPS__
37-
#include HAL_PATH(../HAL, timers.h)
38-
#include HAL_PATH(../HAL, spi_pins.h)
37+
#include HAL_PATH(.., timers.h)
38+
#include HAL_PATH(.., spi_pins.h)
3939
#endif
4040

4141
#include "Conditionals_post.h"
4242

4343
#ifndef __MARLIN_DEPS__
4444

45-
#include HAL_PATH(../HAL, inc/Conditionals_post.h)
45+
#include HAL_PATH(.., inc/Conditionals_post.h)
4646

4747
#include "../core/types.h" // Ahead of sanity-checks
4848

4949
#include "Changes.h"
5050
#include "SanityCheck.h"
51-
#include HAL_PATH(../HAL, inc/SanityCheck.h)
51+
#include HAL_PATH(.., inc/SanityCheck.h)
5252

5353
// Include all core headers
5454
#include "../core/language.h"

‎Marlin/src/inc/MarlinConfigPre.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
#include "Conditionals_LCD.h"
5050

5151
#ifndef __MARLIN_DEPS__
52-
#include HAL_PATH(../HAL, inc/Conditionals_LCD.h)
52+
#include HAL_PATH(.., inc/Conditionals_LCD.h)
5353
#endif
5454

5555
#include "../core/drivers.h"
@@ -58,5 +58,5 @@
5858
#include "Conditionals_adv.h"
5959

6060
#ifndef __MARLIN_DEPS__
61-
#include HAL_PATH(../HAL, inc/Conditionals_adv.h)
61+
#include HAL_PATH(.., inc/Conditionals_adv.h)
6262
#endif

‎Marlin/src/lcd/extui/mks_ui/tft_lvgl_configuration.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
#include "../../../MarlinCore.h"
3939
#include "../../../inc/MarlinConfig.h"
4040

41-
#include HAL_PATH(../../../HAL, tft/xpt2046.h)
41+
#include HAL_PATH(../../.., tft/xpt2046.h)
4242
#include "../../marlinui.h"
4343
XPT2046 touch;
4444

‎Marlin/src/lcd/tft/touch.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@
3131
#endif
3232

3333
#if ENABLED(TFT_TOUCH_DEVICE_GT911)
34-
#include HAL_PATH(../../HAL, tft/gt911.h)
34+
#include HAL_PATH(../.., tft/gt911.h)
3535
#define TOUCH_DRIVER_CLASS GT911
3636
#elif ENABLED(TFT_TOUCH_DEVICE_XPT2046)
37-
#include HAL_PATH(../../HAL, tft/xpt2046.h)
37+
#include HAL_PATH(../.., tft/xpt2046.h)
3838
#define TOUCH_DRIVER_CLASS XPT2046
3939
#else
4040
#error "Unknown Touch Screen Type."

‎Marlin/src/lcd/tft_io/tft_io.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@
2424
#include "../../inc/MarlinConfig.h"
2525

2626
#if HAS_SPI_TFT
27-
#include HAL_PATH(../../HAL, tft/tft_spi.h)
27+
#include HAL_PATH(../.., tft/tft_spi.h)
2828
#elif HAS_FSMC_TFT
29-
#include HAL_PATH(../../HAL, tft/tft_fsmc.h)
29+
#include HAL_PATH(../.., tft/tft_fsmc.h)
3030
#elif HAS_LTDC_TFT
31-
#include HAL_PATH(../../HAL, tft/tft_ltdc.h)
31+
#include HAL_PATH(../.., tft/tft_ltdc.h)
3232
#else
3333
#error "TFT IO only supports SPI, FSMC or LTDC interface."
3434
#endif

‎Marlin/src/lcd/touch/touch_buttons.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@
2828
#include "../scaled_tft.h"
2929

3030
#if ENABLED(TFT_TOUCH_DEVICE_GT911)
31-
#include HAL_PATH(../../HAL, tft/gt911.h)
31+
#include HAL_PATH(../.., tft/gt911.h)
3232
GT911 touchIO;
3333
#elif ENABLED(TFT_TOUCH_DEVICE_XPT2046)
34-
#include HAL_PATH(../../HAL, tft/xpt2046.h)
34+
#include HAL_PATH(../.., tft/xpt2046.h)
3535
XPT2046 touchIO;
3636
#else
3737
#error "Unknown Touch Screen Type."

‎Marlin/src/libs/MAX31865.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545

4646
#include "../inc/MarlinConfig.h"
4747
#include "../HAL/shared/Delay.h"
48-
#include HAL_PATH(../HAL, MarlinSPI.h)
48+
#include HAL_PATH(.., MarlinSPI.h)
4949

5050
#define MAX31865_CONFIG_REG 0x00
5151
#define MAX31865_CONFIG_BIAS 0x80

‎Marlin/src/libs/W25Qxx.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
#include <stdint.h>
2525

26-
#include HAL_PATH(../HAL, MarlinSPI.h)
26+
#include HAL_PATH(.., MarlinSPI.h)
2727

2828
#define W25X_WriteEnable 0x06
2929
#define W25X_WriteDisable 0x04

‎Marlin/src/module/endstops.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
#include "../core/debug_out.h"
3636

3737
#if ENABLED(ENDSTOP_INTERRUPTS_FEATURE)
38-
#include HAL_PATH(../HAL, endstop_interrupts.h)
38+
#include HAL_PATH(.., endstop_interrupts.h)
3939
#endif
4040

4141
#if BOTH(SD_ABORT_ON_ENDSTOP_HIT, HAS_MEDIA)

‎Marlin/src/module/stepper.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -3985,7 +3985,7 @@ void Stepper::report_positions() {
39853985

39863986
#else // PRINTRBOARD_G2
39873987

3988-
#include HAL_PATH(../HAL, fastio/G2_PWM.h)
3988+
#include HAL_PATH(.., fastio/G2_PWM.h)
39893989

39903990
#endif
39913991

‎Marlin/src/pins/pinsDebug.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ const PinInfo pin_array[] PROGMEM = {
168168

169169
};
170170

171-
#include HAL_PATH(../HAL, pinsDebug.h) // get the correct support file for this CPU
171+
#include HAL_PATH(.., pinsDebug.h) // get the correct support file for this CPU
172172

173173
#ifndef M43_NEVER_TOUCH
174174
#define M43_NEVER_TOUCH(Q) false

‎Marlin/src/sd/usb_flashdrive/Sd2Card_FlashDrive.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -84,10 +84,10 @@
8484
#elif ENABLED(USE_OTG_USB_HOST)
8585

8686
#if HAS_SD_HOST_DRIVE
87-
#include HAL_PATH(../../HAL, msc_sd.h)
87+
#include HAL_PATH(../.., msc_sd.h)
8888
#endif
8989

90-
#include HAL_PATH(../../HAL, usb_host.h)
90+
#include HAL_PATH(../.., usb_host.h)
9191

9292
#define UHS_START usb.start()
9393
#define rREVISION 0

‎ini/features.ini

+1
Original file line numberDiff line numberDiff line change
@@ -248,3 +248,4 @@ HAS_MICROSTEPS = src_filter=+<src/gcode/control/M350_M35
248248
arduinoWebSockets=links2004/WebSockets@2.3.4
249249
luc-github/ESP32SSDP@1.1.1
250250
lib_ignore=ESPAsyncTCP
251+
build_flags=-DSRCHOME=${platformio.src_dir}/src -DHALHOME=SRCHOME

0 commit comments

Comments
 (0)