Merge branch 'master' into refactor

This commit is contained in:
kliment 2011-07-06 21:28:27 +02:00
commit dda13a84e5

View file

@ -427,7 +427,7 @@
****************************************************************************************/ ****************************************************************************************/
#if MOTHERBOARD == 62 #if MOTHERBOARD == 62
#define MOTHERBOARD 6 #define MOTHERBOARD 6
#define #define SANGUINOLOLU_V_1_2
#endif #endif
#if MOTHERBOARD == 6 #if MOTHERBOARD == 6
#define KNOWN_BOARD 1 #define KNOWN_BOARD 1
@ -436,7 +436,6 @@
#endif #endif
// comment the following line for Sanguinololu v1.1 or earlier. // comment the following line for Sanguinololu v1.1 or earlier.
#define SANGUINOLOLU_V_1_2
#define X_STEP_PIN 15 #define X_STEP_PIN 15