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

Update fatfs 

wifi transfer
pull/45/head
Sergey 3 years ago
parent
c4d79ab54c
commit
67c6fbf4a7
8 changed files with 142 additions and 100 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      Marlin/src/libs/fatfs/ff.cpp
  2. 5
      Marlin/src/libs/fatfs/ff.h
  3. 0
      Marlin/src/libs/fatfs/integer.h
  4. 3
      Marlin/src/libs/fatfs/sdio_driver.cpp
  5. 2
      Marlin/src/libs/fatfs/sdio_driver.h
  6. 189
      Marlin/src/module/mks_wifi/mks_wifi_sd.cpp
  7. 10
      Marlin/src/module/mks_wifi/mks_wifi_sd.h
  8. 2
      Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h

5
Marlin/src/libs/fatfs/ff.cpp
View File

@ -18,6 +18,7 @@
/
/----------------------------------------------------------------------------*/
#include "ff.h" /* Declarations of FatFs API */
#include "diskio.h" /* Declarations of device I/O functions */
#ifdef MKS_WIFI
@ -6532,7 +6533,7 @@ static void putc_bfd (putbuff* pb, TCHAR c)
WCHAR hs, wc;
#if FF_LFN_UNICODE == 2
DWORD dc;
const TCHAR *tp;
TCHAR *tp;
#endif
#endif
@ -6574,7 +6575,7 @@ static void putc_bfd (putbuff* pb, TCHAR c)
return;
}
}
tp = (const TCHAR*)pb->bs;
tp = (TCHAR*)pb->bs;
dc = tchar2uni(&tp); /* UTF-8 ==> UTF-16 */
if (dc == 0xFFFFFFFF) return; /* Wrong code? */
wc = (WCHAR)dc;

5
Marlin/src/libs/fatfs/ff.h
View File

@ -28,7 +28,6 @@
#include "ffconf.h" /* FatFs configuration options */
#if FF_DEFINED != FFCONF_DEF
#error Wrong configuration file (ffconf.h).
#endif
@ -130,7 +129,7 @@ typedef DWORD LBA_t;
/* Filesystem object structure (FATFS) */
typedef struct {
typedef __attribute__ ((aligned (32))) struct {
BYTE fs_type; /* Filesystem type (0:not mounted) */
BYTE pdrv; /* Associated physical drive */
BYTE n_fats; /* Number of FATs (1 or 2) */
@ -203,7 +202,7 @@ typedef struct {
/* File object structure (FIL) */
typedef struct {
typedef __attribute__ ((aligned (32))) struct {
FFOBJID obj; /* Object identifier (must be the 1st member to detect invalid object pointer) */
BYTE flag; /* File status flags */
BYTE err; /* Abort flag (error code) */

0
Marlin/src/libs/fatfs/integer.h
View File

3
Marlin/src/libs/fatfs/sdio_driver.cpp
View File

@ -91,8 +91,7 @@ uint32_t SD_transfer(uint8_t *buf, uint32_t blk, uint32_t cnt, uint32_t dir){
if (dir==UM2SD){ //Запись
DMA2_Channel4->CCR|=(0x01 << DMA_CCR_DIR_Pos);
cmd=(cnt == 1)? SD_CMD24 : SD_CMD25;
}
else if (dir==SD2UM){ //Чтение
}else{ //Чтение
cmd=(cnt == 1)? SD_CMD17 : SD_CMD18;
};

2
Marlin/src/libs/fatfs/sdio_driver.h
View File

@ -120,7 +120,7 @@ enum {
#define DMA_S4_CLEAR ((uint32_t) DMA_IFCR_CTCIF4 | DMA_IFCR_CTEIF4 | DMA_IFCR_CGIF4 | DMA_IFCR_CHTIF4)
#define DMA_SDIO_CR ((uint32_t)( (0x03 << DMA_CCR_PL_Pos) | \
#define DMA_SDIO_CR ((uint32_t)( (0x00 << DMA_CCR_PL_Pos) | \
(0x02 << DMA_CCR_MSIZE_Pos) | \
(0x02 << DMA_CCR_PSIZE_Pos) | \
(0x01 << DMA_CCR_MINC_Pos) | \

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

@ -18,12 +18,13 @@ volatile uint8_t *file_buff=shared_mem;
volatile uint8_t *file_buff_pos;
volatile uint16_t file_data_size;
volatile uint8_t *dma_buff1=file_buff+FILE_BUFFER_SIZE;
volatile uint8_t *dma_buff2=dma_buff1+ESP_PACKET_SIZE;
volatile uint8_t *dma_buff[] = {dma_buff1,dma_buff2};
volatile uint8_t *dma_buff[] = {file_buff+FILE_BUFFER_SIZE,file_buff+FILE_BUFFER_SIZE+ESP_PACKET_SIZE};
volatile uint8_t dma_buff_index=0;
volatile uint8_t *buff;
volatile uint8_t buffer_ready;
volatile uint8_t dma_stopped;
FIL upload_file;
void mks_wifi_sd_ls(void){
@ -112,9 +113,10 @@ void mks_wifi_start_file_upload(ESP_PROTOC_FRAME *packet){
int16_t save_bed,save_e0;
uint32_t data_to_write=0;
uint8_t *data_packet;
char file_name[100];
save_bed=thermalManager.degTargetBed();
save_e0=thermalManager.degTargetHotend(0);
@ -169,116 +171,117 @@ void mks_wifi_start_file_upload(ESP_PROTOC_FRAME *packet){
file_data_size = 0;
dma_timeout = DMA_TIMEOUT; //Тайм-аут, на случай если передача зависла.
last_sector = 0;
buffer_ready = 0;
//Отключение тактирования не используемых блоков
RCC->APB1ENR &= ~(RCC_APB1ENR_TIM5EN|RCC_APB1ENR_TIM4EN);
RCC->APB1ENR &= ~(RCC_APB1ENR_SPI2EN|RCC_APB1ENR_USART3EN);
RCC->APB2ENR &= ~RCC_APB2ENR_TIM1EN;
RCC->AHBENR &= ~(RCC_AHBENR_FSMCEN);
DMA1_Channel5->CCR = DMA_CCR_PL|DMA_CCR_MINC;
//Максимальная частота в режиме out
GPIOC->CRL |= GPIO_CRL_MODE7;
GPIOC->CRL &= ~GPIO_CRL_CNF7;
DMA1_Channel5->CCR = DMA_CONF;
DMA1_Channel5->CPAR = (uint32_t)&USART1->DR;
DMA1_Channel5->CMAR = (uint32_t)dma_buff[dma_buff_index];
DMA1_Channel5->CNDTR = ESP_PACKET_SIZE;
DMA1->IFCR = DMA_IFCR_CGIF5|DMA_IFCR_CTEIF5|DMA_IFCR_CHTIF5|DMA_IFCR_CTCIF5;
DMA1_Channel5->CCR |= DMA_CCR_EN;
DMA1_Channel5->CCR = DMA_CONF|DMA_CCR_EN;
NVIC_EnableIRQ(DMA1_Channel5_IRQn);
USART1->CR1 = 0;
USART1->CR1 = USART_CR1_UE;
USART1->CR1 = USART_CR1_TE | USART_CR1_UE;
USART1->BRR = 0x25;
USART1->CR2 = 0;
USART1->CR3 = USART_CR3_DMAR;
USART1->SR = 0;
USART1->CR1 |= USART_CR1_RE;
safe_delay(200);
USART1->CR1 = USART_CR1_RE | USART_CR1_UE;
(void)USART1->DR;
TERN_(USE_WATCHDOG, HAL_watchdog_refresh());
DEBUG("DMA1 buff: %0X", dma_buff[0]);
DEBUG("DMA2 buff: %0X", dma_buff[1]);
DEBUG("File buff: %0X size %d (%0X)", file_buff, FILE_BUFFER_SIZE, FILE_BUFFER_SIZE);
while(dma_timeout-- > 0){
//На время передачи отключение systick
SysTick->CTRL &= ~SysTick_CTRL_ENABLE_Msk;
TERN_(USE_WATCHDOG, HAL_watchdog_refresh());
data_packet = 0;
if(DMA1->ISR & DMA_ISR_TCIF5){
DMA1->IFCR = DMA_IFCR_CGIF5|DMA_IFCR_CTEIF5|DMA_IFCR_CHTIF5|DMA_IFCR_CTCIF5;
while(--dma_timeout > 0){
//Указатель на полученный буфер
buff=dma_buff[dma_buff_index];
//переключить индекс
dma_buff_index = (dma_buff_index) ? 0 : 1;
if(buffer_ready > 0){
if(data_packet != buff){
data_packet = (uint8_t *)buff;
}else{
DEBUG("Change");
if(dma_buff_index){
data_packet = (uint8_t *)dma_buff[1];
}else{
data_packet = (uint8_t *)dma_buff[0];
}
}
//Запустить DMA на прием следующего пакета, пока обрабатывается этот
DMA1_Channel5->CCR = DMA_CCR_PL|DMA_CCR_MINC;
DMA1_Channel5->CPAR = (uint32_t)&USART1->DR;
DMA1_Channel5->CMAR = (uint32_t)dma_buff[dma_buff_index];
DMA1_Channel5->CNDTR = ESP_PACKET_SIZE;
DMA1_Channel5->CCR = DMA_CCR_PL|DMA_CCR_MINC|DMA_CCR_EN;
if(*buff != ESP_PROTOC_HEAD){
if(*data_packet != ESP_PROTOC_HEAD){
ERROR("Wrong packet head");
break;
}
in_sector = (*(buff+5) << 8) | *(buff+4);
in_sector = (*(data_packet+5) << 8) | *(data_packet+4);
if((in_sector - last_sector) > 1){
ERROR("IN Sec: %d Prev sec: %d",in_sector,last_sector);
dma_stopped = 2;
break;
}else{
last_sector=in_sector;
}
data_size = (*(buff+3) << 8) | *(buff+2);
data_size = (*(data_packet+3) << 8) | *(data_packet+2);
data_size -= 4; //4 байта с номером сегмента и флагами
data_to_write = file_data_size / 512;
data_to_write = data_to_write * 512;
//DEBUG("In[%d] d_size: %d f_size: %d to_w: %d",in_sector,data_size,file_data_size,data_to_write);
memcpy((uint8_t *)file_buff+file_data_size,(uint8_t*)(data_packet+8),data_size);
file_data_size+=data_size;
//Если буфер полон и писать некуда, запись в файл
if((data_size + file_data_size) > FILE_BUFFER_SIZE){
WRITE(MKS_WIFI_IO4, HIGH); //Остановить передачу от ESP
if((file_data_size + ESP_PACKET_SIZE) > FILE_BUFFER_SIZE){
data_to_write = file_data_size / 512;
data_to_write = data_to_write * 512;
file_inc_size += data_to_write;
DEBUG("[%d]Save %d bytes (%d of %d) ",in_sector,data_to_write,file_inc_size,file_size);
DEBUG("%d [%d]Save %d bytes (%d of %d) ",buffer_ready,in_sector,data_to_write,file_inc_size,file_size);
res=f_write((FIL *)&upload_file,(uint8_t*)file_buff,data_to_write,&bytes_writen);
if(res){
ERROR("Write err %d",res);
break;
}
file_size_writen+=bytes_writen;
res=f_sync((FIL *)&upload_file);
if(res){
ERROR("Fsync err %d",res);
break;
}
#if ENABLED(TFT_480x320) || ENABLED(TFT_480x320_SPI)
#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);
ui.update();
#endif
file_data_size = file_data_size - data_to_write;
file_size_writen+=bytes_writen;
file_data_size -= data_to_write;
memcpy((uint8_t *)file_buff,(uint8_t *)(file_buff+data_to_write),file_data_size);
WRITE(MKS_WIFI_IO4, LOW); //Записано, сигнал ESP продолжать
}
//DEBUG("Check in_sector %d data %d filesize %d",in_sector,data_size,file_size);
if(in_sector == 0){
if(data_size == file_size){
DEBUG("1-packet file");
*(buff+7) = 0x80;
*(data_packet+7) = 0x80;
}
}
if(*(buff+7) == 0x80){ //Последний пакет с данными
if(*(data_packet+7) == 0x80){ //Последний пакет с данными
WRITE(MKS_WIFI_IO4, HIGH); //Остановить передачу от ESP
DEBUG("Last packet");
if(file_data_size != 0){ //В буфере что-то есть
if(file_data_size != 0 ){
file_inc_size += file_data_size;
DEBUG("Save last %d bytes from buffer (%d of %d) ",file_data_size,file_inc_size,file_size);
@ -290,43 +293,55 @@ void mks_wifi_start_file_upload(ESP_PROTOC_FRAME *packet){
file_size_writen+=bytes_writen;
}
file_inc_size += data_size;
DEBUG("Save %d bytes from dma (%d of %d) ",data_size,file_inc_size,file_size);
res=f_write((FIL *)&upload_file,(uint8_t*)(buff+8),data_size,&bytes_writen);
if(res){
ERROR("Write err %d",res);
break;
}
file_size_writen+=bytes_writen;
f_sync((FIL *)&upload_file);
break;
}
memcpy((uint8_t *)file_buff+file_data_size,(uint8_t*)(buff+8),data_size);
file_data_size+=data_size;
if(buffer_ready > 0){
--buffer_ready;
};
//memset((uint8_t*)buff,0,ESP_PACKET_SIZE);
dma_timeout = DMA_TIMEOUT;
if((buffer_ready == 0) && (dma_stopped == 1)){
DEBUG("Start");
(void)USART1->SR;
GPIOC->BSRR = GPIO_BSRR_BR7;
dma_stopped=0;
}
if(DMA1->ISR & DMA_ISR_TEIF5){
ERROR("DMA Error");
if(dma_stopped == 2){
break;
}
dma_timeout = DMA_TIMEOUT;
}else{
TERN_(USE_WATCHDOG, HAL_watchdog_refresh());
}
}
if(dma_timeout == 0){
DEBUG("End of while by timeout, NDTR: %d",DMA1_Channel5->CNDTR);
//Включение обратно переферии
SysTick->CTRL |= SysTick_CTRL_ENABLE_Msk;
RCC->APB1ENR |= (RCC_APB1ENR_TIM5EN|RCC_APB1ENR_TIM4EN);
RCC->APB1ENR |= (RCC_APB1ENR_SPI2EN|RCC_APB1ENR_USART3EN);
RCC->APB2ENR |= RCC_APB2ENR_TIM1EN;
RCC->AHBENR |= (RCC_AHBENR_FSMCEN);
if((dma_timeout == 0) || (dma_stopped == 2)) {
DEBUG("DMA timeout, NDTR: %d",DMA1_Channel5->CNDTR);
DEBUG("SR: %0X",USART1->SR);
//Restart ESP8266
WRITE(MKS_WIFI_IO_RST, LOW);
delay(200);
WRITE(MKS_WIFI_IO_RST, HIGH);
}
//Выключить DMA
DMA1->IFCR = DMA_IFCR_CGIF5|DMA_IFCR_CTEIF5|DMA_IFCR_CHTIF5|DMA_IFCR_CTCIF5;
DMA1_Channel5->CCR = 0;
MYSERIAL2.begin(BAUDRATE_2);
WRITE(MKS_WIFI_IO4, LOW); //Включить передачу от ESP
TERN_(USE_WATCHDOG, HAL_watchdog_refresh());
f_close((FIL *)&upload_file);
DEBUG("File closed");
@ -382,7 +397,35 @@ void mks_wifi_start_file_upload(ESP_PROTOC_FRAME *packet){
thermalManager.setTargetBed(save_bed);
thermalManager.setTargetHotend(save_e0,0);
DEBUG("Restore thermal settings E0:%d Bed:%d",save_bed,save_e0);
WRITE(MKS_WIFI_IO4, LOW); //Включить передачу от ESP
}
extern "C" void DMA1_Channel5_IRQHandler(void){
if(DMA1->ISR & DMA_ISR_TEIF5){
DEBUG("DMA Error");
dma_stopped = 2;
DMA1->IFCR = DMA_CLEAR;
return;
}
if(buffer_ready > 0){
GPIOC->BSRR = GPIO_BSRR_BS7; //остановить передачу от esp
dma_stopped=1;
};
DMA1->IFCR = DMA_CLEAR;
//Указатель на полученный буфер
buff=dma_buff[dma_buff_index];
//переключить индекс
dma_buff_index = (dma_buff_index) ? 0 : 1;
DMA1_Channel5->CCR = DMA_CONF;
DMA1_Channel5->CMAR = (uint32_t)dma_buff[dma_buff_index];
DMA1_Channel5->CNDTR = ESP_PACKET_SIZE;
DMA1_Channel5->CCR = DMA_CONF|DMA_CCR_EN;
++buffer_ready;
}
#endif

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

@ -6,19 +6,19 @@
#ifdef MKS_WIFI
#define SHOW_PROGRESS
//#define SHOW_PROGRESS
#define DMA_TIMEOUT 0x0ffffff
#define DMA_TIMEOUT 0x1ffffff
#define ESP_PACKET_SIZE 1024
#define DMA_CONF (uint32_t)(DMA_CCR_PL|DMA_CCR_MINC|DMA_CCR_TEIE|DMA_CCR_TCIE)
#define DMA_CLEAR (uint32_t)(DMA_IFCR_CGIF5|DMA_IFCR_CTEIF5|DMA_IFCR_CHTIF5|DMA_IFCR_CTCIF5)
//Под буфер для DMA два последних КБ из буфера
#define ESP_FILE_BUFF_COUNT (SHARED_MEM_1KB_COUNT-2)
//Под буфер для записи в файл все оставшееся с начала
#define FILE_BUFFER_SIZE ESP_PACKET_SIZE*ESP_FILE_BUFF_COUNT
extern volatile uint8_t *dma_buff1;
extern volatile uint8_t *dma_buff2;
void mks_wifi_sd_ls(void);
uint8_t mks_wifi_sd_init(void);

2
Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h
View File

@ -231,7 +231,7 @@ https://sergey1560.github.io/fb4s_howto/mks_pwc/
#define TOUCH_BUTTONS_HW_SPI
#define TOUCH_BUTTONS_HW_SPI_DEVICE 2
#define TFT_BUFFER_SIZE 480*10
#define TFT_BUFFER_SIZE 480*8
#endif
#define HAS_SPI_FLASH 1

Write Preview
Loading…
Cancel
Save