From 2adc8a55563ad1ff7df34e01e7261ef21d3a634a Mon Sep 17 00:00:00 2001 From: penglei <1624952103@qq.com> Date: Sat, 6 Jul 2024 14:54:47 +0800 Subject: [PATCH] =?utf8?q?=E5=B0=86PRINT=E6=9B=BF=E6=8D=A2=E4=B8=BAWEARABL?= =?utf8?q?E=5FLOGE=EF=BC=8CAT=E6=8C=87=E4=BB=A4=E4=B8=ADPRINT=E6=9B=BF?= =?utf8?q?=E6=8D=A2=E4=B8=BAwstp=5Fprint=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../nativeui/heartrate/src/HeartModel.cpp | 2 +- .../nativeui/main/src/dial/DialModelPower.cpp | 2 +- .../main/src/dial/DialModelPowerStandby.cpp | 2 +- .../nativeui/producttest/src/testold.cpp | 4 +- .../nativeui/system/src/Systemupgrade.cpp | 20 +-- .../systemupdate/src/SystemUpdateModel.cpp | 12 +- .../systemupdate/src/SystemUpdateView.cpp | 16 +- .../takephotos/src/TakephotosModel.cpp | 2 +- .../nativeui/traing/src/TraingModel.cpp | 26 ++-- .../traing/src/TraingNomalPresenter.cpp | 2 +- .../traing/src/TraingSetPresenter.cpp | 2 +- .../training_card/src/TraingCardPresenter.cpp | 8 +- .../training_card/src/TraingCardView.cpp | 2 +- .../ble_service/bleservice/bleService.c | 6 +- .../drivers/peripheral/cywee/src/main_dml.c | 14 +- .../slip/cat1Service/cat1_at_cmd.cpp | 9 +- .../peripheral/slip/cat1Service/cat1_ctl.cpp | 16 +- .../slip/cat1Service/cat1_server.cpp | 86 +++++------ .../peripheral/utils/custom_utils_at_cmd.c | 141 ++++++++++++------ 19 files changed, 209 insertions(+), 163 deletions(-) diff --git a/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartModel.cpp index 76fd5d39b..c9d61d00c 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartModel.cpp @@ -631,7 +631,7 @@ namespace OHOS if (disvalid_counter_ >= MAX_DISVALID_HRS_COUNT) { // 结束本次测试 - PRINT("MAX_DISVALID_HRS_COUNT\r\n"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"MAX_DISVALID_HRS_COUNT\r\n"); Heart_Stop(); // 关闭自动检测心率 如果有其他高级心率检测在进行，则不会进行关闭[低优先级] HeartModel::GetInstance()->Heart_Control(HeartState::End, HeartCheck::PASSIVITY); diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialModelPower.cpp b/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialModelPower.cpp index 49962d680..dc126c89d 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialModelPower.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialModelPower.cpp @@ -65,7 +65,7 @@ namespace OHOS if (onChangeListener_ != nullptr) { onChangeListener_->OnDialFloatDataUpdate(DialDataType::DATA_TYPE_POWER, power_); - PRINT("[UpdatePower!]\r\n"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"[UpdatePower!]\r\n"); } } } diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialModelPowerStandby.cpp b/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialModelPowerStandby.cpp index a4a376364..a69677379 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialModelPowerStandby.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialModelPowerStandby.cpp @@ -57,7 +57,7 @@ namespace OHOS if (onChangeListener_ != nullptr) { onChangeListener_->OnDialFloatDataUpdate(DialDataType::DATA_TYPE_POWER_STANDBY, PowerStanby_); - PRINT("[UpdatePowerStanby!]\r\n"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"[UpdatePowerStanby!]\r\n"); } } } diff --git a/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testold.cpp b/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testold.cpp index 968fff5b6..4499b0282 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testold.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/producttest/src/testold.cpp @@ -93,7 +93,7 @@ namespace OHOS errcode_t old_test_init(void) { AGING_task_falg=1; - PRINT("uapi_ppg_service_init !\r\n"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"uapi_ppg_service_init !\r\n"); app_task_definition_t taskcfg={0}; taskcfg.create_queue_handle = NULL; taskcfg.attr.name="AGING_test_service"; @@ -105,7 +105,7 @@ namespace OHOS errcode_t ret=uapi_create_osThread_custom(&taskcfg); if(ret != ERRCODE_SUCC) { - PRINT("create ppg_service failed %d!\r\n",ret); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"create ppg_service failed %d!\r\n",ret); return ERRCODE_FAIL; } diff --git a/code/sdk/application/wearable/fd230app/nativeui/system/src/Systemupgrade.cpp b/code/sdk/application/wearable/fd230app/nativeui/system/src/Systemupgrade.cpp index 857b2c2d7..c29ecaec1 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/system/src/Systemupgrade.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/system/src/Systemupgrade.cpp @@ -59,7 +59,7 @@ namespace OHOS static void httpc_download_result_report_data(void *arg, httpc_result_t httpc_result, u32_t rx_content_len, u32_t srv_res, err_t err) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "httpc_download_result_ui"); - PRINT("httpc_download_result , httpc_result_t %d, rx_content_len %d , srv_res %d, err %d\n", + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"httpc_download_result , httpc_result_t %d, rx_content_len %d , srv_res %d, err %d\n", httpc_result,rx_content_len,srv_res,err); if(srv_res==200 && err==0) remove(UPDATAREPORT); @@ -100,7 +100,7 @@ namespace OHOS NULL, (const char*) otadatapath, &connection); - PRINT("custom_start_ota_download %d \r\n",rett); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"custom_start_ota_download %d \r\n",rett); WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "use_post_"); } //#define UP_TEST @@ -243,7 +243,7 @@ namespace OHOS errcode_t upgrade_service_service_init(void) { - PRINT("uapi_ppg_service_init !\r\n"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"uapi_ppg_service_init !\r\n"); app_task_definition_t taskcfg={0}; taskcfg.create_queue_handle = NULL; taskcfg.attr.name="upgrade_service"; @@ -255,7 +255,7 @@ namespace OHOS errcode_t ret=uapi_create_osThread_custom(&taskcfg); if(ret != ERRCODE_SUCC) { - PRINT("create ppg_service failed %d!\r\n",ret); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"create ppg_service failed %d!\r\n",ret); return ERRCODE_FAIL; } @@ -265,7 +265,7 @@ namespace OHOS errcode_t upgrade_service_service_init_packpage(void) { - PRINT("uapi_ppg_service_init !\r\n"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"uapi_ppg_service_init !\r\n"); app_task_definition_t taskcfg={0}; taskcfg.create_queue_handle = NULL; taskcfg.attr.name="upgrade_service_ota_fwpkg"; @@ -277,7 +277,7 @@ namespace OHOS errcode_t ret=uapi_create_osThread_custom(&taskcfg); if(ret != ERRCODE_SUCC) { - PRINT("create ppg_service failed %d!\r\n",ret); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"create ppg_service failed %d!\r\n",ret); return ERRCODE_FAIL; } @@ -290,7 +290,7 @@ namespace OHOS static void httpc_download_result_ui_packpage(void *arg, httpc_result_t httpc_result, u32_t rx_content_len, u32_t srv_res, err_t err) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "httpc_download_result_ui"); - PRINT("httpc_download_result , httpc_result_t %d, rx_content_len %d , srv_res %d, err %d\n", + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"httpc_download_result , httpc_result_t %d, rx_content_len %d , srv_res %d, err %d\n", httpc_result,rx_content_len,srv_res,err); uapi_cat1_keep_wakeup(0); if(httpc_result!=0) @@ -308,7 +308,7 @@ namespace OHOS static void httpc_download_result_ui(void *arg, httpc_result_t httpc_result, u32_t rx_content_len, u32_t srv_res, err_t err) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "httpc_download_result_ui"); - PRINT("httpc_download_result , httpc_result_t %d, rx_content_len %d , srv_res %d, err %d\n", + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"httpc_download_result , httpc_result_t %d, rx_content_len %d , srv_res %d, err %d\n", httpc_result,rx_content_len,srv_res,err); uapi_cat1_keep_wakeup(0); upgrade_service_service_init();//线程当timer用 @@ -324,7 +324,7 @@ namespace OHOS //(uint8_t*)argv[0]; uint8_t *otadatapath = (uint8_t*)Path; - PRINT("custom_start_ota_download %s to %s\r\n",uri_str,otadatapath); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"custom_start_ota_download %s to %s\r\n",uri_str,otadatapath); uapi_cat1_keep_wakeup(1); if(falg) { @@ -355,7 +355,7 @@ namespace OHOS NULL, (const char*) otadatapath, &connection); - PRINT("custom_start_ota_download %d \r\n",rett); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"custom_start_ota_download %d \r\n",rett); if(rett!=0) { if(SystemupgradeView::GetInstance()) diff --git a/code/sdk/application/wearable/fd230app/nativeui/systemupdate/src/SystemUpdateModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/systemupdate/src/SystemUpdateModel.cpp index 4e10ead87..e8395337a 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/systemupdate/src/SystemUpdateModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/systemupdate/src/SystemUpdateModel.cpp @@ -1,8 +1,8 @@ /* * @Author: luozheng 1732036298@qq.com * @Date: 2024-05-07 11:26:25 - * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-05-07 18:10:26 + * @LastEditors: penglei 1624952103@qq.com + * @LastEditTime: 2024-07-06 14:25:30 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/systemupdate/src/SystemUpdateModel.cpp */ #include "systemupdate/include/SystemUpdateModel.h" @@ -38,7 +38,7 @@ namespace OHOS if(fp!=NULL) { falg=true; - PRINT("UPDATAREPORT_M IS TRUE!\r\n"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"UPDATAREPORT_M IS TRUE!\r\n"); fclose(fp); } @@ -64,12 +64,12 @@ namespace OHOS falg=false; } } - PRINT("UPDATAREPORT IS OK!\r\n"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"UPDATAREPORT IS OK!\r\n"); } int start_report_timer(void) { - PRINT("uapi_upgrade_service_init !\r\n"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"uapi_upgrade_service_init !\r\n"); app_task_definition_t taskcfg={0}; taskcfg.create_queue_handle = NULL; taskcfg.attr.name="report_upgrade_service"; @@ -81,7 +81,7 @@ namespace OHOS errcode_t ret=uapi_create_osThread_custom(&taskcfg); if(ret != ERRCODE_SUCC) { - PRINT("create uapi_upgrade_service_init failed %d!\r\n",ret); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"create uapi_upgrade_service_init failed %d!\r\n",ret); return ERRCODE_FAIL; } diff --git a/code/sdk/application/wearable/fd230app/nativeui/systemupdate/src/SystemUpdateView.cpp b/code/sdk/application/wearable/fd230app/nativeui/systemupdate/src/SystemUpdateView.cpp index c3a1f89df..eb81d37ec 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/systemupdate/src/SystemUpdateView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/systemupdate/src/SystemUpdateView.cpp @@ -1,8 +1,8 @@ /* * @Author: luozheng 1732036298@qq.com * @Date: 2024-05-07 11:25:58 - * @LastEditors: luozheng 1732036298@qq.com - * @LastEditTime: 2024-05-07 18:03:07 + * @LastEditors: penglei 1624952103@qq.com + * @LastEditTime: 2024-07-06 14:25:05 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/systemupdate/src/SystemUpdateView.cpp */ @@ -87,7 +87,7 @@ namespace OHOS static void httpc_download_result_ui(void *arg, httpc_result_t httpc_result, u32_t rx_content_len, u32_t srv_res, err_t err) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "httpc_download_result_ui"); - PRINT("httpc_download_result , httpc_result_t %d, rx_content_len %d , srv_res %d, err %d\n", + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"httpc_download_result , httpc_result_t %d, rx_content_len %d , srv_res %d, err %d\n", httpc_result,rx_content_len,srv_res,err); uapi_cat1_keep_wakeup(0); LCD_auto_timeout(true); @@ -98,7 +98,7 @@ namespace OHOS static void httpc_download_FWPKG_result_ui(void *arg, httpc_result_t httpc_result, u32_t rx_content_len, u32_t srv_res, err_t err) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "httpc_download_result_ui"); - PRINT("httpc_download_result , httpc_result_t %d, rx_content_len %d , srv_res %d, err %d\n", + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"httpc_download_result , httpc_result_t %d, rx_content_len %d , srv_res %d, err %d\n", httpc_result,rx_content_len,srv_res,err); uapi_cat1_keep_wakeup(0); LCD_auto_timeout(true); @@ -109,7 +109,7 @@ namespace OHOS static void httpc_download_result_report_data(void *arg, httpc_result_t httpc_result, u32_t rx_content_len, u32_t srv_res, err_t err) { WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "httpc_download_result_ui"); - PRINT("httpc_download_result , httpc_result_t %d, rx_content_len %d , srv_res %d, err %d\n", + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"httpc_download_result , httpc_result_t %d, rx_content_len %d , srv_res %d, err %d\n", httpc_result,rx_content_len,srv_res,err); return ; } @@ -136,7 +136,7 @@ namespace OHOS NULL, (const char*) otadatapath, &connection); - PRINT("custom_start_ota_download %d \r\n",rett); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"custom_start_ota_download %d \r\n",rett); WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "use_post_"); } @@ -227,7 +227,7 @@ namespace OHOS //(uint8_t*)argv[0]; uint8_t *otadatapath = (uint8_t*)Path; - PRINT("custom_start_ota_download %s to %s\r\n",uri_str,otadatapath); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"custom_start_ota_download %s to %s\r\n",uri_str,otadatapath); uapi_cat1_keep_wakeup(1); LCD_auto_timeout(false); @@ -264,7 +264,7 @@ namespace OHOS NULL, (const char*) otadatapath, &connection); - PRINT("custom_start_ota_download %d \r\n",rett); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"custom_start_ota_download %d \r\n",rett); if(rett!=0) { diff --git a/code/sdk/application/wearable/fd230app/nativeui/takephotos/src/TakephotosModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/takephotos/src/TakephotosModel.cpp index 6ecf25bfb..f97c77475 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/takephotos/src/TakephotosModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/takephotos/src/TakephotosModel.cpp @@ -86,7 +86,7 @@ extern "C" // 进入拍照界面 if (request->msgId == TOPIC_EVENT_ENTER_CMAERA) { - PRINT(" 遥控拍照 \r\n"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP," 遥控拍照 \r\n"); uapi_set_screen_on_api(); // 亮屏 NativeAbility::GetInstance().EnterSlice(VIEW_TAKEPHOTOS); TakephotosView::GetInstance()->SetPopupViewStatus(PopupPhoto::TakePopup, true); diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp index f272e6caa..a6887356e 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp @@ -125,7 +125,7 @@ extern "C" { return; } - PRINT("request %d\r\n", request->msgId); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"request %d\r\n", request->msgId); if (request->msgId == TOPIC_EVENT_ACTIVITY_UPDATE) { #if BLETEST @@ -354,14 +354,14 @@ namespace OHOS TraingCardView::GetInstance()->SetPopupViewStatus(HeartPopup, true); } // sportdata->duration = cyweeInfo->duration; - PRINT("normal sportdata->calories[%d],sportdata->heart[%d] \r\n", sportdata->calories, sportdata->heart); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"normal sportdata->calories[%d],sportdata->heart[%d] \r\n", sportdata->calories, sportdata->heart); switch (type) { case ExerciseClass::OUTDOOR: case ExerciseClass::INDOOR: sportdata->distance = cyweeInfo->distance; sportdata->steps = cyweeInfo->steps; - PRINT("indoor sportdata->distance[%d],sportdata->steps[%d] \r\n", sportdata->distance, sportdata->steps); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"indoor sportdata->distance[%d],sportdata->steps[%d] \r\n", sportdata->distance, sportdata->steps); break; case ExerciseClass::FREE_TRAINING: break; @@ -503,7 +503,7 @@ namespace OHOS free(start_date); // 释放内存 return; } - PRINT("start_date[%s]\r\n", start_date); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"start_date[%s]\r\n", start_date); sportdata->start_date = std::string(start_date); free(start_date); // 释放内存 @@ -516,7 +516,7 @@ namespace OHOS } sportdata->start_time = std::string(start_time); free(start_time); // 释放内存 - PRINT("sportdata->start_time [%s]\r\n", (sportdata->start_time).c_str()); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"sportdata->start_time [%s]\r\n", (sportdata->start_time).c_str()); Startstate = true; Endstate = false; // 确保"开始"和"结束"状态互斥 @@ -534,13 +534,13 @@ namespace OHOS free(end_time); // 释放内存 return; } - // PRINT("end_time [%s]\r\n", end_time); + // WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"end_time [%s]\r\n", end_time); sportdata->end_time = std::string(end_time); sportState_ = ExerciseState::General; Openstate = false; // 关闭运动标志位 free(end_time); // 释放内存 - PRINT("sportdata->end_time [%s]\r\n", (sportdata->end_time).c_str()); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"sportdata->end_time [%s]\r\n", (sportdata->end_time).c_str()); #if READTEST if (SaveSportData() == false) { @@ -871,7 +871,7 @@ namespace OHOS { msg_get_train_data_info_t data; memset(&data, 0, sizeof(msg_get_train_data_info_t)); - PRINT("sportdata->starttime %d \r\n", sportdata->starttime); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"sportdata->starttime %d \r\n", sportdata->starttime); data.st = sportdata->starttime; data.hr = sportdata->heart; data.ca = sportdata->calories; @@ -901,14 +901,14 @@ namespace OHOS if (ConfigModel::GetInstance()->get_configData_int(ConfigModel::CONFIGMODEL_ITEM_TRANING_AUTO)) { freq = ConfigModel::GetInstance()->get_configData_int(ConfigModel::CONFIGMODEL_ITEM_TRANING_FREQ); - PRINT("freq is %d\r\n", freq); // 获取实时数据频率 + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"freq is %d\r\n", freq); // 获取实时数据频率 if (sportdata->duration % freq == 0) { - PRINT("SendLiveData is OK\r\n"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"SendLiveData is OK\r\n"); SendLiveData(); // 发送实时数据 } } - PRINT("duration:[%d] g_motionTimes[%d]\r\n", sportdata->duration, g_motionTimes); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"duration:[%d] g_motionTimes[%d]\r\n", sportdata->duration, g_motionTimes); } int hour = g_motionTimes / NUM_TIME_HOUR; @@ -936,7 +936,7 @@ namespace OHOS return; } gTraingCardPresenter->ModifiesTime(); - PRINT("TraingTimerCallback\r\n"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"TraingTimerCallback\r\n"); } /* 开启定时器 */ @@ -984,7 +984,7 @@ namespace OHOS return; } g_startCounting = NULL; - PRINT("g_motionTimes:%d\r\n", sportdata->duration); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"g_motionTimes:%d\r\n", sportdata->duration); g_motionTimes = 0; WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "DisableTimer!"); } diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingNomalPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingNomalPresenter.cpp index 342df0129..62bd3aa0e 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingNomalPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingNomalPresenter.cpp @@ -67,7 +67,7 @@ namespace OHOS { if (event.GetDragDirection() == DragEvent::DIRECTION_LEFT_TO_RIGHT) { - PRINT("TraingNomalPresenter OnDrag!\r\rn"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"TraingNomalPresenter OnDrag!\r\rn"); NativeAbility::GetInstance().Back(); // 返回函数 } UNUSED(view); diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetPresenter.cpp index b47137d1d..4a1185401 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingSetPresenter.cpp @@ -149,7 +149,7 @@ namespace OHOS #if TAGTEST TraingModel::GetInstance()->SetSportTag(ExerciseTag::STEP, 10); // 测试 #endif - PRINT("GetButtonIdFromCard:%d tag:%d \r\n", CardID, tag); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"GetButtonIdFromCard:%d tag:%d \r\n", CardID, tag); // 切换到训练卡片 NativeAbility::GetInstance().ChangeSlice(VIEW_TRAININGCRAD); // 获取训练项目 diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardPresenter.cpp index ca38e016c..9fbae0729 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardPresenter.cpp @@ -293,14 +293,14 @@ namespace OHOS { // 设置目标:在非运动情况下设置 [单指令，执行后退出] TraingModel::GetInstance()->SetSportTag(static_cast(cmd->sportTagType), cmd->sportTag); - PRINT("SetSportTag is succeed!\r\n"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"SetSportTag is succeed!\r\n"); return true; } break; case SENDDATA: TraingModel::GetInstance()->SendLiveData(); // 发送实时数据 [单指令，执行后退出] - PRINT("SendLiveData is succeed!\r\n"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"SendLiveData is succeed!\r\n"); return true; default: break; @@ -329,10 +329,10 @@ namespace OHOS } } - PRINT("cmd->sportType[%d],cmd->controlmd[%d],cmd->sportTagType[%d],cmd->sportTag[%d]\r\n", cmd->sportType, cmd->controlmd, cmd->sportTagType, cmd->sportTag); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"cmd->sportType[%d],cmd->controlmd[%d],cmd->sportTagType[%d],cmd->sportTag[%d]\r\n", cmd->sportType, cmd->controlmd, cmd->sportTagType, cmd->sportTag); ExerciseState cmdState = static_cast(cmd->controlmd); - PRINT("ExerciseState::End [%d]\r\n", cmdState); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"ExerciseState::End [%d]\r\n", cmdState); switch (cmdState) { diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardView.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardView.cpp index c5ae60dea..07bee8eaf 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardView.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/training_card/src/TraingCardView.cpp @@ -543,7 +543,7 @@ namespace OHOS default: break; } - PRINT("tag[%d]-tagType[%d]-tagString[%s]\r\n", tag, tagType, tagString.c_str()); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"tag[%d]-tagType[%d]-tagString[%s]\r\n", tag, tagType, tagString.c_str()); InitLabel(labeltag, 70, 215, 326, 97, "label2", tagString.c_str(), DEFAULT_VECTOR_FONT_FILENAME, 80); labeltag->SetTextColor(Color::GetColorFromRGBA(0x4f, 0xc3, 0x4c, 0xff)); getView->Add(labeltag); diff --git a/code/sdk/application/wearable/service/ble_service/bleservice/bleService.c b/code/sdk/application/wearable/service/ble_service/bleservice/bleService.c index fc1daa00f..d25e7f2d6 100644 --- a/code/sdk/application/wearable/service/ble_service/bleservice/bleService.c +++ b/code/sdk/application/wearable/service/ble_service/bleservice/bleService.c @@ -1338,7 +1338,7 @@ void blesrv_service_recv_msg_handler(uint16_t srv_handle, uint8_t * msg_data, ui if (ret != OSAL_SUCCESS) { - PRINT("Error blesrv Check send failed! err=0x%X! \r\n", ret); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"Error blesrv Check send failed! err=0x%X! \r\n", ret); } } @@ -1420,7 +1420,7 @@ void create_blesrv_queue(void) errcode_t uapi_blesrv_service_init(void) { - PRINT("uapi_blesrv_service_init !\r\n"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"uapi_blesrv_service_init !\r\n"); app_task_definition_t taskcfg = {0}; taskcfg.create_queue_handle = create_blesrv_queue; taskcfg.attr.name = "blesrv_recv_service"; @@ -1432,7 +1432,7 @@ errcode_t uapi_blesrv_service_init(void) errcode_t ret = uapi_create_osThread_custom(&taskcfg); if (ret != ERRCODE_SUCC) { - PRINT("create blesrv_service failed %d!\r\n", ret); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"create blesrv_service failed %d!\r\n", ret); return ERRCODE_FAIL; } diff --git a/code/sdk/drivers/peripheral/cywee/src/main_dml.c b/code/sdk/drivers/peripheral/cywee/src/main_dml.c index e73443db8..9e208581a 100644 --- a/code/sdk/drivers/peripheral/cywee/src/main_dml.c +++ b/code/sdk/drivers/peripheral/cywee/src/main_dml.c @@ -410,7 +410,7 @@ void cywee_activity_mode_change(int mode) { //一般模式(生活模式) case SPORT_ACTIVE_MODE_NORMAL: - PRINT("SPORT_ACTIVE_MODE_NORMAL\r\n"); + CWM_OS_dbgPrintf("SPORT_ACTIVE_MODE_NORMAL\r\n"); memset(&scl, 0, sizeof(scl)); scl.iData[0] = 1; scl.iData[1] = SPORT_ACTIVE_MODE_NORMAL; @@ -419,7 +419,7 @@ void cywee_activity_mode_change(int mode) //跑步机 case SPORT_ACTIVE_MODE_TREADMILL: - PRINT("SPORT_ACTIVE_MODE_TREADMILL\r\n"); + CWM_OS_dbgPrintf("SPORT_ACTIVE_MODE_TREADMILL\r\n"); memset(&scl, 0, sizeof(scl)); scl.iData[0] = 1; scl.iData[1] = SPORT_ACTIVE_MODE_TREADMILL; @@ -428,7 +428,7 @@ void cywee_activity_mode_change(int mode) //户外跑步 case SPORT_ACTIVE_MODE_OUTDOOR_RUNNING: - PRINT("SPORT_ACTIVE_MODE_OUTDOOR_RUNNING\r\n"); + CWM_OS_dbgPrintf("SPORT_ACTIVE_MODE_OUTDOOR_RUNNING\r\n"); memset(&scl, 0, sizeof(scl)); scl.iData[0] = 1; scl.iData[1] = SPORT_ACTIVE_MODE_OUTDOOR_RUNNING; @@ -437,7 +437,7 @@ void cywee_activity_mode_change(int mode) //室内跑步 case SPORT_ACTIVE_MODE_INDOOR_RUNNING: - PRINT("SPORT_ACTIVE_MODE_INDOOR_RUNNING\r\n"); + CWM_OS_dbgPrintf("SPORT_ACTIVE_MODE_INDOOR_RUNNING\r\n"); memset(&scl, 0, sizeof(scl)); scl.iData[0] = 1; scl.iData[1] = SPORT_ACTIVE_MODE_INDOOR_RUNNING; @@ -454,7 +454,7 @@ void cywee_activity_mode_change(int mode) //自由运动 case SPORT_ACTIVE_MODE_FREE_TRAINING: - PRINT("SPORT_ACTIVE_MODE_FREE_TRAINING\r\n"); + CWM_OS_dbgPrintf("SPORT_ACTIVE_MODE_FREE_TRAINING\r\n"); memset(&scl, 0, sizeof(scl)); scl.iData[0] = 1; scl.iData[1] = SPORT_ACTIVE_MODE_FREE_TRAINING; @@ -585,13 +585,13 @@ void CWM_AP_SensorListen(pSensorEVT_t sensorEVT) { { #if defined(SUPPORT_POWER_MANAGER) display_api->set_screen_set_keepon_timeout(0); - PRINT("[cwyee] turn_off_screen"); + CWM_OS_dbgPrintf("[cwyee] turn_off_screen"); #endif }else if ((int)sensorEVT->fData[1] == 1) { #if defined(SUPPORT_POWER_MANAGER) if (display_api->get_screen_state() != SCREEN_ON) { - PRINT("[cwyee] turn_on_screen"); + CWM_OS_dbgPrintf("[cwyee] turn_on_screen"); display_api->turn_on_screen(); } display_api->set_screen_set_keepon_timeout(5000); diff --git a/code/sdk/drivers/peripheral/slip/cat1Service/cat1_at_cmd.cpp b/code/sdk/drivers/peripheral/slip/cat1Service/cat1_at_cmd.cpp index d83f91622..e3b8fdceb 100644 --- a/code/sdk/drivers/peripheral/slip/cat1Service/cat1_at_cmd.cpp +++ b/code/sdk/drivers/peripheral/slip/cat1Service/cat1_at_cmd.cpp @@ -12,6 +12,7 @@ #include #include "phoneaddressmodel.h" + #ifdef __cplusplus #if __cplusplus extern "C" { @@ -24,6 +25,8 @@ extern "C" { #define PPG_SUCCESS 0 #define PPG_FAILED (-1) +#include "app_at_process.h" + static int ConvertCmdToParam(uint8_t *para, uint32_t paraLen, uint8_t argv[PPG_MAX_ARGC][PPG_MAX_ARGV_LEN], uint32_t* argc) { @@ -62,18 +65,18 @@ static uint32_t cat1_power(uint8_t *para, uint32_t paraLen, char *strCommonCmd) int ret = ConvertCmdToParam(para, paraLen, argv, &argc); if (ret != PPG_SUCCESS) { - printf("CAT1TEST ATCMD Convert Command Failed\n"); + wstp_print("CAT1TEST ATCMD Convert Command Failed\n"); return ERRCODE_FAIL; } if (argc != 1) { - printf("CAT1TEST ATCMD Set Parameter Failed\n"); + wstp_print("CAT1TEST ATCMD Set Parameter Failed\n"); return ERRCODE_FAIL; } // char *mode = (char*)argv[0]; int enabled = atoi((char*)argv[0]); - printf("CAT1TEST ATCMD power enable %d \n",enabled); + wstp_print("CAT1TEST ATCMD power enable %d \n",enabled); if(enabled == 1) { diff --git a/code/sdk/drivers/peripheral/slip/cat1Service/cat1_ctl.cpp b/code/sdk/drivers/peripheral/slip/cat1Service/cat1_ctl.cpp index 9ced3f562..377b764a9 100644 --- a/code/sdk/drivers/peripheral/slip/cat1Service/cat1_ctl.cpp +++ b/code/sdk/drivers/peripheral/slip/cat1Service/cat1_ctl.cpp @@ -36,11 +36,11 @@ uint32_t uapi_cat1_power_on(uint32_t pwron) { uapi_gpio_set_dir(S_AGPIO_L23, GPIO_DIRECTION_OUTPUT); uapi_gpio_set_val(S_AGPIO_L23, GPIO_LEVEL_LOW); - // wstp_print("Power OFF Cat1! L23 low \r\n"); + // wstp_WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"Power OFF Cat1! L23 low \r\n"); }else{ uapi_gpio_set_dir(S_AGPIO_L23, GPIO_DIRECTION_OUTPUT); uapi_gpio_set_val(S_AGPIO_L23, GPIO_LEVEL_HIGH); - // wstp_print("Power ON Cat1! L23 high \r\n"); + // wstp_WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"Power ON Cat1! L23 high \r\n"); } return 0; @@ -51,11 +51,11 @@ uint32_t uapi_cat1_reset(uint32_t pwron) { uapi_gpio_set_dir(S_AGPIO_L28, GPIO_DIRECTION_OUTPUT); uapi_gpio_set_val(S_AGPIO_L28, GPIO_LEVEL_HIGH); - // wstp_print("clear reset Cat1! L28 high \r\n"); + // wstp_WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"clear reset Cat1! L28 high \r\n"); }else{ uapi_gpio_set_dir(S_AGPIO_L28, GPIO_DIRECTION_OUTPUT); uapi_gpio_set_val(S_AGPIO_L28, GPIO_LEVEL_LOW); - // wstp_print("Reset Cat1! L28 low\r\n"); + // wstp_WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"Reset Cat1! L28 low\r\n"); } return 0; @@ -130,7 +130,7 @@ void uapi_cat1_wakeup_cat1(uint8_t wakeup) LOS_Mdelay(100); //第一次唤醒 Cat1 需要延时等其正常运行 } - // wstp_print("wakeup Cat1! L30 high \r\n"); + // wstp_WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"wakeup Cat1! L30 high \r\n"); }else{ // WEARABLE_LOGW(WEARABLE_LOG_MODULE_MAIN_SERVICE,"sleep cat1\n"); uapi_gpio_set_dir(S_AGPIO_L30, GPIO_DIRECTION_OUTPUT); @@ -138,7 +138,7 @@ void uapi_cat1_wakeup_cat1(uint8_t wakeup) { uapi_gpio_set_val(S_AGPIO_L30, GPIO_LEVEL_LOW); } - // wstp_print("sleep Cat1! L30 low\r\n"); + // wstp_WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"sleep Cat1! L30 low\r\n"); } } @@ -153,7 +153,7 @@ void uapi_cat1_pre_init(void) void uapi_cat1_suspend(void) { - PRINT("uapi_cat1_suspend\n"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"uapi_cat1_suspend\n"); // //关闭唤醒对方 // uapi_cat1_wakeup_cat1(0); @@ -184,7 +184,7 @@ void uapi_cat1_suspend(void) void uapi_cat1_resume(void) { - PRINT("uapi_cat1_resume\n"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"uapi_cat1_resume\n"); } diff --git a/code/sdk/drivers/peripheral/slip/cat1Service/cat1_server.cpp b/code/sdk/drivers/peripheral/slip/cat1Service/cat1_server.cpp index f15e418ea..91e1374cb 100644 --- a/code/sdk/drivers/peripheral/slip/cat1Service/cat1_server.cpp +++ b/code/sdk/drivers/peripheral/slip/cat1Service/cat1_server.cpp @@ -330,10 +330,10 @@ static void udp_send_response(char *tx_buffer, uint8_t cmd, char *content) if( len > 0 ) { err = sendto(g_listen_sock, tx_buffer, len, 0, (struct sockaddr *)&sourceAddr, sizeof(sourceAddr)); if (err < 0) { - PRINT("Error occured during sending: errno %d\n", errno); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"Error occured during sending: errno %d\n", errno); } } else { - PRINT("Error occured unkown send data\n"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"Error occured unkown send data\n"); } } #include "uart_porting.h" @@ -342,7 +342,7 @@ void udp_send_msg_toCat1(uint8_t cmd,char *content) if (!uapi_cat1_get_power_stat()) { - PRINT("Error cat1 poweroff skipp send data\n"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"Error cat1 poweroff skipp send data\n"); return ; } uapi_cat1_wakeup_cat1(1); @@ -372,7 +372,7 @@ static int decodeSMS(char* msg) int msglen = strlen(msg)+1; if (msglen < 25) { - PRINT("sms msg len is too short !\r\n"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"sms msg len is too short !\r\n"); return -1; } @@ -393,19 +393,19 @@ static int decodeSMS(char* msg) if((strlen(s)> 4) && (strncmp(s,"ref:",4) == 0) ) { char* ptmp=s+4; - PRINT("ref %s\r\n",ptmp); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"ref %s\r\n",ptmp); }else if ((strlen(s)> 10) && (strncmp(s,"total_num:",10) == 0) ) { char* ptmp=s+10; - PRINT("total_num %s\r\n",ptmp); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"total_num %s\r\n",ptmp); }else if ((strlen(s)> 4) && (strncmp(s,"seq:",4) == 0) ) { char* ptmp=s+4; - PRINT("seq %s\r\n",ptmp); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"seq %s\r\n",ptmp); }else if ((strlen(s)> 5) && (strncmp(s,"data:",5) == 0) ) { char* ptmp=s+5; - PRINT("data %s\r\n",ptmp); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"data %s\r\n",ptmp); pdu_decode_example(ptmp); } } @@ -423,20 +423,20 @@ static int decodeVersion(char* msg) if (strlen(msg) < 50) { - PRINT("msg len is too short !\r\n"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"msg len is too short !\r\n"); return -1; } char buf[200] = {0}; if (strncmp(msg,BOOTMSG_HEADER_STR,BOOTMSG_HEADER_STR_LEN) ==0) { strcpy(buf,msg+BOOTMSG_HEADER_STR_LEN+1); - // PRINT("BOOTMSG =============\r\n"); + // WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"BOOTMSG =============\r\n"); } else if (strncmp(msg,VERMSG_HEADER_STR,VERMSG_HEADER_STR_LEN) ==0) { strcpy(buf,msg); - // PRINT("version =============\r\n"); + // WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"version =============\r\n"); }else{ return -2; @@ -455,7 +455,7 @@ static int decodeVersion(char* msg) { char* ptmp=s+6; char* pyverstr = uapi_dev_runtime_get_cat1_pyver(); - PRINT("pyVer %s to %s\r\n",pyverstr,ptmp); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"pyVer %s to %s\r\n",pyverstr,ptmp); if ( strcmp(pyverstr,ptmp)!=0 ) { update++; @@ -471,7 +471,7 @@ static int decodeVersion(char* msg) { char* ptmp=s+9; char* modemverstr=uapi_dev_runtime_get_cat1_modemver(); - PRINT("modemVer %s to %s\r\n",modemverstr,ptmp); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"modemVer %s to %s\r\n",modemverstr,ptmp); if (strcmp(modemverstr,ptmp) != 0) { @@ -481,7 +481,7 @@ static int decodeVersion(char* msg) } else if (strncmp(s,"PY_",3) == 0 ) { char* pyverstr = uapi_dev_runtime_get_cat1_pyver(); - PRINT("pyVer %s to %s\r\n",pyverstr,s); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"pyVer %s to %s\r\n",pyverstr,s); if ( strcmp(pyverstr,s)!=0 ) { @@ -493,7 +493,7 @@ static int decodeVersion(char* msg) { char* modemverstr=uapi_dev_runtime_get_cat1_modemver(); - PRINT("modemVer %s to %s\r\n",modemverstr,s); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"modemVer %s to %s\r\n",modemverstr,s); if (strcmp(modemverstr,s) != 0) { update++; @@ -517,7 +517,7 @@ static int decodeNetStat(char* msg) int update = 0; if (strlen(msg) < 50) { - PRINT("msg len is too short !\r\n"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"msg len is too short !\r\n"); return -1; } char buf[200] = {0}; @@ -545,12 +545,12 @@ static int decodeNetStat(char* msg) char* ppbuf = NULL; for (s = strtok_r(buf,p,&pchStrTmpIn); s!=NULL;s=strtok_r(NULL,p,&pchStrTmpIn)) { - // PRINT("%s\r\n",s ); + // WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"%s\r\n",s ); if(strncmp(s,"imei:",5) == 0) { ppbuf = s+5; char* imei = uapi_dev_runtime_get_cat1_imei(); - PRINT("=== imei %s to %s\r\n",imei,ppbuf); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"=== imei %s to %s\r\n",imei,ppbuf); if ( strcmp(imei,ppbuf)!=0 ) { update++; @@ -561,7 +561,7 @@ static int decodeNetStat(char* msg) { ppbuf=s+4; int simstat = atoi(ppbuf); - PRINT("=== sim = %d\r\n",simstat); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"=== sim = %d\r\n",simstat); if ( uapi_dev_runtime_get_cat1_simstat() != simstat) { update++; @@ -578,7 +578,7 @@ static int decodeNetStat(char* msg) char* opera=uapi_dev_runtime_get_cat1_operator(); - PRINT("=== opera %s to %s\r\n",opera,ppbuf); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"=== opera %s to %s\r\n",opera,ppbuf); if ( strcmp(opera,ppbuf)!=0 ) { update++; @@ -590,7 +590,7 @@ static int decodeNetStat(char* msg) { ppbuf=s+7; int signals = atoi(ppbuf); - PRINT("=== signal = %d\r\n",signals); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"=== signal = %d\r\n",signals); if ( uapi_dev_runtime_get_cat1_signal() != signals) { update++; @@ -640,16 +640,16 @@ static int decodeNetStat(char* msg) { int idx=0; pchStrTmpIn=NULL; - // PRINT("netstat %s\n",netstat); + // WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"netstat %s\n",netstat); for (s = strtok_r(netstat,",",&pchStrTmpIn); s!=NULL;s=strtok_r(NULL,",",&pchStrTmpIn)) { - // PRINT("idx %d, value %s\n",idx,s); + // WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"idx %d, value %s\n",idx,s); switch(idx) { case 2: { int networkon = atoi(s) ; - PRINT("=== networkon = %d , %s \n",networkon,networkon==1?"connected":networkon==5?"roaming":"unkown"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"=== networkon = %d , %s \n",networkon,networkon==1?"connected":networkon==5?"roaming":"unkown"); switch(networkon) { case 1: @@ -667,7 +667,7 @@ static int decodeNetStat(char* msg) case 3: { int network_type = atoi(s); - PRINT("=== network_type = %d , %s\n",network_type, + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"=== network_type = %d , %s\n",network_type, network_type==0?"GSM":network_type==1?"GSM COMPACT":network_type==2?"UTRAN":network_type==3?"GSM wEGPRS":network_type==4?"UTRAN wHSDPA":network_type==5?"UTRAN wHSUPA":network_type==6?"UTRAN wHSDPA HSUPA":network_type==7?"E_UTRAN":network_type==8?"UTRAN HSPAP":network_type==9?"E_UTRAN_CA":"NONE" ); switch (network_type) @@ -741,7 +741,7 @@ void cat1_getsignal(void) } void cat1_gettime(void) { - PRINT("UDP_CMD_GET_TIME\n"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"UDP_CMD_GET_TIME\n"); udp_send_msg_toCat1(UDP_CMD_GET_TIME,"0"); } @@ -910,11 +910,11 @@ void restart_sleep_cat1_timer(void) static void time_sync_func(void) { - // PRINT("time_sync_func\n"); + // WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"time_sync_func\n"); if (uapi_cat1_get_power_stat() == false ) { - // PRINT("cat1 power off reset cat1_runtime \n"); + // WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"cat1 power off reset cat1_runtime \n"); //开关是关的 则cat1所有状态清空 uapi_dev_runtime_set_cat1_powerstat(0); uapi_dev_runtime_set_cat1_networkstat(0); @@ -1184,10 +1184,10 @@ static int udp_packet_parse(char *rx_buffer, int len) index = cat1_handle_call_disconnected(); break; case UDP_CMD_CAT1_OTA_UPDATE: - PRINT("CAT1_OTA_UPDATE reply %s\n",msg_buffer); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"CAT1_OTA_UPDATE reply %s\n",msg_buffer); break; case UDP_MSG_REPLY: - PRINT("UDP_MSG_REPLY reply %s!!!!!!!\n",msg_buffer); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"UDP_MSG_REPLY reply %s!!!!!!!\n",msg_buffer); //"BOOTUP,pyVer,PY_SRV_V4,modemVer,EG810MCNLAR06A01M08_VOLTE_OCPU_QPY_BETA0312" // VER:xxxxx // ICCID:xxxxxx @@ -1243,9 +1243,9 @@ static int udp_packet_parse(char *rx_buffer, int len) memcpy_s(ble_buffer,20,msg_buffer,strlen(msg_buffer)); if (strlen(msg_buffer) == 0) { - PRINT("ATCMD reply len(0): OK\n"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"ATCMD reply len(0): OK\n"); }else{ - PRINT("ATCMD reply len(%d): %s\n", strlen(msg_buffer),msg_buffer); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"ATCMD reply len(%d): %s\n", strlen(msg_buffer),msg_buffer); } break; case UDP_MSG_SAVE_SIM_ICCID://暂时不用 @@ -1258,7 +1258,7 @@ static int udp_packet_parse(char *rx_buffer, int len) index = cat1_handle_sms(msg_buffer); break; default: - PRINT("error message: %s\n", rx_buffer); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"error message: %s\n", rx_buffer); index = 1; break; } @@ -1289,14 +1289,14 @@ static int udp_socket_init() int listen_sock = socket(addr_family, SOCK_DGRAM, ip_protocol); if (listen_sock < 0) { - PRINT("Unable to create socket: errno %d\n", errno); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"Unable to create socket: errno %d\n", errno); return -1; } setsockopt(listen_sock, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt)); int err = bind(listen_sock, (struct sockaddr *)&destAddr, sizeof(destAddr)); if (err != 0) { - PRINT("Socket unable to bind: errno %d\n", errno); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"Socket unable to bind: errno %d\n", errno); return -1; } @@ -1319,7 +1319,7 @@ void cat1_server_task(void *pvParameters) if( g_listen_sock > 0 ) close(g_listen_sock); g_listen_sock = udp_socket_init(); if( g_listen_sock < 0 ) { - PRINT("socket init fail and retry\n"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"socket init fail and retry\n"); // vTaskDelay(1000/portTICK_RATE_MS); cat1_msleep(1000); continue; @@ -1334,15 +1334,15 @@ void cat1_server_task(void *pvParameters) // Error occured during receiving printf("recv len:%d rx_buffer:%s\r\n",len,rx_buffer); if (len < 0) { - PRINT("recv failed: errno %d\n", errno); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"recv failed: errno %d\n", errno); break; } else if (len == 0) { - PRINT("Connection closed\n"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"Connection closed\n"); break; } // Data received rx_buffer[len] = '\0'; // Null-terminate whatever we received and treat like a string - // PRINT("Received %d bytes, rx_buffer: %s\n", len, rx_buffer); + // WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"Received %d bytes, rx_buffer: %s\n", len, rx_buffer); index = udp_packet_parse(rx_buffer, len); // if( index >= 0 ) { // udp_send_response(tx_buffer, rx_buffer, "OK"/* msg_wifi_resp[index]*/); @@ -1368,7 +1368,7 @@ void cat1_server_task(void *pvParameters) errcode_t cat1_server_init(void) { - PRINT("cat1_server_init !\r\n"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"cat1_server_init !\r\n"); app_task_definition_t taskcfg={0}; taskcfg.create_queue_handle = NULL; taskcfg.attr.name="cat1_service"; @@ -1380,20 +1380,20 @@ errcode_t cat1_server_init(void) errcode_t ret=uapi_create_osThread_custom(&taskcfg); if(ret != ERRCODE_SUCC) { - PRINT("create cat1_service failed %d!\r\n",ret); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"create cat1_service failed %d!\r\n",ret); return ERRCODE_FAIL; } g_timer_time_sync = osTimerNew((osTimerFunc_t)time_sync_func, osTimerPeriodic, NULL, NULL); if (g_timer_time_sync == NULL) - PRINT("g_timer_time_sync create failed\n"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"g_timer_time_sync create failed\n"); restart_time_sync(); #ifdef USE_CAT1_SLEEP_TIMER g_timer_cat1_sleep = osTimerNew((osTimerFunc_t)timeout_handler_sleep_cat1, osTimerPeriodic, NULL, NULL); if (g_timer_cat1_sleep == NULL) - PRINT("g_timer_cat1_sleep create failed\n"); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"g_timer_cat1_sleep create failed\n"); //第一次启动，要确保去除已经添加过的cat1 Vote restart_sleep_cat1_timer(); #endif diff --git a/code/sdk/drivers/peripheral/utils/custom_utils_at_cmd.c b/code/sdk/drivers/peripheral/utils/custom_utils_at_cmd.c index 90044dc72..ab31c6011 100644 --- a/code/sdk/drivers/peripheral/utils/custom_utils_at_cmd.c +++ b/code/sdk/drivers/peripheral/utils/custom_utils_at_cmd.c @@ -58,18 +58,18 @@ static uint32_t custom_utils_setsn(uint8_t *para, uint32_t paraLen, char *strCom int ret = ConvertCmdToParam(para, paraLen, argv, &argc); if (ret != CUSTOM_UTILS_SUCCESS) { - PRINT("CUSTOM_UTILSTEST ATCMD Convert Command Failed\n"); + wstp_print("CUSTOM_UTILSTEST ATCMD Convert Command Failed\n"); return ERRCODE_FAIL; } if (argc != 1) { - PRINT("CUSTOM_UTILSTEST ATCMD Set Parameter Failed argc %d\n",argc); + wstp_print("CUSTOM_UTILSTEST ATCMD Set Parameter Failed argc %d\n",argc); return ERRCODE_FAIL; } uint8_t *sn_buf = (uint8_t*)argv[0]; uint16_t len = strlen((const char*)sn_buf); uint32_t rret = zh_set_sn(sn_buf,len); - PRINT("set sn = %s , len = %d, ret 0x%X\r\n",sn_buf,len, rret); + wstp_print("set sn = %s , len = %d, ret 0x%X\r\n",sn_buf,len, rret); return 0; } @@ -77,7 +77,7 @@ static uint32_t custom_utils_setsn(uint8_t *para, uint32_t paraLen, char *strCom static uint32_t custom_start_ota(uint8_t *para, uint32_t paraLen, char *strCommonCmd) { UNUSED(strCommonCmd); - PRINT("custom_start_ota \r\n"); + wstp_print("custom_start_ota \r\n"); return uaip_cmd_update_request(); } @@ -87,7 +87,7 @@ static uint32_t custom_utils_getsn(uint8_t *para, uint32_t paraLen, char *strCom uint8_t sn_buf[32] = {0}; uint32_t len = 0; uint32_t ret = zh_get_sn(sn_buf,&len); - PRINT("get sn len %d , %s , ret = 0x%X\r\n",len,sn_buf,ret); + wstp_print("get sn len %d , %s , ret = 0x%X\r\n",len,sn_buf,ret); return 0; } @@ -95,7 +95,7 @@ static uint32_t custom_utils_getsn(uint8_t *para, uint32_t paraLen, char *strCom #include "lwip/apps/http_client.h" void httpc_download_result(void *arg, httpc_result_t httpc_result, u32_t rx_content_len, u32_t srv_res, err_t err) { - PRINT("httpc_download_result , httpc_result_t %d, rx_content_len %d , srv_res %d, err %d\n", + wstp_print("httpc_download_result , httpc_result_t %d, rx_content_len %d , srv_res %d, err %d\n", httpc_result,rx_content_len,srv_res,err); //通讯结束，休眠cat1 uapi_cat1_keep_wakeup(0); @@ -104,13 +104,13 @@ void httpc_download_result(void *arg, httpc_result_t httpc_result, u32_t rx_cont static uint32_t file_total_len = 0; err_t httpc_download_headers_done(httpc_state_t *connection, void *arg, struct pbuf *hdr, u16_t hdr_len, u32_t content_len) { - PRINT("httpc_download_headers_done , hdr_len %d ,content_len %d\n",hdr_len,content_len); + wstp_print("httpc_download_headers_done , hdr_len %d ,content_len %d\n",hdr_len,content_len); file_total_len = content_len; return 0; } err_t httpc_download_file_recv_ui(httpc_state_t *connection, u32_t rx_len,u32_t rx_total_len) { - PRINT("httpc_download_file_recv_ui recv %d bytes total received %d filelen %d\r\n",rx_len,rx_total_len,file_total_len); + wstp_print("httpc_download_file_recv_ui recv %d bytes total received %d filelen %d\r\n",rx_len,rx_total_len,file_total_len); return 0; } @@ -160,12 +160,12 @@ static uint32_t custom_start_ota_download(uint8_t *para, uint32_t paraLen, char int ret = ConvertCmdToParam(para, paraLen, argv, &argc); if (ret != CUSTOM_UTILS_SUCCESS) { - PRINT("CUSTOM_UTILSTEST ATCMD Convert Command Failed\n"); + wstp_print("CUSTOM_UTILSTEST ATCMD Convert Command Failed\n"); return ERRCODE_FAIL; } if (argc != 4) { - PRINT("CUSTOM_UTILSTEST ATCMD Set Parameter Failed argc %d\n",argc); + wstp_print("CUSTOM_UTILSTEST ATCMD Set Parameter Failed argc %d\n",argc); return ERRCODE_FAIL; } @@ -175,11 +175,11 @@ static uint32_t custom_start_ota_download(uint8_t *para, uint32_t paraLen, char uint16_t port = atoi((const char*)argv[1]); uint8_t *uri = (uint8_t*)argv[2]; uint8_t *otadatapath = (uint8_t*)argv[3]; - PRINT("custom_start_ota_download %s:%d %s to %s\r\n",server,port,uri,otadatapath); + wstp_print("custom_start_ota_download %s:%d %s to %s\r\n",server,port,uri,otadatapath); httpc_connection_t settings = {0}; size_t calen = sizeof(SSL_CA_PEM); struct altcp_tls_config *tlsconfig = altcp_tls_create_config_client((const uint8_t *)SSL_CA_PEM,calen); - PRINT("custom_start_ota_download pa perm %s \n======len %d \r\n",SSL_CA_PEM,calen); + wstp_print("custom_start_ota_download pa perm %s \n======len %d \r\n",SSL_CA_PEM,calen); g_allocator = malloc(sizeof(altcp_allocator_t)); @@ -206,7 +206,7 @@ static uint32_t custom_start_ota_download(uint8_t *para, uint32_t paraLen, char (const char*) otadatapath, &connection); - PRINT("custom_start_ota_download %d \r\n",rett); + wstp_print("custom_start_ota_download %d \r\n",rett); return ERRCODE_SUCC; } @@ -219,12 +219,12 @@ static uint32_t custom_dsp_power_test(uint8_t *para, uint32_t paraLen, char *str int ret = ConvertCmdToParam(para, paraLen, argv, &argc); if (ret != CUSTOM_UTILS_SUCCESS) { - PRINT("CUSTOM_UTILSTEST ATCMD Convert Command Failed\n"); + wstp_print("CUSTOM_UTILSTEST ATCMD Convert Command Failed\n"); return ERRCODE_FAIL; } if (argc != 1) { - PRINT("CUSTOM_UTILSTEST power_test ATCMD Set Parameter Failed argc %d\r\nPM_DSP_POWER_UP_AND_RUN=2 PM_DSP_POWER_OFF=3\r\n",argc); + wstp_print("CUSTOM_UTILSTEST power_test ATCMD Set Parameter Failed argc %d\r\nPM_DSP_POWER_UP_AND_RUN=2 PM_DSP_POWER_OFF=3\r\n",argc); return ERRCODE_FAIL; } @@ -233,17 +233,17 @@ static uint32_t custom_dsp_power_test(uint8_t *para, uint32_t paraLen, char *str if (cmd == 2 ) { - PRINT("PM_DSP_POWER_UP_AND_RUN=2\r\n",argc); + wstp_print("PM_DSP_POWER_UP_AND_RUN=2\r\n",argc); uapi_pm_control(PM_DSP_POWER_UP_AND_RUN); }else if (cmd ==3 ){ - PRINT("PM_DSP_POWER_OFF=3\r\n",argc); + wstp_print("PM_DSP_POWER_OFF=3\r\n",argc); uapi_pm_control(PM_DSP_POWER_OFF); }else if (cmd ==0 ){ errcode_t ret = gap_ble_stop_scan(); - PRINT("gap_ble_stop_scan ret %x\r\n",ret); + wstp_print("gap_ble_stop_scan ret %x\r\n",ret); }else{ - PRINT("arguments only support PM_DSP_POWER_UP_AND_RUN: 2 or PM_DSP_POWER_OFF: 3\r\n"); + wstp_print("arguments only support PM_DSP_POWER_UP_AND_RUN: 2 or PM_DSP_POWER_OFF: 3\r\n"); } @@ -298,9 +298,9 @@ static uint32_t custom_charge_getstate(uint8_t *para, uint32_t paraLen, char *st UNUSED(strCommonCmd); if(get_charge_stat()) - PRINT("charging\r\n"); + wstp_print("charging\r\n"); else - PRINT("uncharged\r\n"); + wstp_print("uncharged\r\n"); return ERRCODE_SUCC; } @@ -312,7 +312,7 @@ static uint32_t custom_battery_getpower(uint8_t *para, uint32_t paraLen, char *s float vol = 0; uint8_t percent = battery_get_voltage(&vol); - PRINT("voltage : %f , percent %02D\%\r\n",vol,percent); + wstp_print("voltage : %f , percent %02D\%\r\n",vol,percent); return ERRCODE_SUCC; } @@ -323,9 +323,9 @@ static uint32_t custom_battery_gettemp(uint8_t *para, uint32_t paraLen, char *st UNUSED(strCommonCmd); float temp=0.0f; int ret = battery_get_battery_temp(&temp); - PRINT("battery temp %.4f , ret %d\r\n",temp,ret); + wstp_print("battery temp %.4f , ret %d\r\n",temp,ret); ret = battery_get_pcb_temp(&temp); - PRINT("pcb temp %.4f , ret %d\r\n",temp,ret); + wstp_print("pcb temp %.4f , ret %d\r\n",temp,ret); return ERRCODE_SUCC; } @@ -375,12 +375,12 @@ static uint32_t custom_bleservice_test(uint8_t *para, uint32_t paraLen, char *st int ret = ConvertCmdToParam(para, paraLen, argv, &argc); if (ret != CUSTOM_UTILS_SUCCESS) { - PRINT("CUSTOM_UTILSTEST ATCMD Convert Command Failed\n"); + wstp_print("CUSTOM_UTILSTEST ATCMD Convert Command Failed\n"); return ERRCODE_FAIL; } if (argc != 1) { - PRINT("CUSTOM_UTILSTEST ATCMD Set Parameter Failed argc %d\n",argc); + wstp_print("CUSTOM_UTILSTEST ATCMD Set Parameter Failed argc %d\n",argc); return ERRCODE_FAIL; } @@ -402,7 +402,7 @@ static uint32_t custom_get_ppg_id(uint8_t *para, uint32_t paraLen, char *strComm UNUSED(strCommonCmd); uint8_t chip_id = 0; uapi_ppg_get_id(&chip_id); - PRINT("ppg_id[%x]\n",chip_id); + wstp_print("ppg_id[%x]\n",chip_id); return ERRCODE_SUCC; } @@ -413,7 +413,7 @@ static uint32_t custom_get_mmc_id(uint8_t *para, uint32_t paraLen, char *strComm unsigned char id; mmc5603_getid(&id); - PRINT("mmc5603 id : 0x%X \r\n",id); + wstp_print("mmc5603 id : 0x%X \r\n",id); return ERRCODE_SUCC; } @@ -487,18 +487,18 @@ static uint32_t custom_utils_lzmadec(uint8_t *para, uint32_t paraLen, char *strC int ret = ConvertCmdToParam(para, paraLen, argv, &argc); if (ret != CUSTOM_UTILS_SUCCESS) { - PRINT("CUSTOM_UTILSTEST ATCMD Convert Command Failed\n"); + wstp_print("CUSTOM_UTILSTEST ATCMD Convert Command Failed\n"); return ERRCODE_FAIL; } if (argc != 2) { - PRINT("CUSTOM_UTILSTEST ATCMD Set Parameter Failed argc %d\n",argc); + wstp_print("CUSTOM_UTILSTEST ATCMD Set Parameter Failed argc %d\n",argc); return ERRCODE_FAIL; } const char *infile = (const char*)argv[0]; char *outfile = ( char*)argv[1]; uint32_t rret = uapi_dial_pkg_decompress(infile,outfile); - PRINT("extract %s to %s , ret 0x%X\r\n",infile,outfile, rret); + wstp_print("extract %s to %s , ret 0x%X\r\n",infile,outfile, rret); return ERRCODE_SUCC; } @@ -510,12 +510,12 @@ static uint32_t custom_utils_pdudec(uint8_t *para, uint32_t paraLen, char *strCo int ret = ConvertCmdToParam(para, paraLen, argv, &argc); if (ret != CUSTOM_UTILS_SUCCESS) { - PRINT("CUSTOM_UTILSTEST ATCMD Convert Command Failed\n"); + wstp_print("CUSTOM_UTILSTEST ATCMD Convert Command Failed\n"); return ERRCODE_FAIL; } if (argc != 1) { - PRINT("CUSTOM_UTILSTEST ATCMD Set Parameter Failed argc %d\n",argc); + wstp_print("CUSTOM_UTILSTEST ATCMD Set Parameter Failed argc %d\n",argc); return ERRCODE_FAIL; } const char *inpdustr = (const char*)argv[0]; @@ -533,12 +533,12 @@ static uint32_t custom_test_time_synct(uint8_t *para, uint32_t paraLen, char *st int ret = ConvertCmdToParam(para, paraLen, argv, &argc); if (ret != CUSTOM_UTILS_SUCCESS) { - PRINT("CUSTOM_UTILSTEST ATCMD Convert Command Failed\n"); + wstp_print("CUSTOM_UTILSTEST ATCMD Convert Command Failed\n"); return ERRCODE_FAIL; } if (argc != 1) { - PRINT("CUSTOM_UTILSTEST ATCMD Set Parameter Failed argc %d\n",argc); + wstp_print("CUSTOM_UTILSTEST ATCMD Set Parameter Failed argc %d\n",argc); return ERRCODE_FAIL; } uint32_t inpdustr = atol((char*)argv[0]); @@ -556,12 +556,12 @@ static uint32_t custom_test_time_showtype(uint8_t *para, uint32_t paraLen, char int ret = ConvertCmdToParam(para, paraLen, argv, &argc); if (ret != CUSTOM_UTILS_SUCCESS) { - PRINT("CUSTOM_UTILSTEST ATCMD Convert Command Failed\n"); + wstp_print("CUSTOM_UTILSTEST ATCMD Convert Command Failed\n"); return ERRCODE_FAIL; } if (argc != 1) { - PRINT("CUSTOM_UTILSTEST ATCMD Set Parameter Failed argc %d\n",argc); + wstp_print("CUSTOM_UTILSTEST ATCMD Set Parameter Failed argc %d\n",argc); return ERRCODE_FAIL; } uint32_t inpdustr = atol((char*)argv[0]); @@ -570,7 +570,7 @@ static uint32_t custom_test_time_showtype(uint8_t *para, uint32_t paraLen, char { uapi_dev_runtime_set_time_hour_show_model(inpdustr); } else{ - PRINT(" only accept 12 or 24 !\n"); + wstp_print(" only accept 12 or 24 !\n"); } return ERRCODE_SUCC; @@ -589,7 +589,7 @@ static uint32_t custom_test_sntp(uint8_t *para, uint32_t paraLen, char *strCommo sntp_stop(); sntp_init(); } - PRINT("CUSTOM_UTILSTEST ATCMD custom_test_sntp sntp_init \n"); + wstp_print("CUSTOM_UTILSTEST ATCMD custom_test_sntp sntp_init \n"); return ERRCODE_SUCC; } @@ -604,12 +604,12 @@ static uint32_t custom_uapi_efuse_test_write(uint8_t *para, uint32_t paraLen, ch int ret = ConvertCmdToParam(para, paraLen, argv, &argc); if (ret != CUSTOM_UTILS_SUCCESS) { - PRINT("CUSTOM_UTILSTEST ATCMD Convert Command Failed\n"); + wstp_print("CUSTOM_UTILSTEST ATCMD Convert Command Failed\n"); return ERRCODE_FAIL; } if (argc != 3) { - PRINT("CUSTOM_UTILSTEST power_test ATCMD Set Parameter Failed argc %d\r\nPM_DSP_POWER_UP_AND_RUN=2 PM_DSP_POWER_OFF=3\r\n",argc); + wstp_print("CUSTOM_UTILSTEST power_test ATCMD Set Parameter Failed argc %d\r\nPM_DSP_POWER_UP_AND_RUN=2 PM_DSP_POWER_OFF=3\r\n",argc); return ERRCODE_FAIL; } @@ -642,12 +642,12 @@ static uint32_t custom_uapi_efuse_test_read(uint8_t *para, uint32_t paraLen, cha int ret = ConvertCmdToParam(para, paraLen, argv, &argc); if (ret != CUSTOM_UTILS_SUCCESS) { - PRINT("CUSTOM_UTILSTEST ATCMD Convert Command Failed\n"); + wstp_print("CUSTOM_UTILSTEST ATCMD Convert Command Failed\n"); return ERRCODE_FAIL; } if (argc != 2) { - PRINT("CUSTOM_UTILSTEST power_test ATCMD Set Parameter Failed argc %d\r\nPM_DSP_POWER_UP_AND_RUN=2 PM_DSP_POWER_OFF=3\r\n",argc); + wstp_print("CUSTOM_UTILSTEST power_test ATCMD Set Parameter Failed argc %d\r\nPM_DSP_POWER_UP_AND_RUN=2 PM_DSP_POWER_OFF=3\r\n",argc); return ERRCODE_FAIL; } uint32_t add = atol((char*)argv[0]); @@ -667,12 +667,12 @@ static uint32_t custom_task_sched_debug(uint8_t *para, uint32_t paraLen, char *s int ret = ConvertCmdToParam(para, paraLen, argv, &argc); if (ret != CUSTOM_UTILS_SUCCESS) { - PRINT("CUSTOM_UTILSTEST ATCMD Convert Command Failed\n"); + wstp_print("CUSTOM_UTILSTEST ATCMD Convert Command Failed\n"); return ERRCODE_FAIL; } if (argc != 1) { - PRINT("CUSTOM_UTILSTEST power_test ATCMD Set Parameter Failed argc %d\r\n"); + wstp_print("CUSTOM_UTILSTEST power_test ATCMD Set Parameter Failed argc %d\r\n"); return ERRCODE_FAIL; } uint32_t enable = atol((char*)argv[0]); @@ -701,7 +701,7 @@ static uint32_t custom_mem_debug(uint8_t *para, uint32_t paraLen, char *strCommo // 执行恢复出厂设置的操作 uapi_restore_factory_setting(); - PRINT("Restoring Factory Settings...\n"); + wstp_print("Restoring Factory Settings...\n"); return ERRCODE_SUCC; } @@ -717,13 +717,13 @@ static uint32_t custom_mem_debug(uint8_t *para, uint32_t paraLen, char *strCommo int ret = ConvertCmdToParam(para, paraLen, argv, &argc); if (ret != CUSTOM_UTILS_SUCCESS) { - PRINT("CUSTOM_UTILSTEST ATCMD Convert Command Failed\n"); + wstp_print("CUSTOM_UTILSTEST ATCMD Convert Command Failed\n"); return ERRCODE_FAIL; } if (argc != 1) { - PRINT("CUSTOM_UTILSTEST power_test ATCMD Set Parameter Failed argc %d\r\n"); + wstp_print("CUSTOM_UTILSTEST power_test ATCMD Set Parameter Failed argc %d\r\n"); return ERRCODE_FAIL; } int heartRateDetectionFreq = atol((char *)argv[0]); @@ -731,10 +731,49 @@ static uint32_t custom_mem_debug(uint8_t *para, uint32_t paraLen, char *strCommo // 设置心率检测频率 set_config_heart(heartRateDetectionFreq); - PRINT("heartRateDetectionFreq is %d\n", heartRateDetectionFreq); + wstp_print("heartRateDetectionFreq is %d\n", heartRateDetectionFreq); return ERRCODE_SUCC; } #endif + +static uint32_t custom_get_cywee_chip_info(uint8_t *para, uint32_t paraLen, char *strCommonCmd) +{ + + UNUSED(strCommonCmd); + + char chipinfo[64] = {0}; + uapi_cywee_get_chipinfo(chipinfo,sizeof(chipinfo)); + wstp_print("cywee_chip_info:%s\n",chipinfo); + return ERRCODE_SUCC; +} + +static uint32_t custom_get_bt_addr(uint8_t *para, uint32_t paraLen, char *strCommonCmd) +{ + + UNUSED(strCommonCmd); + + uint8_t bt_addr[6] = {0}; + uint32_t len = 6; + uapi_get_nv_btaddr(bt_addr, &len); + wstp_print("bt_mac_addr:"); + for (int i = 0; i < len; i++) + { + wstp_print("%02X", bt_addr[i]); + } + wstp_print("\n"); + return ERRCODE_SUCC; +} + +static uint32_t custom_get_imei(uint8_t *para, uint32_t paraLen, char *strCommonCmd) +{ + + UNUSED(strCommonCmd); + + char* imei = uapi_dev_runtime_get_cat1_imei(); + wstp_print("imei:%s\n",imei); + return ERRCODE_SUCC; +} + extern void lsfd(void); static uint32_t custom_lsfd(uint8_t *para, uint32_t paraLen, char *strCommonCmd) { @@ -799,6 +838,10 @@ static const at_cmd_table_t g_custom_utils_cmd[] = { {(char *)"AT^SETHEART", custom_set_heart, (char *)" "}, {(char *)"AT^LSFD", custom_lsfd, (char *)" "}, + {(char *)"AT^GETMAC", custom_get_bt_addr, (char *)" "}, + {(char *)"AT^GETIMEI", custom_get_imei, (char *)" "}, + {(char *)"AT^GETCHIPINFO", custom_get_cywee_chip_info, (char *)" "}, + }; -- 2.17.1