Merge remote branch 'origin/master' into experimental

1 files changed, 18 insertions, 3 deletions

diff --git a/Tonokip_Firmware/pins.h b/Tonokip_Firmware/pins.h
index 9cdceb1..eee78e8 100644
--- a/Tonokip_Firmware/pins.h
+++ b/Tonokip_Firmware/pins.h
@@ -416,6 +416,10 @@
 #error Oops!  Make sure you have 'Sanguino' selected from the 'Tools -> Boards' menu.
 #endif
 
+// uncomment the following line for Sanguinololu v1.2, comment for 1.1 or earlier.
+// #define SANGUINOLOLU_V_1_2 
+
+
 #define X_STEP_PIN         15
 #define X_DIR_PIN          21
 #define X_ENABLE_PIN       -1
@@ -430,7 +434,7 @@
 
 #define Z_STEP_PIN         3
 #define Z_DIR_PIN          2
-#define Z_ENABLE_PIN       -1
+// zenable defined by platform below
 #define Z_MIN_PIN          20
 #define Z_MAX_PIN          -1 //19
 
@@ -445,8 +449,19 @@
 #define PS_ON_PIN          -1
 #define KILL_PIN           -1
 
-#define HEATER_0_PIN       13 // THIS LINE FOR V1.0 (extruder)
-#define HEATER_1_PIN       14 // THIS LINE FOR V1.0 (bed)
+#define HEATER_0_PIN       13 // THIS LINE FOR V1.0+ (extruder)
+
+#ifdef SANGUINOLOLU_V_1_2
+
+#define HEATER_1_PIN       12 // (bed)
+#define Z_ENABLE_PIN       26
+
+#else
+
+#define HEATER_1_PIN       14  // (bed)
+#define Z_ENABLE_PIN       -1
+
+#endif
 
 #define TEMP_0_PIN          7   // MUST USE ANALOG INPUT NUMBERING NOT DIGITAL OUTPUT NUMBERING!!!!!!!!! (pin 33 extruder)
 #define TEMP_1_PIN          6   // MUST USE ANALOG INPUT NUMBERING NOT DIGITAL OUTPUT NUMBERING!!!!!!!!! (pin 34 bed)