3d_print_resources/Marlin
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Config tweaks

Browse source
This commit is contained in:
Scott Lahteine 2020-10-27 22:17:24 -05:00
parent be8448c71b
commit c8b3dc849d
3 changed files with 16 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Marlin/src/core/macros.h
View file

@ -516,12 +516,3 @@
#define MAP0(f, x, peek, ...) f(x) MAP_NEXT (peek, MAP1) (f, peek, __VA_ARGS__) #define MAP0(f, x, peek, ...) f(x) MAP_NEXT (peek, MAP1) (f, peek, __VA_ARGS__)
#define MAP1(f, x, peek, ...) f(x) MAP_NEXT (peek, MAP0) (f, peek, __VA_ARGS__) #define MAP1(f, x, peek, ...) f(x) MAP_NEXT (peek, MAP0) (f, peek, __VA_ARGS__)
#define MAP(f, ...) EVAL512 (MAP1 (f, __VA_ARGS__, (), 0)) #define MAP(f, ...) EVAL512 (MAP1 (f, __VA_ARGS__, (), 0))
//
// Multi-Material-Unit models
//
#define PRUSA_MMU1 1
#define PRUSA_MMU2 2
#define PRUSA_MMU2S 3
#define SMUFF_EMU_MMU2 4
#define SMUFF_EMU_MMU2S 5

12
Marlin/src/inc/Conditionals_LCD.h
View file

@ -498,6 +498,12 @@
/** /**
* Multi-Material-Unit supported models * Multi-Material-Unit supported models
*/ */
#define PRUSA_MMU1 1
#define PRUSA_MMU2 2
#define PRUSA_MMU2S 3
#define SMUFF_EMU_MMU2 4
#define SMUFF_EMU_MMU2S 5
#ifdef MMU_MODEL #ifdef MMU_MODEL
#define HAS_MMU 1 #define HAS_MMU 1
#if MMU_MODEL == PRUSA_MMU1 #if MMU_MODEL == PRUSA_MMU1
@ -512,6 +518,12 @@
#endif #endif
#endif #endif
#undef PRUSA_MMU1
#undef PRUSA_MMU2
#undef PRUSA_MMU2S
#undef SMUFF_EMU_MMU2
#undef SMUFF_EMU_MMU2S
/** /**
* Extruders have some combination of stepper motors and hotends * Extruders have some combination of stepper motors and hotends
* so we separate these concepts into the defines: * so we separate these concepts into the defines:

8
Marlin/src/inc/SanityCheck.h
View file

@ -919,13 +919,13 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
* Sanity checking for all Průša MMU * Sanity checking for all Průša MMU
*/ */
#ifdef SNMM #ifdef SNMM
#error "SNMM is now MMU_MODEL = PRUSA_MMU1. Please update your configuration." #error "SNMM is obsolete. Define MMU_MODE as PRUSA_MMU1 instead."
#elif ENABLED(MK2_MULTIPLEXER) #elif ENABLED(MK2_MULTIPLEXER)
#error "MK2_MULTIPLEXER is now MMU_MODEL = PRUSA_MMU1. Please update your configuration." #error "MK2_MULTIPLEXER is obsolete. Define MMU_MODEL as PRUSA_MMU1 instead."
#elif ENABLED(PRUSA_MMU2) #elif ENABLED(PRUSA_MMU2)
#error "PRUSA_MMU2 is now MMU_MODEL = PRUSA_MMU2. Please update your configuration." #error "PRUSA_MMU2 is obsolete. Define MMU_MODE as PRUSA_MMU2 instead."
#elif ENABLED(PRUSA_MMU2_S_MODE) #elif ENABLED(PRUSA_MMU2_S_MODE)
#error "PRUSA_MMU2_S_MODE is now MMU_MODEL = PRUSA_MMU2S. Please update your configuration." #error "PRUSA_MMU2_S_MODE is obsolete. Define MMU_MODE as PRUSA_MMU2S instead."
#endif #endif
/** /**