From bbe7d3d0fe010a93f9142ff1d72cb7fd4f525356 Mon Sep 17 00:00:00 2001 From: daid303 Date: Tue, 8 Jan 2013 17:09:57 +0100 Subject: [PATCH] Fixed #312 --- Marlin/Configuration.h | 9 ++++++--- Marlin/pins.h | 8 ++++++-- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 1d2a48111..15495dff8 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -310,13 +310,16 @@ const bool Z_ENDSTOPS_INVERTING = true; // set to true to invert the logic of th //#define ULTIMAKERCONTROLLER //as available from the ultimaker online store. //#define ULTIPANEL //the ultipanel as on thingiverse -// The RepRapDiscount Smart Controller +// The RepRapDiscount Smart Controller (white PCB) // http://reprap.org/wiki/RepRapDiscount_Smart_Controller //#define REPRAP_DISCOUNT_SMART_CONTROLLER - + +// The GADGETS3D G3D LCD/SD Controller (blue PCB) +// http://reprap.org/wiki/RAMPS_1.3/1.4_GADGETS3D_Shield_with_Panel +//#define G3D_PANEL //automatic expansion -#if defined(ULTIMAKERCONTROLLER) || defined(REPRAP_DISCOUNT_SMART_CONTROLLER) +#if defined(ULTIMAKERCONTROLLER) || defined(REPRAP_DISCOUNT_SMART_CONTROLLER) || defined(G3D_PANEL) #define ULTIPANEL #define NEWPANEL #endif diff --git a/Marlin/pins.h b/Marlin/pins.h index 4518dadc1..8e3ed0743 100644 --- a/Marlin/pins.h +++ b/Marlin/pins.h @@ -362,7 +362,7 @@ #endif #define PS_ON_PIN 12 -#ifdef REPRAP_DISCOUNT_SMART_CONTROLLER +#if defined(REPRAP_DISCOUNT_SMART_CONTROLLER) || defined(G3D_PANEL) #define KILL_PIN 41 #else #define KILL_PIN -1 @@ -418,7 +418,11 @@ #define BTN_EN2 35 #define BTN_ENC 31 //the click - #define SDCARDDETECT -1 // Ramps does not use this port + #ifdef G3D_PANEL + #define SDCARDDETECT 49 + #else + #define SDCARDDETECT -1 // Ramps does not use this port + #endif #endif #else //old style panel with shift register