From 47d4f55bc0182cc3b016c87f60bd6cb751ea6bf1 Mon Sep 17 00:00:00 2001 From: Bracken Dawson Date: Wed, 22 Aug 2012 23:15:46 +0100 Subject: [PATCH 1/3] Fix Gen7 1.4 pinout Gen7 1.4 uses very different pin assignments, might as well make a new section and remove some of the conditionals from each. It's easier to change your pin assingment this way if like me you don't wire it exactly to plan. --- Marlin/pins.h | 84 +++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 74 insertions(+), 10 deletions(-) diff --git a/Marlin/pins.h b/Marlin/pins.h index 8d719375bd..8f06e3698b 100644 --- a/Marlin/pins.h +++ b/Marlin/pins.h @@ -45,16 +45,11 @@ #endif /* 99 */ /**************************************************************************************** -* Gen7 v1.1, v1.2, v1.3, v1.4 pin assignment +* Gen7 v1.1, v1.2, v1.3 pin assignment * ****************************************************************************************/ -#if MOTHERBOARD == 13 -#define MOTHERBOARD 11 -#define GEN7_VERSION 14 // v1.4 -#endif - #if MOTHERBOARD == 12 #define MOTHERBOARD 11 #define GEN7_VERSION 13 // v1.3 @@ -121,12 +116,81 @@ #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 +//our pin for debugging. +#define DEBUG_PIN 0 + +//our RS485 pins +#define TX_ENABLE_PIN 12 +#define RX_ENABLE_PIN 13 + #endif +/**************************************************************************************** +* Gen7 v1.4 pin assignment +* +****************************************************************************************/ + +#if MOTHERBOARD == 13 +#define GEN7_VERSION 14 // v1.4 +#endif + +#if MOTHERBOARD == 13 +#define KNOWN_BOARD + +#if !defined(__AVR_ATmega644P__) && !defined(__AVR_ATmega644__) && !defined(__AVR_ATmega1284P__) +#error Oops! Make sure you have 'Gen7' selected from the 'Tools -> Boards' menu. + +#endif + +#ifndef GEN7_VERSION +#define GEN7_VERSION 14 // v1.x +#endif + +//x axis pins +#define X_STEP_PIN 29 +#define X_DIR_PIN 28 +#define X_ENABLE_PIN 25 +#define X_MIN_PIN 0 +#define X_MAX_PIN -1 + +//y axis pins +#define Y_STEP_PIN 27 +#define Y_DIR_PIN 26 +#define Y_ENABLE_PIN 25 +#define Y_MIN_PIN 1 +#define Y_MAX_PIN -1 + +//z axis pins +#define Z_STEP_PIN 23 +#define Z_DIR_PIN 22 +#define Z_ENABLE_PIN 25 +#define Z_MIN_PIN 2 +#define Z_MAX_PIN -1 + +//extruder pins +#define E0_STEP_PIN 19 +#define E0_DIR_PIN 18 +#define E0_ENABLE_PIN 25 + +#define TEMP_0_PIN 0 +#define TEMP_1_PIN -1 +#define TEMP_2_PIN -1 +#define TEMP_BED_PIN 1 + +#define HEATER_0_PIN 4 +#define HEATER_1_PIN -1 +#define HEATER_2_PIN -1 +#define HEATER_BED_PIN 3 + + +#define SDPOWER -1 +#define SDSS -1 // SCL pin of I2C header +#define LED_PIN -1 + +#define FAN_PIN -1 + +#define PS_ON_PIN 15 + //our pin for debugging. #define DEBUG_PIN 0 From 2873d67b17dd0400813d3e6ded940a1d083d70fe Mon Sep 17 00:00:00 2001 From: Bracken Dawson Date: Fri, 26 Oct 2012 22:17:26 +0100 Subject: [PATCH 2/3] Put bogus temp override back in Gen7 up to 1.3 Took out the ifdef when I split 1.4 out and forgot to permanently define it for <=1.3. --- Marlin/pins.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Marlin/pins.h b/Marlin/pins.h index 8f06e3698b..a6e157e7a3 100644 --- a/Marlin/pins.h +++ b/Marlin/pins.h @@ -116,6 +116,10 @@ #endif #define PS_ON_PIN 15 +//All these generations of Gen7 supply thermistor power +//via PS_ON, so ignore bad thermistor readings +#define BOGUS_TEMPERATURE_FAILSAFE_OVERRIDE + //our pin for debugging. #define DEBUG_PIN 0 From f5631a89e89a531cea7f100f8394e9955de6445d Mon Sep 17 00:00:00 2001 From: Bracken Dawson Date: Fri, 26 Oct 2012 22:28:37 +0100 Subject: [PATCH 3/3] Add dummy Emergancy Pin to Gen7 1.4 Change required after pulling from ErikZalm. --- Marlin/pins.h | 1 + 1 file changed, 1 insertion(+) diff --git a/Marlin/pins.h b/Marlin/pins.h index a807f2aa8c..fd79dc6e0e 100644 --- a/Marlin/pins.h +++ b/Marlin/pins.h @@ -187,6 +187,7 @@ #define HEATER_2_PIN -1 #define HEATER_BED_PIN 3 +#define KILL_PIN -1 #define SDPOWER -1 #define SDSS -1 // SCL pin of I2C header