From e1923074f90281503c34a412c446dcd46d9c06e4 Mon Sep 17 00:00:00 2001 From: Luc <8822552+luc-github@users.noreply.github.com> Date: Sun, 19 Jun 2022 12:30:19 +0800 Subject: [PATCH] Fix gpio error if Shared pin is -1 --- esp3d/src/core/hal.cpp | 2 ++ esp3d/src/modules/filesystem/esp_sd.cpp | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/esp3d/src/core/hal.cpp b/esp3d/src/core/hal.cpp index ef61bf8e..c70d299e 100644 --- a/esp3d/src/core/hal.cpp +++ b/esp3d/src/core/hal.cpp @@ -131,8 +131,10 @@ bool Hal::begin() #if defined(ESP_SD_DETECT_PIN) && ESP_SD_DETECT_PIN != -1 pinMode (ESP_SD_DETECT_PIN, INPUT); #endif +#if defined(ESP_FLAG_SHARED_SD_PIN) && ESP_FLAG_SHARED_SD_PIN != -1 pinMode (ESP_FLAG_SHARED_SD_PIN, OUTPUT); digitalWrite(ESP_FLAG_SHARED_SD_PIN, !ESP_FLAG_SHARED_SD_VALUE); +#endif //ESP_FLAG_SHARED_SD_PIN #endif //SD_DEVICE_CONNECTION == ESP_SHARED_SD return true; } diff --git a/esp3d/src/modules/filesystem/esp_sd.cpp b/esp3d/src/modules/filesystem/esp_sd.cpp index 11048049..e1108eb8 100644 --- a/esp3d/src/modules/filesystem/esp_sd.cpp +++ b/esp3d/src/modules/filesystem/esp_sd.cpp @@ -66,7 +66,7 @@ bool ESP_SD::enableSharedSD() return false; } _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 ? //Method : TBD //1 - check sd cs state ? what about SDIO then ? @@ -127,7 +127,7 @@ void ESP_SD::releaseFS(uint8_t FS) { (void)FS; #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); digitalWrite(ESP_FLAG_SHARED_SD_PIN, !ESP_FLAG_SHARED_SD_VALUE); #endif // ESP_FLAG_SHARED_SD_PIN