From: SnickerSun Date: Fri, 26 Jul 2024 14:46:16 +0000 (+0800) Subject: A5133 发送协议修复,更新lt22编译参数 X-Git-Tag: release_V1.2.70_20241020_135402~741^2~4^2 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=refs%2Fchanges%2F598%2F1;p=mirrors%2FFD230.git A5133 发送协议修复,更新lt22编译参数 --- diff --git a/code/sdk/application/brandy/brandy_standard/thread_pri_init.c b/code/sdk/application/brandy/brandy_standard/thread_pri_init.c index a647b6775..309efcba1 100755 --- a/code/sdk/application/brandy/brandy_standard/thread_pri_init.c +++ b/code/sdk/application/brandy/brandy_standard/thread_pri_init.c @@ -463,10 +463,12 @@ static void thread_main(const void *unused) uapi_blesrv_service_init(); start_custom_ble_service(); - + #ifdef SUPPORT_ALIPAY_SEC +#if !defined(A5133_DEMO_SERVER) && !defined(A5133_DEMO_CLIENT) uapi_alipay_svr_init(); #endif +#endif #ifdef SUPPORT_A5133_SERVICE uapi_a5133_service_init(); diff --git a/code/sdk/build/config/target_config/brandy/config.py b/code/sdk/build/config/target_config/brandy/config.py index db3586c75..ced5577e2 100755 --- a/code/sdk/build/config/target_config/brandy/config.py +++ b/code/sdk/build/config/target_config/brandy/config.py @@ -210,7 +210,13 @@ target = { 'brandy-native-js-lt22': { 'base_target_name': 'brandy-native-js', 'defines': ['SUPPORT_A5133_SERVICE' - #,'A5133_USE_HW_SPI' + ,'A5133_DEMO_SERVER' + ,'DISABLE_ENCODER' + ,'-:ENABLE_CYWEE' + ,'-:SUPPORT_ALIPAY_SEC' + # 'WEARABLE_LOG_DEBUG', + # ,'A5133_DEMO_CLIENT' + # ,'A5133_USE_HW_SPI' ], 'ram_component':["driver_a5133","a5133_service"], 'fs_image_path':'fd230', diff --git a/code/sdk/drivers/peripheral/utils/custom_utils.c b/code/sdk/drivers/peripheral/utils/custom_utils.c index 37a7840e2..53e914046 100644 --- a/code/sdk/drivers/peripheral/utils/custom_utils.c +++ b/code/sdk/drivers/peripheral/utils/custom_utils.c @@ -59,9 +59,10 @@ #include "microtar.h" #include "mag_service.h" #include "ppg_service.h" - #ifdef SUPPORT_A5133_SERVICE #include "A5133main.h" +#include "service/a5133_service.h" +#include "input_app.h" #endif errcode_t uapi_create_osThread_custom(app_task_definition_t *task_cfg) @@ -303,6 +304,26 @@ bool stop_alipay_ble_service(void) ble_avd_mode_change(0); return true; } + +#ifdef A5133_DEMO_SERVER + +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) +{ + uint8_t* p_msg = (uint8_t*)&a5133_demo_msg_send[a5133_demo_msg_send_index]; + int msg_len = strlen((char*)p_msg); + uapi_a5133_set_send_data(p_msg,msg_len); + PRINT("a5133 send msg[%d] %s"NEWLINE,a5133_demo_msg_send_index,p_msg); + if(a5133_demo_msg_send_index == 0) + a5133_demo_msg_send_index = 1; + else + a5133_demo_msg_send_index = 0; +} +#endif void startup_post_init_task(void) { uint8_t day = 0; @@ -357,6 +378,12 @@ void startup_post_init_task(void) { do_cywee_service_check_msg(CYWEE_SERVICE_CMD_RESET_DAILY_DATA,NULL); } +#ifdef A5133_DEMO_SERVER + uapi_button_register_event_cb(a5133_demo_msg_change_callback, BUTTON_PWR_CLICKUP); + a5133_demo_msg_change_callback(); + send_a5133_cmd_msg(A5133_SERVICE_CMD_TYPE_RUN_MASTER); + // ScreenAlwaysOnCtr(true); +#endif } void startup_post_init(void) @@ -2269,6 +2296,11 @@ int custom_exit_lpm(void) return ret; } +#else +int custom_exit_lpm(void) +{ + return 0; +} #endif int32_t uapi_microhone_switch(bool isopen)