From 97508d9617284dbc4a36d804f2bacc70e2587aac Mon Sep 17 00:00:00 2001 From: Luc <8822552+luc-github@users.noreply.github.com> Date: Sun, 11 Feb 2024 08:58:42 +0800 Subject: [PATCH] Fix typo in ESP700 thanks @levak for pointing this out Fix API change in SDIO for 1bit set pin and 4 pins set pins --- esp3d/src/core/commands/ESP700.cpp | 2 +- esp3d/src/modules/filesystem/sd/sdio_esp32.cpp | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/esp3d/src/core/commands/ESP700.cpp b/esp3d/src/core/commands/ESP700.cpp index fe018120..9bfa993f 100644 --- a/esp3d/src/core/commands/ESP700.cpp +++ b/esp3d/src/core/commands/ESP700.cpp @@ -61,7 +61,7 @@ void ESP3DCommands::ESP700(int cmd_params_pos, ESP3DMessage* msg) { if (esp3d_gcode_host.getStatus() == HOST_NO_STREAM) { if (esp3d_gcode_host.processFile(tmpstr.c_str(), msg->authentication_level)) { - esp3d_log("Processing %s", parameter.c_str()); + esp3d_log("Processing %s", tmpstr.c_str()); } else { hasError = true; error_msg = "Error processing file"; diff --git a/esp3d/src/modules/filesystem/sd/sdio_esp32.cpp b/esp3d/src/modules/filesystem/sd/sdio_esp32.cpp index 92498dbd..f4278887 100644 --- a/esp3d/src/modules/filesystem/sd/sdio_esp32.cpp +++ b/esp3d/src/modules/filesystem/sd/sdio_esp32.cpp @@ -100,12 +100,18 @@ uint8_t ESP_SD::getState(bool refresh) { } bool ESP_SD::begin() { +#if SDIO_BIT_MODE == SD_ONE_BIT_MODE +#if (ESP_SDIO_CLK_PIN != -1) || (ESP_SDIO_CMD_PIN != -1) || (ESP_SDIO_D0_PIN != -1) + SD_MMC.setPins(ESP_SDIO_CLK_PIN, ESP_SDIO_CMD_PIN, ESP_SDIO_D0_PIN); +#endif //(ESP_SDIO_CLK_PIN != -1) +#else #if (ESP_SDIO_CLK_PIN != -1) || (ESP_SDIO_CMD_PIN != -1) || \ (ESP_SDIO_D0_PIN != -1) || (ESP_SDIO_D1_PIN != -1) || \ (ESP_SDIO_D2_PIN != -1) || (ESP_SDIO_D3_PIN != -1) SD_MMC.setPins(ESP_SDIO_CLK_PIN, ESP_SDIO_CMD_PIN, ESP_SDIO_D0_PIN, ESP_SDIO_D1_PIN, ESP_SDIO_D2_PIN, ESP_SDIO_D3_PIN); #endif //(ESP_SDIO_CLK_PIN != -1) +#endif // SD_ONE_BIT_MODE esp3d_log("Begin SDIO"); _started = true; #ifdef SDMMC_FORCE_BEGIN