From 48a185d0044336eb71663f9271d9e9f7f4515120 Mon Sep 17 00:00:00 2001 From: Erik van der Zalm Date: Sun, 10 Nov 2013 16:36:37 +0100 Subject: [PATCH] Fixed compile errors from bad commits. --- Marlin/Configuration.h | 2 +- Marlin/Marlin.h | 2 ++ Marlin/language.h | 8 +++++--- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 7380b134e0..14afa75ea3 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -69,7 +69,7 @@ // 21 = Elefu Ra Board (v3) #ifndef MOTHERBOARD -//#define MOTHERBOARD 7 +#define MOTHERBOARD 7 #endif // Define this to set a custom name for your generic Mendel, diff --git a/Marlin/Marlin.h b/Marlin/Marlin.h index ef59f3f3f4..f8fa556a00 100644 --- a/Marlin/Marlin.h +++ b/Marlin/Marlin.h @@ -55,6 +55,8 @@ #else #define MYSERIAL Serial #endif // BTENABLED +#else + #define MYSERIAL MSerial #endif #define SERIAL_PROTOCOL(x) (MYSERIAL.print(x)) diff --git a/Marlin/language.h b/Marlin/language.h index 4e7a10fa92..5ebbd3fa14 100644 --- a/Marlin/language.h +++ b/Marlin/language.h @@ -38,12 +38,14 @@ #else #define MACHINE_NAME "Mendel" #endif - #ifndef MACHINE_UUID - #define MACHINE_UUID "00000000-0000-0000-0000-000000000000" - #endif + #define FIRMWARE_URL "http://www.mendel-parts.com" #endif +#ifndef MACHINE_UUID + #define MACHINE_UUID "00000000-0000-0000-0000-000000000000" +#endif + #define STRINGIFY_(n) #n #define STRINGIFY(n) STRINGIFY_(n)