0x90/Marlin
12
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

fixed some format problems and cleaned code

Browse source
This commit is contained in:
AndySze 2015-07-23 15:39:44 +08:00 committed by Richard Wackerbarth
parent eef595aa64
commit 8ac5e56934
1 changed files with 93 additions and 113 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
Marlin/pins_MEGACONTROLLER.h
View file

@ -6,28 +6,20 @@
#error Oops! Make sure you have 'Arduino Mega' selected from the 'Tools -> Boards' menu. #error Oops! Make sure you have 'Arduino Mega' selected from the 'Tools -> Boards' menu.
#endif #endif
#if EXTRUDERS > 3 #if EXTRUDERS > 2
#error RUMBA supports up to 3 extruders. Comment this line to keep going. #error Mega Controller supports up to 2 extruders. Comment this line to keep going.
#endif #endif
#define X_STEP_PIN 62//A8 #define X_STEP_PIN 62//A8
#define X_DIR_PIN 63//A9 #define X_DIR_PIN 63//A9
#define X_ENABLE_PIN 61//A7 #define X_ENABLE_PIN 61//A7
#ifdef DELTA
#define X_MIN_PIN -1
#else
#define X_MIN_PIN 43 #define X_MIN_PIN 43
#endif //DELTA #define X_MAX_PIN 42 //Max endstops default to disabled "-1", set to commented value to enable.
#define X_MAX_PIN 42 //2 //Max endstops default to disabled "-1", set to commented value to enable.
#define Y_STEP_PIN 65 // A11 #define Y_STEP_PIN 65 // A11
#define Y_DIR_PIN 66 // A12 #define Y_DIR_PIN 66 // A12
#define Y_ENABLE_PIN 64//A10 #define Y_ENABLE_PIN 64//A10
#ifdef DELTA
#define Y_MIN_PIN -1
#else
#define Y_MIN_PIN 38 #define Y_MIN_PIN 38
#endif //DELTA #define Y_MAX_PIN 41
#define Y_MAX_PIN 41 //15
#define Z_STEP_PIN 68 // A14 #define Z_STEP_PIN 68 // A14
#define Z_DIR_PIN 69 // A15 #define Z_DIR_PIN 69 // A15
@ -87,16 +79,14 @@
#if NUM_SERVOS > 1 #if NUM_SERVOS > 1
#define SERVO1_PIN 31 #define SERVO1_PIN 31
#endif
#if NUM_SERVOS > 2 #if NUM_SERVOS > 2
#define SERVO2_PIN 32 #define SERVO2_PIN 32
#endif
#if NUM_SERVOS > 3 #if NUM_SERVOS > 3
#define SERVO3_PIN 33 #define SERVO3_PIN 33
#endif #endif
#endif #endif
#endif
#endif// NUM_SERVOS
#ifdef MINIPANEL #ifdef MINIPANEL
#define BEEPER 46 #define BEEPER 46
@ -120,13 +110,3 @@
#define SDCARDDETECT 49 #define SDCARDDETECT 49
#endif //Minipanel #endif //Minipanel
//encoder rotation values
#define encrot0 0
#define encrot1 2
#define encrot2 3
#define encrot3 1
#define SERVO0_PIN 5