Skip to content

Allow Marlin to relocate its HAL #68

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 25, 2023
Merged

Allow Marlin to relocate its HAL #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6178abd
Allow Marlin to relocate its HAL
thinkyhead Apr 25, 2023
db27917
Add a block for testing
thinkyhead Apr 25, 2023
f67e259
Version: Please 'git tag 1.0.12' (and 1.0.11)
thinkyhead Apr 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion library.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name=ESP3DLib
version=1.0.11
version=1.0.12
author=Luc Lebosse
maintainer=Luc Lebosse, <support@tech-hunters.com>
sentence=A 3D printer front end for ESP boards.
Expand Down
24 changes: 21 additions & 3 deletions src/esp3dlibconfig.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down