diff --git a/main/Receiver.c b/main/Receiver.c index 938e0af..12a1e31 100644 --- a/main/Receiver.c +++ b/main/Receiver.c @@ -123,26 +123,25 @@ void Transfer_file(uint8_t *buffer) } else if(buffer[0] == 0x02) {//文件内容 // 包数 | (0xff - 包数)| 数据 | crc - // 01 | 7f | data | crc + // 01 | 00 | data | crc if (WaitPrnBufBytes(&uart_interface_data,data_len,1000,(uint8_t*)&data_buff[0]) == data_len) { 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; // - if (data_buff[0] != 0xff) - { - 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); - } - fclose(file); - }else{ - // fclose(file); + 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); } - crc_calc = crc16_modbus((uint8_t*)&data_buff[0],data_len-2); + 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]); + crc_calc = crc16_modbus((uint8_t*)&data_buff[2],data_len-4); } } ESP_LOGI(TAG,"crc:%X----%X",crc_calc,crc_received);