From e58f8b7494aa4ca275dec6ac99f0e08cc62be2fb Mon Sep 17 00:00:00 2001 From: SnickerSun Date: Sat, 27 Jul 2024 11:23:13 +0800 Subject: [PATCH] =?utf8?q?=E6=B7=BB=E5=8A=A0A5133=20Client=E5=92=8CServer?= =?utf8?q?=20=E4=B8=8D=E4=BC=91=E7=9C=A0=E8=83=BD=E5=8A=9B=EF=BC=8C?= =?utf8?q?=E6=96=B9=E4=BE=BF=E6=BC=94=E7=A4=BA=E3=80=82=20=E9=98=B2?= =?utf8?q?=E6=AD=A2UI=E6=93=8D=E4=BD=9C=E5=85=B3=E9=97=AD5133=E7=94=B5?= =?utf8?q?=E6=BA=90=EF=BC=8C=E5=BD=B1=E5=93=8DA5133=E6=BC=94=E7=A4=BA?= =?utf8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../networkandcall/src/NetworkAndCallPresenter.cpp | 8 ++++++-- .../wearable/ohos_startup/ohosfwk_startup.c | 6 ++++++ .../sdk/build/config/target_config/brandy/config.py | 2 +- code/sdk/drivers/peripheral/a5133/A5133Main.c | 13 +++++++++++-- code/sdk/drivers/peripheral/utils/custom_utils.c | 5 ++++- code/sdk/drivers/peripheral/utils/custom_utils.h | 6 ++++++ 6 files changed, 34 insertions(+), 6 deletions(-) diff --git a/code/sdk/application/wearable/fd230app/nativeui/networkandcall/src/NetworkAndCallPresenter.cpp b/code/sdk/application/wearable/fd230app/nativeui/networkandcall/src/NetworkAndCallPresenter.cpp index f456ea7a3..39526c799 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/networkandcall/src/NetworkAndCallPresenter.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/networkandcall/src/NetworkAndCallPresenter.cpp @@ -1,8 +1,8 @@ /* * @Author: luozheng 1732036298@qq.com * @Date: 2024-04-23 09:59:32 - * @LastEditors: penglei 1624952103@qq.com - * @LastEditTime: 2024-07-19 14:53:51 + * @LastEditors: SnickerSun snickersun@163.com + * @LastEditTime: 2024-07-27 11:19:24 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/networkandcall/src/NetworkAndCallPresenter.cpp */ #include "AppViewIDs.h" @@ -104,7 +104,11 @@ namespace OHOS } else if (it->second == "4GCapability") { + #if defined(A5133_DEMO_CLIENT) || defined(A5133_DEMO_SERVER) + uapi_set4GCapability(true); + #else uapi_set4GCapability(false); + #endif ConfigModel::GetInstance()->SetCat1_4Gability(uapi_cat1_get_power_stat()); } } diff --git a/code/sdk/application/wearable/ohos_startup/ohosfwk_startup.c b/code/sdk/application/wearable/ohos_startup/ohosfwk_startup.c index abdfc2c8e..0d2b8bdcc 100755 --- a/code/sdk/application/wearable/ohos_startup/ohosfwk_startup.c +++ b/code/sdk/application/wearable/ohos_startup/ohosfwk_startup.c @@ -54,8 +54,12 @@ void ohos_startup() #ifdef SUPPORT_POWER_MANAGER const power_display_svr_api_t *display_api = power_display_svr_get_api(); display_api->turn_on_screen(); +#if defined(A5133_DEMO_SERVER) || defined(A5133_DEMO_CLIENT) + display_api->set_screen_set_keepon_timeout(-1); +#else display_api->set_screen_set_keepon_timeout(25000); #endif +#endif #if defined(CONFIG_OTA_UPDATE_SUPPORT) && defined(ENABLE_UIKIT) @@ -96,7 +100,9 @@ boot_animation_init_deinit(); #ifdef SUPPORT_POWER_MANAGER // const power_display_svr_api_t *display_api = power_display_svr_get_api(); // display_api->turn_on_screen(); +#if !defined(A5133_DEMO_SERVER) && !defined(A5133_DEMO_CLIENT) display_api->set_screen_set_keepon_timeout(0); +#endif // display_api->set_screen_set_keepon_timeout(5000); #endif } diff --git a/code/sdk/build/config/target_config/brandy/config.py b/code/sdk/build/config/target_config/brandy/config.py index ced5577e2..d54f53551 100755 --- a/code/sdk/build/config/target_config/brandy/config.py +++ b/code/sdk/build/config/target_config/brandy/config.py @@ -211,11 +211,11 @@ target = { 'base_target_name': 'brandy-native-js', 'defines': ['SUPPORT_A5133_SERVICE' ,'A5133_DEMO_SERVER' + # ,'A5133_DEMO_CLIENT' ,'DISABLE_ENCODER' ,'-:ENABLE_CYWEE' ,'-:SUPPORT_ALIPAY_SEC' # 'WEARABLE_LOG_DEBUG', - # ,'A5133_DEMO_CLIENT' # ,'A5133_USE_HW_SPI' ], 'ram_component':["driver_a5133","a5133_service"], diff --git a/code/sdk/drivers/peripheral/a5133/A5133Main.c b/code/sdk/drivers/peripheral/a5133/A5133Main.c index a265ccf1c..b9d499c02 100644 --- a/code/sdk/drivers/peripheral/a5133/A5133Main.c +++ b/code/sdk/drivers/peripheral/a5133/A5133Main.c @@ -275,6 +275,12 @@ void ISR_Timer0 (void) //interrupt 1 Slot_TX=1; TimerCnt++; + + //发送数据切换 + #ifdef A5133_DEMO_SERVER + if (TimerCnt >=100) + a5133_demo_msg_change_callback(); + #else if (TimerCnt >=500) { TimerCnt=0; @@ -284,12 +290,15 @@ void ISR_Timer0 (void) //interrupt 1 memcpy(&CmdBuf[5], &Err_Frame, 2); memcpy(&CmdBuf[7], &Err_BitCnt, 4); - //输出日志 - PRINT("=====RxCnt %d , Err_Loss %d , Err_Frame %d , Err_BitCnt %d \n",RxCnt,Err_Loss,Err_Frame,Err_BitCnt); // UartSendCnt=12; // Uartptr=&CmdBuf[0]; // SBUF=CmdBuf[0]; + + + //输出日志 + PRINT("=====RxCnt %d , Err_Loss %d , Err_Frame %d , Err_BitCnt %d \n",RxCnt,Err_Loss,Err_Frame,Err_BitCnt); } + #endif } /************************************************************************ diff --git a/code/sdk/drivers/peripheral/utils/custom_utils.c b/code/sdk/drivers/peripheral/utils/custom_utils.c index 53e914046..e0f182907 100644 --- a/code/sdk/drivers/peripheral/utils/custom_utils.c +++ b/code/sdk/drivers/peripheral/utils/custom_utils.c @@ -312,7 +312,7 @@ uint8_t a5133_demo_msg_send[2][64]={ "前方道路拥堵，请减速慢行，注意安全！" }; static uint8_t a5133_demo_msg_send_index=0; -static void a5133_demo_msg_change_callback(void) +void a5133_demo_msg_change_callback(void) { uint8_t* p_msg = (uint8_t*)&a5133_demo_msg_send[a5133_demo_msg_send_index]; int msg_len = strlen((char*)p_msg); @@ -383,7 +383,10 @@ void startup_post_init_task(void) a5133_demo_msg_change_callback(); send_a5133_cmd_msg(A5133_SERVICE_CMD_TYPE_RUN_MASTER); // ScreenAlwaysOnCtr(true); +#elif defined(A5133_DEMO_CLIENT) + send_a5133_cmd_msg(A5133_SERVICE_CMD_TYPE_RUN_SLAVE); #endif + } void startup_post_init(void) diff --git a/code/sdk/drivers/peripheral/utils/custom_utils.h b/code/sdk/drivers/peripheral/utils/custom_utils.h index b00a4eb9f..83363cdee 100644 --- a/code/sdk/drivers/peripheral/utils/custom_utils.h +++ b/code/sdk/drivers/peripheral/utils/custom_utils.h @@ -242,6 +242,12 @@ void uapi_get_a5133_rxdata(uint8_t *databuf,uint8_t len); uint16_t CRC16_XMODEM(uint8_t *bytes,uint16_t length); errcode_t uapi_a5133_set_send_data(uint8_t *senddata,uint8_t datalen); + + +#ifdef A5133_DEMO_SERVER +void a5133_demo_msg_change_callback(void); +#endif + #include "custom_utilscpp.h" -- 2.17.1