diff --git a/library.properties b/library.properties index b15381a..356e61a 100644 --- a/library.properties +++ b/library.properties @@ -1,5 +1,5 @@ name=ESP3DLib -version=1.0.11 +version=1.0.12 author=Luc Lebosse maintainer=Luc Lebosse, sentence=A 3D printer front end for ESP boards. diff --git a/src/esp3dlibconfig.h b/src/esp3dlibconfig.h index d537f98..35f3e42 100644 --- a/src/esp3dlibconfig.h +++ b/src/esp3dlibconfig.h @@ -22,13 +22,31 @@ #define ESP_XSTR_(M) #M #define ESP_XSTR(M) ESP_XSTR_(M) #endif -#define MARLIN_HAL_PATH(PATH) HAL_PATH( ../../../../../Marlin/src/HAL, PATH) -#define MARLIN_PATH(PATH) ESP_XSTR(../../../../../Marlin/src/PATH) +#ifndef SRCHOME +#define SRCHOME ../../../../../Marlin/src +#endif +#ifndef HALHOME +#define HALHOME SRCHOME/HAL +#endif +#define MARLIN_HAL_PATH(PATH) HAL_PATH(HALHOME, PATH) +#define MARLIN_PATH(PATH) ESP_XSTR(SRCHOME/PATH) + +#if 0 +#define HAL_INCLUDE MARLIN_HAL_PATH(hal-file.h) +#define SRC_INCLUDE MARLIN_PATH(src-file.h) +static_assert(false, + " SRCHOME='" ESP_XSTR(SRCHOME) "'" + " HALHOME='" ESP_XSTR(HALHOME) "'" + " HAL_INCLUDE='" ESP_XSTR(HAL_INCLUDE) "'" + " SRC_INCLUDE='" ESP_XSTR(SRC_INCLUDE) "'" +); +#endif + #include MARLIN_PATH(inc/MarlinConfigPre.h) #undef DISABLED #undef _BV //version -#define LIB_VERSION "1.0.11" +#define LIB_VERSION "1.0.12" //Allow to override the default core used by ESP3DLIB #ifndef ESP3DLIB_RUNNING_CORE