From 35e57bf149685a10cfa64b3437c428bf57519e5f Mon Sep 17 00:00:00 2001 From: Erik van der Zalm Date: Sat, 25 Feb 2012 17:44:45 +0100 Subject: [PATCH] Added gen6 deluxe. --- Marlin/Configuration.h | 17 +++++++++-------- Marlin/pins.h | 10 ++++++++-- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 1818b0cc21..035928ba89 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -8,12 +8,12 @@ //User specified version info of THIS file to display in [Pronterface, etc] terminal window during startup. //Implementation of an idea by Prof Braino to inform user that any changes made //to THIS file by the user have been successfully uploaded into firmware. -#define STRING_VERSION_CONFIG_H "2012-02-08j" //Personal revision number for changes to THIS file. -#define STRING_CONFIG_H_AUTHOR "scuba82" //Who made the changes. +#define STRING_VERSION_CONFIG_H "2012-02-25" //Personal revision number for changes to THIS file. +#define STRING_CONFIG_H_AUTHOR "erik" //Who made the changes. // This determines the communication speed of the printer -//#define BAUDRATE 250000 -#define BAUDRATE 115200 +#define BAUDRATE 250000 +//#define BAUDRATE 115200 //// The following define selects which electronics board you have. Please choose the one that matches your setup // Gen7 custom (Alfons3 Version) = 10 "https://github.com/Alfons3/Generation_7_Electronics" @@ -22,12 +22,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) -// Gen6 = +// Gen6 = 5 +// Gen6 deluxe = 51 // Sanguinololu 1.2 and above = 62 // Ultimaker = 7 // Teensylu = 8 // Gen3+ =9 -#define MOTHERBOARD 33 +#define MOTHERBOARD 51 //=========================================================================== //=============================Thermal Settings ============================ @@ -186,9 +187,9 @@ const bool Z_ENDSTOPS_INVERTING = false; // set to true to invert the logic of t //LCD and SD support //#define ULTRA_LCD //general lcd support, also 16x2 -#define SDSUPPORT // Enable SD Card Support in Hardware Console +//#define SDSUPPORT // Enable SD Card Support in Hardware Console -#define ULTIPANEL +//#define ULTIPANEL #ifdef ULTIPANEL #define NEWPANEL //enable this if you have a click-encoder panel #define SDSUPPORT diff --git a/Marlin/pins.h b/Marlin/pins.h index bd6535e4d7..69afa18b4c 100644 --- a/Marlin/pins.h +++ b/Marlin/pins.h @@ -475,7 +475,7 @@ * Gen6 pin assignment * ****************************************************************************************/ -#if MOTHERBOARD == 5 +#if MOTHERBOARD == 5 || MOTHERBOARD == 51 #define KNOWN_BOARD 1 #ifndef __AVR_ATmega644P__ @@ -509,13 +509,19 @@ #define E0_ENABLE_PIN 3 //Added @ EJE Electronics 20100715 #define TEMP_0_PIN 5 //changed @ rkoeppl 20110410 #define TEMP_1_PIN -1 //changed @ rkoeppl 20110410 + + #define TEMP_2_PIN -1 //changed @ rkoeppl 20110410 #define HEATER_0_PIN 14 //changed @ rkoeppl 20110410 #define HEATER_1_PIN -1 #define HEATER_2_PIN -1 + #if MOTHERBOARD == 51 #define HEATER_BED_PIN -1 //changed @ rkoeppl 20110410 #define TEMP_BED_PIN -1 //changed @ rkoeppl 20110410 - + #else + #define HEATER_BED_PIN 1 //changed @ rkoeppl 20110410 + #define TEMP_BED_PIN 0 //changed @ rkoeppl 20110410 + #endif #define SDPOWER -1 #define SDSS 17 #define LED_PIN -1 //changed @ rkoeppl 20110410