Browse Source

SDPOWER => SDPOWER_PIN

pull/1/head
Scott Lahteine 5 years ago
parent
commit
9ac348ef7b
  1. 2
      Marlin/src/inc/SanityCheck.h
  2. 1
      Marlin/src/pins/mega/pins_CHEAPTRONICv2.h
  3. 1
      Marlin/src/pins/mega/pins_GT2560_REV_A.h
  4. 1
      Marlin/src/pins/mega/pins_WANHAO_ONEPLUS.h
  5. 4
      Marlin/src/pins/pins.h
  6. 4
      Marlin/src/pins/pinsDebug_list.h
  7. 3
      Marlin/src/pins/ramps/pins_FELIX2.h
  8. 2
      Marlin/src/pins/ramps/pins_RAMPS_OLD.h
  9. 1
      Marlin/src/pins/ramps/pins_RUMBA.h
  10. 1
      Marlin/src/pins/stm32/pins_BEAST.h
  11. 1
      Marlin/src/pins/stm32/pins_CHITU3D.h
  12. 5
      Marlin/src/sd/cardreader.cpp

2
Marlin/src/inc/SanityCheck.h

@ -384,6 +384,8 @@
#error "POWER_SUPPLY is now obsolete. Please remove it from Configuration.h." #error "POWER_SUPPLY is now obsolete. Please remove it from Configuration.h."
#elif defined(MKS_ROBIN_TFT) #elif defined(MKS_ROBIN_TFT)
#error "MKS_ROBIN_TFT is now FSMC_GRAPHICAL_TFT. Please update your configuration." #error "MKS_ROBIN_TFT is now FSMC_GRAPHICAL_TFT. Please update your configuration."
#elif defined(SDPOWER)
#error "SDPOWER is now SDPOWER_PIN. Please update your configuration and/or pins."
#endif #endif
#define BOARD_MKS_13 -1109 #define BOARD_MKS_13 -1109

1
Marlin/src/pins/mega/pins_CHEAPTRONICv2.h

@ -125,7 +125,6 @@
#define BEEPER_PIN 44 #define BEEPER_PIN 44
#if ENABLED(SDSUPPORT) #if ENABLED(SDSUPPORT)
#define SDPOWER -1
#define SDSS 53 #define SDSS 53
#define SD_DETECT_PIN 49 #define SD_DETECT_PIN 49
#endif #endif

1
Marlin/src/pins/mega/pins_GT2560_REV_A.h

@ -89,7 +89,6 @@
// //
// Misc. Functions // Misc. Functions
// //
#define SDPOWER -1
#define SDSS 53 #define SDSS 53
#define LED_PIN 13 #define LED_PIN 13
#define PS_ON_PIN 12 #define PS_ON_PIN 12

1
Marlin/src/pins/mega/pins_WANHAO_ONEPLUS.h

@ -83,7 +83,6 @@
// SD Card // SD Card
// //
#define SD_DETECT_PIN -1 #define SD_DETECT_PIN -1
#define SDPOWER -1
#define SDSS 53 #define SDSS 53
// //

4
Marlin/src/pins/pins.h

@ -774,8 +774,8 @@
#ifndef SD_DETECT_PIN #ifndef SD_DETECT_PIN
#define SD_DETECT_PIN -1 #define SD_DETECT_PIN -1
#endif #endif
#ifndef SDPOWER #ifndef SDPOWER_PIN
#define SDPOWER -1 #define SDPOWER_PIN -1
#endif #endif
#ifndef SDSS #ifndef SDSS
#define SDSS -1 #define SDSS -1

4
Marlin/src/pins/pinsDebug_list.h

@ -707,8 +707,8 @@
// #if defined(SDA) && SDA >= 0 // #if defined(SDA) && SDA >= 0
// REPORT_NAME_DIGITAL(__LINE__, SDA) // REPORT_NAME_DIGITAL(__LINE__, SDA)
// #endif // #endif
#if defined(SDPOWER) && SDPOWER >= 0 #if PIN_EXISTS(SDPOWER)
REPORT_NAME_DIGITAL(__LINE__, SDPOWER) REPORT_NAME_DIGITAL(__LINE__, SDPOWER_PIN)
#endif #endif
#if defined(SDSS) && SDSS >= 0 #if defined(SDSS) && SDSS >= 0
REPORT_NAME_DIGITAL(__LINE__, SDSS) REPORT_NAME_DIGITAL(__LINE__, SDSS)

3
Marlin/src/pins/ramps/pins_FELIX2.h

@ -42,8 +42,7 @@
// //
// Misc. Functions // Misc. Functions
// //
#undef SDPOWER #define SDPOWER_PIN 1
#define SDPOWER 1
#define PS_ON_PIN 12 #define PS_ON_PIN 12

2
Marlin/src/pins/ramps/pins_RAMPS_OLD.h

@ -103,7 +103,7 @@
// //
// Misc. Functions // Misc. Functions
// //
#define SDPOWER 48 #define SDPOWER_PIN 48
#define SDSS 53 #define SDSS 53
#define LED_PIN 13 #define LED_PIN 13
#define CASE_LIGHT_PIN 45 // Hardware PWM #define CASE_LIGHT_PIN 45 // Hardware PWM

1
Marlin/src/pins/ramps/pins_RUMBA.h

@ -215,7 +215,6 @@
#define BEEPER_PIN 44 #define BEEPER_PIN 44
#if ENABLED(SDSUPPORT) #if ENABLED(SDSUPPORT)
#define SDPOWER -1
#define SDSS 53 #define SDSS 53
#define SD_DETECT_PIN 49 #define SD_DETECT_PIN 49
#endif #endif

1
Marlin/src/pins/stm32/pins_BEAST.h

@ -86,7 +86,6 @@
// //
// Misc. Functions // Misc. Functions
// //
#define SDPOWER -1
#define SDSS PA15 #define SDSS PA15
#define LED_PIN PB2 #define LED_PIN PB2

1
Marlin/src/pins/stm32/pins_CHITU3D.h

@ -84,7 +84,6 @@
// //
// Misc. Functions // Misc. Functions
// //
#define SDPOWER -1
#define SDSS -1 #define SDSS -1
#define LED_PIN -1 #define LED_PIN -1
#define CASE_LIGHT_PIN 8 #define CASE_LIGHT_PIN 8

5
Marlin/src/sd/cardreader.cpp

@ -133,9 +133,8 @@ CardReader::CardReader() {
// Disable autostart until card is initialized // Disable autostart until card is initialized
autostart_index = -1; autostart_index = -1;
//power to SD reader #if PIN_EXISTS(SDPOWER)
#if SDPOWER > -1 OUT_WRITE(SDPOWER_PIN, HIGH); // Power the SD reader
OUT_WRITE(SDPOWER, HIGH);
#endif #endif
} }

Loading…
Cancel
Save