Browse Source

Fixed compile errors from bad commits.

Erik van der Zalm 11 years ago
parent
commit
48a185d004
3 changed files with 8 additions and 4 deletions
  1. 1
    1
      Marlin/Configuration.h
  2. 2
    0
      Marlin/Marlin.h
  3. 5
    3
      Marlin/language.h

+ 1
- 1
Marlin/Configuration.h View File

69
 // 21 = Elefu Ra Board (v3)
69
 // 21 = Elefu Ra Board (v3)
70
 
70
 
71
 #ifndef MOTHERBOARD
71
 #ifndef MOTHERBOARD
72
-//#define MOTHERBOARD 7
72
+#define MOTHERBOARD 7
73
 #endif
73
 #endif
74
 
74
 
75
 // Define this to set a custom name for your generic Mendel,
75
 // Define this to set a custom name for your generic Mendel,

+ 2
- 0
Marlin/Marlin.h View File

55
    #else
55
    #else
56
          #define MYSERIAL Serial
56
          #define MYSERIAL Serial
57
    #endif // BTENABLED
57
    #endif // BTENABLED
58
+#else
59
+  #define MYSERIAL MSerial
58
 #endif
60
 #endif
59
 
61
 
60
 #define SERIAL_PROTOCOL(x) (MYSERIAL.print(x))
62
 #define SERIAL_PROTOCOL(x) (MYSERIAL.print(x))

+ 5
- 3
Marlin/language.h View File

38
 	#else
38
 	#else
39
 		#define MACHINE_NAME "Mendel"
39
 		#define MACHINE_NAME "Mendel"
40
 	#endif
40
 	#endif
41
-	#ifndef MACHINE_UUID
42
-		#define MACHINE_UUID "00000000-0000-0000-0000-000000000000"
43
-	#endif
41
+
44
 	#define FIRMWARE_URL "http://www.mendel-parts.com"
42
 	#define FIRMWARE_URL "http://www.mendel-parts.com"
45
 #endif
43
 #endif
46
 
44
 
45
+#ifndef MACHINE_UUID
46
+   #define MACHINE_UUID "00000000-0000-0000-0000-000000000000"
47
+#endif
48
+
47
 #define STRINGIFY_(n) #n
49
 #define STRINGIFY_(n) #n
48
 #define STRINGIFY(n) STRINGIFY_(n)
50
 #define STRINGIFY(n) STRINGIFY_(n)
49
 
51
 

Loading…
Cancel
Save