From b65ef8d66c99bb909966ef4d1576f347cbe88b19 Mon Sep 17 00:00:00 2001 From: Phil Hord Date: Sun, 26 Feb 2012 20:39:49 -0500 Subject: [PATCH] Add support for upcoming Gen7 v1.4 V1.4 moves thermistor power to the always-on 5v line. The BOGUS_TEMPERATURE_FAILSAFE_OVERRIDE is no longer needed on this board. Add a new motherboard type to support this feature. --- Marlin/Configuration.h | 1 + Marlin/pins.h | 19 ++++++++++++++++--- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 38bb61c5c..74c03eb04 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -19,6 +19,7 @@ // Gen7 custom (Alfons3 Version) = 10 "https://github.com/Alfons3/Generation_7_Electronics" // Gen7 v1.1, v1.2 = 11 // Gen7 v1.3 = 12 +// Gen7 v1.4 = 13 // MEGA/RAMPS up to 1.2 = 3 // RAMPS 1.3 = 33 (Power outputs: Extruder, Bed, Fan) // RAMPS 1.3 = 34 (Power outputs: Extruder0, Extruder1, Bed) diff --git a/Marlin/pins.h b/Marlin/pins.h index 52aae6b7e..2fa53126f 100644 --- a/Marlin/pins.h +++ b/Marlin/pins.h @@ -45,13 +45,19 @@ #endif /* 99 */ /**************************************************************************************** -* Gen7 v1.1, v1.2, v1.3 pin assignment +* Gen7 v1.1, v1.2, v1.3, v1.4 pin assignment * ****************************************************************************************/ + +#if MOTHERBOARD == 13 +#define MOTHERBOARD 11 +#define GEN7_VERSION 14 // v1.4 +#endif + #if MOTHERBOARD == 12 #define MOTHERBOARD 11 -#define GEN7_V_1_3 +#define GEN7_VERSION 13 // v1.3 #endif #if MOTHERBOARD == 11 @@ -62,6 +68,10 @@ #endif +#ifndef GEN7_VERSION +#define GEN7_VERSION 12 // v1.x +#endif + //x axis pins #define X_STEP_PIN 19 #define X_DIR_PIN 18 @@ -103,7 +113,7 @@ #define SDSS -1 // SCL pin of I2C header #define LED_PIN -1 -#ifdef GEN7_V_1_3 +#if (GEN7_VERSION >= 13) // Gen7 v1.3 removed the fan pin #define FAN_PIN -1 #else @@ -111,9 +121,12 @@ #endif #define PS_ON_PIN 15 +#if (GEN7_VERSION < 14) // Gen 1.3 and earlier supplied thermistor power via PS_ON // Need to ignore the bad thermistor readings on those units #define BOGUS_TEMPERATURE_FAILSAFE_OVERRIDE +#endif + //our pin for debugging. #define DEBUG_PIN 0