Browse Source

Move deprecation test to SanityCheck.h

Richard Wackerbarth 9 years ago
parent
commit
5a11d32a85
3 changed files with 4 additions and 10 deletions
  1. 4
    0
      Marlin/SanityCheck.h
  2. 0
    5
      Marlin/configurator/config/language.h
  3. 0
    5
      Marlin/language.h

+ 4
- 0
Marlin/SanityCheck.h View File

378
     #error BTENABLED has been replaced with BLUETOOTH. Please update your configuration.
378
     #error BTENABLED has been replaced with BLUETOOTH. Please update your configuration.
379
   #endif
379
   #endif
380
 
380
 
381
+  #ifdef CUSTOM_MENDEL_NAME
382
+    #error CUSTOM_MENDEL_NAME deprecated - use CUSTOM_MACHINE_NAME instead
383
+  #endif
384
+
381
 #endif //SANITYCHECK_H
385
 #endif //SANITYCHECK_H

+ 0
- 5
Marlin/configurator/config/language.h View File

64
   #define MACHINE_NAME "3D Printer"
64
   #define MACHINE_NAME "3D Printer"
65
 #endif
65
 #endif
66
 
66
 
67
-#ifdef CUSTOM_MENDEL_NAME
68
-  #error CUSTOM_MENDEL_NAME deprecated - use CUSTOM_MACHINE_NAME
69
-  #define CUSTOM_MACHINE_NAME CUSTOM_MENDEL_NAME
70
-#endif
71
-
72
 #ifdef CUSTOM_MACHINE_NAME
67
 #ifdef CUSTOM_MACHINE_NAME
73
   #undef MACHINE_NAME
68
   #undef MACHINE_NAME
74
   #define MACHINE_NAME CUSTOM_MACHINE_NAME
69
   #define MACHINE_NAME CUSTOM_MACHINE_NAME

+ 0
- 5
Marlin/language.h View File

64
   #define MACHINE_NAME "3D Printer"
64
   #define MACHINE_NAME "3D Printer"
65
 #endif
65
 #endif
66
 
66
 
67
-#ifdef CUSTOM_MENDEL_NAME
68
-  #error CUSTOM_MENDEL_NAME deprecated - use CUSTOM_MACHINE_NAME
69
-  #define CUSTOM_MACHINE_NAME CUSTOM_MENDEL_NAME
70
-#endif
71
-
72
 #ifdef CUSTOM_MACHINE_NAME
67
 #ifdef CUSTOM_MACHINE_NAME
73
   #undef MACHINE_NAME
68
   #undef MACHINE_NAME
74
   #define MACHINE_NAME CUSTOM_MACHINE_NAME
69
   #define MACHINE_NAME CUSTOM_MACHINE_NAME

Loading…
Cancel
Save