diff options
| author | midopple <mdoppler@gmx.at> | 2012-03-19 18:39:36 +0100 |
|---|---|---|
| committer | midopple <mdoppler@gmx.at> | 2012-03-19 18:39:36 +0100 |
| commit | 8954e1ccb99e030dcc4186475882d91b37a05e76 (patch) | |
| tree | 69815f01c38d7f70213158aea4fb910f2b0c7b93 | |
| parent | 9af1ae8589c2ff49d2c861d2f0c7d8170514e0e3 (diff) | |
| parent | 7d45ae9ecfc3a3eccd40ab8978513976949cc7d8 (diff) | |
Merge commit pins.h from master to experimentell
Conflicts:
Sprinter/pins.h
| -rw-r--r-- | Sprinter/pins.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/Sprinter/pins.h b/Sprinter/pins.h index e35e6a8..63ea464 100644 --- a/Sprinter/pins.h +++ b/Sprinter/pins.h @@ -143,6 +143,7 @@ #endif + /**************************************************************************************** * RepRap Motherboard ****---NOOOOOO RS485/EXTRUDER CONTROLLER!!!!!!!!!!!!!!!!!---******* * @@ -662,17 +663,20 @@ #define HEATER_0_PIN 13 // (extruder) #ifdef SANGUINOLOLU_V_1_2 + #define HEATER_1_PIN 12 // (bed) #define X_ENABLE_PIN 14 #define Y_ENABLE_PIN 14 #define Z_ENABLE_PIN 26 #define E_ENABLE_PIN 14 #else + #define HEATER_1_PIN 14 // (bed) #define X_ENABLE_PIN -1 #define Y_ENABLE_PIN -1 #define Z_ENABLE_PIN -1 #define E_ENABLE_PIN -1 + #endif #define TEMP_0_PIN 7 // MUST USE ANALOG INPUT NUMBERING NOT DIGITAL OUTPUT NUMBERING!!!!!!!!! (pin 33 extruder) @@ -682,7 +686,6 @@ #endif - /**************************************************************************************** * Gen7 pin assignment * @@ -773,8 +776,6 @@ #define E_DIR_PIN 35 #define E_ENABLE_PIN 13 - - #define HEATER_0_PIN 15 // Extruder #define HEATER_1_PIN 14 // Bed #define FAN_PIN 16 // Fan @@ -830,8 +831,6 @@ #define E_DIR_PIN 35 #define E_ENABLE_PIN 13 - - #define HEATER_0_PIN 15 // Extruder #define HEATER_1_PIN 14 // Bed #define FAN_PIN 16 // Fan |