zhangjianhui/ESPC3-wireless
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改打印信息为SYS_LOG_DBG

Browse Source
This commit is contained in:
OPTOC
2025-10-28 16:29:00 +08:00
parent d43b1aca73
commit ed435b4cc8
4 changed files with 43 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/drivers/data_port/ble_spp/ble_spp_server.c
View File

@@ -769,7 +769,7 @@ static void _ble_spp_server_init(void)
{ {
s_init_param.manufacturer_data(s_manufacturer_data); s_init_param.manufacturer_data(s_manufacturer_data);
printf("set manufacturer data %d %d\n",s_manufacturer_data[0],s_manufacturer_data[1]); // SYS_LOG_DBG("set manufacturer data %d %d\n",s_manufacturer_data[0],s_manufacturer_data[1]);
} }
else else
{ {

56
app/drivers/sertrf/sertrf.c
View File

@@ -1,7 +1,7 @@
#include "sertrf.h" #include "sertrf.h"
//设置日志打印类型 //设置日志打印类型
#define CONFIG_SYS_LOG_LEVEL SYS_LOG_LEVEL_INF #define CONFIG_SYS_LOG_LEVEL SYS_LOG_LEVEL_DBG
#define SYS_LOG_DOMAIN "Seryrf" #define SYS_LOG_DOMAIN "Seryrf"
sertrf_t sertrf; sertrf_t sertrf;
@@ -167,13 +167,13 @@ void app_thread(void* arg)
sertrf.resend_device.handle_flag = 0;//标志位清零 sertrf.resend_device.handle_flag = 0;//标志位清零
break; break;
case RESEND_CMD_OTA_GET_PARAM: case RESEND_CMD_OTA_GET_PARAM:
printf("RESEND_CMD_OTA_GET_PARAM\r\n"); SYS_LOG_DBG("RESEND_CMD_OTA_GET_PARAM\r\n");
ota_parm_t ota_parm; ota_parm_t ota_parm;
resend_send_data(&sertrf.resend_device, RESEND_CMD_OTA_GET_PARAM, &ota_parm, sizeof(ota_parm_t), 1000); resend_send_data(&sertrf.resend_device, RESEND_CMD_OTA_GET_PARAM, &ota_parm, sizeof(ota_parm_t), 1000);
sertrf.resend_device.handle_flag = 0;//标志位清零 sertrf.resend_device.handle_flag = 0;//标志位清零
break; break;
case RESEND_CMD_FC_ISP_GET_PARAM: case RESEND_CMD_FC_ISP_GET_PARAM:
printf("RESEND_CMD_FC_ISP_GET_PARAM\r\n"); SYS_LOG_DBG("RESEND_CMD_FC_ISP_GET_PARAM\r\n");
stmisp_parm_t stmisp_parm; stmisp_parm_t stmisp_parm;
resend_send_data(&sertrf.resend_device, RESEND_CMD_FC_ISP_GET_PARAM, &stmisp_parm, sizeof(stmisp_parm), 1000); resend_send_data(&sertrf.resend_device, RESEND_CMD_FC_ISP_GET_PARAM, &stmisp_parm, sizeof(stmisp_parm), 1000);
sertrf.resend_device.handle_flag = 0;//标志位清零 sertrf.resend_device.handle_flag = 0;//标志位清零
@@ -427,7 +427,7 @@ void resend_user_parse(void *resend_device)
// 减6的目的是因为华哥没对MAC进行处理，所以也不返回 // 减6的目的是因为华哥没对MAC进行处理，所以也不返回
if(sizeof(sertrf_stauct_t) - 6 != resend_parse->rx_frame.len) if(sizeof(sertrf_stauct_t) - 6 != resend_parse->rx_frame.len)
{ {
printf("RESEND_CMD_SET_PARAM len error\r\n"); SYS_LOG_DBG("RESEND_CMD_SET_PARAM len error\r\n");
} }
sertrf_stauct_t* sertrf_stauct = (sertrf_stauct_t*)resend_parse->rx_frame.payload; sertrf_stauct_t* sertrf_stauct = (sertrf_stauct_t*)resend_parse->rx_frame.payload;
@@ -444,10 +444,10 @@ void resend_user_parse(void *resend_device)
{ {
if(sizeof(ota_parm_t) != resend_parse->rx_frame.len) if(sizeof(ota_parm_t) != resend_parse->rx_frame.len)
{ {
printf("RESEND_CMD_OTA_GET_PARAM len error\r\n"); SYS_LOG_DBG("RESEND_CMD_OTA_GET_PARAM len error\r\n");
} }
ota_parm_t* ota_parm = (ota_parm_t*)resend_parse->rx_frame.payload; ota_parm_t* ota_parm = (ota_parm_t*)resend_parse->rx_frame.payload;
printf("RESEND_CMD_OTA_GET_PARAM %d\n", ota_parm->ota_file_size); SYS_LOG_DBG("RESEND_CMD_OTA_GET_PARAM %d\n", ota_parm->ota_file_size);
resend_send_cmd(resend_device, RESEND_CMD_ACK, 0); resend_send_cmd(resend_device, RESEND_CMD_ACK, 0);
} }
break; break;
@@ -496,10 +496,10 @@ void resend_user_parse(void *resend_device)
case RESEND_CMD_FC_ISP_GET_PARAM: case RESEND_CMD_FC_ISP_GET_PARAM:
if(sizeof(stmisp_parm_t) != resend_parse->rx_frame.len) if(sizeof(stmisp_parm_t) != resend_parse->rx_frame.len)
{ {
printf("RESEND_CMD_FC_ISP_GET_PARAM len error\r\n"); SYS_LOG_DBG("RESEND_CMD_FC_ISP_GET_PARAM len error\r\n");
} }
stmisp_parm_t* stmisp_parm = (stmisp_parm_t*)resend_parse->rx_frame.payload; stmisp_parm_t* stmisp_parm = (stmisp_parm_t*)resend_parse->rx_frame.payload;
printf("RESEND_CMD_FC_ISP_GET_PARAM %d\n", stmisp_parm->stmisp_file_size); SYS_LOG_DBG("RESEND_CMD_FC_ISP_GET_PARAM %d\n", stmisp_parm->stmisp_file_size);
resend_send_cmd(resend_device, RESEND_CMD_ACK, 0); resend_send_cmd(resend_device, RESEND_CMD_ACK, 0);
break; break;
case RESEND_CMD_FC_ISP_START: case RESEND_CMD_FC_ISP_START:
@@ -520,40 +520,40 @@ void resend_user_parse(void *resend_device)
// 与isp确定通讯波特率，并建立联系 // 与isp确定通讯波特率，并建立联系
if(!send_sync(&sertrf.stmisp_device, 5)) if(!send_sync(&sertrf.stmisp_device, 5))
{ {
printf("stmisp: sync error\n"); SYS_LOG_DBG("stmisp: sync error\n");
// app_send_error_code(SERTRF_ERROR_FC_ISP_SYNC); // app_send_error_code(SERTRF_ERROR_FC_ISP_SYNC);
break; break;
} }
else else
printf("stmisp: sync ok\n"); SYS_LOG_DBG("stmisp: sync ok\n");
os_thread_sleep(100); os_thread_sleep(100);
// 解除写保护 // 解除写保护
if(!cmd_write_unprotect(&sertrf.stmisp_device)) if(!cmd_write_unprotect(&sertrf.stmisp_device))
printf("stmisp: write unprotect error\n"); SYS_LOG_DBG("stmisp: write unprotect error\n");
else else
printf("stmisp: write unprotect ok\n"); SYS_LOG_DBG("stmisp: write unprotect ok\n");
os_thread_sleep(100); os_thread_sleep(100);
if(!send_sync(&sertrf.stmisp_device, 5)) if(!send_sync(&sertrf.stmisp_device, 5))
printf("stmisp: sync error\n"); SYS_LOG_DBG("stmisp: sync error\n");
else else
printf("stmisp: sync ok\n"); SYS_LOG_DBG("stmisp: sync ok\n");
os_thread_sleep(100); os_thread_sleep(100);
boot_set_high_z_2(); boot_set_high_z_2();
// 全盘擦除 // 全盘擦除
if(!cmd_extended_erase_mass(&sertrf.stmisp_device)) if(!cmd_extended_erase_mass(&sertrf.stmisp_device))
printf("stmisp: erase mass error\n"); SYS_LOG_DBG("stmisp: erase mass error\n");
else else
printf("stmisp: erase mass ok\n"); SYS_LOG_DBG("stmisp: erase mass ok\n");
os_thread_sleep(10); os_thread_sleep(10);
printf("stmisp: isp start\n"); SYS_LOG_DBG("stmisp: isp start\n");
sertrf.mode_status.task_state = DATA_HANDLE_ISP_DATA; sertrf.mode_status.task_state = DATA_HANDLE_ISP_DATA;
resend_send_cmd(resend_device, RESEND_CMD_ACK, 0); resend_send_cmd(resend_device, RESEND_CMD_ACK, 0);
@@ -581,11 +581,11 @@ void resend_user_parse(void *resend_device)
// ISP下跳转到应用层运行地址 // ISP下跳转到应用层运行地址
if(cmd_go(&sertrf.stmisp_device, sertrf.fc_address)) if(cmd_go(&sertrf.stmisp_device, sertrf.fc_address))
{ {
printf("stmisp: go ok\n"); SYS_LOG_DBG("stmisp: go ok\n");
} }
else else
{ {
printf("stmisp: go error\n"); SYS_LOG_DBG("stmisp: go error\n");
} }
//开启其他线程中相同串口的使用 //开启其他线程中相同串口的使用
sertrf.stmisp_device.flag = 0; sertrf.stmisp_device.flag = 0;
@@ -615,35 +615,35 @@ void Examples_run(void)
os_thread_sleep(500); os_thread_sleep(500);
// 与isp确定通讯波特率，并建立联系 // 与isp确定通讯波特率，并建立联系
if(!send_sync(&sertrf.stmisp_device, 5)) if(!send_sync(&sertrf.stmisp_device, 5))
printf("stmisp: sync error\n"); SYS_LOG_DBG("stmisp: sync error\n");
else else
printf("stmisp: sync ok\n"); SYS_LOG_DBG("stmisp: sync ok\n");
os_thread_sleep(100); os_thread_sleep(100);
// 解除写保护 // 解除写保护
if(!cmd_write_unprotect(&sertrf.stmisp_device)) if(!cmd_write_unprotect(&sertrf.stmisp_device))
printf("stmisp: write unprotect error\n"); SYS_LOG_DBG("stmisp: write unprotect error\n");
else else
printf("stmisp: write unprotect ok\n"); SYS_LOG_DBG("stmisp: write unprotect ok\n");
os_thread_sleep(100); os_thread_sleep(100);
if(!send_sync(&sertrf.stmisp_device, 5)) if(!send_sync(&sertrf.stmisp_device, 5))
printf("stmisp: sync error\n"); SYS_LOG_DBG("stmisp: sync error\n");
else else
printf("stmisp: sync ok\n"); SYS_LOG_DBG("stmisp: sync ok\n");
os_thread_sleep(100); os_thread_sleep(100);
boot_set_high_z(); boot_set_high_z();
// 全盘擦除 // 全盘擦除
if(!cmd_extended_erase_mass(&sertrf.stmisp_device)) if(!cmd_extended_erase_mass(&sertrf.stmisp_device))
printf("stmisp: erase mass error\n"); SYS_LOG_DBG("stmisp: erase mass error\n");
else else
printf("stmisp: erase mass ok\n"); SYS_LOG_DBG("stmisp: erase mass ok\n");
os_thread_sleep(10); os_thread_sleep(10);
printf("stmisp: isp start\n"); SYS_LOG_DBG("stmisp: isp start\n");
} }
int stmisp_send(void* data, uint16_t len, int timeout) int stmisp_send(void* data, uint16_t len, int timeout)

16
app/drivers/sertrf/tool.c
View File

@@ -44,7 +44,7 @@ uint32_t parse_hex_or_dec(const char *s) {
void aes_test(void) void aes_test(void)
{ {
// if(!esp_efuse_mac_get_default_id(efuse_mac)) // if(!esp_efuse_mac_get_default_id(efuse_mac))
// printf("mac: %02X:%02X:%02X:%02X:%02X:%02X\n", efuse_mac[0], efuse_mac[1], efuse_mac[2], efuse_mac[3], efuse_mac[4], efuse_mac[5]); // SYS_LOG_DBG("mac: %02X:%02X:%02X:%02X:%02X:%02X\n", efuse_mac[0], efuse_mac[1], efuse_mac[2], efuse_mac[3], efuse_mac[4], efuse_mac[5]);
// const unsigned char key[16] = "1234567890abcdef"; // 128-bit key // const unsigned char key[16] = "1234567890abcdef"; // 128-bit key
// unsigned char nonce_counter[16] = {0}; // 初始计数器块 (可用随机数 + 计数) // unsigned char nonce_counter[16] = {0}; // 初始计数器块 (可用随机数 + 计数)
@@ -62,10 +62,10 @@ void aes_test(void)
// mbedtls_aes_crypt_ctr(&aes, sizeof(efuse_mac), &nc_off, // mbedtls_aes_crypt_ctr(&aes, sizeof(efuse_mac), &nc_off,
// nonce_counter, stream_block, efuse_mac, output); // nonce_counter, stream_block, efuse_mac, output);
// printf("Ciphertext (hex): "); // SYS_LOG_DBG("Ciphertext (hex): ");
// for (int i = 0; i < sizeof(efuse_mac); i++) // for (int i = 0; i < sizeof(efuse_mac); i++)
// printf("%02X", output[i]); // SYS_LOG_DBG("%02X", output[i]);
// printf("\n"); // SYS_LOG_DBG("\n");
// // 解密（同一函数） // // 解密（同一函数）
// unsigned char decrypted[64] = {0}; // unsigned char decrypted[64] = {0};
@@ -76,21 +76,21 @@ void aes_test(void)
// mbedtls_aes_crypt_ctr(&aes, sizeof(efuse_mac), &nc_off, // mbedtls_aes_crypt_ctr(&aes, sizeof(efuse_mac), &nc_off,
// nonce_counter, stream_block, output, decrypted); // nonce_counter, stream_block, output, decrypted);
// printf("Decrypted: %s\n", decrypted); // SYS_LOG_DBG("Decrypted: %s\n", decrypted);
// mbedtls_aes_free(&aes); // mbedtls_aes_free(&aes);
if(!esp_efuse_mac_get_default_id(efuse_mac)) if(!esp_efuse_mac_get_default_id(efuse_mac))
printf("mac: %02X:%02X:%02X:%02X:%02X:%02X\n", efuse_mac[0], efuse_mac[1], efuse_mac[2], efuse_mac[3], efuse_mac[4], efuse_mac[5]); SYS_LOG_DBG("mac: %02X:%02X:%02X:%02X:%02X:%02X\n", efuse_mac[0], efuse_mac[1], efuse_mac[2], efuse_mac[3], efuse_mac[4], efuse_mac[5]);
uint8_t efuse_mac_encrypt[6] = {0}; uint8_t efuse_mac_encrypt[6] = {0};
sertrf_aes_ctr_encrypt(efuse_mac, 6, efuse_mac_encrypt); sertrf_aes_ctr_encrypt(efuse_mac, 6, efuse_mac_encrypt);
printf("mac: %02X:%02X:%02X:%02X:%02X:%02X\n", efuse_mac_encrypt[0], efuse_mac_encrypt[1], efuse_mac_encrypt[2], efuse_mac_encrypt[3], efuse_mac_encrypt[4], efuse_mac_encrypt[5]); SYS_LOG_DBG("mac: %02X:%02X:%02X:%02X:%02X:%02X\n", efuse_mac_encrypt[0], efuse_mac_encrypt[1], efuse_mac_encrypt[2], efuse_mac_encrypt[3], efuse_mac_encrypt[4], efuse_mac_encrypt[5]);
uint8_t efuse_mac_decrypt[6] = {0}; uint8_t efuse_mac_decrypt[6] = {0};
sertrf_aes_ctr_decrypt(efuse_mac_encrypt, 6, efuse_mac_decrypt); sertrf_aes_ctr_decrypt(efuse_mac_encrypt, 6, efuse_mac_decrypt);
printf("mac: %02X:%02X:%02X:%02X:%02X:%02X\n", efuse_mac_decrypt[0], efuse_mac_decrypt[1], efuse_mac_decrypt[2], efuse_mac_decrypt[3], efuse_mac_decrypt[4], efuse_mac_decrypt[5]); SYS_LOG_DBG("mac: %02X:%02X:%02X:%02X:%02X:%02X\n", efuse_mac_decrypt[0], efuse_mac_decrypt[1], efuse_mac_decrypt[2], efuse_mac_decrypt[3], efuse_mac_decrypt[4], efuse_mac_decrypt[5]);
} }
void sertrf_aes_ctr_encrypt(uint8_t *data, uint32_t len,uint8_t* output) void sertrf_aes_ctr_encrypt(uint8_t *data, uint32_t len,uint8_t* output)

6
sdkconfig_defaults/sdkconfig.release_SERTRF_esp32c3.defaults
View File

@@ -29,3 +29,9 @@ CONFIG_LOG_DEFAULT_LEVEL_NONE=y
#定义APP配置 #定义APP配置
CONFIG_BOARD_NAME_SERTRF_ESP32C3=y CONFIG_BOARD_NAME_SERTRF_ESP32C3=y
CONFIG_PRODUCT_ID_SERTRF=y CONFIG_PRODUCT_ID_SERTRF=y
#关闭bootloard生成输出日志
#CONFIG_BOOT_ROM_LOG_ON_GPIO_LOW=y
#设置应用层输出日志等级
#CONFIG_LOG_DEFAULT_LEVEL_INFO=y