From ffc69537aa53c660362c8c1842a60856219d69e3 Mon Sep 17 00:00:00 2001 From: daid303 Date: Fri, 9 Nov 2012 09:10:51 +0100 Subject: [PATCH] Update on some comments, make the MOTHERBOARD list complete again. --- Marlin/Configuration.h | 35 ++++++++++++++++++++--------------- Marlin/pins.h | 8 ++++---- 2 files changed, 24 insertions(+), 19 deletions(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 54435f646..18c5fbf57 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -21,21 +21,26 @@ //#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" -// 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) -// Gen6 = 5 -// Gen6 deluxe = 51 -// Sanguinololu 1.2 and above = 62 -// Melzi = 63 -// Ultimaker = 7 -// Teensylu = 8 -// Gen3+ =9 -// Megatronics =70 +// 10 = Gen7 custom (Alfons3 Version) "https://github.com/Alfons3/Generation_7_Electronics" +// 11 = Gen7 v1.1, v1.2 = 11 +// 12 = Gen7 v1.3 +// 13 = Gen7 v1.4 +// 3 = MEGA/RAMPS up to 1.2 = 3 +// 33 = RAMPS 1.3 (Power outputs: Extruder, Bed, Fan) +// 34 = RAMPS 1.3 (Power outputs: Extruder0, Extruder1, Bed) +// 4 = Duemilanove w/ ATMega328P pin assignment +// 5 = Gen6 +// 51 = Gen6 deluxe +// 6 = Sanguinololu < 1.2 +// 62 = Sanguinololu 1.2 and above +// 63 = Melzi +// 7 = Ultimaker +// 71 = Ultimaker (Older electronics. Pre 1.5.4. This is rare) +// 8 = Teensylu +// 9 = Gen3+ +// 70 = Megatronics +// 90 = Alpha OMCA board +// 91 = Final OMCA board #ifndef MOTHERBOARD #define MOTHERBOARD 7 diff --git a/Marlin/pins.h b/Marlin/pins.h index 9723e3623..f890e127e 100644 --- a/Marlin/pins.h +++ b/Marlin/pins.h @@ -459,7 +459,7 @@ #endif #endif //ULTRA_LCD -#else // RAMPS_V_1_1 or RAMPS_V_1_2 as default +#else // RAMPS_V_1_1 or RAMPS_V_1_2 as default (MOTHERBOARD == 3) #define X_STEP_PIN 26 #define X_DIR_PIN 28 @@ -504,7 +504,7 @@ #define TEMP_1_PIN -1 #define TEMP_2_PIN -1 #define TEMP_BED_PIN 1 // MUST USE ANALOG INPUT NUMBERING NOT DIGITAL OUTPUT NUMBERING!!!!!!!!! -#endif +#endif// MOTHERBOARD == 33 || MOTHERBOARD == 34 // SPI for Max6675 Thermocouple @@ -518,7 +518,7 @@ #define MAX6675_SS 49 #endif -#endif +#endif//MOTHERBOARD == 3 || MOTHERBOARD == 33 || MOTHERBOARD == 34 /**************************************************************************************** * Duemilanove w/ ATMega328P pin assignment @@ -1008,7 +1008,7 @@ * ****************************************************************************************/ #if MOTHERBOARD == 9 -#define MOTHERBOARD 6 +#define MOTHERBOARD 6 /*TODO: Figure out, Why is this done?*/ #define KNOWN_BOARD 1 #ifndef __AVR_ATmega644P__ #ifndef __AVR_ATmega1284P__