diff --git a/.github/ci/install-esp8266.sh b/.github/ci/install-esp8266.sh index 3c832b91..15112737 100644 --- a/.github/ci/install-esp8266.sh +++ b/.github/ci/install-esp8266.sh @@ -7,7 +7,7 @@ shopt -s globstar cd $HOME/arduino_ide/hardware mkdir esp8266com cd esp8266com -git clone https://github.com/esp8266/Arduino.git esp8266 +git clone -b 3.0.2 https://github.com/esp8266/Arduino.git esp8266 cd esp8266 git submodule update --init cd tools diff --git a/esp3d/src/core/commands.cpp b/esp3d/src/core/commands.cpp index bb202b50..20a44140 100644 --- a/esp3d/src/core/commands.cpp +++ b/esp3d/src/core/commands.cpp @@ -528,11 +528,13 @@ bool Commands::execute_internal_command (int cmd, const char* cmd_params, level_ case 200: response = ESP200(cmd_params, auth_type, output); break; +#if SD_DEVICE != ESP_SDIO //Get/Set SD card Speed factor 1 2 4 6 8 16 32 //[ESP202]SPEED=pwd= case 202: response = ESP202(cmd_params, auth_type, output); break; +#endif //SD_DEVICE != ESP_SDIO #ifdef SD_UPDATE_FEATURE //Get/Set SD Check at boot state which can be ON, OFF //[ESP402]pwd= diff --git a/esp3d/src/core/commands.h b/esp3d/src/core/commands.h index 7a9a3688..887fde0e 100644 --- a/esp3d/src/core/commands.h +++ b/esp3d/src/core/commands.h @@ -96,7 +96,9 @@ public: #endif //WEBDAV_FEATURE #if defined (SD_DEVICE) bool ESP200(const char* cmd_params, level_authenticate_type auth_level, ESP3DOutput * output); +#if SD_DEVICE != ESP_SDIO bool ESP202(const char* cmd_params, level_authenticate_type auth_level, ESP3DOutput * output); +#endif //SD_DEVICE != ESP_SDIO #ifdef SD_UPDATE_FEATURE bool ESP402(const char* cmd_params, level_authenticate_type auth_level, ESP3DOutput * output); #endif //SD_UPDATE_FEATURE diff --git a/esp3d/src/core/espcmd/ESP0.cpp b/esp3d/src/core/espcmd/ESP0.cpp index 2e71a16f..c765f20b 100644 --- a/esp3d/src/core/espcmd/ESP0.cpp +++ b/esp3d/src/core/espcmd/ESP0.cpp @@ -84,7 +84,9 @@ const char * help[]= {"[ESP] (id) - display this help", "[ESP201](P=xxx) (V=xxx) (PULLUP=YES RAW=YES ANALOG=NO ANALOG_RANGE=255) - read / set pin value", #endif //DIRECT_PIN_FEATURE #if defined (SD_DEVICE) +#if SD_DEVICE != ESP_SDIO "[ESP202] SPEED=(factor) - display / set SD Card SD card Speed factor (1 2 4 6 8 16 32)", +#endif //SD_DEVICE != ESP_SDIO #endif //SD_DEVICE #ifdef SENSOR_DEVICE "[ESP210](type=NONE/xxx) (interval=xxxx) - display and read/set SENSOR info", @@ -216,7 +218,7 @@ const uint cmdlist[]= {0, #ifdef DIRECT_PIN_FEATURE 201, #endif //DIRECT_PIN_FEATURE -#if defined (SD_DEVICE) +#if defined (SD_DEVICE) && SD_DEVICE != ESP_SDIO 202, #endif //SD_DEVICE #ifdef SENSOR_DEVICE diff --git a/esp3d/src/core/espcmd/ESP202.cpp b/esp3d/src/core/espcmd/ESP202.cpp index 9d17115e..c1bfcf8b 100644 --- a/esp3d/src/core/espcmd/ESP202.cpp +++ b/esp3d/src/core/espcmd/ESP202.cpp @@ -18,7 +18,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #include "../../include/esp3d_config.h" -#if defined (SD_DEVICE) +#if defined (SD_DEVICE) && SD_DEVICE != ESP_SDIO #include "../commands.h" #include "../esp3doutput.h" #include "../settings_esp3d.h" diff --git a/esp3d/src/core/espcmd/ESP400.cpp b/esp3d/src/core/espcmd/ESP400.cpp index f12522b3..ba3f9a7f 100644 --- a/esp3d/src/core/espcmd/ESP400.cpp +++ b/esp3d/src/core/espcmd/ESP400.cpp @@ -522,13 +522,15 @@ bool Commands::ESP400(const char* cmd_params, level_authenticate_type auth_type, output->print (Settings_ESP3D::get_min_int32_value(ESP_SENSOR_INTERVAL)); output->print ("\"}"); #endif //SENSOR_DEVICE -#ifdef SD_DEVICE +#if defined(SD_DEVICE) +#if SD_DEVICE != ESP_SDIO //SPI SD Divider output->print(",{\"F\":\"device/sd\",\"P\":\""); output->print(ESP_SD_SPEED_DIV); output->print("\",\"T\":\"B\",\"V\":\""); output->print (Settings_ESP3D::read_byte(ESP_SD_SPEED_DIV)); output->print("\",\"H\":\"speedx\",\"O\":[{\"1\":\"1\"},{\"2\":\"2\"},{\"3\":\"3\"},{\"4\":\"4\"},{\"6\":\"6\"},{\"8\":\"8\"},{\"16\":\"16\"},{\"32\":\"32\"}]}"); +#endif //SD_DEVICE != ESP_SDIO #ifdef SD_UPDATE_FEATURE //SD CHECK UPDATE AT BOOT feature output->print(",{\"F\":\"device/sd\",\"P\":\""); diff --git a/esp3d/src/modules/filesystem/sd/sdio_esp32.cpp b/esp3d/src/modules/filesystem/sd/sdio_esp32.cpp index 5fae948a..791436c6 100644 --- a/esp3d/src/modules/filesystem/sd/sdio_esp32.cpp +++ b/esp3d/src/modules/filesystem/sd/sdio_esp32.cpp @@ -60,7 +60,7 @@ uint8_t ESP_SD::getState(bool refresh) //refresh content if card was removed if (!lastinitok) { log_esp3d("last init was failed try sd_mmc begin"); - //SD_MMC.end(); + SD_MMC.end(); if (SD_MMC.begin("/sdcard", SDIO_BIT_MODE)) { log_esp3d("sd_mmc begin succeed"); if (SD_MMC.cardType() != CARD_NONE ) { @@ -81,7 +81,7 @@ uint8_t ESP_SD::getState(bool refresh) } else { lastinitok = false; log_esp3d("Soft sd check failed"); - //SD_MMC.end(); + SD_MMC.end(); if (SD_MMC.begin("/sdcard", SDIO_BIT_MODE)) { log_esp3d("new sd_mmc begin succeed"); if ( SD_MMC.cardType() != CARD_NONE ) {