CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1

Browse Source
This commit is contained in:
Erik van der Zalm 2012-05-16 19:22:08 +02:00
commit d459fb41b7
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Marlin/Configuration.h
View File

@ -26,6 +26,7 @@
// Gen6 = 5 // Gen6 = 5
// Gen6 deluxe = 51 // Gen6 deluxe = 51
// Sanguinololu 1.2 and above = 62 // Sanguinololu 1.2 and above = 62
// Melzi = 63
// Ultimaker = 7 // Ultimaker = 7
// Teensylu = 8 // Teensylu = 8
// Gen3+ =9 // Gen3+ =9

14
Marlin/pins.h
View File

@ -554,7 +554,10 @@
* Sanguinololu pin assignment * Sanguinololu pin assignment
* *
****************************************************************************************/ ****************************************************************************************/
#if MOTHERBOARD == 62 #if MOTHERBOARD == 63
#define MELZI
#endif
#if MOTHERBOARD == 62 || MOTHERBOARD == 63
#undef MOTHERBOARD #undef MOTHERBOARD
#define MOTHERBOARD 6 #define MOTHERBOARD 6
#define SANGUINOLOLU_V_1_2 #define SANGUINOLOLU_V_1_2
@ -589,6 +592,11 @@
#define FAN_PIN -1 #define FAN_PIN -1
#ifdef MELZI
#define LED_PIN 28
#define FAN_PIN 4
#endif
#define PS_ON_PIN -1 #define PS_ON_PIN -1
#define KILL_PIN -1 #define KILL_PIN -1
@ -621,6 +629,10 @@
#define SDPOWER -1 #define SDPOWER -1
#define SDSS 31 #define SDSS 31
#ifdef MELZI
#define SDSS 24
#endif
#endif #endif