From 4f24323817f82d0fb81f4007b61ddcb09da5868d Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sat, 2 Apr 2016 18:41:01 -0700 Subject: [PATCH] Split DEFAULT_MACHINE_NAME from DEFAULT_SOURCE_URL MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Addressing #3325 – Avoid undefined symbol errors in the compiler. --- Marlin/language.h | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/Marlin/language.h b/Marlin/language.h index 2c8d3cc72..ba2797179 100644 --- a/Marlin/language.h +++ b/Marlin/language.h @@ -73,22 +73,29 @@ #if MB(ULTIMAKER)|| MB(ULTIMAKER_OLD)|| MB(ULTIMAIN_2) #define DEFAULT_MACHINE_NAME "Ultimaker" - #define DEFAULT_SOURCE_URL "https://github.com/Ultimaker/Marlin" #elif MB(RUMBA) #define DEFAULT_MACHINE_NAME "Rumba" #elif MB(3DRAG) #define DEFAULT_MACHINE_NAME "3Drag" - #define DEFAULT_SOURCE_URL "http://3dprint.elettronicain.it/" #elif MB(K8200) #define DEFAULT_MACHINE_NAME "K8200" - #define DEFAULT_SOURCE_URL "https://github.com/CONSULitAS/Marlin-K8200" #elif MB(5DPRINT) #define DEFAULT_MACHINE_NAME "Makibox" #elif MB(SAV_MKI) #define DEFAULT_MACHINE_NAME "SAV MkI" - #define DEFAULT_SOURCE_URL "https://github.com/fmalpartida/Marlin/tree/SAV-MkI-config" #else #define DEFAULT_MACHINE_NAME "3D Printer" +#endif + +#if MB(ULTIMAKER)|| MB(ULTIMAKER_OLD)|| MB(ULTIMAIN_2) + #define DEFAULT_SOURCE_URL "https://github.com/Ultimaker/Marlin" +#elif MB(3DRAG) + #define DEFAULT_SOURCE_URL "http://3dprint.elettronicain.it/" +#elif MB(K8200) + #define DEFAULT_SOURCE_URL "https://github.com/CONSULitAS/Marlin-K8200" +#elif MB(SAV_MKI) + #define DEFAULT_SOURCE_URL "https://github.com/fmalpartida/Marlin/tree/SAV-MkI-config" +#else #define DEFAULT_SOURCE_URL "https://github.com/MarlinFirmware/Marlin" #endif