From c8b3dc849de1df36a2a4af581232cfbb2d816f28 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Tue, 27 Oct 2020 22:17:24 -0500
Subject: [PATCH] Config tweaks

---
 Marlin/src/core/macros.h          |  9 ---------
 Marlin/src/inc/Conditionals_LCD.h | 12 ++++++++++++
 Marlin/src/inc/SanityCheck.h      |  8 ++++----
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/Marlin/src/core/macros.h b/Marlin/src/core/macros.h
index 3de79a9e4d..7948e8ce87 100644
--- a/Marlin/src/core/macros.h
+++ b/Marlin/src/core/macros.h
@@ -516,12 +516,3 @@
 #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 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
diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
index d48159f6b5..fa9c8448fb 100644
--- a/Marlin/src/inc/Conditionals_LCD.h
+++ b/Marlin/src/inc/Conditionals_LCD.h
@@ -498,6 +498,12 @@
 /**
  *  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
   #define HAS_MMU 1
   #if MMU_MODEL == PRUSA_MMU1
@@ -512,6 +518,12 @@
   #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
  * so we separate these concepts into the defines:
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index ed57c54296..0c98e9f4f9 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -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
  */
 #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)
-  #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)
-  #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)
-  #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
 
 /**