Merge SDCARDDETECTINVERTED (#2144)
This commit is contained in:
commit
bdf778bec2
15 changed files with 25 additions and 4 deletions
|
@ -33,8 +33,9 @@
|
|||
#define DEFAULT_LCD_CONTRAST 40
|
||||
#elif defined(ELB_FULL_GRAPHIC_CONTROLLER)
|
||||
#define DEFAULT_LCD_CONTRAST 110
|
||||
#ifdef ELB_FULL_GRAPHIC_CONTROLLER_SDCARDDETECTINVERTED
|
||||
#define SDCARDDETECTINVERTED
|
||||
#define SDSLOW
|
||||
#endif
|
||||
#define U8GLIB_LM6059_AF
|
||||
#endif
|
||||
|
||||
|
@ -322,7 +323,7 @@
|
|||
#define STEPS_PER_CUBIC_MM_E (axis_steps_per_unit[E_AXIS] / EXTRUSION_AREA)
|
||||
#endif
|
||||
|
||||
#ifdef ULTIPANEL
|
||||
#if defined(ULTIPANEL) && !defined(ELB_FULL_GRAPHIC_CONTROLLER)
|
||||
#undef SDCARDDETECTINVERTED
|
||||
#endif
|
||||
|
||||
|
|
|
@ -670,6 +670,7 @@ const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic
|
|||
//
|
||||
// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
|
||||
//#define ELB_FULL_GRAPHIC_CONTROLLER
|
||||
//#define ELB_FULL_GRAPHIC_CONTROLLER_SDCARDDETECTINVERTED
|
||||
|
||||
// The RepRapDiscount Smart Controller (white PCB)
|
||||
// http://reprap.org/wiki/RepRapDiscount_Smart_Controller
|
||||
|
|
|
@ -289,7 +289,9 @@
|
|||
// You can get round this by connecting a push button or single throw switch to the pin defined as SDCARDCARDDETECT
|
||||
// in the pins.h file. When using a push button pulling the pin to ground this will need inverted. This setting should
|
||||
// be commented out otherwise
|
||||
#ifndef ELB_FULL_GRAPHIC_CONTROLLER
|
||||
#define SDCARDDETECTINVERTED
|
||||
#endif
|
||||
|
||||
#define SD_FINISHED_STEPPERRELEASE true //if sd support and the file is finished: disable steppers?
|
||||
#define SD_FINISHED_RELEASECOMMAND "M84 X Y Z E" // You might want to keep the z enabled so your bed stays in place.
|
||||
|
|
|
@ -610,6 +610,7 @@ const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic
|
|||
//
|
||||
// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
|
||||
//#define ELB_FULL_GRAPHIC_CONTROLLER
|
||||
//#define ELB_FULL_GRAPHIC_CONTROLLER_SDCARDDETECTINVERTED
|
||||
|
||||
// The RepRapDiscount Smart Controller (white PCB)
|
||||
// http://reprap.org/wiki/RepRapDiscount_Smart_Controller
|
||||
|
|
|
@ -600,6 +600,12 @@ const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic
|
|||
//#define VIKI2
|
||||
//#define miniVIKI
|
||||
|
||||
// This is a new controller currently under development. https://github.com/eboston/Adafruit-ST7565-Full-Graphic-Controller/
|
||||
//
|
||||
// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
|
||||
//#define ELB_FULL_GRAPHIC_CONTROLLER
|
||||
//#define ELB_FULL_GRAPHIC_CONTROLLER_SDCARDDETECTINVERTED
|
||||
|
||||
// The RepRapDiscount Smart Controller (white PCB)
|
||||
// http://reprap.org/wiki/RepRapDiscount_Smart_Controller
|
||||
//#define REPRAP_DISCOUNT_SMART_CONTROLLER
|
||||
|
|
|
@ -633,6 +633,7 @@ const bool Z_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the logic
|
|||
//
|
||||
// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
|
||||
//#define ELB_FULL_GRAPHIC_CONTROLLER
|
||||
//#define ELB_FULL_GRAPHIC_CONTROLLER_SDCARDDETECTINVERTED
|
||||
|
||||
// The RepRapDiscount Smart Controller (white PCB)
|
||||
// http://reprap.org/wiki/RepRapDiscount_Smart_Controller
|
||||
|
|
|
@ -688,6 +688,7 @@ const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic
|
|||
//
|
||||
// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
|
||||
//#define ELB_FULL_GRAPHIC_CONTROLLER
|
||||
//#define ELB_FULL_GRAPHIC_CONTROLLER_SDCARDDETECTINVERTED
|
||||
|
||||
// The RepRapDiscount Smart Controller (white PCB)
|
||||
// http://reprap.org/wiki/RepRapDiscount_Smart_Controller
|
||||
|
|
|
@ -671,6 +671,7 @@ const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic
|
|||
//
|
||||
// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
|
||||
//#define ELB_FULL_GRAPHIC_CONTROLLER
|
||||
//#define ELB_FULL_GRAPHIC_CONTROLLER_SDCARDDETECTINVERTED
|
||||
|
||||
// The RepRapDiscount Smart Controller (white PCB)
|
||||
// http://reprap.org/wiki/RepRapDiscount_Smart_Controller
|
||||
|
|
|
@ -668,6 +668,7 @@ const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic
|
|||
//
|
||||
// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
|
||||
//#define ELB_FULL_GRAPHIC_CONTROLLER
|
||||
//#define ELB_FULL_GRAPHIC_CONTROLLER_SDCARDDETECTINVERTED
|
||||
|
||||
// The RepRapDiscount Smart Controller (white PCB)
|
||||
// http://reprap.org/wiki/RepRapDiscount_Smart_Controller
|
||||
|
|
|
@ -632,6 +632,7 @@ const bool Z_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the logic
|
|||
//
|
||||
// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
|
||||
//#define ELB_FULL_GRAPHIC_CONTROLLER
|
||||
//#define ELB_FULL_GRAPHIC_CONTROLLER_SDCARDDETECTINVERTED
|
||||
|
||||
// The RepRapDiscount Smart Controller (white PCB)
|
||||
// http://reprap.org/wiki/RepRapDiscount_Smart_Controller
|
||||
|
|
|
@ -675,6 +675,7 @@ const bool Z_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the logic
|
|||
//
|
||||
// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
|
||||
//#define ELB_FULL_GRAPHIC_CONTROLLER
|
||||
//#define ELB_FULL_GRAPHIC_CONTROLLER_SDCARDDETECTINVERTED
|
||||
|
||||
// The RepRapDiscount Smart Controller (white PCB)
|
||||
// http://reprap.org/wiki/RepRapDiscount_Smart_Controller
|
||||
|
|
|
@ -678,6 +678,7 @@ const bool Z_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the logic
|
|||
//
|
||||
// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
|
||||
//#define ELB_FULL_GRAPHIC_CONTROLLER
|
||||
//#define ELB_FULL_GRAPHIC_CONTROLLER_SDCARDDETECTINVERTED
|
||||
|
||||
// The RepRapDiscount Smart Controller (white PCB)
|
||||
// http://reprap.org/wiki/RepRapDiscount_Smart_Controller
|
||||
|
|
|
@ -682,6 +682,7 @@ const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic
|
|||
//
|
||||
// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
|
||||
//#define ELB_FULL_GRAPHIC_CONTROLLER
|
||||
//#define ELB_FULL_GRAPHIC_CONTROLLER_SDCARDDETECTINVERTED
|
||||
|
||||
// The RepRapDiscount Smart Controller (white PCB)
|
||||
// http://reprap.org/wiki/RepRapDiscount_Smart_Controller
|
||||
|
|
|
@ -630,6 +630,7 @@ const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic
|
|||
//
|
||||
// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
|
||||
//#define ELB_FULL_GRAPHIC_CONTROLLER
|
||||
//#define ELB_FULL_GRAPHIC_CONTROLLER_SDCARDDETECTINVERTED
|
||||
|
||||
// The RepRapDiscount Smart Controller (white PCB)
|
||||
// http://reprap.org/wiki/RepRapDiscount_Smart_Controller
|
||||
|
|
|
@ -636,6 +636,7 @@ const bool Z_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the logic
|
|||
//
|
||||
// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
|
||||
//#define ELB_FULL_GRAPHIC_CONTROLLER
|
||||
//#define ELB_FULL_GRAPHIC_CONTROLLER_SDCARDDETECTINVERTED
|
||||
|
||||
// The RepRapDiscount Smart Controller (white PCB)
|
||||
// http://reprap.org/wiki/RepRapDiscount_Smart_Controller
|
||||
|
|
Reference in a new issue