Small fixes after merge
This commit is contained in:
parent
d298dd121f
commit
8816ef1c64
|
@ -183,13 +183,6 @@ const bool Z_ENDSTOPS_INVERTING = false; // set to true to invert the logic of t
|
||||||
#define SDSUPPORT // Enable SD Card Support in Hardware Console
|
#define SDSUPPORT // Enable SD Card Support in Hardware Console
|
||||||
|
|
||||||
//#define ULTIPANEL
|
//#define ULTIPANEL
|
||||||
// If you are using a RAMPS board or cheap E-bay purchased boards that do not detect when an SD card is inserted
|
|
||||||
// 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
|
|
||||||
#define SDCARDDETECTINVERTED
|
|
||||||
|
|
||||||
#define ULTIPANEL
|
|
||||||
#ifdef ULTIPANEL
|
#ifdef ULTIPANEL
|
||||||
#define NEWPANEL //enable this if you have a click-encoder panel
|
#define NEWPANEL //enable this if you have a click-encoder panel
|
||||||
#define SDSUPPORT
|
#define SDSUPPORT
|
||||||
|
|
|
@ -148,6 +148,12 @@
|
||||||
|
|
||||||
const int dropsegments=5; //everything with less than this number of steps will be ignored as move and joined with the next movement
|
const int dropsegments=5; //everything with less than this number of steps will be ignored as move and joined with the next movement
|
||||||
|
|
||||||
|
// If you are using a RAMPS board or cheap E-bay purchased boards that do not detect when an SD card is inserted
|
||||||
|
// 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
|
||||||
|
//#define SDCARDDETECTINVERTED
|
||||||
|
|
||||||
//===========================================================================
|
//===========================================================================
|
||||||
//=============================Buffers ============================
|
//=============================Buffers ============================
|
||||||
//===========================================================================
|
//===========================================================================
|
||||||
|
|
|
@ -28,16 +28,11 @@
|
||||||
#define CLICKED (buttons&EN_C)
|
#define CLICKED (buttons&EN_C)
|
||||||
#define BLOCK {blocking=millis()+blocktime;}
|
#define BLOCK {blocking=millis()+blocktime;}
|
||||||
#if (SDCARDDETECT > -1)
|
#if (SDCARDDETECT > -1)
|
||||||
{
|
|
||||||
|
|
||||||
#ifdef SDCARDDETECTINVERTED
|
#ifdef SDCARDDETECTINVERTED
|
||||||
#define CARDINSERTED (READ(SDCARDDETECT)!=0)
|
#define CARDINSERTED (READ(SDCARDDETECT)!=0)
|
||||||
|
|
||||||
#else
|
#else
|
||||||
#define CARDINSERTED (READ(SDCARDDETECT)==0)
|
#define CARDINSERTED (READ(SDCARDDETECT)==0)
|
||||||
}
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#endif //SDCARDTETECTINVERTED
|
#endif //SDCARDTETECTINVERTED
|
||||||
|
|
||||||
#else
|
#else
|
||||||
|
|
Loading…
Reference in a new issue