From 270c766de27abbf89a1d7d64d11ae9f3ba06c5cb Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Fri, 31 Jul 2015 16:40:50 -0700 Subject: [PATCH 1/3] SDCARDDETECT -> SD_DETECT, added docs - `SD_DETECT_PIN` replaces `SDCARDDETECT` - `SD_DETECT_INVERTED` replaces `SDCARDDETECTINVERTED` - Revise the description of `SD_DETECT_INVERTED` - Add a note about the override of `SD_DETECT_INVERTED` in `Conditionals.h` --- Marlin/Conditionals.h | 2 +- Marlin/Configuration.h | 2 +- Marlin/Configuration_adv.h | 13 ++++++------- Marlin/cardreader.h | 8 ++++---- Marlin/configurator/config/Configuration.h | 2 +- Marlin/configurator/config/Configuration_adv.h | 13 ++++++------- .../Felix/Configuration.h | 2 +- .../Felix/Configuration_DUAL.h | 2 +- .../Felix/Configuration_adv.h | 11 ++++++----- .../Hephestos/Configuration.h | 2 +- .../Hephestos/Configuration_adv.h | 11 ++++++----- .../K8200/Configuration.h | 2 +- .../K8200/Configuration_adv.h | 11 ++++++----- .../RepRapWorld/Megatronics/Configuration.h | 2 +- .../RigidBot/Configuration.h | 2 +- .../RigidBot/Configuration_adv.h | 4 ++-- .../SCARA/Configuration.h | 2 +- .../SCARA/Configuration_adv.h | 11 ++++++----- .../WITBOX/Configuration.h | 2 +- .../WITBOX/Configuration_adv.h | 11 ++++++----- .../adafruit/ST7565/Configuration.h | 2 +- .../delta/biv2.5/Configuration.h | 2 +- .../delta/biv2.5/Configuration_adv.h | 11 ++++++----- .../delta/generic/Configuration.h | 2 +- .../delta/generic/Configuration_adv.h | 11 ++++++----- .../delta/kossel_mini/Configuration.h | 2 +- .../delta/kossel_mini/Configuration_adv.h | 11 ++++++----- .../delta/kossel_pro/Configuration.h | 2 +- .../delta/kossel_pro/Configuration_adv.h | 13 +++++++------ .../makibox/Configuration.h | 2 +- .../makibox/Configuration_adv.h | 4 ++-- .../tvrrug/Round2/Configuration.h | 2 +- .../tvrrug/Round2/Configuration_adv.h | 11 ++++++----- Marlin/pins_AZTEEG_X3.h | 2 +- Marlin/pins_AZTEEG_X3_PRO.h | 2 +- Marlin/pins_BRAINWAVE_PRO.h | 2 +- Marlin/pins_CHEAPTRONIC.h | 2 +- Marlin/pins_ELEFU_3.h | 2 +- Marlin/pins_FELIX2.h | 2 +- Marlin/pins_GEN7_CUSTOM.h | 2 +- Marlin/pins_LEAPFROG.h | 2 +- Marlin/pins_MEGACONTROLLER.h | 2 +- Marlin/pins_MEGATRONICS.h | 2 +- Marlin/pins_MEGATRONICS_2.h | 2 +- Marlin/pins_MEGATRONICS_3.h | 2 +- Marlin/pins_MINIRAMBO.h | 2 +- Marlin/pins_MINITRONICS.h | 2 +- Marlin/pins_OMCA.h | 2 +- Marlin/pins_OMCA_A.h | 2 +- Marlin/pins_PRINTRBOARD.h | 4 ++-- Marlin/pins_RAMBO.h | 4 ++-- Marlin/pins_RAMPS_13.h | 14 +++++++------- Marlin/pins_RIGIDBOARD.h | 12 ++++++------ Marlin/pins_RUMBA.h | 2 +- Marlin/pins_SANGUINOLOLU_11.h | 4 ++-- Marlin/pins_SAV_MKI.h | 2 +- Marlin/pins_TEENSY2.h | 2 +- Marlin/pins_TEENSYLU.h | 2 +- Marlin/pins_ULTIMAIN_2.h | 2 +- Marlin/pins_ULTIMAKER.h | 4 ++-- Marlin/ultralcd.cpp | 18 +++++++++--------- 61 files changed, 150 insertions(+), 142 deletions(-) diff --git a/Marlin/Conditionals.h b/Marlin/Conditionals.h index 06de0f955..35312aef0 100644 --- a/Marlin/Conditionals.h +++ b/Marlin/Conditionals.h @@ -321,7 +321,7 @@ #endif #if ENABLED(ULTIPANEL) && DISABLED(ELB_FULL_GRAPHIC_CONTROLLER) - #undef SDCARDDETECTINVERTED + #undef SD_DETECT_INVERTED #endif // Power Signal Control Definitions diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index dfcfaebee..1e632ba25 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -674,7 +674,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 SDCARDDETECTINVERTED +//#define SD_DETECT_INVERTED // The RepRapDiscount Smart Controller (white PCB) // http://reprap.org/wiki/RepRapDiscount_Smart_Controller diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h index 94d96d01a..7a12bec5b 100644 --- a/Marlin/Configuration_adv.h +++ b/Marlin/Configuration_adv.h @@ -291,13 +291,12 @@ #if ENABLED(SDSUPPORT) - // 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 - #ifndef ELB_FULL_GRAPHIC_CONTROLLER - #define SDCARDDETECTINVERTED - #endif + // Some RAMPS and other boards don't detect when an SD card is inserted. You can work + // around this by connecting a push button or single throw switch to the pin defined + // as SD_DETECT_PIN in your board's pins definitions. + // This setting should be disabled unless you are using a push button, pulling the pin to ground. + // Note: This is always disabled for ULTIPANEL (except ELB_FULL_GRAPHIC_CONTROLLER). + #define SD_DETECT_INVERTED #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. diff --git a/Marlin/cardreader.h b/Marlin/cardreader.h index 07faabd88..26e480566 100644 --- a/Marlin/cardreader.h +++ b/Marlin/cardreader.h @@ -81,11 +81,11 @@ extern CardReader card; #define IS_SD_PRINTING (card.sdprinting) -#if PIN_EXISTS(SDCARDDETECT) - #if ENABLED(SDCARDDETECTINVERTED) - #define IS_SD_INSERTED (READ(SDCARDDETECT_PIN) != 0) +#if PIN_EXISTS(SD_DETECT) + #if ENABLED(SD_DETECT_INVERTED) + #define IS_SD_INSERTED (READ(SD_DETECT_PIN) != 0) #else - #define IS_SD_INSERTED (READ(SDCARDDETECT_PIN) == 0) + #define IS_SD_INSERTED (READ(SD_DETECT_PIN) == 0) #endif #else //No card detect line? Assume the card is inserted. diff --git a/Marlin/configurator/config/Configuration.h b/Marlin/configurator/config/Configuration.h index dfcfaebee..1e632ba25 100644 --- a/Marlin/configurator/config/Configuration.h +++ b/Marlin/configurator/config/Configuration.h @@ -674,7 +674,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 SDCARDDETECTINVERTED +//#define SD_DETECT_INVERTED // The RepRapDiscount Smart Controller (white PCB) // http://reprap.org/wiki/RepRapDiscount_Smart_Controller diff --git a/Marlin/configurator/config/Configuration_adv.h b/Marlin/configurator/config/Configuration_adv.h index 94d96d01a..7a12bec5b 100644 --- a/Marlin/configurator/config/Configuration_adv.h +++ b/Marlin/configurator/config/Configuration_adv.h @@ -291,13 +291,12 @@ #if ENABLED(SDSUPPORT) - // 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 - #ifndef ELB_FULL_GRAPHIC_CONTROLLER - #define SDCARDDETECTINVERTED - #endif + // Some RAMPS and other boards don't detect when an SD card is inserted. You can work + // around this by connecting a push button or single throw switch to the pin defined + // as SD_DETECT_PIN in your board's pins definitions. + // This setting should be disabled unless you are using a push button, pulling the pin to ground. + // Note: This is always disabled for ULTIPANEL (except ELB_FULL_GRAPHIC_CONTROLLER). + #define SD_DETECT_INVERTED #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. diff --git a/Marlin/example_configurations/Felix/Configuration.h b/Marlin/example_configurations/Felix/Configuration.h index ff5a0f0e7..6b3e557a4 100644 --- a/Marlin/example_configurations/Felix/Configuration.h +++ b/Marlin/example_configurations/Felix/Configuration.h @@ -652,7 +652,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 SDCARDDETECTINVERTED +//#define SD_DETECT_INVERTED // The RepRapDiscount Smart Controller (white PCB) // http://reprap.org/wiki/RepRapDiscount_Smart_Controller diff --git a/Marlin/example_configurations/Felix/Configuration_DUAL.h b/Marlin/example_configurations/Felix/Configuration_DUAL.h index a11017815..e082a8826 100644 --- a/Marlin/example_configurations/Felix/Configuration_DUAL.h +++ b/Marlin/example_configurations/Felix/Configuration_DUAL.h @@ -610,7 +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 SDCARDDETECTINVERTED +//#define SD_DETECT_INVERTED // The RepRapDiscount Smart Controller (white PCB) // http://reprap.org/wiki/RepRapDiscount_Smart_Controller diff --git a/Marlin/example_configurations/Felix/Configuration_adv.h b/Marlin/example_configurations/Felix/Configuration_adv.h index 9da7c6093..36064d3ce 100644 --- a/Marlin/example_configurations/Felix/Configuration_adv.h +++ b/Marlin/example_configurations/Felix/Configuration_adv.h @@ -299,11 +299,12 @@ #if ENABLED(SDSUPPORT) - // 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 + // Some RAMPS and other boards don't detect when an SD card is inserted. You can work + // around this by connecting a push button or single throw switch to the pin defined + // as SD_DETECT_PIN in your board's pins definitions. + // This setting should be disabled unless you are using a push button, pulling the pin to ground. + // Note: This is always disabled for ULTIPANEL (except ELB_FULL_GRAPHIC_CONTROLLER). + #define SD_DETECT_INVERTED #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. diff --git a/Marlin/example_configurations/Hephestos/Configuration.h b/Marlin/example_configurations/Hephestos/Configuration.h index 1b5ab591e..abf49aa81 100644 --- a/Marlin/example_configurations/Hephestos/Configuration.h +++ b/Marlin/example_configurations/Hephestos/Configuration.h @@ -661,7 +661,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 SDCARDDETECTINVERTED +//#define SD_DETECT_INVERTED // The RepRapDiscount Smart Controller (white PCB) // http://reprap.org/wiki/RepRapDiscount_Smart_Controller diff --git a/Marlin/example_configurations/Hephestos/Configuration_adv.h b/Marlin/example_configurations/Hephestos/Configuration_adv.h index 4a74b74c5..2fac324e9 100644 --- a/Marlin/example_configurations/Hephestos/Configuration_adv.h +++ b/Marlin/example_configurations/Hephestos/Configuration_adv.h @@ -299,11 +299,12 @@ #if ENABLED(SDSUPPORT) - // 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 + // Some RAMPS and other boards don't detect when an SD card is inserted. You can work + // around this by connecting a push button or single throw switch to the pin defined + // as SD_DETECT_PIN in your board's pins definitions. + // This setting should be disabled unless you are using a push button, pulling the pin to ground. + // Note: This is always disabled for ULTIPANEL (except ELB_FULL_GRAPHIC_CONTROLLER). + #define SD_DETECT_INVERTED #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. diff --git a/Marlin/example_configurations/K8200/Configuration.h b/Marlin/example_configurations/K8200/Configuration.h index dc16f49cd..7eb31984e 100644 --- a/Marlin/example_configurations/K8200/Configuration.h +++ b/Marlin/example_configurations/K8200/Configuration.h @@ -657,7 +657,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 SDCARDDETECTINVERTED +//#define SD_DETECT_INVERTED // The RepRapDiscount Smart Controller (white PCB) // http://reprap.org/wiki/RepRapDiscount_Smart_Controller diff --git a/Marlin/example_configurations/K8200/Configuration_adv.h b/Marlin/example_configurations/K8200/Configuration_adv.h index 97a6d4e13..2a034dc53 100644 --- a/Marlin/example_configurations/K8200/Configuration_adv.h +++ b/Marlin/example_configurations/K8200/Configuration_adv.h @@ -299,11 +299,12 @@ #if ENABLED(SDSUPPORT) - // 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 + // Some RAMPS and other boards don't detect when an SD card is inserted. You can work + // around this by connecting a push button or single throw switch to the pin defined + // as SD_DETECT_PIN in your board's pins definitions. + // This setting should be disabled unless you are using a push button, pulling the pin to ground. + // Note: This is always disabled for ULTIPANEL (except ELB_FULL_GRAPHIC_CONTROLLER). + #define SD_DETECT_INVERTED #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. diff --git a/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h b/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h index fc98c12bc..dd624e63e 100644 --- a/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h +++ b/Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h @@ -669,7 +669,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 SDCARDDETECTINVERTED +//#define SD_DETECT_INVERTED // The RepRapDiscount Smart Controller (white PCB) // http://reprap.org/wiki/RepRapDiscount_Smart_Controller diff --git a/Marlin/example_configurations/RigidBot/Configuration.h b/Marlin/example_configurations/RigidBot/Configuration.h index 537da5ee3..40a00b6d4 100644 --- a/Marlin/example_configurations/RigidBot/Configuration.h +++ b/Marlin/example_configurations/RigidBot/Configuration.h @@ -649,7 +649,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 SDCARDDETECTINVERTED +//#define SD_DETECT_INVERTED // The RepRapDiscount Smart Controller (white PCB) // http://reprap.org/wiki/RepRapDiscount_Smart_Controller diff --git a/Marlin/example_configurations/RigidBot/Configuration_adv.h b/Marlin/example_configurations/RigidBot/Configuration_adv.h index 72276f255..18d9e8003 100644 --- a/Marlin/example_configurations/RigidBot/Configuration_adv.h +++ b/Marlin/example_configurations/RigidBot/Configuration_adv.h @@ -292,11 +292,11 @@ #if ENABLED(SDSUPPORT) // 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 + // You can get round this by connecting a push button or single throw switch to the pin defined as SD_DETECT_PIN // 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 + #define SD_DETECT_INVERTED #endif #define SD_FINISHED_STEPPERRELEASE true //if sd support and the file is finished: disable steppers? diff --git a/Marlin/example_configurations/SCARA/Configuration.h b/Marlin/example_configurations/SCARA/Configuration.h index 41304db43..05cf12ffe 100644 --- a/Marlin/example_configurations/SCARA/Configuration.h +++ b/Marlin/example_configurations/SCARA/Configuration.h @@ -677,7 +677,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 SDCARDDETECTINVERTED +//#define SD_DETECT_INVERTED // The RepRapDiscount Smart Controller (white PCB) // http://reprap.org/wiki/RepRapDiscount_Smart_Controller diff --git a/Marlin/example_configurations/SCARA/Configuration_adv.h b/Marlin/example_configurations/SCARA/Configuration_adv.h index 8fa955e37..e2c4571a2 100644 --- a/Marlin/example_configurations/SCARA/Configuration_adv.h +++ b/Marlin/example_configurations/SCARA/Configuration_adv.h @@ -299,11 +299,12 @@ #if ENABLED(SDSUPPORT) - // 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 + // Some RAMPS and other boards don't detect when an SD card is inserted. You can work + // around this by connecting a push button or single throw switch to the pin defined + // as SD_DETECT_PIN in your board's pins definitions. + // This setting should be disabled unless you are using a push button, pulling the pin to ground. + // Note: This is always disabled for ULTIPANEL (except ELB_FULL_GRAPHIC_CONTROLLER). + #define SD_DETECT_INVERTED #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. diff --git a/Marlin/example_configurations/WITBOX/Configuration.h b/Marlin/example_configurations/WITBOX/Configuration.h index 32c709e0c..7b00bb2ff 100644 --- a/Marlin/example_configurations/WITBOX/Configuration.h +++ b/Marlin/example_configurations/WITBOX/Configuration.h @@ -661,7 +661,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 SDCARDDETECTINVERTED +//#define SD_DETECT_INVERTED // The RepRapDiscount Smart Controller (white PCB) // http://reprap.org/wiki/RepRapDiscount_Smart_Controller diff --git a/Marlin/example_configurations/WITBOX/Configuration_adv.h b/Marlin/example_configurations/WITBOX/Configuration_adv.h index b4b71bd0f..d4a047343 100644 --- a/Marlin/example_configurations/WITBOX/Configuration_adv.h +++ b/Marlin/example_configurations/WITBOX/Configuration_adv.h @@ -299,11 +299,12 @@ #if ENABLED(SDSUPPORT) - // 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 + // Some RAMPS and other boards don't detect when an SD card is inserted. You can work + // around this by connecting a push button or single throw switch to the pin defined + // as SD_DETECT_PIN in your board's pins definitions. + // This setting should be disabled unless you are using a push button, pulling the pin to ground. + // Note: This is always disabled for ULTIPANEL (except ELB_FULL_GRAPHIC_CONTROLLER). + #define SD_DETECT_INVERTED #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. diff --git a/Marlin/example_configurations/adafruit/ST7565/Configuration.h b/Marlin/example_configurations/adafruit/ST7565/Configuration.h index dcc0905b2..61419ef86 100644 --- a/Marlin/example_configurations/adafruit/ST7565/Configuration.h +++ b/Marlin/example_configurations/adafruit/ST7565/Configuration.h @@ -669,7 +669,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 SDCARDDETECTINVERTED +//#define SD_DETECT_INVERTED // The RepRapDiscount Smart Controller (white PCB) // http://reprap.org/wiki/RepRapDiscount_Smart_Controller diff --git a/Marlin/example_configurations/delta/biv2.5/Configuration.h b/Marlin/example_configurations/delta/biv2.5/Configuration.h index 285bcf855..c8a9b5052 100644 --- a/Marlin/example_configurations/delta/biv2.5/Configuration.h +++ b/Marlin/example_configurations/delta/biv2.5/Configuration.h @@ -789,7 +789,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 SDCARDDETECTINVERTED +//#define SD_DETECT_INVERTED // The RepRapDiscount Smart Controller (white PCB) // http://reprap.org/wiki/RepRapDiscount_Smart_Controller diff --git a/Marlin/example_configurations/delta/biv2.5/Configuration_adv.h b/Marlin/example_configurations/delta/biv2.5/Configuration_adv.h index b233eb0b3..2f40b3830 100644 --- a/Marlin/example_configurations/delta/biv2.5/Configuration_adv.h +++ b/Marlin/example_configurations/delta/biv2.5/Configuration_adv.h @@ -300,11 +300,12 @@ #if ENABLED(SDSUPPORT) - // 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 + // Some RAMPS and other boards don't detect when an SD card is inserted. You can work + // around this by connecting a push button or single throw switch to the pin defined + // as SD_DETECT_PIN in your board's pins definitions. + // This setting should be disabled unless you are using a push button, pulling the pin to ground. + // Note: This is always disabled for ULTIPANEL (except ELB_FULL_GRAPHIC_CONTROLLER). + #define SD_DETECT_INVERTED #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. diff --git a/Marlin/example_configurations/delta/generic/Configuration.h b/Marlin/example_configurations/delta/generic/Configuration.h index 25439a3b8..c1ce9a016 100644 --- a/Marlin/example_configurations/delta/generic/Configuration.h +++ b/Marlin/example_configurations/delta/generic/Configuration.h @@ -789,7 +789,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 SDCARDDETECTINVERTED +//#define SD_DETECT_INVERTED // The RepRapDiscount Smart Controller (white PCB) // http://reprap.org/wiki/RepRapDiscount_Smart_Controller diff --git a/Marlin/example_configurations/delta/generic/Configuration_adv.h b/Marlin/example_configurations/delta/generic/Configuration_adv.h index a760cf60a..f8133d6c7 100644 --- a/Marlin/example_configurations/delta/generic/Configuration_adv.h +++ b/Marlin/example_configurations/delta/generic/Configuration_adv.h @@ -300,11 +300,12 @@ #if ENABLED(SDSUPPORT) - // 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 + // Some RAMPS and other boards don't detect when an SD card is inserted. You can work + // around this by connecting a push button or single throw switch to the pin defined + // as SD_DETECT_PIN in your board's pins definitions. + // This setting should be disabled unless you are using a push button, pulling the pin to ground. + // Note: This is always disabled for ULTIPANEL (except ELB_FULL_GRAPHIC_CONTROLLER). + #define SD_DETECT_INVERTED #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. diff --git a/Marlin/example_configurations/delta/kossel_mini/Configuration.h b/Marlin/example_configurations/delta/kossel_mini/Configuration.h index f7fb6476c..10aa237f9 100644 --- a/Marlin/example_configurations/delta/kossel_mini/Configuration.h +++ b/Marlin/example_configurations/delta/kossel_mini/Configuration.h @@ -793,7 +793,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 SDCARDDETECTINVERTED +//#define SD_DETECT_INVERTED // The RepRapDiscount Smart Controller (white PCB) // http://reprap.org/wiki/RepRapDiscount_Smart_Controller diff --git a/Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h b/Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h index 6fe31f2cf..829d30432 100644 --- a/Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h +++ b/Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h @@ -299,11 +299,12 @@ #if ENABLED(SDSUPPORT) - // 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 + // Some RAMPS and other boards don't detect when an SD card is inserted. You can work + // around this by connecting a push button or single throw switch to the pin defined + // as SD_DETECT_PIN in your board's pins definitions. + // This setting should be disabled unless you are using a push button, pulling the pin to ground. + // Note: This is always disabled for ULTIPANEL (except ELB_FULL_GRAPHIC_CONTROLLER). + #define SD_DETECT_INVERTED #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. diff --git a/Marlin/example_configurations/delta/kossel_pro/Configuration.h b/Marlin/example_configurations/delta/kossel_pro/Configuration.h index 025753952..1a637e33e 100644 --- a/Marlin/example_configurations/delta/kossel_pro/Configuration.h +++ b/Marlin/example_configurations/delta/kossel_pro/Configuration.h @@ -788,7 +788,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 SDCARDDETECTINVERTED +//#define SD_DETECT_INVERTED // The RepRapDiscount Smart Controller (white PCB) // http://reprap.org/wiki/RepRapDiscount_Smart_Controller diff --git a/Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h b/Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h index 7c20e2cf1..8e25b8f89 100644 --- a/Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h +++ b/Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h @@ -340,11 +340,12 @@ #if ENABLED(SDSUPPORT) - // 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 + // Some RAMPS and other boards don't detect when an SD card is inserted. You can work + // around this by connecting a push button or single throw switch to the pin defined + // as SD_DETECT_PIN in your board's pins definitions. + // This setting should be disabled unless you are using a push button, pulling the pin to ground. + // Note: This is always disabled for ULTIPANEL (except ELB_FULL_GRAPHIC_CONTROLLER). + #define SD_DETECT_INVERTED #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. @@ -452,7 +453,7 @@ const unsigned int dropsegments=5; //everything with less than this number of steps will be ignored as move and joined with the next movement #if ENABLED(ULTIPANEL) - #undef SDCARDDETECTINVERTED + #undef SD_DETECT_INVERTED #endif // Power Signal Control Definitions diff --git a/Marlin/example_configurations/makibox/Configuration.h b/Marlin/example_configurations/makibox/Configuration.h index 9b8ae1f77..bd75fb5d2 100644 --- a/Marlin/example_configurations/makibox/Configuration.h +++ b/Marlin/example_configurations/makibox/Configuration.h @@ -672,7 +672,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 SDCARDDETECTINVERTED +//#define SD_DETECT_INVERTED // The RepRapDiscount Smart Controller (white PCB) // http://reprap.org/wiki/RepRapDiscount_Smart_Controller diff --git a/Marlin/example_configurations/makibox/Configuration_adv.h b/Marlin/example_configurations/makibox/Configuration_adv.h index 04c3c85e0..e40f082bf 100644 --- a/Marlin/example_configurations/makibox/Configuration_adv.h +++ b/Marlin/example_configurations/makibox/Configuration_adv.h @@ -300,10 +300,10 @@ #if ENABLED(SDSUPPORT) // 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 + // You can get round this by connecting a push button or single throw switch to the pin defined as SD_DETECT_PIN // 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 SD_DETECT_INVERTED #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. diff --git a/Marlin/example_configurations/tvrrug/Round2/Configuration.h b/Marlin/example_configurations/tvrrug/Round2/Configuration.h index d653e41a1..ea9215e1f 100644 --- a/Marlin/example_configurations/tvrrug/Round2/Configuration.h +++ b/Marlin/example_configurations/tvrrug/Round2/Configuration.h @@ -663,7 +663,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 SDCARDDETECTINVERTED +//#define SD_DETECT_INVERTED // The RepRapDiscount Smart Controller (white PCB) // http://reprap.org/wiki/RepRapDiscount_Smart_Controller diff --git a/Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h b/Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h index 7c411a899..112bd9e9a 100644 --- a/Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h +++ b/Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h @@ -299,11 +299,12 @@ #if ENABLED(SDSUPPORT) - // 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 + // Some RAMPS and other boards don't detect when an SD card is inserted. You can work + // around this by connecting a push button or single throw switch to the pin defined + // as SD_DETECT_PIN in your board's pins definitions. + // This setting should be disabled unless you are using a push button, pulling the pin to ground. + // Note: This is always disabled for ULTIPANEL (except ELB_FULL_GRAPHIC_CONTROLLER). + #define SD_DETECT_INVERTED #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. diff --git a/Marlin/pins_AZTEEG_X3.h b/Marlin/pins_AZTEEG_X3.h index 1e8d5ddb5..ca2360660 100644 --- a/Marlin/pins_AZTEEG_X3.h +++ b/Marlin/pins_AZTEEG_X3.h @@ -21,7 +21,7 @@ #define BTN_ENC 12 //the click switch #define SDSS 53 - #define SDCARDDETECT -1 // Pin 49 if using display sd interface + #define SD_DETECT -1 // Pin 49 if using display sd interface #if ENABLED(TEMP_STAT_LEDS) #define STAT_LED_RED 64 diff --git a/Marlin/pins_AZTEEG_X3_PRO.h b/Marlin/pins_AZTEEG_X3_PRO.h index 7e2c0a488..247a688c5 100644 --- a/Marlin/pins_AZTEEG_X3_PRO.h +++ b/Marlin/pins_AZTEEG_X3_PRO.h @@ -109,7 +109,7 @@ #define BTN_ENC 39 //the click switch #define SDSS 53 - #define SDCARDDETECT_PIN 49 + #define SD_DETECT_PIN 49 #define KILL_PIN 31 #endif diff --git a/Marlin/pins_BRAINWAVE_PRO.h b/Marlin/pins_BRAINWAVE_PRO.h index b27aa362a..6e9fb89af 100644 --- a/Marlin/pins_BRAINWAVE_PRO.h +++ b/Marlin/pins_BRAINWAVE_PRO.h @@ -54,7 +54,7 @@ #define PS_ON_PIN -1 #define KILL_PIN -1 #define ALARM_PIN -1 -#define SDCARDDETECT_PIN 12 +#define SD_DETECT_PIN 12 #if DISABLED(SDSUPPORT) // these pins are defined in the SD library if building with SD support diff --git a/Marlin/pins_CHEAPTRONIC.h b/Marlin/pins_CHEAPTRONIC.h index 6884622de..b15339d37 100644 --- a/Marlin/pins_CHEAPTRONIC.h +++ b/Marlin/pins_CHEAPTRONIC.h @@ -86,4 +86,4 @@ #define BLEN_A 0 // Cheaptronic v1.0 doesn't use this -#define SDCARDDETECT_PIN -1 +#define SD_DETECT_PIN -1 diff --git a/Marlin/pins_ELEFU_3.h b/Marlin/pins_ELEFU_3.h index 55b44bf27..798a7be82 100644 --- a/Marlin/pins_ELEFU_3.h +++ b/Marlin/pins_ELEFU_3.h @@ -64,7 +64,7 @@ #if ENABLED(RA_CONTROL_PANEL) #define SDSS 53 - #define SDCARDDETECT_PIN 28 + #define SD_DETECT_PIN 28 #define BTN_EN1 14 #define BTN_EN2 39 diff --git a/Marlin/pins_FELIX2.h b/Marlin/pins_FELIX2.h index d345c37c9..f0e9942a7 100644 --- a/Marlin/pins_FELIX2.h +++ b/Marlin/pins_FELIX2.h @@ -19,6 +19,6 @@ #define BLEN_C 2 #define BLEN_B 1 #define BLEN_A 0 - #define SDCARDDETECT_PIN 6 + #define SD_DETECT_PIN 6 #endif // NEWPANEL && ULTRA_LCD diff --git a/Marlin/pins_GEN7_CUSTOM.h b/Marlin/pins_GEN7_CUSTOM.h index 9c489d15a..2183291b4 100644 --- a/Marlin/pins_GEN7_CUSTOM.h +++ b/Marlin/pins_GEN7_CUSTOM.h @@ -57,7 +57,7 @@ //#define RX_ENABLE_PIN 13 #define BEEPER_PIN -1 -#define SDCARDDETECT_PIN -1 +#define SD_DETECT_PIN -1 #define SUICIDE_PIN -1 //has to be defined; otherwise Power_off doesn't work #define KILL_PIN -1 diff --git a/Marlin/pins_LEAPFROG.h b/Marlin/pins_LEAPFROG.h index 45cf6bde4..b25b24455 100644 --- a/Marlin/pins_LEAPFROG.h +++ b/Marlin/pins_LEAPFROG.h @@ -42,7 +42,7 @@ #define SDPOWER -1 #define SDSS 11 -#define SDCARDDETECT_PIN -1 // 10 optional also used as mode pin +#define SD_DETECT_PIN -1 // 10 optional also used as mode pin #define LED_PIN 13 #define FAN_PIN 7 #define PS_ON_PIN -1 diff --git a/Marlin/pins_MEGACONTROLLER.h b/Marlin/pins_MEGACONTROLLER.h index aa39c3920..5bd008a57 100644 --- a/Marlin/pins_MEGACONTROLLER.h +++ b/Marlin/pins_MEGACONTROLLER.h @@ -107,6 +107,6 @@ #define BTN_EN2 11 #define BTN_ENC 10 //the click switch //not connected to a pin - #define SDCARDDETECT_PIN 49 + #define SD_DETECT_PIN 49 #endif //Minipanel diff --git a/Marlin/pins_MEGATRONICS.h b/Marlin/pins_MEGATRONICS.h index 82b6e8175..31812a773 100644 --- a/Marlin/pins_MEGATRONICS.h +++ b/Marlin/pins_MEGATRONICS.h @@ -78,6 +78,6 @@ #define BLEN_B 1 #define BLEN_A 0 - #define SDCARDDETECT_PIN -1 // RAMPS doesn't use this + #define SD_DETECT_PIN -1 // RAMPS doesn't use this #endif // ULTRA_LCD && NEWPANEL diff --git a/Marlin/pins_MEGATRONICS_2.h b/Marlin/pins_MEGATRONICS_2.h index 931b0317a..f75747c87 100644 --- a/Marlin/pins_MEGATRONICS_2.h +++ b/Marlin/pins_MEGATRONICS_2.h @@ -94,4 +94,4 @@ #define BLEN_B 1 #define BLEN_A 0 -#define SDCARDDETECT_PIN -1 // Megatronics doesn't use this +#define SD_DETECT_PIN -1 // Megatronics doesn't use this diff --git a/Marlin/pins_MEGATRONICS_3.h b/Marlin/pins_MEGATRONICS_3.h index d27eeaaf0..10bbb0dc3 100644 --- a/Marlin/pins_MEGATRONICS_3.h +++ b/Marlin/pins_MEGATRONICS_3.h @@ -99,4 +99,4 @@ #define BLEN_B 1 #define BLEN_A 0 -#define SDCARDDETECT_PIN -1 // Megatronics doesn't use this +#define SD_DETECT_PIN -1 // Megatronics doesn't use this diff --git a/Marlin/pins_MINIRAMBO.h b/Marlin/pins_MINIRAMBO.h index 9732e342f..23633862d 100644 --- a/Marlin/pins_MINIRAMBO.h +++ b/Marlin/pins_MINIRAMBO.h @@ -107,7 +107,7 @@ #define BTN_EN2 72 #define BTN_ENC 9 // the click - #define SDCARDDETECT_PIN 15 + #define SD_DETECT_PIN 15 #endif //NEWPANEL #endif //ULTRA_LCD diff --git a/Marlin/pins_MINITRONICS.h b/Marlin/pins_MINITRONICS.h index 6fc60345a..db9122393 100644 --- a/Marlin/pins_MINITRONICS.h +++ b/Marlin/pins_MINITRONICS.h @@ -78,4 +78,4 @@ #define BLEN_B 1 #define BLEN_A 0 -#define SDCARDDETECT_PIN -1 // Minitronics doesn't use this +#define SD_DETECT_PIN -1 // Minitronics doesn't use this diff --git a/Marlin/pins_OMCA.h b/Marlin/pins_OMCA.h index 173177f8c..db8f6ea4c 100644 --- a/Marlin/pins_OMCA.h +++ b/Marlin/pins_OMCA.h @@ -70,7 +70,7 @@ #define SDPOWER -1 #define SDSS 11 -#define SDCARDDETECT_PIN -1 // 10 optional also used as mode pin +#define SD_DETECT_PIN -1 // 10 optional also used as mode pin #define LED_PIN -1 #define FAN_PIN 14 // PWM on MIDDLE connector #define PS_ON_PIN -1 diff --git a/Marlin/pins_OMCA_A.h b/Marlin/pins_OMCA_A.h index f66de1ff4..618de120c 100644 --- a/Marlin/pins_OMCA_A.h +++ b/Marlin/pins_OMCA_A.h @@ -61,7 +61,7 @@ #define SDPOWER -1 #define SDSS 11 -#define SDCARDDETECT_PIN -1 // 10 optional also used as mode pin +#define SD_DETECT_PIN -1 // 10 optional also used as mode pin #define LED_PIN -1 #define FAN_PIN 3 #define PS_ON_PIN -1 diff --git a/Marlin/pins_PRINTRBOARD.h b/Marlin/pins_PRINTRBOARD.h index ff81cfee9..f6eff9c9b 100644 --- a/Marlin/pins_PRINTRBOARD.h +++ b/Marlin/pins_PRINTRBOARD.h @@ -88,7 +88,7 @@ #define SDSS 40 //use SD card on Panelolu2 (Teensyduino pin mapping) #endif // LCD_I2C_PANELOLU2 //not connected to a pin - #define SDCARDDETECT_PIN -1 + #define SD_DETECT_PIN -1 #endif // ULTRA_LCD && NEWPANEL #if ENABLED(VIKI2) || ENABLED(miniVIKI) @@ -104,7 +104,7 @@ #define BTN_ENC 47 //the click switch #define SDSS 45 - #define SDCARDDETECT_PIN -1 // FastIO (Manual says 72 I'm not certain cause I can't test) + #define SD_DETECT_PIN -1 // FastIO (Manual says 72 I'm not certain cause I can't test) #if ENABLED(TEMP_STAT_LEDS) #define STAT_LED_RED 12 //Non-FastIO diff --git a/Marlin/pins_RAMBO.h b/Marlin/pins_RAMBO.h index 9d8c2515a..e85f03777 100644 --- a/Marlin/pins_RAMBO.h +++ b/Marlin/pins_RAMBO.h @@ -133,7 +133,7 @@ #define BLEN_B 1 #define BLEN_A 0 - #define SDCARDDETECT_PIN 81 // Ramps doesn't use this + #define SD_DETECT_PIN 81 // Ramps doesn't use this #else //!NEWPANEL - old style panel with shift register @@ -180,7 +180,7 @@ #define BTN_EN2 84 #define BTN_ENC 83 //the click switch - #define SDCARDDETECT_PIN -1 // Pin 72 if using easy adapter board + #define SD_DETECT_PIN -1 // Pin 72 if using easy adapter board #if ENABLED(TEMP_STAT_LEDS) #define STAT_LED_RED 22 diff --git a/Marlin/pins_RAMPS_13.h b/Marlin/pins_RAMPS_13.h index fc43a7983..c2b4af185 100644 --- a/Marlin/pins_RAMPS_13.h +++ b/Marlin/pins_RAMPS_13.h @@ -165,25 +165,25 @@ #define BTN_EN2 33 #define BTN_ENC 35 - #define SDCARDDETECT_PIN 49 + #define SD_DETECT_PIN 49 #elif ENABLED(LCD_I2C_PANELOLU2) #define BTN_EN1 47 // reverse if the encoder turns the wrong way. #define BTN_EN2 43 #define BTN_ENC 32 #define LCD_SDSS 53 - #define SDCARDDETECT_PIN -1 + #define SD_DETECT_PIN -1 #define KILL_PIN 41 #elif ENABLED(LCD_I2C_VIKI) #define BTN_EN1 22 // reverse if the encoder turns the wrong way. #define BTN_EN2 7 #define BTN_ENC -1 #define LCD_SDSS 53 - #define SDCARDDETECT_PIN 49 + #define SD_DETECT_PIN 49 #elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER) #define BTN_EN1 35 // reverse if the encoder turns the wrong way. #define BTN_EN2 37 #define BTN_ENC 31 - #define SDCARDDETECT_PIN 49 + #define SD_DETECT_PIN 49 #define LCD_SDSS 53 #define KILL_PIN 41 #define BEEPER_PIN 23 @@ -210,7 +210,7 @@ #define BTN_EN2 63 #define BTN_ENC 59 //the click switch //not connected to a pin - #define SDCARDDETECT_PIN 49 + #define SD_DETECT_PIN 49 #else @@ -235,9 +235,9 @@ #endif #if ENABLED(G3D_PANEL) - #define SDCARDDETECT_PIN 49 + #define SD_DETECT_PIN 49 #else - #define SDCARDDETECT_PIN -1 // Ramps doesn't use this + #define SD_DETECT_PIN -1 // Ramps doesn't use this #endif #endif diff --git a/Marlin/pins_RIGIDBOARD.h b/Marlin/pins_RIGIDBOARD.h index 905397434..881b0ad37 100644 --- a/Marlin/pins_RIGIDBOARD.h +++ b/Marlin/pins_RIGIDBOARD.h @@ -25,8 +25,8 @@ #undef BEEPER_PIN #define BEEPER_PIN -1 - #undef SDCARDDETECT_PIN - #define SDCARDDETECT_PIN 22 + #undef SD_DETECT_PIN + #define SD_DETECT_PIN 22 // Extra button definitions, substitute for EN1 / EN2 #define BTN_UP 37 // BTN_EN1 @@ -43,16 +43,16 @@ #undef BTN_ENC #define BTN_ENC 31 - #undef SDCARDDETECT_PIN - #define SDCARDDETECT_PIN 22 + #undef SD_DETECT_PIN + #define SD_DETECT_PIN 22 #elif defined(REPRAP_DISCOUNT_SMART_CONTROLLER) #undef BEEPER_PIN #define BEEPER_PIN -1 - #undef SDCARDDETECT_PIN - #define SDCARDDETECT_PIN 22 + #undef SD_DETECT_PIN + #define SD_DETECT_PIN 22 #undef KILL_PIN #define KILL_PIN 32 diff --git a/Marlin/pins_RUMBA.h b/Marlin/pins_RUMBA.h index c2ac2c185..8f114a846 100644 --- a/Marlin/pins_RUMBA.h +++ b/Marlin/pins_RUMBA.h @@ -101,7 +101,7 @@ #define SDPOWER -1 #define SDSS 53 -#define SDCARDDETECT_PIN 49 +#define SD_DETECT_PIN 49 #define BEEPER_PIN 44 #define LCD_PINS_RS 19 #define LCD_PINS_ENABLE 42 diff --git a/Marlin/pins_SANGUINOLOLU_11.h b/Marlin/pins_SANGUINOLOLU_11.h index 93eb68254..32e8a8fc2 100644 --- a/Marlin/pins_SANGUINOLOLU_11.h +++ b/Marlin/pins_SANGUINOLOLU_11.h @@ -156,7 +156,7 @@ #define LCD_SDSS 28 // Smart Controller SD card reader rather than the Melzi #endif //Panelolu2 - #define SDCARDDETECT_PIN -1 + #define SD_DETECT_PIN -1 #elif ENABLED(MAKRPANEL) @@ -178,7 +178,7 @@ #define BTN_EN2 10 #define BTN_ENC 16 - #define SDCARDDETECT_PIN -1 + #define SD_DETECT_PIN -1 #endif // MAKRPANEL diff --git a/Marlin/pins_SAV_MKI.h b/Marlin/pins_SAV_MKI.h index e5cfd79f7..f66f035ef 100644 --- a/Marlin/pins_SAV_MKI.h +++ b/Marlin/pins_SAV_MKI.h @@ -83,7 +83,7 @@ #define LED_PIN -1 #define PS_ON_PIN -1 #define ALARM_PIN -1 -#define SDCARDDETECT_PIN -1 +#define SD_DETECT_PIN -1 #define BEEPER_PIN -1 #define LCD_PINS_RS -1 diff --git a/Marlin/pins_TEENSY2.h b/Marlin/pins_TEENSY2.h index 1328a4a33..d0875b495 100644 --- a/Marlin/pins_TEENSY2.h +++ b/Marlin/pins_TEENSY2.h @@ -86,7 +86,7 @@ #define TEMP_2_PIN -1 #define SDPOWER -1 -#define SDCARDDETECT_PIN -1 +#define SD_DETECT_PIN -1 #define SDSS 20 // 8 #define LED_PIN 6 #define PS_ON_PIN 27 diff --git a/Marlin/pins_TEENSYLU.h b/Marlin/pins_TEENSYLU.h index 0f8c24ed3..293da35db 100644 --- a/Marlin/pins_TEENSYLU.h +++ b/Marlin/pins_TEENSYLU.h @@ -78,7 +78,7 @@ #define SDSS 40 //use SD card on Panelolu2 (Teensyduino pin mapping) #endif // LCD_I2C_PANELOLU2 - #define SDCARDDETECT_PIN -1 + #define SD_DETECT_PIN -1 #endif // ULTRA_LCD && NEWPANEL diff --git a/Marlin/pins_ULTIMAIN_2.h b/Marlin/pins_ULTIMAIN_2.h index 95675f410..b6131dd92 100644 --- a/Marlin/pins_ULTIMAIN_2.h +++ b/Marlin/pins_ULTIMAIN_2.h @@ -76,4 +76,4 @@ #define BLEN_B 1 #define BLEN_A 0 -#define SDCARDDETECT_PIN 39 +#define SD_DETECT_PIN 39 diff --git a/Marlin/pins_ULTIMAKER.h b/Marlin/pins_ULTIMAKER.h index ef0d2dff6..a272b1908 100644 --- a/Marlin/pins_ULTIMAKER.h +++ b/Marlin/pins_ULTIMAKER.h @@ -73,7 +73,7 @@ #define BTN_EN2 42 #define BTN_ENC 19 - #define SDCARDDETECT_PIN 38 + #define SD_DETECT_PIN 38 #else //!NEWPANEL - Old style panel with shift register @@ -90,7 +90,7 @@ #define LCD_PINS_D6 20 #define LCD_PINS_D7 19 - #define SDCARDDETECT_PIN -1 + #define SD_DETECT_PIN -1 #endif // !NEWPANEL diff --git a/Marlin/ultralcd.cpp b/Marlin/ultralcd.cpp index 8066e88de..e4c10ccfd 100644 --- a/Marlin/ultralcd.cpp +++ b/Marlin/ultralcd.cpp @@ -221,7 +221,7 @@ static void lcd_status_screen(); millis_t next_button_update_ms; uint8_t lastEncoderBits; uint32_t encoderPosition; - #if PIN_EXISTS(SDCARDDETECT) + #if PIN_EXISTS(SD_DETECT) bool lcd_oldcardstatus; #endif @@ -411,14 +411,14 @@ static void lcd_main_menu() { } else { MENU_ITEM(submenu, MSG_CARD_MENU, lcd_sdcard_menu); - #if !PIN_EXISTS(SDCARDDETECT) + #if !PIN_EXISTS(SD_DETECT) MENU_ITEM(gcode, MSG_CNG_SDCARD, PSTR("M21")); // SD-card changed by user #endif } } else { MENU_ITEM(submenu, MSG_NO_CARD, lcd_sdcard_menu); - #if !PIN_EXISTS(SDCARDDETECT) + #if !PIN_EXISTS(SD_DETECT) MENU_ITEM(gcode, MSG_INIT_SDCARD, PSTR("M21")); // Manually initialize the SD-card via user interface #endif } @@ -1156,7 +1156,7 @@ static void lcd_control_volumetric_menu() { } #endif // FWRETRACT -#if !PIN_EXISTS(SDCARDDETECT) +#if !PIN_EXISTS(SD_DETECT) static void lcd_sd_refresh() { card.initsd(); currentMenuViewOffset = 0; @@ -1180,7 +1180,7 @@ void lcd_sdcard_menu() { MENU_ITEM(back, MSG_MAIN, lcd_main_menu); card.getWorkDirName(); if (card.filename[0] == '/') { - #if !PIN_EXISTS(SDCARDDETECT) + #if !PIN_EXISTS(SD_DETECT) MENU_ITEM(function, LCD_STR_REFRESH MSG_REFRESH, lcd_sd_refresh); #endif } @@ -1407,9 +1407,9 @@ void lcd_init() { #endif // SR_LCD_2W_NL #endif//!NEWPANEL - #if ENABLED(SDSUPPORT) && PIN_EXISTS(SDCARDDETECT) - pinMode(SDCARDDETECT_PIN, INPUT); - WRITE(SDCARDDETECT_PIN, HIGH); + #if ENABLED(SDSUPPORT) && PIN_EXISTS(SD_DETECT) + pinMode(SD_DETECT_PIN, INPUT); + WRITE(SD_DETECT_PIN, HIGH); lcd_oldcardstatus = IS_SD_INSERTED; #endif @@ -1466,7 +1466,7 @@ void lcd_update() { lcd_buttons_update(); - #if PIN_EXISTS(SDCARDDETECT) + #if PIN_EXISTS(SD_DETECT) if (IS_SD_INSERTED != lcd_oldcardstatus && lcd_detected()) { lcdDrawUpdate = 2; lcd_oldcardstatus = IS_SD_INSERTED; From f03e06375068643d640dee4a2bed9f8f9e383589 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Thu, 30 Jul 2015 23:19:11 -0700 Subject: [PATCH 2/3] Rename BEEPER to BEEPER_PIN For consistency with other pins, allowing use of `PIN_EXISTS` macro. --- Marlin/pins_GEN7_CUSTOM.h | 20 ++++++++++---------- Marlin/pins_OMCA_A.h | 28 ++++++++++++++-------------- Marlin/pins_RAMPS_13.h | 6 +++--- Marlin/pins_RUMBA.h | 34 +++++++++++++++++----------------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/Marlin/pins_GEN7_CUSTOM.h b/Marlin/pins_GEN7_CUSTOM.h index 2183291b4..51aaac095 100644 --- a/Marlin/pins_GEN7_CUSTOM.h +++ b/Marlin/pins_GEN7_CUSTOM.h @@ -13,34 +13,34 @@ #define X_STEP_PIN 21 // different from standard GEN7 #define X_DIR_PIN 20 // different from standard GEN7 #define X_ENABLE_PIN 24 -#define X_STOP_PIN 0 +#define X_STOP_PIN 0 //y axis pins #define Y_STEP_PIN 23 #define Y_DIR_PIN 22 #define Y_ENABLE_PIN 24 -#define Y_STOP_PIN 1 +#define Y_STOP_PIN 1 //z axis pins #define Z_STEP_PIN 26 #define Z_DIR_PIN 25 #define Z_ENABLE_PIN 24 -#define Z_STOP_PIN 2 +#define Z_STOP_PIN 2 //extruder pins #define E0_STEP_PIN 28 #define E0_DIR_PIN 27 #define E0_ENABLE_PIN 24 -#define TEMP_0_PIN 2 +#define TEMP_0_PIN 2 #define TEMP_1_PIN -1 #define TEMP_2_PIN -1 -#define TEMP_BED_PIN 1 // MUST USE ANALOG INPUT NUMBERING NOT DIGITAL OUTPUT NUMBERING!!!!!!!!! (pin 34 bed) +#define TEMP_BED_PIN 1 // MUST USE ANALOG INPUT NUMBERING NOT DIGITAL OUTPUT NUMBERING!!!!!!!!! (pin 34 bed) -#define HEATER_0_PIN 4 +#define HEATER_0_PIN 4 #define HEATER_1_PIN -1 #define HEATER_2_PIN -1 -#define HEATER_BED_PIN 3 // (bed) +#define HEATER_BED_PIN 3 // (bed) #define SDPOWER -1 #define SDSS 31 // SCL pin of I2C header || CS Pin for SD Card support @@ -56,9 +56,9 @@ //#define TX_ENABLE_PIN 12 //#define RX_ENABLE_PIN 13 -#define BEEPER_PIN -1 -#define SD_DETECT_PIN -1 -#define SUICIDE_PIN -1 //has to be defined; otherwise Power_off doesn't work +#define BEEPER_PIN -1 +#define SD_DETECT_PIN -1 +#define SUICIDE_PIN -1 //has to be defined; otherwise Power_off doesn't work #define KILL_PIN -1 //Pins for 4bit LCD Support diff --git a/Marlin/pins_OMCA_A.h b/Marlin/pins_OMCA_A.h index 618de120c..d5f863b00 100644 --- a/Marlin/pins_OMCA_A.h +++ b/Marlin/pins_OMCA_A.h @@ -35,39 +35,39 @@ #define X_STEP_PIN 21 #define X_DIR_PIN 20 #define X_ENABLE_PIN 24 -#define X_STOP_PIN 0 +#define X_STOP_PIN 0 #define Y_STEP_PIN 23 #define Y_DIR_PIN 22 #define Y_ENABLE_PIN 24 -#define Y_STOP_PIN 1 +#define Y_STOP_PIN 1 #define Z_STEP_PIN 26 #define Z_DIR_PIN 25 #define Z_ENABLE_PIN 24 -#define Z_STOP_PIN 2 +#define Z_STOP_PIN 2 -#define E0_STEP_PIN 28 -#define E0_DIR_PIN 27 -#define E0_ENABLE_PIN 24 +#define E0_STEP_PIN 28 +#define E0_DIR_PIN 27 +#define E0_ENABLE_PIN 24 -#define E1_STEP_PIN -1 // 19 -#define E1_DIR_PIN -1 // 18 -#define E1_ENABLE_PIN 24 +#define E1_STEP_PIN -1 // 19 +#define E1_DIR_PIN -1 // 18 +#define E1_ENABLE_PIN 24 -#define E2_STEP_PIN -1 // 17 -#define E2_DIR_PIN -1 // 16 -#define E2_ENABLE_PIN 24 +#define E2_STEP_PIN -1 // 17 +#define E2_DIR_PIN -1 // 16 +#define E2_ENABLE_PIN 24 #define SDPOWER -1 #define SDSS 11 #define SD_DETECT_PIN -1 // 10 optional also used as mode pin #define LED_PIN -1 -#define FAN_PIN 3 +#define FAN_PIN 3 #define PS_ON_PIN -1 #define KILL_PIN -1 -#define HEATER_0_PIN 4 +#define HEATER_0_PIN 4 #define HEATER_1_PIN -1 // 12 #define HEATER_2_PIN -1 // 13 #define TEMP_0_PIN 0 //D27 // MUST USE ANALOG INPUT NUMBERING NOT DIGITAL OUTPUT NUMBERING!!!!!!!!! diff --git a/Marlin/pins_RAMPS_13.h b/Marlin/pins_RAMPS_13.h index c2b4af185..be3d105c3 100644 --- a/Marlin/pins_RAMPS_13.h +++ b/Marlin/pins_RAMPS_13.h @@ -117,10 +117,10 @@ #if MB(RAMPS_13_EFF) || MB(RAMPS_13_EEF) || MB(RAMPS_13_SF) #define HEATER_BED_PIN -1 // NO BED #else - #define HEATER_BED_PIN 8 // BED + #define HEATER_BED_PIN 8 // BED #endif -#define TEMP_BED_PIN 14 // ANALOG NUMBERING +#define TEMP_BED_PIN 14 // ANALOG NUMBERING #if HAS_SERVOS #define SERVO0_PIN 11 @@ -136,7 +136,7 @@ #endif #if ENABLED(Z_PROBE_SLED) - #define SLED_PIN -1 + #define SLED_PIN -1 #endif #if ENABLED(ULTRA_LCD) diff --git a/Marlin/pins_RUMBA.h b/Marlin/pins_RUMBA.h index 8f114a846..3b6c7adf6 100644 --- a/Marlin/pins_RUMBA.h +++ b/Marlin/pins_RUMBA.h @@ -42,41 +42,41 @@ #define LED_PIN 13 -#define FAN_PIN 7 -#define FAN1_PIN 8 +#define FAN_PIN 7 +#define FAN1_PIN 8 #define PS_ON_PIN 45 #define KILL_PIN 46 #if (TEMP_SENSOR_0==0) - #define TEMP_0_PIN -1 - #define HEATER_0_PIN -1 + #define TEMP_0_PIN -1 + #define HEATER_0_PIN -1 #else - #define HEATER_0_PIN 2 // EXTRUDER 1 + #define HEATER_0_PIN 2 // EXTRUDER 1 #if (TEMP_SENSOR_0==-1) - #define TEMP_0_PIN 6 // ANALOG NUMBERING - connector *K1* on RUMBA thermocouple ADD ON is used + #define TEMP_0_PIN 6 // ANALOG NUMBERING - connector *K1* on RUMBA thermocouple ADD ON is used #else #define TEMP_0_PIN 15 // ANALOG NUMBERING - default connector for thermistor *T0* on rumba board is used #endif #endif #if (TEMP_SENSOR_1==0) - #define TEMP_1_PIN -1 - #define HEATER_1_PIN -1 + #define TEMP_1_PIN -1 + #define HEATER_1_PIN -1 #else - #define HEATER_1_PIN 3 // EXTRUDER 2 + #define HEATER_1_PIN 3 // EXTRUDER 2 #if (TEMP_SENSOR_1==-1) - #define TEMP_1_PIN 5 // ANALOG NUMBERING - connector *K2* on RUMBA thermocouple ADD ON is used + #define TEMP_1_PIN 5 // ANALOG NUMBERING - connector *K2* on RUMBA thermocouple ADD ON is used #else #define TEMP_1_PIN 14 // ANALOG NUMBERING - default connector for thermistor *T1* on rumba board is used #endif #endif #if (TEMP_SENSOR_2==0) - #define TEMP_2_PIN -1 - #define HEATER_2_PIN -1 + #define TEMP_2_PIN -1 + #define HEATER_2_PIN -1 #else - #define HEATER_2_PIN 6 // EXTRUDER 3 + #define HEATER_2_PIN 6 // EXTRUDER 3 #if (TEMP_SENSOR_2==-1) #define TEMP_2_PIN 7 // ANALOG NUMBERING - connector *K3* on RUMBA thermocouple ADD ON is used <-- this can not be used when TEMP_SENSOR_BED is defined as thermocouple #else @@ -88,14 +88,14 @@ //optional FAN1 can be used as 4th heater output: #define HEATER_3_PIN 8 // EXTRUDER 4 #if (TEMP_SENSOR_BED==0) - #define TEMP_BED_PIN -1 - #define HEATER_BED_PIN -1 + #define TEMP_BED_PIN -1 + #define HEATER_BED_PIN -1 #else - #define HEATER_BED_PIN 9 // BED + #define HEATER_BED_PIN 9 // BED #if (TEMP_SENSOR_BED==-1) #define TEMP_BED_PIN 7 // ANALOG NUMBERING - connector *K3* on RUMBA thermocouple ADD ON is used <-- this can not be used when TEMP_SENSOR_2 is defined as thermocouple #else - #define TEMP_BED_PIN 11 // ANALOG NUMBERING - default connector for thermistor *THB* on rumba board is used + #define TEMP_BED_PIN 11 // ANALOG NUMBERING - default connector for thermistor *THB* on rumba board is used #endif #endif From 5418faa1f92a1cc9a33a4d5745ea3ecdc172d076 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Fri, 31 Jul 2015 17:01:01 -0700 Subject: [PATCH 3/3] Add sanity checks for old names --- Marlin/SanityCheck.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Marlin/SanityCheck.h b/Marlin/SanityCheck.h index 7bf1d6d4a..d18a336de 100644 --- a/Marlin/SanityCheck.h +++ b/Marlin/SanityCheck.h @@ -366,4 +366,12 @@ #error BEEPER has been replaced with BEEPER_PIN. Please update your pins definitions. #endif + #ifdef SDCARDDETECT + #error SDCARDDETECT is now SD_DETECT_PIN. Please update your pins definitions. + #endif + + #ifdef SDCARDDETECTINVERTED + #error SDCARDDETECTINVERTED is now SD_DETECT_INVERTED. Please update your configuration. + #endif + #endif //SANITYCHECK_H