From d7ddde3f039fcbdd9d83a0873d9ef03cebeaadfc Mon Sep 17 00:00:00 2001 From: Sergey Date: Thu, 12 Nov 2020 00:41:55 +0300 Subject: [PATCH] =?UTF-8?q?=D0=92=D1=80=D0=B5=D0=BC=D0=B5=D0=BD=D0=BD?= =?UTF-8?q?=D0=BE=D0=B5=20=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=B2=D0=BE=D1=81=D1=81=D1=82=D0=B0=D0=BD?= =?UTF-8?q?=D0=BE=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=BF=D0=B5=D1=87?= =?UTF-8?q?=D0=B0=D1=82=D0=B8=20POWER=5FLOSS=5FRECOVERY?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Marlin/src/module/mks_wifi/mks_wifi_gcodes.cpp | 8 ++++++++ Marlin/src/sd/cardreader.cpp | 10 +++++----- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/Marlin/src/module/mks_wifi/mks_wifi_gcodes.cpp b/Marlin/src/module/mks_wifi/mks_wifi_gcodes.cpp index 9b896286a7..3455c843c6 100644 --- a/Marlin/src/module/mks_wifi/mks_wifi_gcodes.cpp +++ b/Marlin/src/module/mks_wifi/mks_wifi_gcodes.cpp @@ -102,6 +102,14 @@ void mks_m23(char *filename){ DEBUG("M23: %s",filename); + if(filename[0] == '/'){ + DEBUG("Strip slash"); + for(uint32_t i = 0; i < strlen(filename) ; i++){ + filename[i] = filename[i+1]; + } + DEBUG("Fixed name: %s",filename); + } + //Имя файла может быть меньше 12 символов, но с расширением .gcode //С конца имени файла шагаем к началу, считаем сколько символов до точки dot_pos=0; diff --git a/Marlin/src/sd/cardreader.cpp b/Marlin/src/sd/cardreader.cpp index 20afb04578..3d49b4322e 100644 --- a/Marlin/src/sd/cardreader.cpp +++ b/Marlin/src/sd/cardreader.cpp @@ -659,11 +659,11 @@ bool CardReader::fileExists(const char * const path) { if (!isMounted()) return false; SdFile *diveDir = nullptr; const char * const fname = diveToFile(false, diveDir, path); - if (fname) { - diveDir->rewind(); - selectByName(*diveDir, fname); - //diveDir->close(); - } + // if (fname) { + // diveDir->rewind(); + // selectByName(*diveDir, fname); + // //diveDir->close(); + // } return fname != nullptr; }