From 140b33330d984953421b786ca7fa62bfe44c295f Mon Sep 17 00:00:00 2001 From: Sergey Date: Thu, 11 Jun 2020 14:47:44 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9E=D1=88=D0=B8=D0=B1=D0=BA=D0=B8=20=D1=81?= =?UTF-8?q?=D0=BB=D0=B8=D1=8F=D0=BD=D0=B8=D1=8F=20=D1=81=20=D1=82=D0=B5?= =?UTF-8?q?=D1=81=D1=82=D0=BE=D0=B2=D0=BE=D0=B9=20=D0=B2=D0=B5=D1=82=D0=BA?= =?UTF-8?q?=D0=BE=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Marlin/src/HAL/STM32F1/w25q64.h | 2 +- Marlin/src/module/mks_wifi/mks_wifi_sd.cpp | 18 ------------------ 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/Marlin/src/HAL/STM32F1/w25q64.h b/Marlin/src/HAL/STM32F1/w25q64.h index 825da00cdf..702d7612e3 100644 --- a/Marlin/src/HAL/STM32F1/w25q64.h +++ b/Marlin/src/HAL/STM32F1/w25q64.h @@ -22,7 +22,7 @@ #define W25X_ManufactDeviceID 0x90 #define W25X_JedecDeviceID 0x9F -#define SPI_EEPROM_SIZE 1024 +#define SPI_EEPROM_SIZE 2024 #define SPIFLASH_PAGESIZE 256 #define SPI_TIMEOUT 2000 //таймаут на ожидание опереций #define CHECK_TIMEOUT do{if(dwt_get_timeout() == 0){ERROR("Timeout");return 0;}}while(0) diff --git a/Marlin/src/module/mks_wifi/mks_wifi_sd.cpp b/Marlin/src/module/mks_wifi/mks_wifi_sd.cpp index bef309135a..b1b6d026ec 100644 --- a/Marlin/src/module/mks_wifi/mks_wifi_sd.cpp +++ b/Marlin/src/module/mks_wifi/mks_wifi_sd.cpp @@ -37,24 +37,6 @@ void mks_wifi_sd_ls(void){ f_closedir(&dir); } -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();