Skip to content

Commit dc0f3d9

Browse files
authored
Merge pull request #68 from thinkyhead/relocate_marlin_hal_PR
Allow Marlin to relocate its HAL
2 parents 687fc59 + f67e259 commit dc0f3d9

File tree

2 files changed

+22
-4
lines changed

2 files changed

+22
-4
lines changed

library.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name=ESP3DLib
2-
version=1.0.11
2+
version=1.0.12
33
author=Luc Lebosse
44
maintainer=Luc Lebosse, <[email protected]>
55
sentence=A 3D printer front end for ESP boards.

src/esp3dlibconfig.h

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,31 @@
2222
#define ESP_XSTR_(M) #M
2323
#define ESP_XSTR(M) ESP_XSTR_(M)
2424
#endif
25-
#define MARLIN_HAL_PATH(PATH) HAL_PATH( ../../../../../Marlin/src/HAL, PATH)
26-
#define MARLIN_PATH(PATH) ESP_XSTR(../../../../../Marlin/src/PATH)
25+
#ifndef SRCHOME
26+
#define SRCHOME ../../../../../Marlin/src
27+
#endif
28+
#ifndef HALHOME
29+
#define HALHOME SRCHOME/HAL
30+
#endif
31+
#define MARLIN_HAL_PATH(PATH) HAL_PATH(HALHOME, PATH)
32+
#define MARLIN_PATH(PATH) ESP_XSTR(SRCHOME/PATH)
33+
34+
#if 0
35+
#define HAL_INCLUDE MARLIN_HAL_PATH(hal-file.h)
36+
#define SRC_INCLUDE MARLIN_PATH(src-file.h)
37+
static_assert(false,
38+
" SRCHOME='" ESP_XSTR(SRCHOME) "'"
39+
" HALHOME='" ESP_XSTR(HALHOME) "'"
40+
" HAL_INCLUDE='" ESP_XSTR(HAL_INCLUDE) "'"
41+
" SRC_INCLUDE='" ESP_XSTR(SRC_INCLUDE) "'"
42+
);
43+
#endif
44+
2745
#include MARLIN_PATH(inc/MarlinConfigPre.h)
2846
#undef DISABLED
2947
#undef _BV
3048
//version
31-
#define LIB_VERSION "1.0.11"
49+
#define LIB_VERSION "1.0.12"
3250

3351
//Allow to override the default core used by ESP3DLIB
3452
#ifndef ESP3DLIB_RUNNING_CORE

0 commit comments

Comments
 (0)