bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Add support for upcoming Gen7 v1.4

Browse Source 
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.
This commit is contained in:
Phil Hord
2012-02-26 20:39:49 -05:00
parent 740f0c7690
commit b65ef8d66c
2 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Marlin/Configuration.h
View File

@@ -19,6 +19,7 @@
// Gen7 custom (Alfons3 Version) = 10 "https://github.com/Alfons3/Generation_7_Electronics" // Gen7 custom (Alfons3 Version) = 10 "https://github.com/Alfons3/Generation_7_Electronics"
// Gen7 v1.1, v1.2 = 11 // Gen7 v1.1, v1.2 = 11
// Gen7 v1.3 = 12 // Gen7 v1.3 = 12
// Gen7 v1.4 = 13
// MEGA/RAMPS up to 1.2 = 3 // MEGA/RAMPS up to 1.2 = 3
// RAMPS 1.3 = 33 (Power outputs: Extruder, Bed, Fan) // RAMPS 1.3 = 33 (Power outputs: Extruder, Bed, Fan)
// RAMPS 1.3 = 34 (Power outputs: Extruder0, Extruder1, Bed) // RAMPS 1.3 = 34 (Power outputs: Extruder0, Extruder1, Bed)

19
Marlin/pins.h
View File

@@ -45,13 +45,19 @@
#endif /* 99 */ #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 #if MOTHERBOARD == 12
#define MOTHERBOARD 11 #define MOTHERBOARD 11
#define GEN7_V_1_3 #define GEN7_VERSION 13 // v1.3
#endif #endif
#if MOTHERBOARD == 11 #if MOTHERBOARD == 11
@@ -62,6 +68,10 @@
#endif #endif
#ifndef GEN7_VERSION
#define GEN7_VERSION 12 // v1.x
#endif
//x axis pins //x axis pins
#define X_STEP_PIN 19 #define X_STEP_PIN 19
#define X_DIR_PIN 18 #define X_DIR_PIN 18
@@ -103,7 +113,7 @@
#define SDSS -1 // SCL pin of I2C header #define SDSS -1 // SCL pin of I2C header
#define LED_PIN -1 #define LED_PIN -1
#ifdef GEN7_V_1_3 #if (GEN7_VERSION >= 13)
// Gen7 v1.3 removed the fan pin // Gen7 v1.3 removed the fan pin
#define FAN_PIN -1 #define FAN_PIN -1
#else #else
@@ -111,9 +121,12 @@
#endif #endif
#define PS_ON_PIN 15 #define PS_ON_PIN 15
#if (GEN7_VERSION < 14)
// Gen 1.3 and earlier supplied thermistor power via PS_ON // Gen 1.3 and earlier supplied thermistor power via PS_ON
// Need to ignore the bad thermistor readings on those units // Need to ignore the bad thermistor readings on those units
#define BOGUS_TEMPERATURE_FAILSAFE_OVERRIDE #define BOGUS_TEMPERATURE_FAILSAFE_OVERRIDE
#endif
//our pin for debugging. //our pin for debugging.
#define DEBUG_PIN 0 #define DEBUG_PIN 0