Browse Source

Исправлена конфигурация

Сохранение файлов с русскими именами
pull/1/head
Sergey 4 years ago
parent
commit
81db25647a
  1. 4
      Marlin/Configuration.h
  2. 2
      Marlin/Configuration_adv.h
  3. 2
      Marlin/src/libs/fatfs/ffconf.h
  4. 20
      Marlin/src/module/mks_wifi/mks_wifi_sd.cpp
  5. 1
      Marlin/src/module/mks_wifi/mks_wifi_sd.h

4
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)

2
Marlin/Configuration_adv.h

@ -1144,7 +1144,7 @@
/**
* Auto-report SdCard status with M27 S<seconds>
*/
//#define AUTO_REPORT_SD_STATUS
#define AUTO_REPORT_SD_STATUS
/**
* Support for USB thumb drives using an Arduino USB Host Shield or

2
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)

20
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;

1
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);

Loading…
Cancel
Save