添加A5133 Client和Server 不休眠能力，方便演示。

防止UI操作关闭5133电源，影响A5133演示。

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 f456ea7..39526c7 100644 (file)
--- 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 abdfc2c..0d2b8bd 100755 (executable)
--- 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 ced5577..d54f535 100755 (executable)
--- 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 a265ccf..b9d499c 100644 (file)
--- 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;\r
 \r
        TimerCnt++;\r
+\r
+               //发送数据切换\r
+       #ifdef A5133_DEMO_SERVER\r
+       if (TimerCnt >=100)\r
+       a5133_demo_msg_change_callback();\r
+       #else\r
        if (TimerCnt >=500)\r
        {\r
                TimerCnt=0;\r
@@ -284,12 +290,15 @@ void ISR_Timer0 (void) //interrupt 1
                memcpy(&CmdBuf[5], &Err_Frame, 2);\r
                memcpy(&CmdBuf[7], &Err_BitCnt, 4);\r
 \r
-               //输出日志\r
-               PRINT("=====RxCnt %d , Err_Loss %d , Err_Frame %d , Err_BitCnt %d \n",RxCnt,Err_Loss,Err_Frame,Err_BitCnt);\r
                // UartSendCnt=12;\r
                // Uartptr=&CmdBuf[0];\r
                // SBUF=CmdBuf[0];\r
+\r
+       \r
+               //输出日志\r
+               PRINT("=====RxCnt %d , Err_Loss %d , Err_Frame %d , Err_BitCnt %d \n",RxCnt,Err_Loss,Err_Frame,Err_BitCnt);\r
        }\r
+       #endif\r
 }\r
 \r
 /************************************************************************\r

diff --git a/code/sdk/drivers/peripheral/utils/custom_utils.c b/code/sdk/drivers/peripheral/utils/custom_utils.c
index 53e9140..e0f1829 100644 (file)
--- 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 b00a4eb..83363cd 100644 (file)
--- 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"