SDPOWER => SDPOWER_PIN
This commit is contained in:
parent
5e2582a31b
commit
9ac348ef7b
@ -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
|
||||||
|
@ -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
|
||||||
|
@ -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
|
||||||
|
@ -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
|
||||||
|
|
||||||
//
|
//
|
||||||
|
@ -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
|
||||||
|
@ -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)
|
||||||
|
@ -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
|
||||||
|
|
||||||
|
@ -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
|
||||||
|
@ -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
|
||||||
|
@ -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
|
||||||
|
|
||||||
|
@ -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
|
||||||
|
@ -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…
Reference in New Issue
Block a user