Ver código fonte

Merge pull request #3331 from thinkyhead/rc_default_info

Split DEFAULT_MACHINE_NAME from DEFAULT_SOURCE_URL
Scott Lahteine 9 anos atrás
pai
commit
783e0122d6

+ 5
- 18
Marlin/language.h Ver arquivo

71
 
71
 
72
 #define PROTOCOL_VERSION "1.0"
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
-  #define DEFAULT_SOURCE_URL "https://github.com/Ultimaker/Marlin"
77
-#elif MB(RUMBA)
78
-  #define DEFAULT_MACHINE_NAME "Rumba"
79
-#elif MB(3DRAG)
80
-  #define DEFAULT_MACHINE_NAME "3Drag"
81
-  #define DEFAULT_SOURCE_URL "http://3dprint.elettronicain.it/"
82
-#elif MB(K8200)
83
-  #define DEFAULT_MACHINE_NAME "K8200"
84
-  #define DEFAULT_SOURCE_URL "https://github.com/CONSULitAS/Marlin-K8200"
85
-#elif MB(5DPRINT)
86
-  #define DEFAULT_MACHINE_NAME "Makibox"
87
-#elif MB(SAV_MKI)
88
-  #define DEFAULT_MACHINE_NAME "SAV MkI"
89
-  #define DEFAULT_SOURCE_URL "https://github.com/fmalpartida/Marlin/tree/SAV-MkI-config"
90
-#else
74
+#ifndef DEFAULT_MACHINE_NAME
91
   #define DEFAULT_MACHINE_NAME "3D Printer"
75
   #define DEFAULT_MACHINE_NAME "3D Printer"
92
-  #define DEFAULT_SOURCE_URL "https://github.com/MarlinFirmware/Marlin"
93
 #endif
76
 #endif
94
 
77
 
95
 #ifdef CUSTOM_MACHINE_NAME
78
 #ifdef CUSTOM_MACHINE_NAME
98
   #define MACHINE_NAME DEFAULT_MACHINE_NAME
81
   #define MACHINE_NAME DEFAULT_MACHINE_NAME
99
 #endif
82
 #endif
100
 
83
 
84
+#ifndef DEFAULT_SOURCE_URL
85
+  #define DEFAULT_SOURCE_URL "https://github.com/MarlinFirmware/Marlin"
86
+#endif
87
+
101
 #ifndef SOURCE_CODE_URL
88
 #ifndef SOURCE_CODE_URL
102
   #define SOURCE_CODE_URL DEFAULT_SOURCE_URL
89
   #define SOURCE_CODE_URL DEFAULT_SOURCE_URL
103
 #endif
90
 #endif

+ 3
- 0
Marlin/pins_3DRAG.h Ver arquivo

26
 
26
 
27
 #include "pins_RAMPS_14.h"
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
 #undef Z_ENABLE_PIN
32
 #undef Z_ENABLE_PIN
30
 #define Z_ENABLE_PIN       63
33
 #define Z_ENABLE_PIN       63
31
 
34
 

+ 2
- 0
Marlin/pins_5DPRINT.h Ver arquivo

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

+ 6
- 0
Marlin/pins_K8200.h Ver arquivo

26
  */
26
  */
27
 
27
 
28
 #include "pins_3DRAG.h"
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 Ver arquivo

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

+ 3
- 0
Marlin/pins_SAV_MKI.h Ver arquivo

31
   #error Oops!  Make sure you have 'Teensy++ 2.0' selected from the 'Tools -> Boards' menu.
31
   #error Oops!  Make sure you have 'Teensy++ 2.0' selected from the 'Tools -> Boards' menu.
32
 #endif
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
 #define LARGE_FLASH        true
37
 #define LARGE_FLASH        true
35
 
38
 
36
 #define X_STEP_PIN         0
39
 #define X_STEP_PIN         0

+ 3
- 0
Marlin/pins_ULTIMAIN_2.h Ver arquivo

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

+ 3
- 0
Marlin/pins_ULTIMAKER.h Ver arquivo

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

+ 3
- 0
Marlin/pins_ULTIMAKER_OLD.h Ver arquivo

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

Carregando…
Cancelar
Salvar