andrey/Marlin_FB4S
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Возможность отключить прогресс загрузки файла

Browse Source
This commit is contained in:
Sergey
2021-07-21 15:16:49 +03:00
parent 7261a0a218
commit 75290bdded
4 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Marlin/src/module/mks_wifi/mks_wifi_sd.cpp
View File

@@ -156,7 +156,11 @@ void mks_wifi_start_file_upload(ESP_PROTOC_FRAME *packet){
}
#if ENABLED(TFT_480x320) || ENABLED(TFT_480x320_SPI)
mks_update_status(file_name+3,0,file_size);
#ifdef SHOW_PROGRESS
mks_update_status(file_name+3,0,file_size);
#else
mks_upload_screen();
#endif
#endif
dma_buff_index=0;
@@ -248,7 +252,9 @@ void mks_wifi_start_file_upload(ESP_PROTOC_FRAME *packet){
}
#if ENABLED(TFT_480x320) || ENABLED(TFT_480x320_SPI)
mks_update_status(file_name+3,file_inc_size,file_size);
#ifdef SHOW_PROGRESS
mks_update_status(file_name+3,file_inc_size,file_size);
#endif
#else
sprintf(str,"Upload %ld%%",file_inc_size*100/file_size);
ui.set_status((const char *)str,true);

2
Marlin/src/module/mks_wifi/mks_wifi_sd.h
View File

@@ -6,6 +6,8 @@
#ifdef MKS_WIFI
#define SHOW_PROGRESS
#define DMA_TIMEOUT 0x0ffffff
#define ESP_PACKET_SIZE 1024

11
Marlin/src/module/mks_wifi/mks_wifi_ui.cpp
View File

@@ -52,6 +52,17 @@ void mks_update_status(char *filename,uint32_t current_filesize, uint32_t file_s
}
void mks_upload_screen(void){
tft.queue.reset();
tft.canvas(0, 0, TFT_WIDTH, TFT_HEIGHT);
tft.set_background(COLOR_BACKGROUND);
tft.add_text(8, 100, COLOR_WHITE, "Uploading...");
tft.queue.sync();
}
void mks_end_transmit(void){
tft.queue.reset();
tft.fill(0, 0, TFT_WIDTH, TFT_HEIGHT, COLOR_BACKGROUND);

2
Marlin/src/module/mks_wifi/mks_wifi_ui.h
View File

@@ -7,7 +7,7 @@
void mks_update_status(char *filename,uint32_t current_filesize, uint32_t file_size);
void mks_end_transmit(void);
void mks_upload_screen(void);
#endif
#endif