From 6bc617180cd80867e0ddbbb8d92d183901a8eb48 Mon Sep 17 00:00:00 2001 From: Yu-886 <2860280851@qq.com> Date: Thu, 27 Mar 2025 13:12:05 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DUSB=E6=B5=81=E6=8E=A7?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E5=AF=BC=E8=87=B4=E8=BE=B9=E6=8E=A5=E6=94=B6?= =?UTF-8?q?=E8=BE=B9=E4=BF=9D=E5=AD=98=E6=97=B6=E6=95=B0=E6=8D=AE=E4=B8=A2?= =?UTF-8?q?=E5=8C=85=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main/Receiver.c | 21 +++++++++++++++------ main/main.c | 2 +- main/usb_serial_task.c | 24 ++++++++++++++---------- 3 files changed, 30 insertions(+), 17 deletions(-) diff --git a/main/Receiver.c b/main/Receiver.c index 0602cbd..aaeadc3 100644 --- a/main/Receiver.c +++ b/main/Receiver.c @@ -113,7 +113,7 @@ void Transfer_file(uint8_t *buffer) char file_name[64]; // ESP_LOGI(TAG,"Transfer_file"); data_len = buffer[1] << 8 | buffer[2]; - ESP_LOGI(TAG,"data_len:%d",data_len); + // ESP_LOGI(TAG,"data_len:%d",data_len); data_buff = malloc(data_len +10); if(buffer[0] == 0x01) {//文件名 if (WaitPrnBufBytes(&uart_interface_data,data_len,1000,(uint8_t*)&data_buff[0]) == data_len) @@ -134,7 +134,6 @@ void Transfer_file(uint8_t *buffer) printf("Failed to open file for writing\n"); return; } - // fclose(file); } } else if(buffer[0] == 0x02) {//文件内容 @@ -150,18 +149,28 @@ void Transfer_file(uint8_t *buffer) if (written != (data_len - 4)) { ESP_LOGE("SPIFFS", "fwrite failed, written=%d", written); } else { - ESP_LOGI("SPIFFS", "Write success: %d bytes", written); + // ESP_LOGI("SPIFFS", "Write success: %d bytes", written); } if(data_buff[0] == 0xff && data_buff[1] == 0xff) { fclose(file); ESP_LOGI(TAG,"data_buff[0]:%X %X",data_buff[0],data_buff[1]); } - ESP_LOGI(TAG,"data_buff[0]:%X %X",data_buff[0],data_buff[1]); + // ESP_LOGI(TAG,"data_buff[0]:%X %X",data_buff[0],data_buff[1]); crc_calc = crc16_modbus((uint8_t*)&data_buff[2],data_len-4); }else{ ESP_LOGE(TAG,"fail:%d",data_len); } + + if(crc_calc != crc_received) + { + ESP_LOG_BUFFER_HEXDUMP("Recv str: ", &data_buff[0], 1024, ESP_LOG_INFO); + while (1) + { + vTaskDelay(100/ portTICK_PERIOD_MS); + } + + } } else if(buffer[0] == 0x03) {//删除所有文件 if (WaitPrnBufBytes(&uart_interface_data,2,0xffff,(uint8_t*)&data_buff[0]) == 2) { @@ -169,7 +178,7 @@ void Transfer_file(uint8_t *buffer) } delete_all_file(); } - ESP_LOGI(TAG,"crc:%X----%X",crc_calc,crc_received); + // ESP_LOGI(TAG,"crc:%X----%X",crc_calc,crc_received); free(data_buff); } @@ -187,7 +196,7 @@ void Read_CMD_task(void *pvParameter) { frameStreamRead(&uart_interface_data,&ch,1); - ESP_LOGI(TAG, "Read:%X,%ld,---%ld:%ld",ch,frameStreamRecLen(&uart_interface_data),uart_interface_data.read,uart_interface_data.write); + // ESP_LOGI(TAG, "Read:%X,%ld,---%ld:%ld",ch,frameStreamRecLen(&uart_interface_data),uart_interface_data.read,uart_interface_data.write); if(ch == 0xAA) { if (WaitPrnBufBytes(&uart_interface_data,2,0xffff,&data[0]) == 2) diff --git a/main/main.c b/main/main.c index 1a6dc89..82cbb9c 100755 --- a/main/main.c +++ b/main/main.c @@ -83,7 +83,7 @@ void app_main(void) ESP_LOGI(TAG, "Found file: %s, size: %ld bytes", off_line_tool.directory[0].name, off_line_tool.directory[0].size); ESP_LOGI(TAG, "Found file: %s, size: %ld bytes", off_line_tool.directory[1].name, off_line_tool.directory[1].size); ESPFlash_Init(); - stream_init(&uart_interface_data,1024*100); + stream_init(&uart_interface_data,1024*50); ESP_LOGI(TAG, "mem free:%ld",esp_get_free_heap_size()); gpio_config_t config = { diff --git a/main/usb_serial_task.c b/main/usb_serial_task.c index 1b6c762..190f6f9 100644 --- a/main/usb_serial_task.c +++ b/main/usb_serial_task.c @@ -4,7 +4,7 @@ #define EX_UART_NUM UART_NUM_1 #define PATTERN_CHR_NUM (3) /*!< Set the number of consecutive and identical characters received by receiver which defines a UART pattern*/ -#define BUF_SIZE (1024) +#define BUF_SIZE (4096) #define ECHO_TASK_STACK_SIZE (4096) #define RD_BUF_SIZE (BUF_SIZE) @@ -32,29 +32,33 @@ static void echo_task(void *arg) while (1) { - int len = usb_serial_jtag_read_bytes(data, (BUF_SIZE - 1), 2000 / portTICK_PERIOD_MS); + int len = usb_serial_jtag_read_bytes(data, (BUF_SIZE - 1), 200 / portTICK_PERIOD_MS); // Write data back to the USB SERIAL JTAG if (len) { - // usb_serial_jtag_write_bytes((const char *) data, len, 20 / portTICK_PERIOD_MS); - if(frameStreamRecEmptyLen(&uart_interface_data) < 1024*30) + if(frameStreamRecEmptyLen(&uart_interface_data) < 1024*4) { - ESP_LOGE(TAG,"frameStream Be almost full:%d",len); + // ESP_LOGE(TAG,"frameStream Be almost full:%d",len); + frameStreamWrite(&uart_interface_data,&data[0],len); while (1) { vTaskDelay(10/ portTICK_PERIOD_MS); - if(frameStreamRecEmptyLen(&uart_interface_data) > 1024*32) + len = usb_serial_jtag_read_bytes(data, 0, 200 / portTICK_PERIOD_MS);//ˢÐÂÁ÷¿Ø + if(frameStreamRecEmptyLen(&uart_interface_data) > 1024*6) { - ESP_LOGE(TAG,"frameStream: %ld",frameStreamRecEmptyLen(&uart_interface_data)); + // ESP_LOGE(TAG,"frameStream: %ld",frameStreamRecEmptyLen(&uart_interface_data)); break; } } - + }else{ + frameStreamWrite(&uart_interface_data,&data[0],len); } - frameStreamWrite(&uart_interface_data,&data[0],len); + // uart_write_bytes(EX_UART_NUM, (const char *) data, len); // data[len] = '\0'; - // ESP_LOG_BUFFER_HEXDUMP("Recv str: ", data, len, ESP_LOG_INFO); + // ESP_LOG_BUFFER_HEXDUMP("Recv str: ", data, 8, ESP_LOG_INFO); + }else{ + } } }