sravan/Marlin-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

🧑‍💻 Change HAL_PATH macro for easier HAL relocation (#25743)

Browse Source
This commit is contained in:
Scott Lahteine
2023-04-26 14:29:21 -05:00
parent 3c9e8e1e60
commit 61d1ce7d2e
15 changed files with 36 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/src/HAL/HAL.h
View File

@@ -27,7 +27,7 @@
#define GCC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) #define GCC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__)
#endif #endif
#include HAL_PATH(.,HAL.h) #include HAL_PATH(..,HAL.h)
extern MarlinHAL hal; extern MarlinHAL hal;
#define HAL_ADC_RANGE _BV(HAL_ADC_RESOLUTION) #define HAL_ADC_RANGE _BV(HAL_ADC_RESOLUTION)

26
Marlin/src/HAL/platforms.h
View File

@@ -24,34 +24,34 @@
#define XSTR(V...) #V #define XSTR(V...) #V
#ifdef __AVR__ #ifdef __AVR__
#define HAL_PATH(PATH, NAME) XSTR(PATH/AVR/NAME) #define HAL_PATH(PATH, NAME) XSTR(PATH/HAL/AVR/NAME)
#elif defined(ARDUINO_ARCH_SAM) #elif defined(ARDUINO_ARCH_SAM)
#define HAL_PATH(PATH, NAME) XSTR(PATH/DUE/NAME) #define HAL_PATH(PATH, NAME) XSTR(PATH/HAL/DUE/NAME)
#elif defined(__MK20DX256__) #elif defined(__MK20DX256__)
#define HAL_PATH(PATH, NAME) XSTR(PATH/TEENSY31_32/NAME) #define HAL_PATH(PATH, NAME) XSTR(PATH/HAL/TEENSY31_32/NAME)
#elif defined(__MK64FX512__) || defined(__MK66FX1M0__) #elif defined(__MK64FX512__) || defined(__MK66FX1M0__)
#define HAL_PATH(PATH, NAME) XSTR(PATH/TEENSY35_36/NAME) #define HAL_PATH(PATH, NAME) XSTR(PATH/HAL/TEENSY35_36/NAME)
#elif defined(__IMXRT1062__) #elif defined(__IMXRT1062__)
#define HAL_PATH(PATH, NAME) XSTR(PATH/TEENSY40_41/NAME) #define HAL_PATH(PATH, NAME) XSTR(PATH/HAL/TEENSY40_41/NAME)
#elif defined(TARGET_LPC1768) #elif defined(TARGET_LPC1768)
#define HAL_PATH(PATH, NAME) XSTR(PATH/LPC1768/NAME) #define HAL_PATH(PATH, NAME) XSTR(PATH/HAL/LPC1768/NAME)
#elif defined(__STM32F1__) || defined(TARGET_STM32F1) #elif defined(__STM32F1__) || defined(TARGET_STM32F1)
#define HAL_PATH(PATH, NAME) XSTR(PATH/STM32F1/NAME) #define HAL_PATH(PATH, NAME) XSTR(PATH/HAL/STM32F1/NAME)
#elif defined(ARDUINO_ARCH_STM32) #elif defined(ARDUINO_ARCH_STM32)
#ifndef HAL_STM32 #ifndef HAL_STM32
#define HAL_STM32 #define HAL_STM32
#endif #endif
#define HAL_PATH(PATH, NAME) XSTR(PATH/STM32/NAME) #define HAL_PATH(PATH, NAME) XSTR(PATH/HAL/STM32/NAME)
#elif defined(ARDUINO_ARCH_ESP32) #elif defined(ARDUINO_ARCH_ESP32)
#define HAL_PATH(PATH, NAME) XSTR(PATH/ESP32/NAME) #define HAL_PATH(PATH, NAME) XSTR(PATH/HAL/ESP32/NAME)
#elif defined(__PLAT_LINUX__) #elif defined(__PLAT_LINUX__)
#define HAL_PATH(PATH, NAME) XSTR(PATH/LINUX/NAME) #define HAL_PATH(PATH, NAME) XSTR(PATH/HAL/LINUX/NAME)
#elif defined(__PLAT_NATIVE_SIM__) #elif defined(__PLAT_NATIVE_SIM__)
#define HAL_PATH(PATH, NAME) XSTR(PATH/NATIVE_SIM/NAME) #define HAL_PATH(PATH, NAME) XSTR(PATH/HAL/NATIVE_SIM/NAME)
#elif defined(__SAMD51__) #elif defined(__SAMD51__)
#define HAL_PATH(PATH, NAME) XSTR(PATH/SAMD51/NAME) #define HAL_PATH(PATH, NAME) XSTR(PATH/HAL/SAMD51/NAME)
#elif defined(__SAMD21__) #elif defined(__SAMD21__)
#define HAL_PATH(PATH, NAME) XSTR(PATH/SAMD21/NAME) #define HAL_PATH(PATH, NAME) XSTR(PATH/HAL/SAMD21/NAME)
#else #else
#error "Unsupported Platform!" #error "Unsupported Platform!"
#endif #endif

8
Marlin/src/inc/MarlinConfig.h
View File

@@ -34,20 +34,20 @@
#include "../pins/pins.h" #include "../pins/pins.h"
#ifndef __MARLIN_DEPS__ #ifndef __MARLIN_DEPS__
#include HAL_PATH(../HAL, timers.h) #include HAL_PATH(.., timers.h)
#include HAL_PATH(../HAL, spi_pins.h) #include HAL_PATH(.., spi_pins.h)
#endif #endif
#include "Conditionals_post.h" #include "Conditionals_post.h"
#ifndef __MARLIN_DEPS__ #ifndef __MARLIN_DEPS__
#include HAL_PATH(../HAL, inc/Conditionals_post.h) #include HAL_PATH(.., inc/Conditionals_post.h)
#include "../core/types.h" // Ahead of sanity-checks #include "../core/types.h" // Ahead of sanity-checks
#include "SanityCheck.h" #include "SanityCheck.h"
#include HAL_PATH(../HAL, inc/SanityCheck.h) #include HAL_PATH(.., inc/SanityCheck.h)
// Include all core headers // Include all core headers
#include "../core/language.h" #include "../core/language.h"

4
Marlin/src/inc/MarlinConfigPre.h
View File

@@ -49,7 +49,7 @@
#include "Conditionals_LCD.h" #include "Conditionals_LCD.h"
#ifndef __MARLIN_DEPS__ #ifndef __MARLIN_DEPS__
#include HAL_PATH(../HAL, inc/Conditionals_LCD.h) #include HAL_PATH(.., inc/Conditionals_LCD.h)
#endif #endif
#include "../core/drivers.h" #include "../core/drivers.h"
@@ -58,5 +58,5 @@
#include "Conditionals_adv.h" #include "Conditionals_adv.h"
#ifndef __MARLIN_DEPS__ #ifndef __MARLIN_DEPS__
#include HAL_PATH(../HAL, inc/Conditionals_adv.h) #include HAL_PATH(.., inc/Conditionals_adv.h)
#endif #endif

2
Marlin/src/lcd/extui/mks_ui/tft_lvgl_configuration.cpp
View File

@@ -38,7 +38,7 @@
#include "../../../MarlinCore.h" #include "../../../MarlinCore.h"
#include "../../../inc/MarlinConfig.h" #include "../../../inc/MarlinConfig.h"
#include HAL_PATH(../../../HAL, tft/xpt2046.h) #include HAL_PATH(../../.., tft/xpt2046.h)
#include "../../marlinui.h" #include "../../marlinui.h"
XPT2046 touch; XPT2046 touch;

4
Marlin/src/lcd/tft/touch.h
View File

@@ -31,10 +31,10 @@
#endif #endif
#if ENABLED(TFT_TOUCH_DEVICE_GT911) #if ENABLED(TFT_TOUCH_DEVICE_GT911)
#include HAL_PATH(../../HAL, tft/gt911.h) #include HAL_PATH(../.., tft/gt911.h)
#define TOUCH_DRIVER_CLASS GT911 #define TOUCH_DRIVER_CLASS GT911
#elif ENABLED(TFT_TOUCH_DEVICE_XPT2046) #elif ENABLED(TFT_TOUCH_DEVICE_XPT2046)
#include HAL_PATH(../../HAL, tft/xpt2046.h) #include HAL_PATH(../.., tft/xpt2046.h)
#define TOUCH_DRIVER_CLASS XPT2046 #define TOUCH_DRIVER_CLASS XPT2046
#else #else
#error "Unknown Touch Screen Type." #error "Unknown Touch Screen Type."

6
Marlin/src/lcd/tft_io/tft_io.h
View File

@@ -24,11 +24,11 @@
#include "../../inc/MarlinConfig.h" #include "../../inc/MarlinConfig.h"
#if HAS_SPI_TFT #if HAS_SPI_TFT
#include HAL_PATH(../../HAL, tft/tft_spi.h) #include HAL_PATH(../.., tft/tft_spi.h)
#elif HAS_FSMC_TFT #elif HAS_FSMC_TFT
#include HAL_PATH(../../HAL, tft/tft_fsmc.h) #include HAL_PATH(../.., tft/tft_fsmc.h)
#elif HAS_LTDC_TFT #elif HAS_LTDC_TFT
#include HAL_PATH(../../HAL, tft/tft_ltdc.h) #include HAL_PATH(../.., tft/tft_ltdc.h)
#else #else
#error "TFT IO only supports SPI, FSMC or LTDC interface." #error "TFT IO only supports SPI, FSMC or LTDC interface."
#endif #endif

4
Marlin/src/lcd/touch/touch_buttons.cpp
View File

@@ -28,10 +28,10 @@
#include "../scaled_tft.h" #include "../scaled_tft.h"
#if ENABLED(TFT_TOUCH_DEVICE_GT911) #if ENABLED(TFT_TOUCH_DEVICE_GT911)
#include HAL_PATH(../../HAL, tft/gt911.h) #include HAL_PATH(../.., tft/gt911.h)
GT911 touchIO; GT911 touchIO;
#elif ENABLED(TFT_TOUCH_DEVICE_XPT2046) #elif ENABLED(TFT_TOUCH_DEVICE_XPT2046)
#include HAL_PATH(../../HAL, tft/xpt2046.h) #include HAL_PATH(../.., tft/xpt2046.h)
XPT2046 touchIO; XPT2046 touchIO;
#else #else
#error "Unknown Touch Screen Type." #error "Unknown Touch Screen Type."

2
Marlin/src/libs/MAX31865.h
View File

@@ -45,7 +45,7 @@
#include "../inc/MarlinConfig.h" #include "../inc/MarlinConfig.h"
#include "../HAL/shared/Delay.h" #include "../HAL/shared/Delay.h"
#include HAL_PATH(../HAL, MarlinSPI.h) #include HAL_PATH(.., MarlinSPI.h)
#define MAX31865_CONFIG_REG 0x00 #define MAX31865_CONFIG_REG 0x00
#define MAX31865_CONFIG_BIAS 0x80 #define MAX31865_CONFIG_BIAS 0x80

2
Marlin/src/libs/W25Qxx.h
View File

@@ -23,7 +23,7 @@
#include <stdint.h> #include <stdint.h>
#include HAL_PATH(../HAL, MarlinSPI.h) #include HAL_PATH(.., MarlinSPI.h)
#define W25X_WriteEnable 0x06 #define W25X_WriteEnable 0x06
#define W25X_WriteDisable 0x04 #define W25X_WriteDisable 0x04

2
Marlin/src/module/endstops.cpp
View File

@@ -35,7 +35,7 @@
#include "../core/debug_out.h" #include "../core/debug_out.h"
#if ENABLED(ENDSTOP_INTERRUPTS_FEATURE) #if ENABLED(ENDSTOP_INTERRUPTS_FEATURE)
#include HAL_PATH(../HAL, endstop_interrupts.h) #include HAL_PATH(.., endstop_interrupts.h)
#endif #endif
#if BOTH(SD_ABORT_ON_ENDSTOP_HIT, SDSUPPORT) #if BOTH(SD_ABORT_ON_ENDSTOP_HIT, SDSUPPORT)

2
Marlin/src/module/stepper.cpp
View File

@@ -3764,7 +3764,7 @@ void Stepper::report_positions() {
#else // PRINTRBOARD_G2 #else // PRINTRBOARD_G2
#include HAL_PATH(../HAL, fastio/G2_PWM.h) #include HAL_PATH(.., fastio/G2_PWM.h)
#endif #endif

2
Marlin/src/pins/pinsDebug.h
View File

@@ -168,7 +168,7 @@ const PinInfo pin_array[] PROGMEM = {
}; };
#include HAL_PATH(../HAL, pinsDebug.h) // get the correct support file for this CPU #include HAL_PATH(.., pinsDebug.h) // get the correct support file for this CPU
#ifndef M43_NEVER_TOUCH #ifndef M43_NEVER_TOUCH
#define M43_NEVER_TOUCH(Q) false #define M43_NEVER_TOUCH(Q) false

4
Marlin/src/sd/usb_flashdrive/Sd2Card_FlashDrive.cpp
View File

@@ -84,10 +84,10 @@
#elif ENABLED(USE_OTG_USB_HOST) #elif ENABLED(USE_OTG_USB_HOST)
#if HAS_SD_HOST_DRIVE #if HAS_SD_HOST_DRIVE
#include HAL_PATH(../../HAL, msc_sd.h) #include HAL_PATH(../.., msc_sd.h)
#endif #endif
#include HAL_PATH(../../HAL, usb_host.h) #include HAL_PATH(../.., usb_host.h)
#define UHS_START usb.start() #define UHS_START usb.start()
#define rREVISION 0 #define rREVISION 0

1
ini/features.ini
View File

@@ -244,3 +244,4 @@ HAS_MICROSTEPS = build_src_filter=+<src/gcode/control/M3
arduinoWebSockets=links2004/WebSockets@2.3.4 arduinoWebSockets=links2004/WebSockets@2.3.4
luc-github/ESP32SSDP@1.1.1 luc-github/ESP32SSDP@1.1.1
lib_ignore=ESPAsyncTCP lib_ignore=ESPAsyncTCP
build_flags=-DSRCHOME=${platformio.src_dir}/src -DHALHOME=SRCHOME