From 464b755918bc6090de10e5fdee6440ebe001b688 Mon Sep 17 00:00:00 2001 From: Bernhard Date: Sun, 22 Apr 2012 20:55:56 +0200 Subject: [PATCH] added support for the UltiController --- Marlin/Configuration.h | 11 ++++++++++- Marlin/pins.h | 16 ++++++++++++---- 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 18942a5..67a32a6 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -196,7 +196,16 @@ const bool Z_ENDSTOPS_INVERTING = true; // set to true to invert the logic of th //#define ULTRA_LCD //general lcd support, also 16x2 //#define SDSUPPORT // Enable SD Card Support in Hardware Console -#define ULTIPANEL +//#define ULTIMAKERCONTROLLER //as available from the ultimaker online store. +//#define ULTIPANEL //the ultipanel as on thingiverse + + +#ifdef ULTIMAKERCONTROLLER //automatic expansion + #define ULTIPANEL + #define NEWPANEL +#endif + + #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 ced9b35..0d6b602 100644 --- a/Marlin/pins.h +++ b/Marlin/pins.h @@ -729,10 +729,18 @@ #define LCD_PINS_D7 19 //encoder rotation values - #define encrot0 0 - #define encrot1 2 - #define encrot2 3 - #define encrot3 1 + #ifndef ULTIMAKERCONTROLLER + #define encrot0 0 + #define encrot1 2 + #define encrot2 3 + #define encrot3 1 + #else + #define encrot0 0 + #define encrot1 1 + #define encrot2 3 + #define encrot3 2 + + #endif #define SDCARDDETECT -1 //bits in the shift register that carry the buttons for: -- 2.30.2