From e2df5b29e0c5dd7c0a0e9874844d0b194456a7f3 Mon Sep 17 00:00:00 2001 From: Yu-886 <2860280851@qq.com> Date: Thu, 27 Mar 2025 17:51:05 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=BF=9B=E5=BA=A6=E6=9D=A1?= =?UTF-8?q?=E4=B8=8A=E6=8A=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main/Receiver.c | 32 +++++++++++++++++++++++++++----- 1 file changed, 27 insertions(+), 5 deletions(-) diff --git a/main/Receiver.c b/main/Receiver.c index aaeadc3..4adb9b2 100644 --- a/main/Receiver.c +++ b/main/Receiver.c @@ -73,6 +73,20 @@ uint16_t crc16_modbus(const uint8_t *data, uint16_t len) { 例:0xAA 0x55 + 0x01 + 0x01 + 0x0008 + 数据内容 + CRC校验 */ +void Report_transmission_progress(uint32_t file_size,uint32_t have_load) +{ + float tran_schedule = 0; + uint8_t send_buff[512] = {0x55, 0xAA, 0x02, 0x04, 0x00, 0x00, 0x00, 0x00}; + uint16_t data_len = 0; + // ESP_LOGI(TAG,"Report_transmission_progress"); + tran_schedule = (float)have_load / file_size; + data_len = 1 + 2; + send_buff[4] = data_len & 0xff; + send_buff[5] = (data_len >> 8) & 0xff; + send_buff[6] = (uint8_t)(tran_schedule * 100); + usb_serial_jtag_write_bytes(&send_buff[0],(6 + data_len + 2),20 / portTICK_PERIOD_MS); + // ESP_LOGI(TAG,"buff size:%d %.2f %d",send_buff[6],tran_schedule,data_len); +} uint8_t Device_SN[12]; @@ -94,9 +108,11 @@ void Connection_test(uint8_t *buffer) if (buffer[0] == 0x01) { usb_serial_jtag_write_bytes(&send_buff[0],(6 + sizeof(Device_info_t) + 2),20 / portTICK_PERIOD_MS); } - ESP_LOGI(TAG,"buff size:%d %d",sizeof(Device_info_t),data_len); + // ESP_LOGI(TAG,"buff size:%d %d",sizeof(Device_info_t),data_len); } + + /* Funcode(0x02) Cmdcode:(0x01)----文件名 @@ -108,12 +124,14 @@ void Transfer_file(uint8_t *buffer) uint16_t data_len = 0; uint16_t crc_calc = 0xffff; uint16_t crc_received = 0; + static uint32_t file_size = 0; + static uint32_t have_load = 0; static FILE* file; char* data_buff = NULL; 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) @@ -127,8 +145,10 @@ void Transfer_file(uint8_t *buffer) { return; } - sprintf(&file_name[0],"/spiffs/%s",data_buff); - ESP_LOGI(TAG,"file name:%s",file_name); + + file_size = data_buff[0] | data_buff[1] << 8 | data_buff[2] << 16 | data_buff[3] << 24; + sprintf(&file_name[0],"/spiffs/%s",&data_buff[4]); + ESP_LOGI(TAG,"file name:%s file size:%ld",file_name,file_size); file = fopen(file_name, "ab"); if (file == NULL) { printf("Failed to open file for writing\n"); @@ -144,15 +164,17 @@ void Transfer_file(uint8_t *buffer) crc_received = data_buff[data_len-1]<<8 | data_buff[data_len-2]; data_buff[data_len-2] = 0; data_buff[data_len-1] = 0; - // + have_load += data_len; size_t written = fwrite(&data_buff[2], 1, (data_len - 4), file); if (written != (data_len - 4)) { ESP_LOGE("SPIFFS", "fwrite failed, written=%d", written); } else { // ESP_LOGI("SPIFFS", "Write success: %d bytes", written); } + Report_transmission_progress(file_size,have_load); if(data_buff[0] == 0xff && data_buff[1] == 0xff) { + have_load = 0; fclose(file); ESP_LOGI(TAG,"data_buff[0]:%X %X",data_buff[0],data_buff[1]); }