diff --git a/app/drivers/data_port/ble_spp/ble_spp_server.c b/app/drivers/data_port/ble_spp/ble_spp_server.c index 92e4158..51fd81f 100644 --- a/app/drivers/data_port/ble_spp/ble_spp_server.c +++ b/app/drivers/data_port/ble_spp/ble_spp_server.c @@ -769,7 +769,7 @@ static void _ble_spp_server_init(void) { 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 { diff --git a/app/drivers/sertrf/sertrf.c b/app/drivers/sertrf/sertrf.c index 53d0ae9..81d9721 100644 --- a/app/drivers/sertrf/sertrf.c +++ b/app/drivers/sertrf/sertrf.c @@ -1,7 +1,7 @@ #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" sertrf_t sertrf; @@ -167,13 +167,13 @@ void app_thread(void* arg) sertrf.resend_device.handle_flag = 0;//标志位清零 break; 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; resend_send_data(&sertrf.resend_device, RESEND_CMD_OTA_GET_PARAM, &ota_parm, sizeof(ota_parm_t), 1000); sertrf.resend_device.handle_flag = 0;//标志位清零 break; 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; resend_send_data(&sertrf.resend_device, RESEND_CMD_FC_ISP_GET_PARAM, &stmisp_parm, sizeof(stmisp_parm), 1000); sertrf.resend_device.handle_flag = 0;//标志位清零 @@ -427,7 +427,7 @@ void resend_user_parse(void *resend_device) // 减6的目的是因为华哥没对MAC进行处理,所以也不返回 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; @@ -444,10 +444,10 @@ void resend_user_parse(void *resend_device) { 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; - 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); } break; @@ -496,10 +496,10 @@ void resend_user_parse(void *resend_device) case RESEND_CMD_FC_ISP_GET_PARAM: 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; - 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); break; case RESEND_CMD_FC_ISP_START: @@ -520,40 +520,40 @@ void resend_user_parse(void *resend_device) // 与isp确定通讯波特率,并建立联系 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); break; } else - printf("stmisp: sync ok\n"); + SYS_LOG_DBG("stmisp: sync ok\n"); os_thread_sleep(100); // 解除写保护 if(!cmd_write_unprotect(&sertrf.stmisp_device)) - printf("stmisp: write unprotect error\n"); + SYS_LOG_DBG("stmisp: write unprotect error\n"); else - printf("stmisp: write unprotect ok\n"); + SYS_LOG_DBG("stmisp: write unprotect ok\n"); os_thread_sleep(100); if(!send_sync(&sertrf.stmisp_device, 5)) - printf("stmisp: sync error\n"); + SYS_LOG_DBG("stmisp: sync error\n"); else - printf("stmisp: sync ok\n"); + SYS_LOG_DBG("stmisp: sync ok\n"); os_thread_sleep(100); boot_set_high_z_2(); // 全盘擦除 if(!cmd_extended_erase_mass(&sertrf.stmisp_device)) - printf("stmisp: erase mass error\n"); + SYS_LOG_DBG("stmisp: erase mass error\n"); else - printf("stmisp: erase mass ok\n"); + SYS_LOG_DBG("stmisp: erase mass ok\n"); 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; resend_send_cmd(resend_device, RESEND_CMD_ACK, 0); @@ -581,11 +581,11 @@ void resend_user_parse(void *resend_device) // ISP下跳转到应用层运行地址 if(cmd_go(&sertrf.stmisp_device, sertrf.fc_address)) { - printf("stmisp: go ok\n"); + SYS_LOG_DBG("stmisp: go ok\n"); } else { - printf("stmisp: go error\n"); + SYS_LOG_DBG("stmisp: go error\n"); } //开启其他线程中相同串口的使用 sertrf.stmisp_device.flag = 0; @@ -615,35 +615,35 @@ void Examples_run(void) os_thread_sleep(500); // 与isp确定通讯波特率,并建立联系 if(!send_sync(&sertrf.stmisp_device, 5)) - printf("stmisp: sync error\n"); + SYS_LOG_DBG("stmisp: sync error\n"); else - printf("stmisp: sync ok\n"); + SYS_LOG_DBG("stmisp: sync ok\n"); os_thread_sleep(100); // 解除写保护 if(!cmd_write_unprotect(&sertrf.stmisp_device)) - printf("stmisp: write unprotect error\n"); + SYS_LOG_DBG("stmisp: write unprotect error\n"); else - printf("stmisp: write unprotect ok\n"); + SYS_LOG_DBG("stmisp: write unprotect ok\n"); os_thread_sleep(100); if(!send_sync(&sertrf.stmisp_device, 5)) - printf("stmisp: sync error\n"); + SYS_LOG_DBG("stmisp: sync error\n"); else - printf("stmisp: sync ok\n"); + SYS_LOG_DBG("stmisp: sync ok\n"); os_thread_sleep(100); boot_set_high_z(); // 全盘擦除 if(!cmd_extended_erase_mass(&sertrf.stmisp_device)) - printf("stmisp: erase mass error\n"); + SYS_LOG_DBG("stmisp: erase mass error\n"); else - printf("stmisp: erase mass ok\n"); + SYS_LOG_DBG("stmisp: erase mass ok\n"); 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) diff --git a/app/drivers/sertrf/tool.c b/app/drivers/sertrf/tool.c index 8359a50..7a37398 100644 --- a/app/drivers/sertrf/tool.c +++ b/app/drivers/sertrf/tool.c @@ -44,7 +44,7 @@ uint32_t parse_hex_or_dec(const char *s) { void aes_test(void) { // 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 // unsigned char nonce_counter[16] = {0}; // 初始计数器块 (可用随机数 + 计数) @@ -62,10 +62,10 @@ void aes_test(void) // mbedtls_aes_crypt_ctr(&aes, sizeof(efuse_mac), &nc_off, // nonce_counter, stream_block, efuse_mac, output); - // printf("Ciphertext (hex): "); + // SYS_LOG_DBG("Ciphertext (hex): "); // for (int i = 0; i < sizeof(efuse_mac); i++) - // printf("%02X", output[i]); - // printf("\n"); + // SYS_LOG_DBG("%02X", output[i]); + // SYS_LOG_DBG("\n"); // // 解密(同一函数) // unsigned char decrypted[64] = {0}; @@ -76,21 +76,21 @@ void aes_test(void) // mbedtls_aes_crypt_ctr(&aes, sizeof(efuse_mac), &nc_off, // nonce_counter, stream_block, output, decrypted); - // printf("Decrypted: %s\n", decrypted); + // SYS_LOG_DBG("Decrypted: %s\n", decrypted); // mbedtls_aes_free(&aes); 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}; 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}; 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) diff --git a/sdkconfig_defaults/sdkconfig.release_SERTRF_esp32c3.defaults b/sdkconfig_defaults/sdkconfig.release_SERTRF_esp32c3.defaults index 0a01bb3..6ce04a4 100644 --- a/sdkconfig_defaults/sdkconfig.release_SERTRF_esp32c3.defaults +++ b/sdkconfig_defaults/sdkconfig.release_SERTRF_esp32c3.defaults @@ -29,3 +29,9 @@ CONFIG_LOG_DEFAULT_LEVEL_NONE=y #定义APP配置 CONFIG_BOARD_NAME_SERTRF_ESP32C3=y CONFIG_PRODUCT_ID_SERTRF=y + + +#关闭bootloard生成输出日志 +#CONFIG_BOOT_ROM_LOG_ON_GPIO_LOW=y +#设置应用层输出日志等级 +#CONFIG_LOG_DEFAULT_LEVEL_INFO=y \ No newline at end of file