From 81db25647aebe6bcba01b659bab81d3ab0a747b1 Mon Sep 17 00:00:00 2001 From: Sergey Date: Thu, 23 Apr 2020 23:57:25 +0300 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B0=20=D0=BA=D0=BE=D0=BD=D1=84=D0=B8=D0=B3=D1=83?= =?UTF-8?q?=D1=80=D0=B0=D1=86=D0=B8=D1=8F=20=D0=A1=D0=BE=D1=85=D1=80=D0=B0?= =?UTF-8?q?=D0=BD=D0=B5=D0=BD=D0=B8=D0=B5=20=D1=84=D0=B0=D0=B9=D0=BB=D0=BE?= =?UTF-8?q?=D0=B2=20=D1=81=20=D1=80=D1=83=D1=81=D1=81=D0=BA=D0=B8=D0=BC?= =?UTF-8?q?=D0=B8=20=D0=B8=D0=BC=D0=B5=D0=BD=D0=B0=D0=BC=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Marlin/Configuration.h | 4 ++-- Marlin/Configuration_adv.h | 2 +- Marlin/src/libs/fatfs/ffconf.h | 2 +- Marlin/src/module/mks_wifi/mks_wifi_sd.cpp | 20 +++++++++++++++++++- Marlin/src/module/mks_wifi/mks_wifi_sd.h | 1 + 5 files changed, 24 insertions(+), 5 deletions(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 8dfbfc9a81..9dabc1bf78 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -571,7 +571,7 @@ * *** IT IS HIGHLY RECOMMENDED TO LEAVE THIS OPTION ENABLED! *** */ #define PREVENT_COLD_EXTRUSION -#define EXTRUDE_MINTEMP 200 +#define EXTRUDE_MINTEMP 170 /** * Prevent a single extrusion longer than EXTRUDE_MAXLENGTH. @@ -743,7 +743,7 @@ * Override with M92 * X, Y, Z, E0 [, E1[, E2...]] */ -#define DEFAULT_AXIS_STEPS_PER_UNIT { 80, 80, 400, 421 } +#define DEFAULT_AXIS_STEPS_PER_UNIT { 80, 80, 400, 400 } /** * Default Max Feed Rate (mm/s) diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h index f9e8846ded..92ce3fae0e 100644 --- a/Marlin/Configuration_adv.h +++ b/Marlin/Configuration_adv.h @@ -1144,7 +1144,7 @@ /** * Auto-report SdCard status with M27 S */ - //#define AUTO_REPORT_SD_STATUS + #define AUTO_REPORT_SD_STATUS /** * Support for USB thumb drives using an Arduino USB Host Shield or diff --git a/Marlin/src/libs/fatfs/ffconf.h b/Marlin/src/libs/fatfs/ffconf.h index bbbd719e69..7c9c4f0c09 100644 --- a/Marlin/src/libs/fatfs/ffconf.h +++ b/Marlin/src/libs/fatfs/ffconf.h @@ -117,7 +117,7 @@ / ff_memfree() exemplified in ffsystem.c, need to be added to the project. */ -#define FF_LFN_UNICODE 0 +#define FF_LFN_UNICODE 2 /* This option switches the character encoding on the API when LFN is enabled. / / 0: ANSI/OEM in current CP (TCHAR = char) diff --git a/Marlin/src/module/mks_wifi/mks_wifi_sd.cpp b/Marlin/src/module/mks_wifi/mks_wifi_sd.cpp index ef8a5fc684..8a27f2b2b4 100644 --- a/Marlin/src/module/mks_wifi/mks_wifi_sd.cpp +++ b/Marlin/src/module/mks_wifi/mks_wifi_sd.cpp @@ -20,6 +20,24 @@ volatile uint8_t *buff; uint8_t __attribute__ ((aligned (4))) data[DATA_SIZE]; +void mks_wifi_sd_ls(void){ + FRESULT res; + DIR dir; + static FILINFO fno; + + res = f_opendir(&dir, "0:"); /* Open the directory */ + if (res == FR_OK) { + for (;;) { + res = f_readdir(&dir, &fno); /* Read a directory item */ + if (res != FR_OK || fno.fname[0] == 0) break; /* Break on error or end of dir */ + DEBUG("%s\n", fno.fname); + } + }else{ + ERROR("Opendir error %d",res); + } + f_closedir(&dir); +} + void mks_wifi_sd_init(void){ CardReader::release(); @@ -52,7 +70,7 @@ void mks_wifi_start_file_upload(ESP_PROTOC_FRAME *packet){ uint16_t last_sector; uint32_t usart1_brr; - uint32_t dma_timeout; + volatile uint32_t dma_timeout; uint16_t data_size; FRESULT res; diff --git a/Marlin/src/module/mks_wifi/mks_wifi_sd.h b/Marlin/src/module/mks_wifi/mks_wifi_sd.h index 0de75b6fc5..0e6f8d6c2e 100644 --- a/Marlin/src/module/mks_wifi/mks_wifi_sd.h +++ b/Marlin/src/module/mks_wifi/mks_wifi_sd.h @@ -14,6 +14,7 @@ #define DATA_SIZE 16*1024 #define WRITE_COUNT 255 +void mks_wifi_sd_ls(void); void mks_wifi_sd_init(void); void mks_wifi_sd_deinit(void);