Merge branch 'master' of https://github.com/kliment/Sprinter

1 files changed, 28 insertions, 20 deletions

diff --git a/Tonokip_Firmware/pins.h b/Tonokip_Firmware/pins.h
index 282961f..42845fd 100644
--- a/Tonokip_Firmware/pins.h
+++ b/Tonokip_Firmware/pins.h
@@ -210,51 +210,59 @@
 #define X_DIR_PIN          28
 #define X_ENABLE_PIN       24
 #define X_MIN_PIN           3
-#define X_MAX_PIN           -2 //2
+#define X_MAX_PIN          -2    //2
 
 #define Y_STEP_PIN         38
 #define Y_DIR_PIN          40
 #define Y_ENABLE_PIN       36
 #define Y_MIN_PIN          16
-#define Y_MAX_PIN          -1 //17
+#define Y_MAX_PIN          -1    //17
 
 #define Z_STEP_PIN         44
 #define Z_DIR_PIN          46
 #define Z_ENABLE_PIN       42
 #define Z_MIN_PIN          18
-#define Z_MAX_PIN          -1 //19
+#define Z_MAX_PIN          -1    //19
 
 #define E_STEP_PIN         32
 #define E_DIR_PIN          34
 #define E_ENABLE_PIN       30
 
-#define SDPOWER          48
-#define SDSS          53
+#define SDPOWER            48
+#define SDSS               53
 #define LED_PIN            13
 
-//#define FAN_PIN            11 // UNCOMMENT THIS LINE FOR V1.0
-#define FAN_PIN            9 // THIS LINE FOR V1.1
-
 #define PS_ON_PIN          -1
 #define KILL_PIN           -1
 
-//#define HEATER_0_PIN        12  // UNCOMMENT THIS LINE FOR V1.0
-#define HEATER_0_PIN       10 // THIS LINE FOR V1.1
-#define HEATER_1_PIN       8 // THIS LINE FOR V1.1
+// uncomment the following line for RAMPS V1.0
+// #define RAMPS_V_1_0 
 
-#define TEMP_0_PIN          2   // MUST USE ANALOG INPUT NUMBERING NOT DIGITAL OUTPUT NUMBERING!!!!!!!!!
-#define TEMP_1_PIN          1   // MUST USE ANALOG INPUT NUMBERING NOT DIGITAL OUTPUT NUMBERING!!!!!!!!!
+#ifdef RAMPS_V_1_0
+  #define HEATER_0_PIN     12    // RAMPS 1.0
+  #define HEATER_1_PIN     -1    // RAMPS 1.0
 
+  #define FAN_PIN          11    // RAMPS 1.0
 
-#ifndef SDSUPPORT
+#else // RAMPS_V_1_1 as default
+  #define HEATER_0_PIN     10    // RAMPS 1.1
+  #define HEATER_1_PIN      8    // RAMPS 1.1
 
-// SPI for Max6675 Thermocouple (these pins are defined in the SD library if building with SD support).
-#define SCK_PIN             52
-#define MISO_PIN            50
-#define MOSI_PIN            51
-#define MAX6675_SS              53
+  #define FAN_PIN           9    // RAMPS 1.1
+#endif
+
+#define TEMP_0_PIN          2    // MUST USE ANALOG INPUT NUMBERING NOT DIGITAL OUTPUT NUMBERING!!!!!!!!!
+#define TEMP_1_PIN          1    // MUST USE ANALOG INPUT NUMBERING NOT DIGITAL OUTPUT NUMBERING!!!!!!!!!
+
+// SPI for Max6675 Thermocouple 
+
+#ifndef SDSUPPORT
+// these pins are defined in the SD library if building with SD support  #define SCK_PIN          52
+  #define MISO_PIN         50
+  #define MOSI_PIN         51
+  #define MAX6675_SS       53
 #else
-#define MAX6675_SS              49
+  #define MAX6675_SS       49
 #endif