Merge branch 'Marlin_v1' of github.com:ErikZalm/Marlin into Marlin_v1

This commit is contained in:
Erik van der Zalm
2012-04-30 13:36:27 +02:00
8 changed files with 162 additions and 33 deletions

View File

@ -197,7 +197,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