From 5a11d32a855d31ca380628b73f999918ac0baf6a Mon Sep 17 00:00:00 2001 From: Richard Wackerbarth Date: Sat, 1 Aug 2015 10:04:57 -0500 Subject: [PATCH] Move deprecation test to SanityCheck.h --- Marlin/SanityCheck.h | 4 ++++ Marlin/configurator/config/language.h | 5 ----- Marlin/language.h | 5 ----- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/Marlin/SanityCheck.h b/Marlin/SanityCheck.h index 3a23b6363..d225bc4c2 100644 --- a/Marlin/SanityCheck.h +++ b/Marlin/SanityCheck.h @@ -378,4 +378,8 @@ #error BTENABLED has been replaced with BLUETOOTH. Please update your configuration. #endif + #ifdef CUSTOM_MENDEL_NAME + #error CUSTOM_MENDEL_NAME deprecated - use CUSTOM_MACHINE_NAME instead + #endif + #endif //SANITYCHECK_H diff --git a/Marlin/configurator/config/language.h b/Marlin/configurator/config/language.h index 10f012775..b421dd946 100644 --- a/Marlin/configurator/config/language.h +++ b/Marlin/configurator/config/language.h @@ -64,11 +64,6 @@ #define MACHINE_NAME "3D Printer" #endif -#ifdef CUSTOM_MENDEL_NAME - #error CUSTOM_MENDEL_NAME deprecated - use CUSTOM_MACHINE_NAME - #define CUSTOM_MACHINE_NAME CUSTOM_MENDEL_NAME -#endif - #ifdef CUSTOM_MACHINE_NAME #undef MACHINE_NAME #define MACHINE_NAME CUSTOM_MACHINE_NAME diff --git a/Marlin/language.h b/Marlin/language.h index 10f012775..b421dd946 100644 --- a/Marlin/language.h +++ b/Marlin/language.h @@ -64,11 +64,6 @@ #define MACHINE_NAME "3D Printer" #endif -#ifdef CUSTOM_MENDEL_NAME - #error CUSTOM_MENDEL_NAME deprecated - use CUSTOM_MACHINE_NAME - #define CUSTOM_MACHINE_NAME CUSTOM_MENDEL_NAME -#endif - #ifdef CUSTOM_MACHINE_NAME #undef MACHINE_NAME #define MACHINE_NAME CUSTOM_MACHINE_NAME