Преглед на файлове

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`
Scott Lahteine преди 8 години
родител
ревизия
270c766de2
променени са 61 файла, в които са добавени 150 реда и са изтрити 142 реда
  1. 1
    1
      Marlin/Conditionals.h
  2. 1
    1
      Marlin/Configuration.h
  3. 6
    7
      Marlin/Configuration_adv.h
  4. 4
    4
      Marlin/cardreader.h
  5. 1
    1
      Marlin/configurator/config/Configuration.h
  6. 6
    7
      Marlin/configurator/config/Configuration_adv.h
  7. 1
    1
      Marlin/example_configurations/Felix/Configuration.h
  8. 1
    1
      Marlin/example_configurations/Felix/Configuration_DUAL.h
  9. 6
    5
      Marlin/example_configurations/Felix/Configuration_adv.h
  10. 1
    1
      Marlin/example_configurations/Hephestos/Configuration.h
  11. 6
    5
      Marlin/example_configurations/Hephestos/Configuration_adv.h
  12. 1
    1
      Marlin/example_configurations/K8200/Configuration.h
  13. 6
    5
      Marlin/example_configurations/K8200/Configuration_adv.h
  14. 1
    1
      Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h
  15. 1
    1
      Marlin/example_configurations/RigidBot/Configuration.h
  16. 2
    2
      Marlin/example_configurations/RigidBot/Configuration_adv.h
  17. 1
    1
      Marlin/example_configurations/SCARA/Configuration.h
  18. 6
    5
      Marlin/example_configurations/SCARA/Configuration_adv.h
  19. 1
    1
      Marlin/example_configurations/WITBOX/Configuration.h
  20. 6
    5
      Marlin/example_configurations/WITBOX/Configuration_adv.h
  21. 1
    1
      Marlin/example_configurations/adafruit/ST7565/Configuration.h
  22. 1
    1
      Marlin/example_configurations/delta/biv2.5/Configuration.h
  23. 6
    5
      Marlin/example_configurations/delta/biv2.5/Configuration_adv.h
  24. 1
    1
      Marlin/example_configurations/delta/generic/Configuration.h
  25. 6
    5
      Marlin/example_configurations/delta/generic/Configuration_adv.h
  26. 1
    1
      Marlin/example_configurations/delta/kossel_mini/Configuration.h
  27. 6
    5
      Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h
  28. 1
    1
      Marlin/example_configurations/delta/kossel_pro/Configuration.h
  29. 7
    6
      Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h
  30. 1
    1
      Marlin/example_configurations/makibox/Configuration.h
  31. 2
    2
      Marlin/example_configurations/makibox/Configuration_adv.h
  32. 1
    1
      Marlin/example_configurations/tvrrug/Round2/Configuration.h
  33. 6
    5
      Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h
  34. 1
    1
      Marlin/pins_AZTEEG_X3.h
  35. 1
    1
      Marlin/pins_AZTEEG_X3_PRO.h
  36. 1
    1
      Marlin/pins_BRAINWAVE_PRO.h
  37. 1
    1
      Marlin/pins_CHEAPTRONIC.h
  38. 1
    1
      Marlin/pins_ELEFU_3.h
  39. 1
    1
      Marlin/pins_FELIX2.h
  40. 1
    1
      Marlin/pins_GEN7_CUSTOM.h
  41. 1
    1
      Marlin/pins_LEAPFROG.h
  42. 1
    1
      Marlin/pins_MEGACONTROLLER.h
  43. 1
    1
      Marlin/pins_MEGATRONICS.h
  44. 1
    1
      Marlin/pins_MEGATRONICS_2.h
  45. 1
    1
      Marlin/pins_MEGATRONICS_3.h
  46. 1
    1
      Marlin/pins_MINIRAMBO.h
  47. 1
    1
      Marlin/pins_MINITRONICS.h
  48. 1
    1
      Marlin/pins_OMCA.h
  49. 1
    1
      Marlin/pins_OMCA_A.h
  50. 2
    2
      Marlin/pins_PRINTRBOARD.h
  51. 2
    2
      Marlin/pins_RAMBO.h
  52. 7
    7
      Marlin/pins_RAMPS_13.h
  53. 6
    6
      Marlin/pins_RIGIDBOARD.h
  54. 1
    1
      Marlin/pins_RUMBA.h
  55. 2
    2
      Marlin/pins_SANGUINOLOLU_11.h
  56. 1
    1
      Marlin/pins_SAV_MKI.h
  57. 1
    1
      Marlin/pins_TEENSY2.h
  58. 1
    1
      Marlin/pins_TEENSYLU.h
  59. 1
    1
      Marlin/pins_ULTIMAIN_2.h
  60. 2
    2
      Marlin/pins_ULTIMAKER.h
  61. 9
    9
      Marlin/ultralcd.cpp

+ 1
- 1
Marlin/Conditionals.h Целия файл

@@ -321,7 +321,7 @@
321 321
   #endif
322 322
 
323 323
   #if ENABLED(ULTIPANEL) && DISABLED(ELB_FULL_GRAPHIC_CONTROLLER)
324
-    #undef SDCARDDETECTINVERTED
324
+    #undef SD_DETECT_INVERTED
325 325
   #endif
326 326
 
327 327
   // Power Signal Control Definitions

+ 1
- 1
Marlin/Configuration.h Целия файл

@@ -674,7 +674,7 @@ const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic
674 674
 //
675 675
 // ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
676 676
 //#define ELB_FULL_GRAPHIC_CONTROLLER
677
-//#define SDCARDDETECTINVERTED
677
+//#define SD_DETECT_INVERTED
678 678
 
679 679
 // The RepRapDiscount Smart Controller (white PCB)
680 680
 // http://reprap.org/wiki/RepRapDiscount_Smart_Controller

+ 6
- 7
Marlin/Configuration_adv.h Целия файл

@@ -291,13 +291,12 @@
291 291
 
292 292
 #if ENABLED(SDSUPPORT)
293 293
 
294
-  // If you are using a RAMPS board or cheap E-bay purchased boards that do not detect when an SD card is inserted
295
-  // You can get round this by connecting a push button or single throw switch to the pin defined as SDCARDCARDDETECT
296
-  // in the pins.h file.  When using a push button pulling the pin to ground this will need inverted.  This setting should
297
-  // be commented out otherwise
298
-  #ifndef ELB_FULL_GRAPHIC_CONTROLLER
299
-    #define SDCARDDETECTINVERTED
300
-  #endif
294
+  // Some RAMPS and other boards don't detect when an SD card is inserted. You can work
295
+  // around this by connecting a push button or single throw switch to the pin defined
296
+  // as SD_DETECT_PIN in your board's pins definitions.
297
+  // This setting should be disabled unless you are using a push button, pulling the pin to ground.
298
+  // Note: This is always disabled for ULTIPANEL (except ELB_FULL_GRAPHIC_CONTROLLER).
299
+  #define SD_DETECT_INVERTED
301 300
 
302 301
   #define SD_FINISHED_STEPPERRELEASE true  //if sd support and the file is finished: disable steppers?
303 302
   #define SD_FINISHED_RELEASECOMMAND "M84 X Y Z E" // You might want to keep the z enabled so your bed stays in place.

+ 4
- 4
Marlin/cardreader.h Целия файл

@@ -81,11 +81,11 @@ extern CardReader card;
81 81
 
82 82
 #define IS_SD_PRINTING (card.sdprinting)
83 83
 
84
-#if PIN_EXISTS(SDCARDDETECT)
85
-  #if ENABLED(SDCARDDETECTINVERTED)
86
-    #define IS_SD_INSERTED (READ(SDCARDDETECT_PIN) != 0)
84
+#if PIN_EXISTS(SD_DETECT)
85
+  #if ENABLED(SD_DETECT_INVERTED)
86
+    #define IS_SD_INSERTED (READ(SD_DETECT_PIN) != 0)
87 87
   #else
88
-    #define IS_SD_INSERTED (READ(SDCARDDETECT_PIN) == 0)
88
+    #define IS_SD_INSERTED (READ(SD_DETECT_PIN) == 0)
89 89
   #endif
90 90
 #else
91 91
   //No card detect line? Assume the card is inserted.

+ 1
- 1
Marlin/configurator/config/Configuration.h Целия файл

@@ -674,7 +674,7 @@ const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic
674 674
 //
675 675
 // ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
676 676
 //#define ELB_FULL_GRAPHIC_CONTROLLER
677
-//#define SDCARDDETECTINVERTED
677
+//#define SD_DETECT_INVERTED
678 678
 
679 679
 // The RepRapDiscount Smart Controller (white PCB)
680 680
 // http://reprap.org/wiki/RepRapDiscount_Smart_Controller

+ 6
- 7
Marlin/configurator/config/Configuration_adv.h Целия файл

@@ -291,13 +291,12 @@
291 291
 
292 292
 #if ENABLED(SDSUPPORT)
293 293
 
294
-  // If you are using a RAMPS board or cheap E-bay purchased boards that do not detect when an SD card is inserted
295
-  // You can get round this by connecting a push button or single throw switch to the pin defined as SDCARDCARDDETECT
296
-  // in the pins.h file.  When using a push button pulling the pin to ground this will need inverted.  This setting should
297
-  // be commented out otherwise
298
-  #ifndef ELB_FULL_GRAPHIC_CONTROLLER
299
-    #define SDCARDDETECTINVERTED
300
-  #endif
294
+  // Some RAMPS and other boards don't detect when an SD card is inserted. You can work
295
+  // around this by connecting a push button or single throw switch to the pin defined
296
+  // as SD_DETECT_PIN in your board's pins definitions.
297
+  // This setting should be disabled unless you are using a push button, pulling the pin to ground.
298
+  // Note: This is always disabled for ULTIPANEL (except ELB_FULL_GRAPHIC_CONTROLLER).
299
+  #define SD_DETECT_INVERTED
301 300
 
302 301
   #define SD_FINISHED_STEPPERRELEASE true  //if sd support and the file is finished: disable steppers?
303 302
   #define SD_FINISHED_RELEASECOMMAND "M84 X Y Z E" // You might want to keep the z enabled so your bed stays in place.

+ 1
- 1
Marlin/example_configurations/Felix/Configuration.h Целия файл

@@ -652,7 +652,7 @@ const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic
652 652
 //
653 653
 // ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
654 654
 //#define ELB_FULL_GRAPHIC_CONTROLLER
655
-//#define SDCARDDETECTINVERTED
655
+//#define SD_DETECT_INVERTED
656 656
 
657 657
 // The RepRapDiscount Smart Controller (white PCB)
658 658
 // http://reprap.org/wiki/RepRapDiscount_Smart_Controller

+ 1
- 1
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
610 610
 //
611 611
 // ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
612 612
 //#define ELB_FULL_GRAPHIC_CONTROLLER
613
-//#define SDCARDDETECTINVERTED
613
+//#define SD_DETECT_INVERTED
614 614
 
615 615
 // The RepRapDiscount Smart Controller (white PCB)
616 616
 // http://reprap.org/wiki/RepRapDiscount_Smart_Controller

+ 6
- 5
Marlin/example_configurations/Felix/Configuration_adv.h Целия файл

@@ -299,11 +299,12 @@
299 299
 
300 300
 #if ENABLED(SDSUPPORT)
301 301
 
302
-  // If you are using a RAMPS board or cheap E-bay purchased boards that do not detect when an SD card is inserted
303
-  // You can get round this by connecting a push button or single throw switch to the pin defined as SDCARDCARDDETECT
304
-  // in the pins.h file.  When using a push button pulling the pin to ground this will need inverted.  This setting should
305
-  // be commented out otherwise
306
-  #define SDCARDDETECTINVERTED
302
+  // Some RAMPS and other boards don't detect when an SD card is inserted. You can work
303
+  // around this by connecting a push button or single throw switch to the pin defined
304
+  // as SD_DETECT_PIN in your board's pins definitions.
305
+  // This setting should be disabled unless you are using a push button, pulling the pin to ground.
306
+  // Note: This is always disabled for ULTIPANEL (except ELB_FULL_GRAPHIC_CONTROLLER).
307
+  #define SD_DETECT_INVERTED
307 308
 
308 309
   #define SD_FINISHED_STEPPERRELEASE true  //if sd support and the file is finished: disable steppers?
309 310
   #define SD_FINISHED_RELEASECOMMAND "M84 X Y Z E" // You might want to keep the z enabled so your bed stays in place.

+ 1
- 1
Marlin/example_configurations/Hephestos/Configuration.h Целия файл

@@ -661,7 +661,7 @@ const bool Z_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the logic
661 661
 //
662 662
 // ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
663 663
 //#define ELB_FULL_GRAPHIC_CONTROLLER
664
-//#define SDCARDDETECTINVERTED
664
+//#define SD_DETECT_INVERTED
665 665
 
666 666
 // The RepRapDiscount Smart Controller (white PCB)
667 667
 // http://reprap.org/wiki/RepRapDiscount_Smart_Controller

+ 6
- 5
Marlin/example_configurations/Hephestos/Configuration_adv.h Целия файл

@@ -299,11 +299,12 @@
299 299
 
300 300
 #if ENABLED(SDSUPPORT)
301 301
 
302
-  // If you are using a RAMPS board or cheap E-bay purchased boards that do not detect when an SD card is inserted
303
-  // You can get round this by connecting a push button or single throw switch to the pin defined as SDCARDCARDDETECT
304
-  // in the pins.h file.  When using a push button pulling the pin to ground this will need inverted.  This setting should
305
-  // be commented out otherwise
306
-  #define SDCARDDETECTINVERTED
302
+  // Some RAMPS and other boards don't detect when an SD card is inserted. You can work
303
+  // around this by connecting a push button or single throw switch to the pin defined
304
+  // as SD_DETECT_PIN in your board's pins definitions.
305
+  // This setting should be disabled unless you are using a push button, pulling the pin to ground.
306
+  // Note: This is always disabled for ULTIPANEL (except ELB_FULL_GRAPHIC_CONTROLLER).
307
+  #define SD_DETECT_INVERTED
307 308
 
308 309
   #define SD_FINISHED_STEPPERRELEASE true  //if sd support and the file is finished: disable steppers?
309 310
   #define SD_FINISHED_RELEASECOMMAND "M84 X Y Z E" // You might want to keep the z enabled so your bed stays in place.

+ 1
- 1
Marlin/example_configurations/K8200/Configuration.h Целия файл

@@ -657,7 +657,7 @@ const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic
657 657
 //
658 658
 // ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
659 659
 //#define ELB_FULL_GRAPHIC_CONTROLLER
660
-//#define SDCARDDETECTINVERTED
660
+//#define SD_DETECT_INVERTED
661 661
 
662 662
 // The RepRapDiscount Smart Controller (white PCB)
663 663
 // http://reprap.org/wiki/RepRapDiscount_Smart_Controller

+ 6
- 5
Marlin/example_configurations/K8200/Configuration_adv.h Целия файл

@@ -299,11 +299,12 @@
299 299
 
300 300
 #if ENABLED(SDSUPPORT)
301 301
 
302
-  // If you are using a RAMPS board or cheap E-bay purchased boards that do not detect when an SD card is inserted
303
-  // You can get round this by connecting a push button or single throw switch to the pin defined as SDCARDCARDDETECT
304
-  // in the pins.h file.  When using a push button pulling the pin to ground this will need inverted.  This setting should
305
-  // be commented out otherwise
306
-  #define SDCARDDETECTINVERTED
302
+  // Some RAMPS and other boards don't detect when an SD card is inserted. You can work
303
+  // around this by connecting a push button or single throw switch to the pin defined
304
+  // as SD_DETECT_PIN in your board's pins definitions.
305
+  // This setting should be disabled unless you are using a push button, pulling the pin to ground.
306
+  // Note: This is always disabled for ULTIPANEL (except ELB_FULL_GRAPHIC_CONTROLLER).
307
+  #define SD_DETECT_INVERTED
307 308
 
308 309
   #define SD_FINISHED_STEPPERRELEASE true  //if sd support and the file is finished: disable steppers?
309 310
   #define SD_FINISHED_RELEASECOMMAND "M84 X Y Z E" // You might want to keep the z enabled so your bed stays in place.

+ 1
- 1
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
669 669
 //
670 670
 // ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
671 671
 //#define ELB_FULL_GRAPHIC_CONTROLLER
672
-//#define SDCARDDETECTINVERTED
672
+//#define SD_DETECT_INVERTED
673 673
 
674 674
 // The RepRapDiscount Smart Controller (white PCB)
675 675
 // http://reprap.org/wiki/RepRapDiscount_Smart_Controller

+ 1
- 1
Marlin/example_configurations/RigidBot/Configuration.h Целия файл

@@ -649,7 +649,7 @@ const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic
649 649
 //
650 650
 // ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
651 651
 //#define ELB_FULL_GRAPHIC_CONTROLLER
652
-//#define SDCARDDETECTINVERTED
652
+//#define SD_DETECT_INVERTED
653 653
 
654 654
 // The RepRapDiscount Smart Controller (white PCB)
655 655
 // http://reprap.org/wiki/RepRapDiscount_Smart_Controller

+ 2
- 2
Marlin/example_configurations/RigidBot/Configuration_adv.h Целия файл

@@ -292,11 +292,11 @@
292 292
 #if ENABLED(SDSUPPORT)
293 293
 
294 294
   // If you are using a RAMPS board or cheap E-bay purchased boards that do not detect when an SD card is inserted
295
-  // You can get round this by connecting a push button or single throw switch to the pin defined as SDCARDCARDDETECT
295
+  // You can get round this by connecting a push button or single throw switch to the pin defined as SD_DETECT_PIN
296 296
   // in the pins.h file.  When using a push button pulling the pin to ground this will need inverted.  This setting should
297 297
   // be commented out otherwise
298 298
   #ifndef ELB_FULL_GRAPHIC_CONTROLLER
299
-    #define SDCARDDETECTINVERTED
299
+    #define SD_DETECT_INVERTED
300 300
   #endif
301 301
 
302 302
   #define SD_FINISHED_STEPPERRELEASE true  //if sd support and the file is finished: disable steppers?

+ 1
- 1
Marlin/example_configurations/SCARA/Configuration.h Целия файл

@@ -677,7 +677,7 @@ const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic
677 677
 //
678 678
 // ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
679 679
 //#define ELB_FULL_GRAPHIC_CONTROLLER
680
-//#define SDCARDDETECTINVERTED
680
+//#define SD_DETECT_INVERTED
681 681
 
682 682
 // The RepRapDiscount Smart Controller (white PCB)
683 683
 // http://reprap.org/wiki/RepRapDiscount_Smart_Controller

+ 6
- 5
Marlin/example_configurations/SCARA/Configuration_adv.h Целия файл

@@ -299,11 +299,12 @@
299 299
 
300 300
 #if ENABLED(SDSUPPORT)
301 301
 
302
-  // If you are using a RAMPS board or cheap E-bay purchased boards that do not detect when an SD card is inserted
303
-  // You can get round this by connecting a push button or single throw switch to the pin defined as SDCARDCARDDETECT
304
-  // in the pins.h file.  When using a push button pulling the pin to ground this will need inverted.  This setting should
305
-  // be commented out otherwise
306
-  #define SDCARDDETECTINVERTED
302
+  // Some RAMPS and other boards don't detect when an SD card is inserted. You can work
303
+  // around this by connecting a push button or single throw switch to the pin defined
304
+  // as SD_DETECT_PIN in your board's pins definitions.
305
+  // This setting should be disabled unless you are using a push button, pulling the pin to ground.
306
+  // Note: This is always disabled for ULTIPANEL (except ELB_FULL_GRAPHIC_CONTROLLER).
307
+  #define SD_DETECT_INVERTED
307 308
 
308 309
   #define SD_FINISHED_STEPPERRELEASE true  //if sd support and the file is finished: disable steppers?
309 310
   #define SD_FINISHED_RELEASECOMMAND "M84 X Y Z E" // You might want to keep the z enabled so your bed stays in place.

+ 1
- 1
Marlin/example_configurations/WITBOX/Configuration.h Целия файл

@@ -661,7 +661,7 @@ const bool Z_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the logic
661 661
 //
662 662
 // ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
663 663
 //#define ELB_FULL_GRAPHIC_CONTROLLER
664
-//#define SDCARDDETECTINVERTED
664
+//#define SD_DETECT_INVERTED
665 665
 
666 666
 // The RepRapDiscount Smart Controller (white PCB)
667 667
 // http://reprap.org/wiki/RepRapDiscount_Smart_Controller

+ 6
- 5
Marlin/example_configurations/WITBOX/Configuration_adv.h Целия файл

@@ -299,11 +299,12 @@
299 299
 
300 300
 #if ENABLED(SDSUPPORT)
301 301
 
302
-  // If you are using a RAMPS board or cheap E-bay purchased boards that do not detect when an SD card is inserted
303
-  // You can get round this by connecting a push button or single throw switch to the pin defined as SDCARDCARDDETECT
304
-  // in the pins.h file.  When using a push button pulling the pin to ground this will need inverted.  This setting should
305
-  // be commented out otherwise
306
-  #define SDCARDDETECTINVERTED
302
+  // Some RAMPS and other boards don't detect when an SD card is inserted. You can work
303
+  // around this by connecting a push button or single throw switch to the pin defined
304
+  // as SD_DETECT_PIN in your board's pins definitions.
305
+  // This setting should be disabled unless you are using a push button, pulling the pin to ground.
306
+  // Note: This is always disabled for ULTIPANEL (except ELB_FULL_GRAPHIC_CONTROLLER).
307
+  #define SD_DETECT_INVERTED
307 308
 
308 309
   #define SD_FINISHED_STEPPERRELEASE true  //if sd support and the file is finished: disable steppers?
309 310
   #define SD_FINISHED_RELEASECOMMAND "M84 X Y Z E" // You might want to keep the z enabled so your bed stays in place.

+ 1
- 1
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
669 669
 //
670 670
 // ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
671 671
 #define ELB_FULL_GRAPHIC_CONTROLLER
672
-//#define SDCARDDETECTINVERTED
672
+//#define SD_DETECT_INVERTED
673 673
 
674 674
 // The RepRapDiscount Smart Controller (white PCB)
675 675
 // http://reprap.org/wiki/RepRapDiscount_Smart_Controller

+ 1
- 1
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
789 789
 //
790 790
 // ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
791 791
 //#define ELB_FULL_GRAPHIC_CONTROLLER
792
-//#define SDCARDDETECTINVERTED
792
+//#define SD_DETECT_INVERTED
793 793
 
794 794
 // The RepRapDiscount Smart Controller (white PCB)
795 795
 // http://reprap.org/wiki/RepRapDiscount_Smart_Controller

+ 6
- 5
Marlin/example_configurations/delta/biv2.5/Configuration_adv.h Целия файл

@@ -300,11 +300,12 @@
300 300
 
301 301
 #if ENABLED(SDSUPPORT)
302 302
 
303
-  // If you are using a RAMPS board or cheap E-bay purchased boards that do not detect when an SD card is inserted
304
-  // You can get round this by connecting a push button or single throw switch to the pin defined as SDCARDCARDDETECT
305
-  // in the pins.h file.  When using a push button pulling the pin to ground this will need inverted.  This setting should
306
-  // be commented out otherwise
307
-  #define SDCARDDETECTINVERTED
303
+  // Some RAMPS and other boards don't detect when an SD card is inserted. You can work
304
+  // around this by connecting a push button or single throw switch to the pin defined
305
+  // as SD_DETECT_PIN in your board's pins definitions.
306
+  // This setting should be disabled unless you are using a push button, pulling the pin to ground.
307
+  // Note: This is always disabled for ULTIPANEL (except ELB_FULL_GRAPHIC_CONTROLLER).
308
+  #define SD_DETECT_INVERTED
308 309
 
309 310
   #define SD_FINISHED_STEPPERRELEASE true  //if sd support and the file is finished: disable steppers?
310 311
   #define SD_FINISHED_RELEASECOMMAND "M84 X Y Z E" // You might want to keep the z enabled so your bed stays in place.

+ 1
- 1
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
789 789
 //
790 790
 // ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
791 791
 //#define ELB_FULL_GRAPHIC_CONTROLLER
792
-//#define SDCARDDETECTINVERTED
792
+//#define SD_DETECT_INVERTED
793 793
 
794 794
 // The RepRapDiscount Smart Controller (white PCB)
795 795
 // http://reprap.org/wiki/RepRapDiscount_Smart_Controller

+ 6
- 5
Marlin/example_configurations/delta/generic/Configuration_adv.h Целия файл

@@ -300,11 +300,12 @@
300 300
 
301 301
 #if ENABLED(SDSUPPORT)
302 302
 
303
-  // If you are using a RAMPS board or cheap E-bay purchased boards that do not detect when an SD card is inserted
304
-  // You can get round this by connecting a push button or single throw switch to the pin defined as SDCARDCARDDETECT
305
-  // in the pins.h file.  When using a push button pulling the pin to ground this will need inverted.  This setting should
306
-  // be commented out otherwise
307
-  #define SDCARDDETECTINVERTED
303
+  // Some RAMPS and other boards don't detect when an SD card is inserted. You can work
304
+  // around this by connecting a push button or single throw switch to the pin defined
305
+  // as SD_DETECT_PIN in your board's pins definitions.
306
+  // This setting should be disabled unless you are using a push button, pulling the pin to ground.
307
+  // Note: This is always disabled for ULTIPANEL (except ELB_FULL_GRAPHIC_CONTROLLER).
308
+  #define SD_DETECT_INVERTED
308 309
 
309 310
   #define SD_FINISHED_STEPPERRELEASE true  //if sd support and the file is finished: disable steppers?
310 311
   #define SD_FINISHED_RELEASECOMMAND "M84 X Y Z E" // You might want to keep the z enabled so your bed stays in place.

+ 1
- 1
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
793 793
 //
794 794
 // ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
795 795
 //#define ELB_FULL_GRAPHIC_CONTROLLER
796
-//#define SDCARDDETECTINVERTED
796
+//#define SD_DETECT_INVERTED
797 797
 
798 798
 // The RepRapDiscount Smart Controller (white PCB)
799 799
 // http://reprap.org/wiki/RepRapDiscount_Smart_Controller

+ 6
- 5
Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h Целия файл

@@ -299,11 +299,12 @@
299 299
 
300 300
 #if ENABLED(SDSUPPORT)
301 301
 
302
-  // If you are using a RAMPS board or cheap E-bay purchased boards that do not detect when an SD card is inserted
303
-  // You can get round this by connecting a push button or single throw switch to the pin defined as SDCARDCARDDETECT
304
-  // in the pins.h file.  When using a push button pulling the pin to ground this will need inverted.  This setting should
305
-  // be commented out otherwise
306
-  #define SDCARDDETECTINVERTED
302
+  // Some RAMPS and other boards don't detect when an SD card is inserted. You can work
303
+  // around this by connecting a push button or single throw switch to the pin defined
304
+  // as SD_DETECT_PIN in your board's pins definitions.
305
+  // This setting should be disabled unless you are using a push button, pulling the pin to ground.
306
+  // Note: This is always disabled for ULTIPANEL (except ELB_FULL_GRAPHIC_CONTROLLER).
307
+  #define SD_DETECT_INVERTED
307 308
 
308 309
   #define SD_FINISHED_STEPPERRELEASE true  //if sd support and the file is finished: disable steppers?
309 310
   #define SD_FINISHED_RELEASECOMMAND "M84 X Y Z E" // You might want to keep the z enabled so your bed stays in place.

+ 1
- 1
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
788 788
 //
789 789
 // ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
790 790
 //#define ELB_FULL_GRAPHIC_CONTROLLER
791
-//#define SDCARDDETECTINVERTED
791
+//#define SD_DETECT_INVERTED
792 792
 
793 793
 // The RepRapDiscount Smart Controller (white PCB)
794 794
 // http://reprap.org/wiki/RepRapDiscount_Smart_Controller

+ 7
- 6
Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h Целия файл

@@ -340,11 +340,12 @@
340 340
 
341 341
 #if ENABLED(SDSUPPORT)
342 342
 
343
-  // If you are using a RAMPS board or cheap E-bay purchased boards that do not detect when an SD card is inserted
344
-  // You can get round this by connecting a push button or single throw switch to the pin defined as SDCARDCARDDETECT
345
-  // in the pins.h file.  When using a push button pulling the pin to ground this will need inverted.  This setting should
346
-  // be commented out otherwise
347
-  #define SDCARDDETECTINVERTED
343
+  // Some RAMPS and other boards don't detect when an SD card is inserted. You can work
344
+  // around this by connecting a push button or single throw switch to the pin defined
345
+  // as SD_DETECT_PIN in your board's pins definitions.
346
+  // This setting should be disabled unless you are using a push button, pulling the pin to ground.
347
+  // Note: This is always disabled for ULTIPANEL (except ELB_FULL_GRAPHIC_CONTROLLER).
348
+  #define SD_DETECT_INVERTED
348 349
 
349 350
   #define SD_FINISHED_STEPPERRELEASE true  //if sd support and the file is finished: disable steppers?
350 351
   #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 @@
452 453
 const unsigned int dropsegments=5; //everything with less than this number of steps will be ignored as move and joined with the next movement
453 454
 
454 455
 #if ENABLED(ULTIPANEL)
455
- #undef SDCARDDETECTINVERTED
456
+ #undef SD_DETECT_INVERTED
456 457
 #endif
457 458
 
458 459
 // Power Signal Control Definitions

+ 1
- 1
Marlin/example_configurations/makibox/Configuration.h Целия файл

@@ -672,7 +672,7 @@ const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic
672 672
 //
673 673
 // ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
674 674
 //#define ELB_FULL_GRAPHIC_CONTROLLER
675
-//#define SDCARDDETECTINVERTED
675
+//#define SD_DETECT_INVERTED
676 676
 
677 677
 // The RepRapDiscount Smart Controller (white PCB)
678 678
 // http://reprap.org/wiki/RepRapDiscount_Smart_Controller

+ 2
- 2
Marlin/example_configurations/makibox/Configuration_adv.h Целия файл

@@ -300,10 +300,10 @@
300 300
 #if ENABLED(SDSUPPORT)
301 301
 
302 302
   // If you are using a RAMPS board or cheap E-bay purchased boards that do not detect when an SD card is inserted
303
-  // You can get round this by connecting a push button or single throw switch to the pin defined as SDCARDCARDDETECT
303
+  // You can get round this by connecting a push button or single throw switch to the pin defined as SD_DETECT_PIN
304 304
   // in the pins.h file.  When using a push button pulling the pin to ground this will need inverted.  This setting should
305 305
   // be commented out otherwise
306
-  //#define SDCARDDETECTINVERTED
306
+  //#define SD_DETECT_INVERTED
307 307
 
308 308
   #define SD_FINISHED_STEPPERRELEASE true  //if sd support and the file is finished: disable steppers?
309 309
   #define SD_FINISHED_RELEASECOMMAND "M84 X Y Z E" // You might want to keep the z enabled so your bed stays in place.

+ 1
- 1
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
663 663
 //
664 664
 // ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
665 665
 //#define ELB_FULL_GRAPHIC_CONTROLLER
666
-//#define SDCARDDETECTINVERTED
666
+//#define SD_DETECT_INVERTED
667 667
 
668 668
 // The RepRapDiscount Smart Controller (white PCB)
669 669
 // http://reprap.org/wiki/RepRapDiscount_Smart_Controller

+ 6
- 5
Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h Целия файл

@@ -299,11 +299,12 @@
299 299
 
300 300
 #if ENABLED(SDSUPPORT)
301 301
 
302
-  // If you are using a RAMPS board or cheap E-bay purchased boards that do not detect when an SD card is inserted
303
-  // You can get round this by connecting a push button or single throw switch to the pin defined as SDCARDCARDDETECT
304
-  // in the pins.h file.  When using a push button pulling the pin to ground this will need inverted.  This setting should
305
-  // be commented out otherwise
306
-  #define SDCARDDETECTINVERTED
302
+  // Some RAMPS and other boards don't detect when an SD card is inserted. You can work
303
+  // around this by connecting a push button or single throw switch to the pin defined
304
+  // as SD_DETECT_PIN in your board's pins definitions.
305
+  // This setting should be disabled unless you are using a push button, pulling the pin to ground.
306
+  // Note: This is always disabled for ULTIPANEL (except ELB_FULL_GRAPHIC_CONTROLLER).
307
+  #define SD_DETECT_INVERTED
307 308
 
308 309
   #define SD_FINISHED_STEPPERRELEASE true  //if sd support and the file is finished: disable steppers?
309 310
   #define SD_FINISHED_RELEASECOMMAND "M84 X Y Z E" // You might want to keep the z enabled so your bed stays in place.

+ 1
- 1
Marlin/pins_AZTEEG_X3.h Целия файл

@@ -21,7 +21,7 @@
21 21
   #define BTN_ENC           12  //the click switch
22 22
 
23 23
   #define SDSS              53
24
-  #define SDCARDDETECT      -1  // Pin 49 if using display sd interface
24
+  #define SD_DETECT         -1  // Pin 49 if using display sd interface
25 25
 
26 26
   #if ENABLED(TEMP_STAT_LEDS)
27 27
     #define STAT_LED_RED    64

+ 1
- 1
Marlin/pins_AZTEEG_X3_PRO.h Целия файл

@@ -109,7 +109,7 @@
109 109
   #define BTN_ENC          39  //the click switch
110 110
  
111 111
   #define SDSS             53
112
-  #define SDCARDDETECT_PIN 49
112
+  #define SD_DETECT_PIN 49
113 113
   
114 114
   #define KILL_PIN         31
115 115
  #endif

+ 1
- 1
Marlin/pins_BRAINWAVE_PRO.h Целия файл

@@ -54,7 +54,7 @@
54 54
 #define PS_ON_PIN          -1
55 55
 #define KILL_PIN           -1
56 56
 #define ALARM_PIN          -1
57
-#define SDCARDDETECT_PIN   12
57
+#define SD_DETECT_PIN      12
58 58
 
59 59
 #if DISABLED(SDSUPPORT)
60 60
 // these pins are defined in the SD library if building with SD support

+ 1
- 1
Marlin/pins_CHEAPTRONIC.h Целия файл

@@ -86,4 +86,4 @@
86 86
 #define BLEN_A 0
87 87
 
88 88
 // Cheaptronic v1.0 doesn't use this
89
-#define SDCARDDETECT_PIN -1
89
+#define SD_DETECT_PIN -1

+ 1
- 1
Marlin/pins_ELEFU_3.h Целия файл

@@ -64,7 +64,7 @@
64 64
 #if ENABLED(RA_CONTROL_PANEL)
65 65
 
66 66
   #define SDSS             53
67
-  #define SDCARDDETECT_PIN 28
67
+  #define SD_DETECT_PIN    28
68 68
 
69 69
   #define BTN_EN1          14
70 70
   #define BTN_EN2          39

+ 1
- 1
Marlin/pins_FELIX2.h Целия файл

@@ -19,6 +19,6 @@
19 19
   #define BLEN_C 2
20 20
   #define BLEN_B 1
21 21
   #define BLEN_A 0
22
-  #define SDCARDDETECT_PIN 6
22
+  #define SD_DETECT_PIN 6
23 23
 
24 24
 #endif // NEWPANEL && ULTRA_LCD

+ 1
- 1
Marlin/pins_GEN7_CUSTOM.h Целия файл

@@ -57,7 +57,7 @@
57 57
 //#define RX_ENABLE_PIN       13
58 58
 
59 59
 #define BEEPER_PIN -1
60
-#define SDCARDDETECT_PIN -1
60
+#define SD_DETECT_PIN -1
61 61
 #define SUICIDE_PIN -1    //has to be defined; otherwise Power_off doesn't work
62 62
 
63 63
 #define KILL_PIN -1

+ 1
- 1
Marlin/pins_LEAPFROG.h Целия файл

@@ -42,7 +42,7 @@
42 42
 
43 43
 #define SDPOWER            -1
44 44
 #define SDSS               11
45
-#define SDCARDDETECT_PIN   -1 // 10 optional also used as mode pin
45
+#define SD_DETECT_PIN      -1 // 10 optional also used as mode pin
46 46
 #define LED_PIN            13
47 47
 #define FAN_PIN            7
48 48
 #define PS_ON_PIN          -1

+ 1
- 1
Marlin/pins_MEGACONTROLLER.h Целия файл

@@ -107,6 +107,6 @@
107 107
     #define BTN_EN2 11
108 108
     #define BTN_ENC 10  //the click switch
109 109
     //not connected to a pin
110
-    #define SDCARDDETECT_PIN 49
110
+    #define SD_DETECT_PIN 49
111 111
 #endif //Minipanel
112 112
 

+ 1
- 1
Marlin/pins_MEGATRONICS.h Целия файл

@@ -78,6 +78,6 @@
78 78
   #define BLEN_B           1
79 79
   #define BLEN_A           0
80 80
 
81
-  #define SDCARDDETECT_PIN -1   // RAMPS doesn't use this
81
+  #define SD_DETECT_PIN   -1   // RAMPS doesn't use this
82 82
 
83 83
 #endif // ULTRA_LCD && NEWPANEL

+ 1
- 1
Marlin/pins_MEGATRONICS_2.h Целия файл

@@ -94,4 +94,4 @@
94 94
 #define BLEN_B 1
95 95
 #define BLEN_A 0
96 96
 
97
-#define SDCARDDETECT_PIN -1  // Megatronics doesn't use this
97
+#define SD_DETECT_PIN -1  // Megatronics doesn't use this

+ 1
- 1
Marlin/pins_MEGATRONICS_3.h Целия файл

@@ -99,4 +99,4 @@
99 99
 #define BLEN_B 1
100 100
 #define BLEN_A 0
101 101
 
102
-#define SDCARDDETECT_PIN -1	// Megatronics doesn't use this
102
+#define SD_DETECT_PIN -1	// Megatronics doesn't use this

+ 1
- 1
Marlin/pins_MINIRAMBO.h Целия файл

@@ -107,7 +107,7 @@
107 107
     #define BTN_EN2         72
108 108
     #define BTN_ENC          9  // the click
109 109
 
110
-    #define SDCARDDETECT_PIN 15
110
+    #define SD_DETECT_PIN   15
111 111
 
112 112
   #endif //NEWPANEL
113 113
 #endif //ULTRA_LCD

+ 1
- 1
Marlin/pins_MINITRONICS.h Целия файл

@@ -78,4 +78,4 @@
78 78
 #define BLEN_B 1
79 79
 #define BLEN_A 0
80 80
 
81
-#define SDCARDDETECT_PIN -1  // Minitronics doesn't use this
81
+#define SD_DETECT_PIN -1  // Minitronics doesn't use this

+ 1
- 1
Marlin/pins_OMCA.h Целия файл

@@ -70,7 +70,7 @@
70 70
 
71 71
 #define SDPOWER            -1
72 72
 #define SDSS               11
73
-#define SDCARDDETECT_PIN   -1 // 10 optional also used as mode pin
73
+#define SD_DETECT_PIN      -1 // 10 optional also used as mode pin
74 74
 #define LED_PIN            -1
75 75
 #define FAN_PIN            14 // PWM on MIDDLE connector
76 76
 #define PS_ON_PIN          -1

+ 1
- 1
Marlin/pins_OMCA_A.h Целия файл

@@ -61,7 +61,7 @@
61 61
 
62 62
 #define SDPOWER            -1
63 63
 #define SDSS               11
64
-#define SDCARDDETECT_PIN   -1 // 10 optional also used as mode pin
64
+#define SD_DETECT_PIN      -1 // 10 optional also used as mode pin
65 65
 #define LED_PIN            -1
66 66
 #define FAN_PIN            3
67 67
 #define PS_ON_PIN          -1

+ 2
- 2
Marlin/pins_PRINTRBOARD.h Целия файл

@@ -88,7 +88,7 @@
88 88
     #define SDSS   40 //use SD card on Panelolu2 (Teensyduino pin mapping)
89 89
   #endif // LCD_I2C_PANELOLU2
90 90
   //not connected to a pin
91
-  #define SDCARDDETECT_PIN -1    
91
+  #define SD_DETECT_PIN -1    
92 92
 #endif // ULTRA_LCD && NEWPANEL
93 93
 
94 94
 #if ENABLED(VIKI2) || ENABLED(miniVIKI)
@@ -104,7 +104,7 @@
104 104
  #define BTN_ENC 47  //the click switch
105 105
 
106 106
  #define SDSS 45
107
- #define SDCARDDETECT_PIN -1 // FastIO (Manual says 72 I'm not certain cause I can't test) 
107
+ #define SD_DETECT_PIN -1 // FastIO (Manual says 72 I'm not certain cause I can't test) 
108 108
 
109 109
  #if ENABLED(TEMP_STAT_LEDS)
110 110
   #define STAT_LED_RED      12 //Non-FastIO

+ 2
- 2
Marlin/pins_RAMBO.h Целия файл

@@ -133,7 +133,7 @@
133 133
     #define BLEN_B 1
134 134
     #define BLEN_A 0
135 135
 
136
-    #define SDCARDDETECT_PIN 81 // Ramps doesn't use this
136
+    #define SD_DETECT_PIN 81 // Ramps doesn't use this
137 137
 
138 138
   #else //!NEWPANEL - old style panel with shift register
139 139
 
@@ -180,7 +180,7 @@
180 180
  #define BTN_EN2 84
181 181
  #define BTN_ENC 83  //the click switch
182 182
 
183
- #define SDCARDDETECT_PIN -1 // Pin 72 if using easy adapter board   
183
+ #define SD_DETECT_PIN -1 // Pin 72 if using easy adapter board   
184 184
 
185 185
   #if ENABLED(TEMP_STAT_LEDS)
186 186
    #define STAT_LED_RED      22

+ 7
- 7
Marlin/pins_RAMPS_13.h Целия файл

@@ -165,25 +165,25 @@
165 165
       #define BTN_EN2 33
166 166
       #define BTN_ENC 35
167 167
 
168
-      #define SDCARDDETECT_PIN 49
168
+      #define SD_DETECT_PIN 49
169 169
     #elif ENABLED(LCD_I2C_PANELOLU2)
170 170
       #define BTN_EN1 47  // reverse if the encoder turns the wrong way.
171 171
       #define BTN_EN2 43
172 172
       #define BTN_ENC 32
173 173
       #define LCD_SDSS 53
174
-      #define SDCARDDETECT_PIN -1
174
+      #define SD_DETECT_PIN -1
175 175
       #define KILL_PIN 41
176 176
     #elif ENABLED(LCD_I2C_VIKI)
177 177
       #define BTN_EN1 22  // reverse if the encoder turns the wrong way.
178 178
       #define BTN_EN2 7
179 179
       #define BTN_ENC -1
180 180
       #define LCD_SDSS 53
181
-      #define SDCARDDETECT_PIN 49
181
+      #define SD_DETECT_PIN 49
182 182
     #elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
183 183
       #define BTN_EN1 35  // reverse if the encoder turns the wrong way.
184 184
       #define BTN_EN2 37
185 185
       #define BTN_ENC 31
186
-      #define SDCARDDETECT_PIN 49
186
+      #define SD_DETECT_PIN 49
187 187
       #define LCD_SDSS 53
188 188
       #define KILL_PIN 41
189 189
       #define BEEPER_PIN 23
@@ -210,7 +210,7 @@
210 210
        #define BTN_EN2 63
211 211
        #define BTN_ENC 59  //the click switch
212 212
        //not connected to a pin
213
-       #define SDCARDDETECT_PIN 49
213
+       #define SD_DETECT_PIN 49
214 214
 
215 215
     #else
216 216
 
@@ -235,9 +235,9 @@
235 235
       #endif
236 236
 
237 237
       #if ENABLED(G3D_PANEL)
238
-        #define SDCARDDETECT_PIN 49
238
+        #define SD_DETECT_PIN 49
239 239
       #else
240
-        #define SDCARDDETECT_PIN -1  // Ramps doesn't use this
240
+        #define SD_DETECT_PIN -1  // Ramps doesn't use this
241 241
       #endif
242 242
 
243 243
     #endif

+ 6
- 6
Marlin/pins_RIGIDBOARD.h Целия файл

@@ -25,8 +25,8 @@
25 25
   #undef BEEPER_PIN
26 26
   #define BEEPER_PIN -1
27 27
 
28
-  #undef SDCARDDETECT_PIN
29
-  #define SDCARDDETECT_PIN 22
28
+  #undef SD_DETECT_PIN
29
+  #define SD_DETECT_PIN 22
30 30
 
31 31
   // Extra button definitions, substitute for EN1 / EN2
32 32
   #define BTN_UP  37 // BTN_EN1
@@ -43,16 +43,16 @@
43 43
   #undef  BTN_ENC
44 44
   #define BTN_ENC 31
45 45
 
46
-  #undef  SDCARDDETECT_PIN
47
-  #define SDCARDDETECT_PIN 22
46
+  #undef  SD_DETECT_PIN
47
+  #define SD_DETECT_PIN 22
48 48
 
49 49
 #elif defined(REPRAP_DISCOUNT_SMART_CONTROLLER)
50 50
 
51 51
   #undef BEEPER_PIN
52 52
   #define BEEPER_PIN -1
53 53
 
54
-  #undef  SDCARDDETECT_PIN
55
-  #define SDCARDDETECT_PIN 22
54
+  #undef  SD_DETECT_PIN
55
+  #define SD_DETECT_PIN 22
56 56
 
57 57
   #undef  KILL_PIN
58 58
   #define KILL_PIN 32

+ 1
- 1
Marlin/pins_RUMBA.h Целия файл

@@ -101,7 +101,7 @@
101 101
 
102 102
 #define SDPOWER            -1
103 103
 #define SDSS               53
104
-#define SDCARDDETECT_PIN   49
104
+#define SD_DETECT_PIN      49
105 105
 #define BEEPER_PIN         44
106 106
 #define LCD_PINS_RS        19
107 107
 #define LCD_PINS_ENABLE    42

+ 2
- 2
Marlin/pins_SANGUINOLOLU_11.h Целия файл

@@ -156,7 +156,7 @@
156 156
     #define LCD_SDSS            28 // Smart Controller SD card reader rather than the Melzi
157 157
   #endif //Panelolu2
158 158
 
159
-  #define SDCARDDETECT_PIN      -1
159
+  #define SD_DETECT_PIN         -1
160 160
 
161 161
 #elif ENABLED(MAKRPANEL)
162 162
 
@@ -178,7 +178,7 @@
178 178
   #define BTN_EN2               10
179 179
   #define BTN_ENC               16
180 180
 
181
-  #define SDCARDDETECT_PIN      -1
181
+  #define SD_DETECT_PIN         -1
182 182
 
183 183
 #endif // MAKRPANEL
184 184
 

+ 1
- 1
Marlin/pins_SAV_MKI.h Целия файл

@@ -83,7 +83,7 @@
83 83
 #define LED_PIN            -1
84 84
 #define PS_ON_PIN          -1
85 85
 #define ALARM_PIN          -1
86
-#define SDCARDDETECT_PIN   -1
86
+#define SD_DETECT_PIN      -1
87 87
 
88 88
 #define BEEPER_PIN         -1
89 89
 #define LCD_PINS_RS        -1

+ 1
- 1
Marlin/pins_TEENSY2.h Целия файл

@@ -86,7 +86,7 @@
86 86
 #define TEMP_2_PIN         -1
87 87
 
88 88
 #define SDPOWER            -1
89
-#define SDCARDDETECT_PIN   -1   
89
+#define SD_DETECT_PIN      -1   
90 90
 #define SDSS               20 // 8
91 91
 #define LED_PIN             6
92 92
 #define PS_ON_PIN          27

+ 1
- 1
Marlin/pins_TEENSYLU.h Целия файл

@@ -78,7 +78,7 @@
78 78
     #define SDSS           40  //use SD card on Panelolu2 (Teensyduino pin mapping)
79 79
   #endif // LCD_I2C_PANELOLU2
80 80
 
81
-  #define SDCARDDETECT_PIN -1    
81
+  #define SD_DETECT_PIN    -1    
82 82
 
83 83
 #endif // ULTRA_LCD && NEWPANEL
84 84
 

+ 1
- 1
Marlin/pins_ULTIMAIN_2.h Целия файл

@@ -76,4 +76,4 @@
76 76
 #define BLEN_B 1
77 77
 #define BLEN_A 0
78 78
 
79
-#define SDCARDDETECT_PIN 39
79
+#define SD_DETECT_PIN 39

+ 2
- 2
Marlin/pins_ULTIMAKER.h Целия файл

@@ -73,7 +73,7 @@
73 73
     #define BTN_EN2 42
74 74
     #define BTN_ENC 19
75 75
 
76
-    #define SDCARDDETECT_PIN 38
76
+    #define SD_DETECT_PIN 38
77 77
 
78 78
   #else //!NEWPANEL - Old style panel with shift register
79 79
 
@@ -90,7 +90,7 @@
90 90
     #define LCD_PINS_D6 20
91 91
     #define LCD_PINS_D7 19
92 92
 
93
-    #define SDCARDDETECT_PIN -1
93
+    #define SD_DETECT_PIN -1
94 94
 
95 95
   #endif // !NEWPANEL
96 96
 

+ 9
- 9
Marlin/ultralcd.cpp Целия файл

@@ -221,7 +221,7 @@ static void lcd_status_screen();
221 221
   millis_t next_button_update_ms;
222 222
   uint8_t lastEncoderBits;
223 223
   uint32_t encoderPosition;
224
-  #if PIN_EXISTS(SDCARDDETECT)
224
+  #if PIN_EXISTS(SD_DETECT)
225 225
     bool lcd_oldcardstatus;
226 226
   #endif
227 227
 
@@ -411,14 +411,14 @@ static void lcd_main_menu() {
411 411
       }
412 412
       else {
413 413
         MENU_ITEM(submenu, MSG_CARD_MENU, lcd_sdcard_menu);
414
-        #if !PIN_EXISTS(SDCARDDETECT)
414
+        #if !PIN_EXISTS(SD_DETECT)
415 415
           MENU_ITEM(gcode, MSG_CNG_SDCARD, PSTR("M21"));  // SD-card changed by user
416 416
         #endif
417 417
       }
418 418
     }
419 419
     else {
420 420
       MENU_ITEM(submenu, MSG_NO_CARD, lcd_sdcard_menu);
421
-      #if !PIN_EXISTS(SDCARDDETECT)
421
+      #if !PIN_EXISTS(SD_DETECT)
422 422
         MENU_ITEM(gcode, MSG_INIT_SDCARD, PSTR("M21")); // Manually initialize the SD-card via user interface
423 423
       #endif
424 424
     }
@@ -1156,7 +1156,7 @@ static void lcd_control_volumetric_menu() {
1156 1156
   }
1157 1157
 #endif // FWRETRACT
1158 1158
 
1159
-#if !PIN_EXISTS(SDCARDDETECT)
1159
+#if !PIN_EXISTS(SD_DETECT)
1160 1160
   static void lcd_sd_refresh() {
1161 1161
     card.initsd();
1162 1162
     currentMenuViewOffset = 0;
@@ -1180,7 +1180,7 @@ void lcd_sdcard_menu() {
1180 1180
   MENU_ITEM(back, MSG_MAIN, lcd_main_menu);
1181 1181
   card.getWorkDirName();
1182 1182
   if (card.filename[0] == '/') {
1183
-    #if !PIN_EXISTS(SDCARDDETECT)
1183
+    #if !PIN_EXISTS(SD_DETECT)
1184 1184
       MENU_ITEM(function, LCD_STR_REFRESH MSG_REFRESH, lcd_sd_refresh);
1185 1185
     #endif
1186 1186
   }
@@ -1407,9 +1407,9 @@ void lcd_init() {
1407 1407
   #endif // SR_LCD_2W_NL
1408 1408
 #endif//!NEWPANEL
1409 1409
 
1410
-  #if ENABLED(SDSUPPORT) && PIN_EXISTS(SDCARDDETECT)
1411
-    pinMode(SDCARDDETECT_PIN, INPUT);
1412
-    WRITE(SDCARDDETECT_PIN, HIGH);
1410
+  #if ENABLED(SDSUPPORT) && PIN_EXISTS(SD_DETECT)
1411
+    pinMode(SD_DETECT_PIN, INPUT);
1412
+    WRITE(SD_DETECT_PIN, HIGH);
1413 1413
     lcd_oldcardstatus = IS_SD_INSERTED;
1414 1414
   #endif
1415 1415
 
@@ -1466,7 +1466,7 @@ void lcd_update() {
1466 1466
 
1467 1467
   lcd_buttons_update();
1468 1468
 
1469
-  #if PIN_EXISTS(SDCARDDETECT)
1469
+  #if PIN_EXISTS(SD_DETECT)
1470 1470
     if (IS_SD_INSERTED != lcd_oldcardstatus && lcd_detected()) {
1471 1471
       lcdDrawUpdate = 2;
1472 1472
       lcd_oldcardstatus = IS_SD_INSERTED;

Loading…
Отказ
Запис