Browse Source

Move default machine info to pins files

Scott Lahteine 8 years ago
parent
commit
2b01649533

+ 5
- 25
Marlin/language.h View File

@@ -71,40 +71,20 @@
71 71
 
72 72
 #define PROTOCOL_VERSION "1.0"
73 73
 
74
-#if MB(ULTIMAKER)|| MB(ULTIMAKER_OLD)|| MB(ULTIMAIN_2)
75
-  #define DEFAULT_MACHINE_NAME "Ultimaker"
76
-#elif MB(RUMBA)
77
-  #define DEFAULT_MACHINE_NAME "Rumba"
78
-#elif MB(3DRAG)
79
-  #define DEFAULT_MACHINE_NAME "3Drag"
80
-#elif MB(K8200)
81
-  #define DEFAULT_MACHINE_NAME "K8200"
82
-#elif MB(5DPRINT)
83
-  #define DEFAULT_MACHINE_NAME "Makibox"
84
-#elif MB(SAV_MKI)
85
-  #define DEFAULT_MACHINE_NAME "SAV MkI"
86
-#else
74
+#ifndef DEFAULT_MACHINE_NAME
87 75
   #define DEFAULT_MACHINE_NAME "3D Printer"
88 76
 #endif
89 77
 
90
-#if MB(ULTIMAKER)|| MB(ULTIMAKER_OLD)|| MB(ULTIMAIN_2)
91
-  #define DEFAULT_SOURCE_URL "https://github.com/Ultimaker/Marlin"
92
-#elif MB(3DRAG)
93
-  #define DEFAULT_SOURCE_URL "http://3dprint.elettronicain.it/"
94
-#elif MB(K8200)
95
-  #define DEFAULT_SOURCE_URL "https://github.com/CONSULitAS/Marlin-K8200"
96
-#elif MB(SAV_MKI)
97
-  #define DEFAULT_SOURCE_URL "https://github.com/fmalpartida/Marlin/tree/SAV-MkI-config"
98
-#else
99
-  #define DEFAULT_SOURCE_URL "https://github.com/MarlinFirmware/Marlin"
100
-#endif
101
-
102 78
 #ifdef CUSTOM_MACHINE_NAME
103 79
   #define MACHINE_NAME CUSTOM_MACHINE_NAME
104 80
 #else
105 81
   #define MACHINE_NAME DEFAULT_MACHINE_NAME
106 82
 #endif
107 83
 
84
+#ifndef DEFAULT_SOURCE_URL
85
+  #define DEFAULT_SOURCE_URL "https://github.com/MarlinFirmware/Marlin"
86
+#endif
87
+
108 88
 #ifndef SOURCE_CODE_URL
109 89
   #define SOURCE_CODE_URL DEFAULT_SOURCE_URL
110 90
 #endif

+ 3
- 0
Marlin/pins_3DRAG.h View File

@@ -26,6 +26,9 @@
26 26
 
27 27
 #include "pins_RAMPS_14.h"
28 28
 
29
+#define DEFAULT_MACHINE_NAME "3Drag"
30
+#define DEFAULT_SOURCE_URL   "http://3dprint.elettronicain.it/"
31
+
29 32
 #undef Z_ENABLE_PIN
30 33
 #define Z_ENABLE_PIN       63
31 34
 

+ 2
- 0
Marlin/pins_5DPRINT.h View File

@@ -30,6 +30,8 @@
30 30
   #error Oops!  Make sure you have 'Teensy++ 2.0' selected from the 'Tools -> Boards' menu.
31 31
 #endif
32 32
 
33
+#define DEFAULT_MACHINE_NAME "Makibox"
34
+
33 35
 #define LARGE_FLASH        true
34 36
 
35 37
 #define X_STEP_PIN          0

+ 6
- 0
Marlin/pins_K8200.h View File

@@ -26,3 +26,9 @@
26 26
  */
27 27
 
28 28
 #include "pins_3DRAG.h"
29
+
30
+#undef DEFAULT_MACHINE_NAME
31
+#define DEFAULT_MACHINE_NAME "K8200"
32
+
33
+#undef DEFAULT_SOURCE_URL
34
+#define DEFAULT_SOURCE_URL   "https://github.com/CONSULitAS/Marlin-K8200"

+ 2
- 0
Marlin/pins_RUMBA.h View File

@@ -32,6 +32,8 @@
32 32
   #error RUMBA supports up to 3 extruders. Comment this line to keep going.
33 33
 #endif
34 34
 
35
+#define DEFAULT_MACHINE_NAME "Rumba"
36
+
35 37
 #define X_STEP_PIN         17
36 38
 #define X_DIR_PIN          16
37 39
 #define X_ENABLE_PIN       48

+ 3
- 0
Marlin/pins_SAV_MKI.h View File

@@ -31,6 +31,9 @@
31 31
   #error Oops!  Make sure you have 'Teensy++ 2.0' selected from the 'Tools -> Boards' menu.
32 32
 #endif
33 33
 
34
+#define DEFAULT_MACHINE_NAME "SAV MkI"
35
+#define DEFAULT_SOURCE_URL   "https://github.com/fmalpartida/Marlin/tree/SAV-MkI-config"
36
+
34 37
 #define LARGE_FLASH        true
35 38
 
36 39
 #define X_STEP_PIN         0

+ 3
- 0
Marlin/pins_ULTIMAIN_2.h View File

@@ -28,6 +28,9 @@
28 28
   #error Oops!  Make sure you have 'Arduino Mega 2560' selected from the 'Tools -> Boards' menu.
29 29
 #endif
30 30
 
31
+#define DEFAULT_MACHINE_NAME "Ultimaker"
32
+#define DEFAULT_SOURCE_URL   "https://github.com/Ultimaker/Marlin"
33
+
31 34
 #define X_STEP_PIN 25
32 35
 #define X_DIR_PIN 23
33 36
 #define X_STOP_PIN 22

+ 3
- 0
Marlin/pins_ULTIMAKER.h View File

@@ -28,6 +28,9 @@
28 28
   #error Oops!  Make sure you have 'Arduino Mega' selected from the 'Tools -> Boards' menu.
29 29
 #endif
30 30
 
31
+#define DEFAULT_MACHINE_NAME "Ultimaker"
32
+#define DEFAULT_SOURCE_URL   "https://github.com/Ultimaker/Marlin"
33
+
31 34
 #define LARGE_FLASH true
32 35
 
33 36
 #define SERVO0_PIN 13 // untested

+ 3
- 0
Marlin/pins_ULTIMAKER_OLD.h View File

@@ -28,6 +28,9 @@
28 28
   #error Oops!  Make sure you have 'Arduino Mega' selected from the 'Tools -> Boards' menu.
29 29
 #endif
30 30
 
31
+#define DEFAULT_MACHINE_NAME "Ultimaker"
32
+#define DEFAULT_SOURCE_URL   "https://github.com/Ultimaker/Marlin"
33
+
31 34
 #define LARGE_FLASH true
32 35
 
33 36
 #define X_STEP_PIN 25

Loading…
Cancel
Save