feat(ota): OTA功能测试通过，CANFD解包效率优化
- 添加OTA固件升级功能，包括应用程序验证和跳转机制 - 实现CANFD数据传输协议，支持加密和CRC校验 - 优化CAN通信处理，添加调试输出和错误处理 - 更新RTE组件配置，升级csolution版本到2.12.0 - 增加Flash擦除和写入的安全验证机制 - 添加应用程序区域扫描和验证功能 refactor(can): 重构CAN通信模块和OTA数据处理 - 移除未使用的常量定义和辅助函数 - 改进数据解包和加密解密流程 - 添加条件编译调试输出 - 优化Flash操作的安全性和可靠性 chore(build): 更新项目配置和忽略文件 - 添加tmp/和out/目录到.gitignore - 扩展ROM0_SIZE从0x0020000到0x08005000 - 添加bin输出格式支持
This commit is contained in:
+105
-113
@@ -2,9 +2,12 @@
|
||||
#include "Can.h"
|
||||
#include "aes128.h"
|
||||
#include "initial.h"
|
||||
#include "sys/OTA.h"
|
||||
#include "sys/config.h"
|
||||
#include "sys/systick.h"
|
||||
#include <cstdio>
|
||||
|
||||
|
||||
extern CAN_transmiter CAN0_transmiter; // CAN初始化
|
||||
|
||||
BootloaderSystem sys;
|
||||
@@ -18,133 +21,122 @@ void BootloaderSystem::initHardware() {
|
||||
crc_deinit(); // 初始化CRC模块
|
||||
CAN0_transmiter.init();
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief 扫描APP地址范围内的Flash内容
|
||||
* @param print_content 是否打印Flash内容，默认为true
|
||||
* @param page_count 扫描的页数，默认为0表示扫描整个APP区域
|
||||
* @retval 无
|
||||
*/
|
||||
void scanAppFlashContent(bool print_content = true, u32 page_count = 0) {
|
||||
u32 start_addr = APP_START_ADDR;
|
||||
u32 total_size = 0xC000;
|
||||
|
||||
// 如果指定了页数，则按页数计算大小
|
||||
if (page_count > 0) {
|
||||
total_size = page_count * FMC_PAGE_SIZE;
|
||||
}
|
||||
|
||||
u32 end_addr = start_addr + total_size;
|
||||
|
||||
#if DEBUG_OTA
|
||||
printf("Scanning Flash from 0x%08X to 0x%08X (%d bytes)\r\n", start_addr,
|
||||
end_addr, total_size);
|
||||
#endif
|
||||
|
||||
u32 page_count_scanned = 0;
|
||||
u32 empty_pages = 0;
|
||||
u32 data_pages = 0;
|
||||
|
||||
for (u32 addr = start_addr; addr < end_addr; addr += FMC_PAGE_SIZE) {
|
||||
bool page_empty = true;
|
||||
|
||||
// 检查当前页是否全为0xFF（空页）
|
||||
for (u32 offset = 0; offset < FMC_PAGE_SIZE; offset += 4) {
|
||||
u32 data = *(u32 *)(addr + offset);
|
||||
|
||||
if (data != 0xFFFFFFFF) {
|
||||
page_empty = false;
|
||||
break; // 找到非空数据，立即退出检查
|
||||
}
|
||||
}
|
||||
|
||||
if (page_empty) {
|
||||
empty_pages++;
|
||||
} else {
|
||||
data_pages++;
|
||||
|
||||
// 只有在非空页面且需要打印时才输出内容
|
||||
if (print_content) {
|
||||
printf("Page 0x%08X: \r\n", addr);
|
||||
|
||||
// 打印所有内容
|
||||
for (u32 offset = 0; offset < FMC_PAGE_SIZE;
|
||||
offset += 16) { // 每行打印16字节
|
||||
// 打印地址偏移
|
||||
printf(" +%03X: ", offset);
|
||||
|
||||
// 打印十六进制数据
|
||||
for (u32 byte_idx = 0; byte_idx < 16; byte_idx++) {
|
||||
if ((offset + byte_idx) < FMC_PAGE_SIZE) {
|
||||
u8 data = *(__IO u8 *)(addr + offset + byte_idx);
|
||||
printf("%02X ", data);
|
||||
} else {
|
||||
printf(" "); // 空白填充
|
||||
}
|
||||
|
||||
// 每8字节加个小空格，便于阅读
|
||||
if (byte_idx == 7) {
|
||||
printf(" ");
|
||||
}
|
||||
}
|
||||
|
||||
// 打印可打印字符
|
||||
printf("|");
|
||||
for (u32 byte_idx = 0; byte_idx < 16; byte_idx++) {
|
||||
if ((offset + byte_idx) < FMC_PAGE_SIZE) {
|
||||
u8 data = *(__IO u8 *)(addr + offset + byte_idx);
|
||||
if (data >= 32 && data <= 126) { // 可打印字符范围
|
||||
printf("%c", data);
|
||||
} else {
|
||||
printf(".");
|
||||
}
|
||||
} else {
|
||||
printf(" "); // 空白填充
|
||||
}
|
||||
}
|
||||
printf("|\r\n");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
page_count_scanned++;
|
||||
}
|
||||
|
||||
#if DEBUG_OTA
|
||||
printf("Scan complete: %d pages scanned, %d empty pages, %d data pages\r\n",
|
||||
page_count_scanned, empty_pages, data_pages);
|
||||
#endif
|
||||
}
|
||||
|
||||
void BootloaderSystem::run() {
|
||||
// 检查是否触发OTA模式
|
||||
if (1) {
|
||||
if (!validateApplication()) {
|
||||
printf("OTA Mode\r\n");
|
||||
// OTA模式
|
||||
while (1) {
|
||||
CAN0_transmiter.communication_check();
|
||||
ota.process();
|
||||
}
|
||||
} else {
|
||||
printf("Normal Mode\r\n");
|
||||
// 正常模式：跳转到APP
|
||||
ota.jumpToApplication();
|
||||
}
|
||||
}
|
||||
|
||||
// 发送单个字节到串口 (用于调试)
|
||||
void uart_send_byte(uint8_t data) {
|
||||
// 实际的串口发送代码
|
||||
while (RESET == usart_flag_get(USART0, USART_FLAG_TBE))
|
||||
;
|
||||
usart_data_transmit(USART0, data);
|
||||
}
|
||||
|
||||
// 以十六进制格式打印数据
|
||||
// 安全的十六进制打印函数，不使用sprintf，不使用大缓冲区
|
||||
void safe_print_hex(const char *prefix, const uint8_t *data, size_t length) {
|
||||
// 1. 先打印前缀
|
||||
const char *p = prefix;
|
||||
while (*p) {
|
||||
while (RESET == usart_flag_get(USART0, USART_FLAG_TBE))
|
||||
;
|
||||
usart_data_transmit(USART0, *p++);
|
||||
}
|
||||
|
||||
while (RESET == usart_flag_get(USART0, USART_FLAG_TBE))
|
||||
;
|
||||
usart_data_transmit(USART0, ':');
|
||||
while (RESET == usart_flag_get(USART0, USART_FLAG_TBE))
|
||||
;
|
||||
usart_data_transmit(USART0, ' ');
|
||||
|
||||
// 2. 逐字节打印数据，每16字节换行
|
||||
for (size_t i = 0; i < length; i++) {
|
||||
uint8_t byte = data[i];
|
||||
|
||||
// 打印高4位
|
||||
uint8_t high = (byte >> 4) & 0x0F;
|
||||
char high_char = (high < 10) ? ('0' + high) : ('A' + high - 10);
|
||||
while (RESET == usart_flag_get(USART0, USART_FLAG_TBE))
|
||||
;
|
||||
usart_data_transmit(USART0, high_char);
|
||||
|
||||
// 打印低4位
|
||||
uint8_t low = byte & 0x0F;
|
||||
char low_char = (low < 10) ? ('0' + low) : ('A' + low - 10);
|
||||
while (RESET == usart_flag_get(USART0, USART_FLAG_TBE))
|
||||
;
|
||||
usart_data_transmit(USART0, low_char);
|
||||
|
||||
// 打印空格
|
||||
while (RESET == usart_flag_get(USART0, USART_FLAG_TBE))
|
||||
;
|
||||
usart_data_transmit(USART0, ' ');
|
||||
|
||||
// 每16字节换行
|
||||
if ((i + 1) % 16 == 0 && i < length - 1) {
|
||||
// 换行
|
||||
while (RESET == usart_flag_get(USART0, USART_FLAG_TBE))
|
||||
;
|
||||
usart_data_transmit(USART0, '\r');
|
||||
while (RESET == usart_flag_get(USART0, USART_FLAG_TBE))
|
||||
;
|
||||
usart_data_transmit(USART0, '\n');
|
||||
|
||||
// 缩进（4个空格）
|
||||
for (int j = 0; j < 4; j++) {
|
||||
while (RESET == usart_flag_get(USART0, USART_FLAG_TBE))
|
||||
;
|
||||
usart_data_transmit(USART0, ' ');
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// 3. 打印换行
|
||||
while (RESET == usart_flag_get(USART0, USART_FLAG_TBE))
|
||||
;
|
||||
usart_data_transmit(USART0, '\r');
|
||||
while (RESET == usart_flag_get(USART0, USART_FLAG_TBE))
|
||||
;
|
||||
usart_data_transmit(USART0, '\n');
|
||||
}
|
||||
|
||||
void test_decrypt() {
|
||||
printf("AES Encryption Verification Starting...\r\n");
|
||||
|
||||
// 定义48字节测试数据
|
||||
uint8_t plaintext[48] = {
|
||||
0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B,
|
||||
0x0C, 0x0D, 0x0E, 0x0F, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
|
||||
0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F, 0x20, 0x21, 0x22, 0x23,
|
||||
0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2A, 0x2B, 0x2C, 0x2D, 0x2E, 0x2F};
|
||||
|
||||
// 定义128位密钥 (16字节)
|
||||
uint8_t key[16] = {0x2b, 0x7e, 0x15, 0x16, 0x28, 0xae, 0xd2, 0xa6,
|
||||
0xab, 0xf7, 0x15, 0x88, 0x09, 0xcf, 0x4f, 0x3c};
|
||||
|
||||
// 创建AES上下文
|
||||
aes128_context ctx;
|
||||
|
||||
// 设置密钥
|
||||
aes128_set_key(&ctx, key);
|
||||
|
||||
// 打印原始数据
|
||||
safe_print_hex("Original Data", plaintext, 48);
|
||||
|
||||
uint8_t ciphertext[48];
|
||||
uint8_t decrypted[48];
|
||||
|
||||
// 加密
|
||||
aes128_ecb_encrypt_48bytes(&ctx, plaintext, ciphertext);
|
||||
safe_print_hex("Encrypted Data", ciphertext, 48);
|
||||
|
||||
// 解密
|
||||
aes128_ecb_decrypt_48bytes(&ctx, ciphertext, decrypted);
|
||||
safe_print_hex("Decrypted Data", decrypted, 48);
|
||||
}
|
||||
int main(void) {
|
||||
sys.initHardware();
|
||||
// scanAppFlashContent();
|
||||
// test_decrypt();
|
||||
sys.run();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user