GitHub-Proxy/ESP3D
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/luc-github/ESP3D.git synced 2025-08-06 07:47:31 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix gpio error if Shared pin is -1

Browse Source
This commit is contained in:
Luc 2022-06-19 12:30:19 +08:00
parent 5b2417af22
commit e1923074f9
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
esp3d/src/core/hal.cpp
View File

@ -131,8 +131,10 @@ bool Hal::begin()
#if defined(ESP_SD_DETECT_PIN) && ESP_SD_DETECT_PIN != -1 #if defined(ESP_SD_DETECT_PIN) && ESP_SD_DETECT_PIN != -1
pinMode (ESP_SD_DETECT_PIN, INPUT); pinMode (ESP_SD_DETECT_PIN, INPUT);
#endif #endif
#if defined(ESP_FLAG_SHARED_SD_PIN) && ESP_FLAG_SHARED_SD_PIN != -1
pinMode (ESP_FLAG_SHARED_SD_PIN, OUTPUT); pinMode (ESP_FLAG_SHARED_SD_PIN, OUTPUT);
digitalWrite(ESP_FLAG_SHARED_SD_PIN, !ESP_FLAG_SHARED_SD_VALUE); digitalWrite(ESP_FLAG_SHARED_SD_PIN, !ESP_FLAG_SHARED_SD_VALUE);
#endif //ESP_FLAG_SHARED_SD_PIN
#endif //SD_DEVICE_CONNECTION == ESP_SHARED_SD #endif //SD_DEVICE_CONNECTION == ESP_SHARED_SD
return true; return true;
} }

4
esp3d/src/modules/filesystem/esp_sd.cpp
View File

@ -66,7 +66,7 @@ bool ESP_SD::enableSharedSD()
return false; return false;
} }
_enabled = true; _enabled = true;
#if defined (ESP_FLAG_SHARED_SD_PIN) #if defined (ESP_FLAG_SHARED_SD_PIN) && ESP_FLAG_SHARED_SD_PIN != -1
//need to check if SD is in use ? //need to check if SD is in use ?
//Method : TBD //Method : TBD
//1 - check sd cs state ? what about SDIO then ? //1 - check sd cs state ? what about SDIO then ?
@ -127,7 +127,7 @@ void ESP_SD::releaseFS(uint8_t FS)
{ {
(void)FS; (void)FS;
#if SD_DEVICE_CONNECTION == ESP_SHARED_SD #if SD_DEVICE_CONNECTION == ESP_SHARED_SD
#if defined (ESP_FLAG_SHARED_SD_PIN) #if defined (ESP_FLAG_SHARED_SD_PIN) && ESP_FLAG_SHARED_SD_PIN != -1
log_esp3d("SD shared disabled PIN %d with %d", ESP_FLAG_SHARED_SD_PIN, ESP_FLAG_SHARED_SD_VALUE); log_esp3d("SD shared disabled PIN %d with %d", ESP_FLAG_SHARED_SD_PIN, ESP_FLAG_SHARED_SD_VALUE);
digitalWrite(ESP_FLAG_SHARED_SD_PIN, !ESP_FLAG_SHARED_SD_VALUE); digitalWrite(ESP_FLAG_SHARED_SD_PIN, !ESP_FLAG_SHARED_SD_VALUE);
#endif // ESP_FLAG_SHARED_SD_PIN #endif // ESP_FLAG_SHARED_SD_PIN