melch/Marlin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #3331 from thinkyhead/rc_default_info

Browse Source 
Split DEFAULT_MACHINE_NAME from DEFAULT_SOURCE_URL
This commit is contained in:
Scott Lahteine 2016-04-02 19:11:48 -07:00
commit 783e0122d6
9 changed files with 30 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Marlin/language.h
View File

@ -71,25 +71,8 @@
#define PROTOCOL_VERSION "1.0"
#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
#ifndef DEFAULT_MACHINE_NAME
#define DEFAULT_MACHINE_NAME "3D Printer"
#define DEFAULT_SOURCE_URL "https://github.com/MarlinFirmware/Marlin"
#endif
#ifdef CUSTOM_MACHINE_NAME
@ -98,6 +81,10 @@
#define MACHINE_NAME DEFAULT_MACHINE_NAME
#endif
#ifndef DEFAULT_SOURCE_URL
#define DEFAULT_SOURCE_URL "https://github.com/MarlinFirmware/Marlin"
#endif
#ifndef SOURCE_CODE_URL
#define SOURCE_CODE_URL DEFAULT_SOURCE_URL
#endif

3
Marlin/pins_3DRAG.h
View File

@ -26,6 +26,9 @@
#include "pins_RAMPS_14.h"
#define DEFAULT_MACHINE_NAME "3Drag"
#define DEFAULT_SOURCE_URL "http://3dprint.elettronicain.it/"
#undef Z_ENABLE_PIN
#define Z_ENABLE_PIN 63

2
Marlin/pins_5DPRINT.h
View File

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

6
Marlin/pins_K8200.h
View File

@ -26,3 +26,9 @@
*/
#include "pins_3DRAG.h"
#undef DEFAULT_MACHINE_NAME
#define DEFAULT_MACHINE_NAME "K8200"
#undef DEFAULT_SOURCE_URL
#define DEFAULT_SOURCE_URL "https://github.com/CONSULitAS/Marlin-K8200"

2
Marlin/pins_RUMBA.h
View File

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

3
Marlin/pins_SAV_MKI.h
View File

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

3
Marlin/pins_ULTIMAIN_2.h
View File

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

3
Marlin/pins_ULTIMAKER.h
View File

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

3
Marlin/pins_ULTIMAKER_OLD.h
View File

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