From: penglei <1624952103@qq.com> Date: Mon, 18 Aug 2025 01:59:57 +0000 (+0800) Subject: 修复N9蓝牙地址为空bug,支持日志与gnss动态切换,优化UI产测,蓝牙产测 X-Git-Tag: leiniao_debug_1.0.0_20250922_020716~99^2~37 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=9512388e483a36973849f42b70b6bdefd59d47ab;p=mirrors%2FFD230.git 修复N9蓝牙地址为空bug,支持日志与gnss动态切换,优化UI产测,蓝牙产测 --- diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/goal/src/goalmodel.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/goal/src/goalmodel.cpp index af8d178cc..272aff00b 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/goal/src/goalmodel.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/goal/src/goalmodel.cpp @@ -2,7 +2,7 @@ * @Author: luozheng 1732036298@qq.com * @Date: 2024-04-08 18:40:09 * @LastEditors: penglei 1624952103@qq.com - * @LastEditTime: 2025-05-20 10:36:33 + * @LastEditTime: 2025-08-12 10:29:17 * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/weather/src/GoalModel.cpp */ #include "goal/include/goalmodel.h" @@ -15,6 +15,10 @@ #include "custom_utils.h" // #include "cywee_ble_service.h" // #include "goalmodel.h" + +#ifdef SUPPORT_CYWEE_SERVICE +#include "cywee_data.h" +#endif namespace OHOS { @@ -44,7 +48,7 @@ namespace OHOS // stand_goal=ConfigModel::GetInstance()->get_configData_int(ConfigModel::CONFIGMODEL_ITEM_SPORTS_GOAL_STANDUP_TIMES); #ifdef SUPPORT_CYWEE_SERVICE - // standdata_now=cywee_get_now_stand_count(); + standdata_now = cywee_get_now_stand_count(); #endif // show_step=goal_parse_step_data(); diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/uiservice/src/ui_service.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/uiservice/src/ui_service.cpp index 78c68bbad..c393b370b 100644 --- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/uiservice/src/ui_service.cpp +++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/uiservice/src/ui_service.cpp @@ -664,8 +664,8 @@ void HandleUpdateDialState(Request *request) void HandleUpdatelcdMode(int type) { WEARABLE_LOGI(WEARABLE_LOG_MODULE_UI_SERVICE, "HandleUpdateSilentMode"); - // GraphicService::GetInstance()->PostGraphicEvent( - // std::bind(&OHOS::testModel::testModelupdata, OHOS::testModel::GetInstance(), type)); + GraphicService::GetInstance()->PostGraphicEvent( + std::bind(&OHOS::testModel::testModelupdata, OHOS::testModel::GetInstance(), type)); } static void HandleUpdateAlarmInfo(Request *request) diff --git a/code/sdk/build/config/target_config/brandy/config.py b/code/sdk/build/config/target_config/brandy/config.py index 175dbd90f..f2cbfba48 100644 --- a/code/sdk/build/config/target_config/brandy/config.py +++ b/code/sdk/build/config/target_config/brandy/config.py @@ -982,10 +982,10 @@ target = { # 'AILPAY_SUPPORT', 'SUPPORT_FACTORY_SERVICE', # 'MEMORY_CORRUPTION', - # 'SUPPORT_GNSS', - # 'DISABLE_UART_LOG', - # 'CONFIG_GNSS_UART_WITH_FLOWCTRL', - # 'DOWNLOAD_GNSS_SWITCH', + 'SUPPORT_GNSS', + 'DISABLE_UART_LOG', + 'CONFIG_GNSS_UART_WITH_FLOWCTRL', + 'DOWNLOAD_GNSS_SWITCH', 'SUPPORT_GYRO_SERVICE', 'GYRO_SH5001', ], @@ -1024,6 +1024,7 @@ target = { "cywee_dml", "gnss", "pgnss_sample", + # "gnss_sample", "cyweeBleService", "gyro", ], diff --git a/code/sdk/build/config/target_config/brandy/menuconfig/acore/brandy_native_js_n9.config b/code/sdk/build/config/target_config/brandy/menuconfig/acore/brandy_native_js_n9.config new file mode 100644 index 000000000..b4b1e2685 --- /dev/null +++ b/code/sdk/build/config/target_config/brandy/menuconfig/acore/brandy_native_js_n9.config @@ -0,0 +1,18 @@ +# Generated by Kconfig Tool. +# Note: !!!This file can not be modify manually!!! + +# +# Main menu description, show how to use this configuration system. +# + +# +# Product +# + +# +# Config the product. +# +CONFIG_NORFLASH_SIZE=16 + +CONFIG_PSRAM_DENSITY_MB=32 +# end of Product diff --git a/code/sdk/build/config/target_config/brandy/menuconfig/acore/brandy_native_js_n9_ssb.config b/code/sdk/build/config/target_config/brandy/menuconfig/acore/brandy_native_js_n9_ssb.config new file mode 100644 index 000000000..b4b1e2685 --- /dev/null +++ b/code/sdk/build/config/target_config/brandy/menuconfig/acore/brandy_native_js_n9_ssb.config @@ -0,0 +1,18 @@ +# Generated by Kconfig Tool. +# Note: !!!This file can not be modify manually!!! + +# +# Main menu description, show how to use this configuration system. +# + +# +# Product +# + +# +# Config the product. +# +CONFIG_NORFLASH_SIZE=16 + +CONFIG_PSRAM_DENSITY_MB=32 +# end of Product diff --git a/code/sdk/build/config/target_config/brandy/menuconfig/acore/brandy_ssb_native_js_n9.config b/code/sdk/build/config/target_config/brandy/menuconfig/acore/brandy_ssb_native_js_n9.config new file mode 100644 index 000000000..b4b1e2685 --- /dev/null +++ b/code/sdk/build/config/target_config/brandy/menuconfig/acore/brandy_ssb_native_js_n9.config @@ -0,0 +1,18 @@ +# Generated by Kconfig Tool. +# Note: !!!This file can not be modify manually!!! + +# +# Main menu description, show how to use this configuration system. +# + +# +# Product +# + +# +# Config the product. +# +CONFIG_NORFLASH_SIZE=16 + +CONFIG_PSRAM_DENSITY_MB=32 +# end of Product diff --git a/code/sdk/drivers/boards/brandy_evb/board_config/board_w9.h b/code/sdk/drivers/boards/brandy_evb/board_config/board_w9.h index 718933d2c..04ed713f5 100644 --- a/code/sdk/drivers/boards/brandy_evb/board_config/board_w9.h +++ b/code/sdk/drivers/boards/brandy_evb/board_config/board_w9.h @@ -339,7 +339,7 @@ const hal_gpio_config_t g_gpio_function_config[PIN_MAX_NUMBER] = { #ifdef PPG_GH3X2X { S_AGPIO_R6, HAL_GPIO_DIRECTION_INPUT, NULL, GPIO_INTERRUPT_RISING_EDGE, ppg_int_callback}, #elif defined PPG_PAH8009 - { S_AGPIO_R6, HAL_GPIO_DIRECTION_INPUT, NULL, GPIO_INTERRUPT_FALLING_EDGE, ppg_int_callback}, + // { S_AGPIO_R6, HAL_GPIO_DIRECTION_INPUT, NULL, GPIO_INTERRUPT_FALLING_EDGE, ppg_int_callback}, #endif #endif #ifdef ROTARYENCODER_MIXO diff --git a/code/sdk/drivers/chips/brandy/include/platform_core.h b/code/sdk/drivers/chips/brandy/include/platform_core.h index ca609c58d..3ea2c1e82 100644 --- a/code/sdk/drivers/chips/brandy/include/platform_core.h +++ b/code/sdk/drivers/chips/brandy/include/platform_core.h @@ -165,11 +165,12 @@ * Maximum UART buses * Defined here rather than in the uart_bus_t enum, due to needing to use it for conditional compilation */ -#ifdef DISABLE_UART_LOG -#define UART_BUS_MAX_NUMBER 3 // !< Max number of UARTS available -#else -#define UART_BUS_MAX_NUMBER 2 // !< Max number of UARTS available -#endif +// #ifdef DISABLE_UART_LOG +// #define UART_BUS_MAX_NUMBER 3 // !< Max number of UARTS available +// #else +// #define UART_BUS_MAX_NUMBER 2 // !< Max number of UARTS available +// #endif +#define UART_BUS_MAX_NUMBER 3 #define I2C_BUS_MAX_NUMBER 4 // !< Max number of I2C available #define I2C_4_IRQn I2C_0_IRQN #define I2C_5_IRQn I2C_0_IRQN @@ -197,7 +198,7 @@ #define CODELOADER_UART_TX_PIN S_MGPIO33 #define CODELOADER_UART_RX_PIN S_MGPIO34 -#if 0 +// #if 0 #define LOG_UART_BUS UART_BUS_1 #define LOG_UART_TX_PIN S_MGPIO33 #define LOG_UART_RX_PIN S_MGPIO34 @@ -217,40 +218,40 @@ #define CHIP_FIXED_RX_PIN S_MGPIO34 #endif #endif -#endif -#ifdef DISABLE_UART_LOG +// #endif +// #ifdef DISABLE_UART_LOG -#define SW_DEBUG_UART_BUS UART_BUS_2 -#define CHIP_FIXED_TX_PIN PIN_NONE -#define CHIP_FIXED_RX_PIN PIN_NONE +// #define SW_DEBUG_UART_BUS UART_BUS_2 +// #define CHIP_FIXED_TX_PIN PIN_NONE +// #define CHIP_FIXED_RX_PIN PIN_NONE -#define LOG_UART_BUS UART_BUS_2 -#define LOG_UART_TX_PIN PIN_NONE -#define LOG_UART_RX_PIN PIN_NONE -#else +// #define LOG_UART_BUS UART_BUS_2 +// #define LOG_UART_TX_PIN PIN_NONE +// #define LOG_UART_RX_PIN PIN_NONE +// #else -#ifndef FT_SINGLE_UART -#define SW_DEBUG_UART_BUS UART_BUS_0 -#define CHIP_FIXED_TX_PIN S_MGPIO19 -#define CHIP_FIXED_RX_PIN S_MGPIO20 +// #ifndef FT_SINGLE_UART +// #define SW_DEBUG_UART_BUS UART_BUS_0 +// #define CHIP_FIXED_TX_PIN S_MGPIO19 +// #define CHIP_FIXED_RX_PIN S_MGPIO20 -#define LOG_UART_BUS UART_BUS_0 -#define LOG_UART_TX_PIN S_MGPIO19 -#define LOG_UART_RX_PIN S_MGPIO20 +// #define LOG_UART_BUS UART_BUS_0 +// #define LOG_UART_TX_PIN S_MGPIO19 +// #define LOG_UART_RX_PIN S_MGPIO20 -#else -#define SW_DEBUG_UART_BUS UART_BUS_1 -#define CHIP_FIXED_TX_PIN S_MGPIO33 -#define CHIP_FIXED_RX_PIN S_MGPIO34 +// #else +// #define SW_DEBUG_UART_BUS UART_BUS_1 +// #define CHIP_FIXED_TX_PIN S_MGPIO33 +// #define CHIP_FIXED_RX_PIN S_MGPIO34 -#define LOG_UART_BUS UART_BUS_1 -#define LOG_UART_TX_PIN S_MGPIO33 -#define LOG_UART_RX_PIN S_MGPIO34 +// #define LOG_UART_BUS UART_BUS_1 +// #define LOG_UART_TX_PIN S_MGPIO33 +// #define LOG_UART_RX_PIN S_MGPIO34 -#endif +// #endif -#endif +// #endif #define CHIP_FIXED_UART_BUS UART_BUS_0 diff --git a/code/sdk/drivers/chips/brandy/porting/uart/uart_porting.c b/code/sdk/drivers/chips/brandy/porting/uart/uart_porting.c index 4ae9e54c0..746720b7a 100644 --- a/code/sdk/drivers/chips/brandy/porting/uart/uart_porting.c +++ b/code/sdk/drivers/chips/brandy/porting/uart/uart_porting.c @@ -96,9 +96,9 @@ uintptr_t uart_porting_base_addr_get(uart_bus_t bus) static bool g_sw_debug_uart_enabled = false; uint8_t g_uart0_rx_buffer[UART_RX_BUFFER_SIZE]; uint8_t g_uart1_rx_buffer[UART_RX_BUFFER_SIZE]; -#ifdef DISABLE_UART_LOG +// #ifdef DISABLE_UART_LOG uint8_t g_uart2_rx_buffer[UART_RX_BUFFER_SIZE]; -#endif +// #endif #if defined(SUPPORT_AT_CMD) static void at_cmd_uart_rx_callback(const void *buf, uint16_t buf_len, bool remaining); #endif @@ -248,7 +248,7 @@ static uart_config_t g_uart_config[UART_BUS_MAX_NUMBER] = { NULL, false } -#ifdef DISABLE_UART_LOG +// #ifdef DISABLE_UART_LOG , /* UART_BUS_2 is used to hso uart */ { @@ -282,7 +282,7 @@ static uart_config_t g_uart_config[UART_BUS_MAX_NUMBER] = { false } -#endif +// #endif #endif }; static uart_recovery_regs_t g_uart_recovery_reg[UART_BUS_MAX_NUMBER] = { 0 }; diff --git a/code/sdk/drivers/drivers/driver/uart/uart.c b/code/sdk/drivers/drivers/driver/uart/uart.c index 6ee7b5e82..8c91db848 100644 --- a/code/sdk/drivers/drivers/driver/uart/uart.c +++ b/code/sdk/drivers/drivers/driver/uart/uart.c @@ -18,6 +18,10 @@ #include "pm_veto.h" #endif +#ifdef SUPPORT_GNSS +#include "pgnss_sample.h" +#endif + /** * @brief Maximum number of fragments per uart for transmission. * Configurable field that specifies the maximum numbers of transmissions the driver can queue @@ -395,6 +399,22 @@ errcode_t uapi_uart_register_frame_error_callback(uart_bus_t bus, uart_error_cal #if defined(CONFIG_UART_SUPPORT_TX) int32_t uapi_uart_write(uart_bus_t bus, const uint8_t *buffer, uint32_t length, uint32_t timeout) { +#ifdef SUPPORT_GNSS + if (getPGnssServerStat() == 1 && timeout != 0xFFFFFFF3) + return -1; + + // if (getPGnssServerStat() == 1 && timeout == 0xFFFFFFF3 && !stat) + // { + // stat = 1; + // } + + // if (getPGnssServerStat() == 0 && stat) + // { + // stat = 0; + // sw_debug_uart_deinit(); + // uart_config_init(); + // } +#endif unused(timeout); bool tx_fifo_full = false; hal_uart_funcs_t *hal_funcs = hal_uart_get_funcs(bus); @@ -668,6 +688,23 @@ int32_t uapi_uart_read_by_dma(uart_bus_t bus, const void *buffer, uint32_t lengt #if defined(CONFIG_UART_SUPPORT_RX) int32_t uapi_uart_read(uart_bus_t bus, const uint8_t *buffer, uint32_t length, uint32_t timeout) { + +#ifdef SUPPORT_GNSS + if (getPGnssServerStat() == 1 && timeout != 0xFFFFFFF3) + return -1; + + // if (getPGnssServerStat() == 1 && timeout == 0xFFFFFFF3 && !stat) + // { + // stat = 1; + // } + + // if (getPGnssServerStat() == 0 && stat) + // { + // stat = 0; + // sw_debug_uart_deinit(); + // uart_config_init(); + // } +#endif unused(timeout); bool rx_fifo_empty = false; diff --git a/code/sdk/middleware/chips/brandy/pm/service/pm_sleep.c b/code/sdk/middleware/chips/brandy/pm/service/pm_sleep.c index 04b0d18d6..302ac88fd 100644 --- a/code/sdk/middleware/chips/brandy/pm/service/pm_sleep.c +++ b/code/sdk/middleware/chips/brandy/pm/service/pm_sleep.c @@ -179,6 +179,15 @@ void pm_wkup_event_by_ulp_callback(void) hal_reboot_chip(); } +void pm_wkup_event_by_uart_callback(void) +{ + + #ifndef SUPPORT_RECOVERY_DISPLAY //判定是否是在编译RECOVERY image,本参数不支持RECOVERY + if (uapi_custom_uart_rx_enable_flag()) + #endif + uapi_pm_add_sleep_veto(PM_ID_DEBUG); +} + void pm_enter_deep_sleep_only_ulp_wakeup(void) { reg16_clrbit(0x520003e4, 0x3); // close mdam clock in deepsleep @@ -215,7 +224,17 @@ void pm_enter_deep_sleep_only_ulp_wakeup(void) pm_core_resume_min(); pm_dev_resume(); } - uint16_t status = pmu_lpm_wakeup_get_status(LPM_EVT_ACTION, PMU_LPM_MCPU_ULP_WAKEUP); + uint16_t status = 0; +#ifndef SUPPORT_GNSS +#ifndef FT_SINGLE_UART + status = pmu_lpm_wakeup_get_status(LPM_EVT_ACTION, PMU_LPM_MCPU_UART_H1_RX_WAKEUP); +#else + status = pmu_lpm_wakeup_get_status(LPM_EVT_ACTION, PMU_LPM_MCPU_UART_H0_RX_WAKEUP); +#endif + if (status != 0) { + pm_wkup_event_by_uart_callback(); + } +#endif pm_wkup_prepare(PM_SLEEP_DS); pm_sleep_info_record(SLP_INFO_DEEPSLEEP); reg16_setbit(0x520003e4, 0x3); // open mdam clock after deepsleep @@ -224,11 +243,6 @@ void pm_enter_deep_sleep_only_ulp_wakeup(void) } } -void pm_wkup_event_by_uart_callback(void) -{ - uapi_pm_add_sleep_veto(PM_ID_DEBUG); -} - static void pm_enter_deep_sleep(void) { reg16_clrbit(0x520003e4, 0x3); // close mdam clock in deepsleep diff --git a/code/sdk/zhihui/UI/producttest/include/testPresenter.h b/code/sdk/zhihui/UI/producttest/include/testPresenter.h index b0a5ecad1..1d5a595ff 100644 --- a/code/sdk/zhihui/UI/producttest/include/testPresenter.h +++ b/code/sdk/zhihui/UI/producttest/include/testPresenter.h @@ -2,7 +2,7 @@ * @Author: penglei 1624952103@qq.com * @Date: 2024-08-23 10:50:37 * @LastEditors: penglei 1624952103@qq.com - * @LastEditTime: 2025-07-11 10:35:58 + * @LastEditTime: 2025-08-13 14:38:27 * @FilePath: /FD230/code/sdk/application/wearable/fd230/nativeapp/nativeui/producttest/include/testPresenter.h * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE */ @@ -48,7 +48,9 @@ namespace OHOS SEChipTest, PingTest, +#ifdef SUPPORT_GNSS GPSTEST, +#endif // pressuretest, PRESSURETEST, OLDTEST, diff --git a/code/sdk/zhihui/UI/producttest/src/testA5133.cpp b/code/sdk/zhihui/UI/producttest/src/testA5133.cpp index d37e7eeff..40d7a2127 100644 --- a/code/sdk/zhihui/UI/producttest/src/testA5133.cpp +++ b/code/sdk/zhihui/UI/producttest/src/testA5133.cpp @@ -110,12 +110,12 @@ namespace OHOS } - uint8_t cnt = pm_veto_get_id_cnt(PM_ID_P_TEST); - if (cnt == 1) { - uapi_pm_remove_sleep_veto(PM_ID_P_TEST); - } else { - // WEARABLE_LOGE(WEARABLE_LOG_MODULE_MAIN_SERVICE,"CAT1 SERVICE MCU has got pm_id_cat1 vote\r\n"); - } + // uint8_t cnt = pm_veto_get_id_cnt(PM_ID_P_TEST); + // if (cnt == 1) { + // uapi_pm_remove_sleep_veto(PM_ID_P_TEST); + // } else { + // // WEARABLE_LOGE(WEARABLE_LOG_MODULE_MAIN_SERVICE,"CAT1 SERVICE MCU has got pm_id_cat1 vote\r\n"); + // } delete testa5133ScrollView; @@ -480,12 +480,12 @@ namespace OHOS receive_flag=false; transmit_flag = false; - uint8_t cnt = pm_veto_get_id_cnt(PM_ID_P_TEST); - if (cnt == 0) { - uapi_pm_add_sleep_veto(PM_ID_P_TEST); - } else { - // WEARABLE_LOGE(WEARABLE_LOG_MODULE_MAIN_SERVICE,"CAT1 SERVICE MCU has got pm_id_cat1 vote\r\n"); - } + // uint8_t cnt = pm_veto_get_id_cnt(PM_ID_P_TEST); + // if (cnt == 0) { + // uapi_pm_add_sleep_veto(PM_ID_P_TEST); + // } else { + // // WEARABLE_LOGE(WEARABLE_LOG_MODULE_MAIN_SERVICE,"CAT1 SERVICE MCU has got pm_id_cat1 vote\r\n"); + // } return true; } diff --git a/code/sdk/zhihui/UI/producttest/src/testLCD.cpp b/code/sdk/zhihui/UI/producttest/src/testLCD.cpp index 20c0ed853..9c7a0c280 100644 --- a/code/sdk/zhihui/UI/producttest/src/testLCD.cpp +++ b/code/sdk/zhihui/UI/producttest/src/testLCD.cpp @@ -66,12 +66,12 @@ namespace OHOS delete Title; Title=nullptr; } - uint8_t cnt = pm_veto_get_id_cnt(PM_ID_P_TEST); - if (cnt == 1) { - uapi_pm_remove_sleep_veto(PM_ID_P_TEST); - } else { - // WEARABLE_LOGE(WEARABLE_LOG_MODULE_MAIN_SERVICE,"CAT1 SERVICE MCU has got pm_id_cat1 vote\r\n"); - } + // uint8_t cnt = pm_veto_get_id_cnt(PM_ID_P_TEST); + // if (cnt == 1) { + // uapi_pm_remove_sleep_veto(PM_ID_P_TEST); + // } else { + // // WEARABLE_LOGE(WEARABLE_LOG_MODULE_MAIN_SERVICE,"CAT1 SERVICE MCU has got pm_id_cat1 vote\r\n"); + // } delete testLCDScrollView; testLCDScrollView=nullptr; @@ -174,12 +174,12 @@ namespace OHOS Title= testAboutView::GetInstance()->init_title(163,45,"LCD_TEST"); testLCDScrollView->Add(Title); - uint8_t cnt = pm_veto_get_id_cnt(PM_ID_P_TEST); - if (cnt == 0) { - uapi_pm_add_sleep_veto(PM_ID_P_TEST); - } else { - // WEARABLE_LOGE(WEARABLE_LOG_MODULE_MAIN_SERVICE,"CAT1 SERVICE MCU has got pm_id_cat1 vote\r\n"); - } + // uint8_t cnt = pm_veto_get_id_cnt(PM_ID_P_TEST); + // if (cnt == 0) { + // uapi_pm_add_sleep_veto(PM_ID_P_TEST); + // } else { + // // WEARABLE_LOGE(WEARABLE_LOG_MODULE_MAIN_SERVICE,"CAT1 SERVICE MCU has got pm_id_cat1 vote\r\n"); + // } diff --git a/code/sdk/zhihui/UI/producttest/src/testModel.cpp b/code/sdk/zhihui/UI/producttest/src/testModel.cpp index 489923e4c..b8a4d7887 100644 --- a/code/sdk/zhihui/UI/producttest/src/testModel.cpp +++ b/code/sdk/zhihui/UI/producttest/src/testModel.cpp @@ -2,7 +2,7 @@ * @Author: penglei 1624952103@qq.com * @Date: 2024-08-22 16:59:44 * @LastEditors: penglei 1624952103@qq.com - * @LastEditTime: 2024-11-05 15:28:21 + * @LastEditTime: 2025-08-16 14:51:45 * @FilePath: /FD230/code/sdk/application/wearable/fd230/nativeapp/nativeui/producttest/src/testModel.cpp * @Description: * @@ -24,6 +24,7 @@ namespace OHOS void testModel::testModelupdata(int type) { + printf("testModelupdata : %d\n",type); switch (type) { case 1: diff --git a/code/sdk/zhihui/UI/producttest/src/testPresenter.cpp b/code/sdk/zhihui/UI/producttest/src/testPresenter.cpp index 85ae75192..f7ea6ffac 100644 --- a/code/sdk/zhihui/UI/producttest/src/testPresenter.cpp +++ b/code/sdk/zhihui/UI/producttest/src/testPresenter.cpp @@ -35,6 +35,21 @@ #include "gnss_ctl.h" #endif +#ifdef __cplusplus +#if __cplusplus +extern "C" +{ +#endif +#endif +#include "pm_definition.h" +#include "pm_veto.h" +#include "pm.h" +#ifdef __cplusplus +#if __cplusplus +} +#endif +#endif + namespace OHOS { REGIST_SLICE(VIEW_TEST, testView, testPresenter); @@ -187,6 +202,15 @@ namespace OHOS LOS_Msleep(50); uapi_set4GCapability(false); LOS_Msleep(50); + + uint8_t cnt = pm_veto_get_id_cnt(PM_ID_P_TEST); + if (cnt == 1) { + uapi_pm_remove_sleep_veto(PM_ID_P_TEST); + } else { + // WEARABLE_LOGE(WEARABLE_LOG_MODULE_MAIN_SERVICE,"CAT1 SERVICE MCU has got pm_id_cat1 vote\r\n"); + } + + mcu_pm_lcd_off(NULL,NULL); return true; } diff --git a/code/sdk/zhihui/UI/producttest/src/testSEChipTest.cpp b/code/sdk/zhihui/UI/producttest/src/testSEChipTest.cpp index 95dfd0084..043697d80 100644 --- a/code/sdk/zhihui/UI/producttest/src/testSEChipTest.cpp +++ b/code/sdk/zhihui/UI/producttest/src/testSEChipTest.cpp @@ -78,12 +78,12 @@ namespace OHOS efuse_label=nullptr; } - uint8_t cnt = pm_veto_get_id_cnt(PM_ID_P_TEST); - if (cnt == 1) { - uapi_pm_remove_sleep_veto(PM_ID_P_TEST); - } else { - // WEARABLE_LOGE(WEARABLE_LOG_MODULE_MAIN_SERVICE,"CAT1 SERVICE MCU has got pm_id_cat1 vote\r\n"); - } + // uint8_t cnt = pm_veto_get_id_cnt(PM_ID_P_TEST); + // if (cnt == 1) { + // uapi_pm_remove_sleep_veto(PM_ID_P_TEST); + // } else { + // // WEARABLE_LOGE(WEARABLE_LOG_MODULE_MAIN_SERVICE,"CAT1 SERVICE MCU has got pm_id_cat1 vote\r\n"); + // } delete testSEChipScrollView; @@ -233,12 +233,12 @@ namespace OHOS Title= testAboutView::GetInstance()->init_title(142,40,"SEChip_TEST"); testSEChipScrollView->Add(Title); - uint8_t cnt = pm_veto_get_id_cnt(PM_ID_P_TEST); - if (cnt == 0) { - uapi_pm_add_sleep_veto(PM_ID_P_TEST); - } else { - // WEARABLE_LOGE(WEARABLE_LOG_MODULE_MAIN_SERVICE,"CAT1 SERVICE MCU has got pm_id_cat1 vote\r\n"); - } + // uint8_t cnt = pm_veto_get_id_cnt(PM_ID_P_TEST); + // if (cnt == 0) { + // uapi_pm_add_sleep_veto(PM_ID_P_TEST); + // } else { + // // WEARABLE_LOGE(WEARABLE_LOG_MODULE_MAIN_SERVICE,"CAT1 SERVICE MCU has got pm_id_cat1 vote\r\n"); + // } /* -------------------------------------------------------------------------- */ return testSEChipScrollView; diff --git a/code/sdk/zhihui/UI/producttest/src/testTP.cpp b/code/sdk/zhihui/UI/producttest/src/testTP.cpp index e50e0982a..91394e0fc 100644 --- a/code/sdk/zhihui/UI/producttest/src/testTP.cpp +++ b/code/sdk/zhihui/UI/producttest/src/testTP.cpp @@ -64,12 +64,12 @@ namespace OHOS delete Title; Title=nullptr; } - uint8_t cnt = pm_veto_get_id_cnt(PM_ID_P_TEST); - if (cnt == 1) { - uapi_pm_remove_sleep_veto(PM_ID_P_TEST); - } else { - // WEARABLE_LOGE(WEARABLE_LOG_MODULE_MAIN_SERVICE,"CAT1 SERVICE MCU has got pm_id_cat1 vote\r\n"); - } + // uint8_t cnt = pm_veto_get_id_cnt(PM_ID_P_TEST); + // if (cnt == 1) { + // uapi_pm_remove_sleep_veto(PM_ID_P_TEST); + // } else { + // // WEARABLE_LOGE(WEARABLE_LOG_MODULE_MAIN_SERVICE,"CAT1 SERVICE MCU has got pm_id_cat1 vote\r\n"); + // } delete testTPScrollView; testTPScrollView=nullptr; @@ -183,12 +183,12 @@ namespace OHOS Title= testAboutView::GetInstance()->init_title(175,45,"TP_TEST"); testTPScrollView->Add(Title); - uint8_t cnt = pm_veto_get_id_cnt(PM_ID_P_TEST); - if (cnt == 0) { - uapi_pm_add_sleep_veto(PM_ID_P_TEST); - } else { - // WEARABLE_LOGE(WEARABLE_LOG_MODULE_MAIN_SERVICE,"CAT1 SERVICE MCU has got pm_id_cat1 vote\r\n"); - } + // uint8_t cnt = pm_veto_get_id_cnt(PM_ID_P_TEST); + // if (cnt == 0) { + // uapi_pm_add_sleep_veto(PM_ID_P_TEST); + // } else { + // // WEARABLE_LOGE(WEARABLE_LOG_MODULE_MAIN_SERVICE,"CAT1 SERVICE MCU has got pm_id_cat1 vote\r\n"); + // } diff --git a/code/sdk/zhihui/UI/producttest/src/testView.cpp b/code/sdk/zhihui/UI/producttest/src/testView.cpp index 8ea5959bf..917978621 100644 --- a/code/sdk/zhihui/UI/producttest/src/testView.cpp +++ b/code/sdk/zhihui/UI/producttest/src/testView.cpp @@ -15,6 +15,21 @@ #include "factorytest_protocol.h" #endif +#ifdef __cplusplus +#if __cplusplus +extern "C" +{ +#endif +#endif +#include "pm_definition.h" +#include "pm_veto.h" +#include "pm.h" +#ifdef __cplusplus +#if __cplusplus +} +#endif +#endif + namespace OHOS { @@ -899,6 +914,14 @@ namespace OHOS } display_api->set_auto_timeout_function(false); + uint8_t cnt = pm_veto_get_id_cnt(PM_ID_P_TEST); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "cnt : %d\n",cnt); + if (cnt == 0) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "uapi_pm_add_sleep_veto(PM_ID_P_TEST);"); + uapi_pm_add_sleep_veto(PM_ID_P_TEST); + } + if (!uapi_dev_runtime_get_factory_test_status_flag()) uapi_set4GCapability(true); diff --git a/code/sdk/zhihui/UI/producttest/src/testbt.cpp b/code/sdk/zhihui/UI/producttest/src/testbt.cpp index fb79422dd..d1ac6d990 100644 --- a/code/sdk/zhihui/UI/producttest/src/testbt.cpp +++ b/code/sdk/zhihui/UI/producttest/src/testbt.cpp @@ -104,12 +104,12 @@ namespace OHOS BluetoothModel::GetInstance()->set_test_bt_falg(false); #endif - uint8_t cnt = pm_veto_get_id_cnt(PM_ID_P_TEST); - if (cnt == 1) { - uapi_pm_remove_sleep_veto(PM_ID_P_TEST); - } else { - // WEARABLE_LOGE(WEARABLE_LOG_MODULE_MAIN_SERVICE,"CAT1 SERVICE MCU has got pm_id_cat1 vote\r\n"); - } + // uint8_t cnt = pm_veto_get_id_cnt(PM_ID_P_TEST); + // if (cnt == 1) { + // uapi_pm_remove_sleep_veto(PM_ID_P_TEST); + // } else { + // // WEARABLE_LOGE(WEARABLE_LOG_MODULE_MAIN_SERVICE,"CAT1 SERVICE MCU has got pm_id_cat1 vote\r\n"); + // } delete testBTScrollView; @@ -387,12 +387,12 @@ namespace OHOS } discovery_falg=false; - uint8_t cnt = pm_veto_get_id_cnt(PM_ID_P_TEST); - if (cnt == 0) { - uapi_pm_add_sleep_veto(PM_ID_P_TEST); - } else { - // WEARABLE_LOGE(WEARABLE_LOG_MODULE_MAIN_SERVICE,"CAT1 SERVICE MCU has got pm_id_cat1 vote\r\n"); - } + // uint8_t cnt = pm_veto_get_id_cnt(PM_ID_P_TEST); + // if (cnt == 0) { + // uapi_pm_add_sleep_veto(PM_ID_P_TEST); + // } else { + // // WEARABLE_LOGE(WEARABLE_LOG_MODULE_MAIN_SERVICE,"CAT1 SERVICE MCU has got pm_id_cat1 vote\r\n"); + // } diff --git a/code/sdk/zhihui/UI/producttest/src/testbutton.cpp b/code/sdk/zhihui/UI/producttest/src/testbutton.cpp index fcd269b99..576dcd8c2 100644 --- a/code/sdk/zhihui/UI/producttest/src/testbutton.cpp +++ b/code/sdk/zhihui/UI/producttest/src/testbutton.cpp @@ -70,12 +70,12 @@ namespace OHOS } RootView::GetInstance()->ClearOnKeyActListener(); - uint8_t cnt = pm_veto_get_id_cnt(PM_ID_P_TEST); - if (cnt == 1) { - uapi_pm_remove_sleep_veto(PM_ID_P_TEST); - } else { - // WEARABLE_LOGE(WEARABLE_LOG_MODULE_MAIN_SERVICE,"CAT1 SERVICE MCU has got pm_id_cat1 vote\r\n"); - } + // uint8_t cnt = pm_veto_get_id_cnt(PM_ID_P_TEST); + // if (cnt == 1) { + // uapi_pm_remove_sleep_veto(PM_ID_P_TEST); + // } else { + // // WEARABLE_LOGE(WEARABLE_LOG_MODULE_MAIN_SERVICE,"CAT1 SERVICE MCU has got pm_id_cat1 vote\r\n"); + // } delete testBUTTONScrollView; testBUTTONScrollView=nullptr; @@ -381,12 +381,12 @@ namespace OHOS testBUTTONScrollView->SetTouchable(true); testBUTTONScrollView->SetDraggable(true); - uint8_t cnt = pm_veto_get_id_cnt(PM_ID_P_TEST); - if (cnt == 0) { - uapi_pm_add_sleep_veto(PM_ID_P_TEST); - } else { - // WEARABLE_LOGE(WEARABLE_LOG_MODULE_MAIN_SERVICE,"CAT1 SERVICE MCU has got pm_id_cat1 vote\r\n"); - } + // uint8_t cnt = pm_veto_get_id_cnt(PM_ID_P_TEST); + // if (cnt == 0) { + // uapi_pm_add_sleep_veto(PM_ID_P_TEST); + // } else { + // // WEARABLE_LOGE(WEARABLE_LOG_MODULE_MAIN_SERVICE,"CAT1 SERVICE MCU has got pm_id_cat1 vote\r\n"); + // } return true; diff --git a/code/sdk/zhihui/UI/producttest/src/testchanging.cpp b/code/sdk/zhihui/UI/producttest/src/testchanging.cpp index 0bfe78f2d..21e59a1e7 100644 --- a/code/sdk/zhihui/UI/producttest/src/testchanging.cpp +++ b/code/sdk/zhihui/UI/producttest/src/testchanging.cpp @@ -74,12 +74,12 @@ namespace OHOS charnge_label=nullptr; } - uint8_t cnt = pm_veto_get_id_cnt(PM_ID_P_TEST); - if (cnt == 1) { - uapi_pm_remove_sleep_veto(PM_ID_P_TEST); - } else { - // WEARABLE_LOGE(WEARABLE_LOG_MODULE_MAIN_SERVICE,"CAT1 SERVICE MCU has got pm_id_cat1 vote\r\n"); - } + // uint8_t cnt = pm_veto_get_id_cnt(PM_ID_P_TEST); + // if (cnt == 1) { + // uapi_pm_remove_sleep_veto(PM_ID_P_TEST); + // } else { + // // WEARABLE_LOGE(WEARABLE_LOG_MODULE_MAIN_SERVICE,"CAT1 SERVICE MCU has got pm_id_cat1 vote\r\n"); + // } delete testCHANINGScrollView; testCHANINGScrollView=nullptr; @@ -210,12 +210,12 @@ namespace OHOS - uint8_t cnt = pm_veto_get_id_cnt(PM_ID_P_TEST); - if (cnt == 0) { - uapi_pm_add_sleep_veto(PM_ID_P_TEST); - } else { - // WEARABLE_LOGE(WEARABLE_LOG_MODULE_MAIN_SERVICE,"CAT1 SERVICE MCU has got pm_id_cat1 vote\r\n"); - } + // uint8_t cnt = pm_veto_get_id_cnt(PM_ID_P_TEST); + // if (cnt == 0) { + // uapi_pm_add_sleep_veto(PM_ID_P_TEST); + // } else { + // // WEARABLE_LOGE(WEARABLE_LOG_MODULE_MAIN_SERVICE,"CAT1 SERVICE MCU has got pm_id_cat1 vote\r\n"); + // } return true; } diff --git a/code/sdk/zhihui/UI/producttest/src/testgsenson.cpp b/code/sdk/zhihui/UI/producttest/src/testgsenson.cpp index 20b4d226e..c381c37c1 100644 --- a/code/sdk/zhihui/UI/producttest/src/testgsenson.cpp +++ b/code/sdk/zhihui/UI/producttest/src/testgsenson.cpp @@ -92,12 +92,12 @@ namespace OHOS delete labelButton_next; labelButton_next=nullptr; } - uint8_t cnt = pm_veto_get_id_cnt(PM_ID_P_TEST); - if (cnt == 1) { - uapi_pm_remove_sleep_veto(PM_ID_P_TEST); - } else { - // WEARABLE_LOGE(WEARABLE_LOG_MODULE_MAIN_SERVICE,"CAT1 SERVICE MCU has got pm_id_cat1 vote\r\n"); - } + // uint8_t cnt = pm_veto_get_id_cnt(PM_ID_P_TEST); + // if (cnt == 1) { + // uapi_pm_remove_sleep_veto(PM_ID_P_TEST); + // } else { + // // WEARABLE_LOGE(WEARABLE_LOG_MODULE_MAIN_SERVICE,"CAT1 SERVICE MCU has got pm_id_cat1 vote\r\n"); + // } delete testGsonsonScrollView; testGsonsonScrollView=nullptr; } @@ -241,12 +241,12 @@ namespace OHOS labelButton_next= testAboutView::GetInstance()->init_button_next(167,378,Test_ViewMapper_t[id].viewid_str_next); testGsonsonScrollView->Add(labelButton_next); - uint8_t cnt = pm_veto_get_id_cnt(PM_ID_P_TEST); - if (cnt == 0) { - uapi_pm_add_sleep_veto(PM_ID_P_TEST); - } else { - // WEARABLE_LOGE(WEARABLE_LOG_MODULE_MAIN_SERVICE,"CAT1 SERVICE MCU has got pm_id_cat1 vote\r\n"); - } + // uint8_t cnt = pm_veto_get_id_cnt(PM_ID_P_TEST); + // if (cnt == 0) { + // uapi_pm_add_sleep_veto(PM_ID_P_TEST); + // } else { + // // WEARABLE_LOGE(WEARABLE_LOG_MODULE_MAIN_SERVICE,"CAT1 SERVICE MCU has got pm_id_cat1 vote\r\n"); + // } testGsonsonScrollView->SetTouchable(true); diff --git a/code/sdk/zhihui/UI/producttest/src/testhrsenson.cpp b/code/sdk/zhihui/UI/producttest/src/testhrsenson.cpp index 7e82ccfa2..440a6c3f2 100644 --- a/code/sdk/zhihui/UI/producttest/src/testhrsenson.cpp +++ b/code/sdk/zhihui/UI/producttest/src/testhrsenson.cpp @@ -80,12 +80,12 @@ namespace OHOS delete Title; Title=nullptr; } - uint8_t cnt = pm_veto_get_id_cnt(PM_ID_P_TEST); - if (cnt == 1) { - uapi_pm_remove_sleep_veto(PM_ID_P_TEST); - } else { - // WEARABLE_LOGE(WEARABLE_LOG_MODULE_MAIN_SERVICE,"CAT1 SERVICE MCU has got pm_id_cat1 vote\r\n"); - } + // uint8_t cnt = pm_veto_get_id_cnt(PM_ID_P_TEST); + // if (cnt == 1) { + // uapi_pm_remove_sleep_veto(PM_ID_P_TEST); + // } else { + // // WEARABLE_LOGE(WEARABLE_LOG_MODULE_MAIN_SERVICE,"CAT1 SERVICE MCU has got pm_id_cat1 vote\r\n"); + // } delete testhrsensonScrollView; testhrsensonScrollView=nullptr; @@ -297,12 +297,12 @@ namespace OHOS int8_t md = PPG_SERVICE_CMD_TYPE_STOP_PPG_TEST; send_ppg_cmd_msg(md); #endif - uint8_t cnt = pm_veto_get_id_cnt(PM_ID_P_TEST); - if (cnt == 0) { - uapi_pm_add_sleep_veto(PM_ID_P_TEST); - } else { - // WEARABLE_LOGE(WEARABLE_LOG_MODULE_MAIN_SERVICE,"CAT1 SERVICE MCU has got pm_id_cat1 vote\r\n"); - } + // uint8_t cnt = pm_veto_get_id_cnt(PM_ID_P_TEST); + // if (cnt == 0) { + // uapi_pm_add_sleep_veto(PM_ID_P_TEST); + // } else { + // // WEARABLE_LOGE(WEARABLE_LOG_MODULE_MAIN_SERVICE,"CAT1 SERVICE MCU has got pm_id_cat1 vote\r\n"); + // } return true; } diff --git a/code/sdk/zhihui/UI/producttest/src/testluminance.cpp b/code/sdk/zhihui/UI/producttest/src/testluminance.cpp index 11c77f072..898c28ab2 100644 --- a/code/sdk/zhihui/UI/producttest/src/testluminance.cpp +++ b/code/sdk/zhihui/UI/producttest/src/testluminance.cpp @@ -64,12 +64,12 @@ namespace OHOS delete Title; Title=nullptr; } - uint8_t cnt = pm_veto_get_id_cnt(PM_ID_P_TEST); - if (cnt == 1) { - uapi_pm_remove_sleep_veto(PM_ID_P_TEST); - } else { - // WEARABLE_LOGE(WEARABLE_LOG_MODULE_MAIN_SERVICE,"CAT1 SERVICE MCU has got pm_id_cat1 vote\r\n"); - } + // uint8_t cnt = pm_veto_get_id_cnt(PM_ID_P_TEST); + // if (cnt == 1) { + // uapi_pm_remove_sleep_veto(PM_ID_P_TEST); + // } else { + // // WEARABLE_LOGE(WEARABLE_LOG_MODULE_MAIN_SERVICE,"CAT1 SERVICE MCU has got pm_id_cat1 vote\r\n"); + // } delete testLUMScrollView; testLUMScrollView=nullptr; @@ -136,12 +136,12 @@ namespace OHOS Title= testAboutView::GetInstance()->init_title(99,54,"BRIGHTNESS_TEST"); testLUMScrollView->Add(Title); - uint8_t cnt = pm_veto_get_id_cnt(PM_ID_P_TEST); - if (cnt == 0) { - uapi_pm_add_sleep_veto(PM_ID_P_TEST); - } else { - // WEARABLE_LOGE(WEARABLE_LOG_MODULE_MAIN_SERVICE,"CAT1 SERVICE MCU has got pm_id_cat1 vote\r\n"); - } + // uint8_t cnt = pm_veto_get_id_cnt(PM_ID_P_TEST); + // if (cnt == 0) { + // uapi_pm_add_sleep_veto(PM_ID_P_TEST); + // } else { + // // WEARABLE_LOGE(WEARABLE_LOG_MODULE_MAIN_SERVICE,"CAT1 SERVICE MCU has got pm_id_cat1 vote\r\n"); + // } return true; } diff --git a/code/sdk/zhihui/UI/producttest/src/testmagnetic.cpp b/code/sdk/zhihui/UI/producttest/src/testmagnetic.cpp index 06e24dcda..f55d1bb37 100644 --- a/code/sdk/zhihui/UI/producttest/src/testmagnetic.cpp +++ b/code/sdk/zhihui/UI/producttest/src/testmagnetic.cpp @@ -81,12 +81,12 @@ namespace OHOS delete labelButton_next; labelButton_next=nullptr; } - uint8_t cnt = pm_veto_get_id_cnt(PM_ID_P_TEST); - if (cnt == 1) { - uapi_pm_remove_sleep_veto(PM_ID_P_TEST); - } else { - // WEARABLE_LOGE(WEARABLE_LOG_MODULE_MAIN_SERVICE,"CAT1 SERVICE MCU has got pm_id_cat1 vote\r\n"); - } + // uint8_t cnt = pm_veto_get_id_cnt(PM_ID_P_TEST); + // if (cnt == 1) { + // uapi_pm_remove_sleep_veto(PM_ID_P_TEST); + // } else { + // // WEARABLE_LOGE(WEARABLE_LOG_MODULE_MAIN_SERVICE,"CAT1 SERVICE MCU has got pm_id_cat1 vote\r\n"); + // } delete testmagicScrollView; testmagicScrollView=nullptr; } @@ -249,12 +249,12 @@ namespace OHOS testmagicScrollView->SetTouchable(true); testmagicScrollView->SetDraggable(true); - uint8_t cnt = pm_veto_get_id_cnt(PM_ID_P_TEST); - if (cnt == 0) { - uapi_pm_add_sleep_veto(PM_ID_P_TEST); - } else { - // WEARABLE_LOGE(WEARABLE_LOG_MODULE_MAIN_SERVICE,"CAT1 SERVICE MCU has got pm_id_cat1 vote\r\n"); - } + // uint8_t cnt = pm_veto_get_id_cnt(PM_ID_P_TEST); + // if (cnt == 0) { + // uapi_pm_add_sleep_veto(PM_ID_P_TEST); + // } else { + // // WEARABLE_LOGE(WEARABLE_LOG_MODULE_MAIN_SERVICE,"CAT1 SERVICE MCU has got pm_id_cat1 vote\r\n"); + // } diff --git a/code/sdk/zhihui/UI/producttest/src/testmicrophone.cpp b/code/sdk/zhihui/UI/producttest/src/testmicrophone.cpp index e3c762801..c3bb6853f 100644 --- a/code/sdk/zhihui/UI/producttest/src/testmicrophone.cpp +++ b/code/sdk/zhihui/UI/producttest/src/testmicrophone.cpp @@ -85,12 +85,12 @@ namespace OHOS delete Title; Title=nullptr; } - uint8_t cnt = pm_veto_get_id_cnt(PM_ID_P_TEST); - if (cnt == 1) { - uapi_pm_remove_sleep_veto(PM_ID_P_TEST); - } else { - // WEARABLE_LOGE(WEARABLE_LOG_MODULE_MAIN_SERVICE,"CAT1 SERVICE MCU has got pm_id_cat1 vote\r\n"); - } + // uint8_t cnt = pm_veto_get_id_cnt(PM_ID_P_TEST); + // if (cnt == 1) { + // uapi_pm_remove_sleep_veto(PM_ID_P_TEST); + // } else { + // // WEARABLE_LOGE(WEARABLE_LOG_MODULE_MAIN_SERVICE,"CAT1 SERVICE MCU has got pm_id_cat1 vote\r\n"); + // } AlarmClockModel::GetInstance()->AlarmPlayerStop(); delete testmakephoneScrollView; testmakephoneScrollView=nullptr; @@ -307,12 +307,12 @@ namespace OHOS testmakephoneScrollView->SetTouchable(true); testmakephoneScrollView->SetDraggable(true); - uint8_t cnt = pm_veto_get_id_cnt(PM_ID_P_TEST); - if (cnt == 0) { - uapi_pm_add_sleep_veto(PM_ID_P_TEST); - } else { - // WEARABLE_LOGE(WEARABLE_LOG_MODULE_MAIN_SERVICE,"CAT1 SERVICE MCU has got pm_id_cat1 vote\r\n"); - } + // uint8_t cnt = pm_veto_get_id_cnt(PM_ID_P_TEST); + // if (cnt == 0) { + // uapi_pm_add_sleep_veto(PM_ID_P_TEST); + // } else { + // // WEARABLE_LOGE(WEARABLE_LOG_MODULE_MAIN_SERVICE,"CAT1 SERVICE MCU has got pm_id_cat1 vote\r\n"); + // } return true; diff --git a/code/sdk/zhihui/UI/producttest/src/testmotor.cpp b/code/sdk/zhihui/UI/producttest/src/testmotor.cpp index e5fbe78c6..33ccb7d57 100644 --- a/code/sdk/zhihui/UI/producttest/src/testmotor.cpp +++ b/code/sdk/zhihui/UI/producttest/src/testmotor.cpp @@ -68,12 +68,12 @@ namespace OHOS delete Title; Title=nullptr; } - uint8_t cnt = pm_veto_get_id_cnt(PM_ID_P_TEST); - if (cnt == 1) { - uapi_pm_remove_sleep_veto(PM_ID_P_TEST); - } else { - // WEARABLE_LOGE(WEARABLE_LOG_MODULE_MAIN_SERVICE,"CAT1 SERVICE MCU has got pm_id_cat1 vote\r\n"); - } + // uint8_t cnt = pm_veto_get_id_cnt(PM_ID_P_TEST); + // if (cnt == 1) { + // uapi_pm_remove_sleep_veto(PM_ID_P_TEST); + // } else { + // // WEARABLE_LOGE(WEARABLE_LOG_MODULE_MAIN_SERVICE,"CAT1 SERVICE MCU has got pm_id_cat1 vote\r\n"); + // } delete tesMOTORScrollView; tesMOTORScrollView=nullptr; } @@ -209,12 +209,12 @@ namespace OHOS Title= testAboutView::GetInstance()->init_title(136,45,"MOTOR_TEST"); tesMOTORScrollView->Add(Title); - uint8_t cnt = pm_veto_get_id_cnt(PM_ID_P_TEST); - if (cnt == 0) { - uapi_pm_add_sleep_veto(PM_ID_P_TEST); - } else { - // WEARABLE_LOGE(WEARABLE_LOG_MODULE_MAIN_SERVICE,"CAT1 SERVICE MCU has got pm_id_cat1 vote\r\n"); - } + // uint8_t cnt = pm_veto_get_id_cnt(PM_ID_P_TEST); + // if (cnt == 0) { + // uapi_pm_add_sleep_veto(PM_ID_P_TEST); + // } else { + // // WEARABLE_LOGE(WEARABLE_LOG_MODULE_MAIN_SERVICE,"CAT1 SERVICE MCU has got pm_id_cat1 vote\r\n"); + // } return true; diff --git a/code/sdk/zhihui/UI/producttest/src/testspeak.cpp b/code/sdk/zhihui/UI/producttest/src/testspeak.cpp index 0824da990..e741868ed 100644 --- a/code/sdk/zhihui/UI/producttest/src/testspeak.cpp +++ b/code/sdk/zhihui/UI/producttest/src/testspeak.cpp @@ -69,12 +69,12 @@ namespace OHOS delete Title; Title=nullptr; } - uint8_t cnt = pm_veto_get_id_cnt(PM_ID_P_TEST); - if (cnt == 1) { - uapi_pm_remove_sleep_veto(PM_ID_P_TEST); - } else { - // WEARABLE_LOGE(WEARABLE_LOG_MODULE_MAIN_SERVICE,"CAT1 SERVICE MCU has got pm_id_cat1 vote\r\n"); - } + // uint8_t cnt = pm_veto_get_id_cnt(PM_ID_P_TEST); + // if (cnt == 1) { + // uapi_pm_remove_sleep_veto(PM_ID_P_TEST); + // } else { + // // WEARABLE_LOGE(WEARABLE_LOG_MODULE_MAIN_SERVICE,"CAT1 SERVICE MCU has got pm_id_cat1 vote\r\n"); + // } delete testSPEAKScrollView; testSPEAKScrollView=nullptr; } @@ -236,12 +236,12 @@ namespace OHOS testSPEAKScrollView->SetTouchable(true); testSPEAKScrollView->SetDraggable(true); - uint8_t cnt = pm_veto_get_id_cnt(PM_ID_P_TEST); - if (cnt == 0) { - uapi_pm_add_sleep_veto(PM_ID_P_TEST); - } else { - // WEARABLE_LOGE(WEARABLE_LOG_MODULE_MAIN_SERVICE,"CAT1 SERVICE MCU has got pm_id_cat1 vote\r\n"); - } + // uint8_t cnt = pm_veto_get_id_cnt(PM_ID_P_TEST); + // if (cnt == 0) { + // uapi_pm_add_sleep_veto(PM_ID_P_TEST); + // } else { + // // WEARABLE_LOGE(WEARABLE_LOG_MODULE_MAIN_SERVICE,"CAT1 SERVICE MCU has got pm_id_cat1 vote\r\n"); + // } return true; diff --git a/code/sdk/zhihui/drivers/cywee/dml/cywee_dml.c b/code/sdk/zhihui/drivers/cywee/dml/cywee_dml.c index b727ae9f0..02fec33ea 100644 --- a/code/sdk/zhihui/drivers/cywee/dml/cywee_dml.c +++ b/code/sdk/zhihui/drivers/cywee/dml/cywee_dml.c @@ -1454,14 +1454,14 @@ void CWM_AP_SensorListen(pSensorEVT_t sensorEVT) { { sedentary_interval_count = 0; // cywee_func(CYWEE_MSG_TYPE_INACTIVITY_UPDATE,&c_inact_result_t,sizeof(inact_result_t)); - //CustomEventPublish(TOPIC_EVENT_INACTIVITY_UPDATE, &c_inact_result_t, sizeof(inact_result_t)); + CustomEventPublish(TOPIC_EVENT_INACTIVITY_UPDATE, &c_inact_result_t, sizeof(inact_result_t)); } } else if(c_inact_result_t.status != 3) { sedentary_interval_count = 0; // cywee_func(CYWEE_MSG_TYPE_INACTIVITY_UPDATE,&c_inact_result_t,sizeof(inact_result_t)); - //CustomEventPublish(TOPIC_EVENT_INACTIVITY_UPDATE, &c_inact_result_t, sizeof(inact_result_t)); + CustomEventPublish(TOPIC_EVENT_INACTIVITY_UPDATE, &c_inact_result_t, sizeof(inact_result_t)); } }else if((int)sensorEVT->fData[0] == 21){ @@ -1609,7 +1609,7 @@ void CWM_AP_SensorListen(pSensorEVT_t sensorEVT) { uapi_get_timestampe_ss(&tm); // CWM_OS_dbgPrintf("ar alert type : %d tm :%d \n",(int)sensorEVT->fData[1],tm); int ar_alert_type = (int)sensorEVT->fData[1]; - //CustomEventPublish(TOPIC_EVENT_AR_ALERT_TYPE_UPDATE,&ar_alert_type,sizeof(int)); + CustomEventPublish(TOPIC_EVENT_AR_ALERT_TYPE_UPDATE,&ar_alert_type,sizeof(int)); }else{ stepcount = (int)sensorEVT->fData[1]; diff --git a/code/sdk/zhihui/drivers/mag/service/mag_service.c b/code/sdk/zhihui/drivers/mag/service/mag_service.c index e261154d9..817da8812 100644 --- a/code/sdk/zhihui/drivers/mag/service/mag_service.c +++ b/code/sdk/zhihui/drivers/mag/service/mag_service.c @@ -99,7 +99,8 @@ static void mag_service_check_task(void const *arg) mag_timer_handler(); }else if (mail.comm.app == MAG_SERVICE_CMD_START_CHECK){ uapi_dev_runtime_set_mmc_status(1); - do_custom_fileoperate_service_check_msg(CUSTOM_FILEOPERATE_MSG_TYPE_MMCDATA_READ, NULL, 0); + // do_custom_fileoperate_service_check_msg(CUSTOM_FILEOPERATE_MSG_TYPE_MMCDATA_READ, NULL, 0); + mag_readPara_infile(); // mmc5603_start(); mag_sensor_start(); LOS_Mdelay(20); @@ -108,8 +109,8 @@ static void mag_service_check_task(void const *arg) mag_service_timer_start_check(MAG_CHECK_MS); }else if (mail.comm.app == MAG_SERVICE_CMD_STOP_CHECK){ uapi_dev_runtime_set_mmc_status(0); - // SavePara_infile(); - do_custom_fileoperate_service_check_msg(CUSTOM_FILEOPERATE_MSG_TYPE_MMCDATA_SAVE, NULL, 0); + // do_custom_fileoperate_service_check_msg(CUSTOM_FILEOPERATE_MSG_TYPE_MMCDATA_SAVE, NULL, 0); + mag_savePara_infile(); mag_service_running_stat = false; osTimerStop(g_mag_service_timer); // mmc5603_stop(); diff --git a/code/sdk/zhihui/drivers/ppg/pah8009/factory/pah800x_factory_test.c b/code/sdk/zhihui/drivers/ppg/pah8009/factory/pah800x_factory_test.c index d4cd39c3c..5d5148dd4 100644 --- a/code/sdk/zhihui/drivers/ppg/pah8009/factory/pah800x_factory_test.c +++ b/code/sdk/zhihui/drivers/ppg/pah8009/factory/pah800x_factory_test.c @@ -550,6 +550,8 @@ void pah8009_get_leaklight_data(uint16_t *ch0,uint16_t *ch1,uint16_t *ch2) *ch1 = factory_test_ch[1]; *ch2 = factory_test_ch[2]; + printf("factory_test_ch[0]:%d,factory_test_ch[0]:%d,factory_test_ch[0]:%d\n",factory_test_ch[0],factory_test_ch[1],factory_test_ch[2]); + factory_test_ch[0] = 0; factory_test_ch[1] = 0; factory_test_ch[2] = 0; diff --git a/code/sdk/zhihui/drivers/ppg/pah8009/sensor/pah800x_main.c b/code/sdk/zhihui/drivers/ppg/pah8009/sensor/pah800x_main.c index 23a53cacc..29acb7688 100644 --- a/code/sdk/zhihui/drivers/ppg/pah8009/sensor/pah800x_main.c +++ b/code/sdk/zhihui/drivers/ppg/pah8009/sensor/pah800x_main.c @@ -90,12 +90,12 @@ static uint8_t wear_cnt = 0; static int history_wear_status = -1; -static int time_out = 40; +static int time_out = 15; static uint8_t hrs_num = 0; static int32_t sum_hrs = 0; -static int8_t hrs_data[7] = {0}; +static int8_t hrs_data[HRS_WINDOW_SIZE] = {0}; static uint8_t left = 0; static uint8_t right = 0; static uint8_t avg_hrs = 0; @@ -392,7 +392,7 @@ void pah_sensor_stop(void) hrs_num = 0; sum_hrs = 0; - memset(hrs_data,0,7); + memset(hrs_data,0,HRS_WINDOW_SIZE); left = 0; right = 0; @@ -497,6 +497,8 @@ static void get_avg_hrs(uint8_t hrs) hrs_num--; } + printf("PAH:hrs:%d\n",hrs); + hrs_data[right] = hrs; sum_hrs += hrs; right = (right + 1) % HRS_WINDOW_SIZE; @@ -515,6 +517,13 @@ static void get_avg_hrs(uint8_t hrs) uint8_t current_idx = (left + i) % HRS_WINDOW_SIZE; uint8_t current_hrs = hrs_data[current_idx]; + printf("current_hrs: %d\n", current_hrs); + + if (current_hrs < 40 || current_hrs > 180) { + printf("PAH:无效数据过滤: %d\n", current_hrs); + continue; + } + if (current_hrs < min_hrs) { min_hrs = current_hrs; } @@ -526,7 +535,7 @@ static void get_avg_hrs(uint8_t hrs) uint8_t valid_count = hrs_num - 2; avg_hrs = (sum_hrs - max_hrs - min_hrs) / valid_count; - // printf("max_hrs[%d],min_hrs[%d],avg_hrs[%d]\n",max_hrs,min_hrs,avg_hrs); + printf("sum_hrs[%d],max_hrs[%d],min_hrs[%d],avg_hrs[%d]\n",sum_hrs,max_hrs,min_hrs,avg_hrs); } } @@ -608,11 +617,21 @@ void hr_alg_task(void) do_cywee_service_check_msg(CYWEE_SERVICE_CMD_CHECK_ACC, NULL); // 检查gsensor是否停止 } #endif - uint8_t data = (uint8_t)hr; + if(hr > 0) + { + int hr_int = round(hr); + if (hr_int >= 30 && hr_int <= 210) + { + avg_hrs = (uint8_t)hr_int; // 安全转换 + } + } + + + // if(data > 30 && data < 220) + // get_avg_hrs(data); - if(data > 30 && data < 220) - get_avg_hrs(data); + LOG_PRINT("hr : %f avg_hrs : %d\n",hr,avg_hrs); // printf("func(PPG_MSG_TYPE_HRS_UPDATE, &avg_hrs, 1); :%d\n",avg_hrs); // func(PPG_MSG_TYPE_HRS_UPDATE, &avg_hrs, 1); @@ -622,7 +641,8 @@ void hr_alg_task(void) #ifdef SUPPORT_PPG_BLE_SERVICE if(uapi_dev_runtime_get_hrs_ble_status()) { - ble_ppgtest_server_send_input_report(&avg_hrs,1); + uint8_t ble_data = (uint8_t)avg_hrs; + ble_ppgtest_server_send_input_report(&ble_data,1); } #endif @@ -1475,7 +1495,10 @@ static void process(uint64_t timestamp) // PRINT("ppg data : %d %d %d\n",ppg_data.data[0],ppg_data.data[1],ppg_data.data[2]); - factory_data = ppg_data.data[0]; + if(work_mode == 1) + factory_data = ppg_data.data[1]; + else if(work_mode == 2) + factory_data = ppg_data.data[0]; uint64_t duration = timestamp - _main.ppg_prev_report_timestamp; @@ -1799,6 +1822,7 @@ void pah8009_check_int(void) void pah8009_timer_handler(void) { + // printf("pah8009_timer_handler \n"); ppg_sensor_task_polling(); if(work_mode == 1) @@ -1814,13 +1838,15 @@ void pah8009_timer_handler(void) } +// static uint32_t last_exec_time = 0; + static void pah8009_timer_callback(void) { - // printf("pah8009_timer_callback \n"); -// #ifdef SUPPORT_PPG_SERVICE -// send_ppg_cmd_msg(PPG_SERVICE_CMD_TYPE_CHECK_INT); -// #endif - pah8009_check_int(); + // printf("pah8009_timer_callback\n"); +#ifdef SUPPORT_PPG_SERVICE + send_ppg_cmd_msg(PPG_SERVICE_CMD_TYPE_DO_PPG_HRS_TIMER_CALLBACK); +#endif + // pah8009_check_int(); } static void pah8009_timer_init(void) @@ -1862,7 +1888,7 @@ void pah8009_control(char *mode,uint8_t enable) work_mode = 1; // touch_only_sensor_start(); ppg_only_sensor_start(); - + time_out = 15; } else if (strcmp(mode, "hrv") == 0) { // md = HRV_MODE; } else if (strcmp(mode, "spo2") == 0) { @@ -1870,6 +1896,7 @@ void pah8009_control(char *mode,uint8_t enable) pah_sensor_init(diw_4mm_ir_r_ir_spo2); ppg_only_sensor_start(); work_mode = 2; + time_out = 15; } else if (strcmp(mode, "leaklight") == 0) { // md = FT_LEAK_LIGHT_MODE; factory_test_mode(factory_test_leak_light_target_sample, 0, 0, 0, 0); @@ -1880,6 +1907,7 @@ void pah8009_control(char *mode,uint8_t enable) pah_sensor_init(diw_4mm_g_ir_hrd); touch_only_sensor_start(); work_mode = 3; + time_out = 5000; } if(work_mode < 3 && work_mode > 0) @@ -1888,7 +1916,11 @@ void pah8009_control(char *mode,uint8_t enable) time_cnt = 0; if(g_pah8009_timer != NULL && work_mode < 3 && work_mode > 0) + { + // printf("time_out : %d\n",time_out); osTimerStart(g_pah8009_timer,time_out); + } + } } diff --git a/code/sdk/zhihui/drivers/ppg/pah8009/sensor/pah_800x_config.h b/code/sdk/zhihui/drivers/ppg/pah8009/sensor/pah_800x_config.h index ea45c7366..8fb130e54 100644 --- a/code/sdk/zhihui/drivers/ppg/pah8009/sensor/pah_800x_config.h +++ b/code/sdk/zhihui/drivers/ppg/pah8009/sensor/pah_800x_config.h @@ -67,8 +67,8 @@ * This definition will enable the corresponding demo functionin main.c * If select INT mode, then slect following INT configuration type */ -#define INTERRUPT_MODE 1 -#define POLLING_MODE 0 +#define INTERRUPT_MODE 0 +#define POLLING_MODE 1 #define Test_pattern_mode 0 /* diff --git a/code/sdk/zhihui/services/ble_service/bleservice/bleService.c b/code/sdk/zhihui/services/ble_service/bleservice/bleService.c index 94a7aee1d..04457cb9d 100644 --- a/code/sdk/zhihui/services/ble_service/bleservice/bleService.c +++ b/code/sdk/zhihui/services/ble_service/bleservice/bleService.c @@ -41,7 +41,7 @@ extern "C" { #ifdef SUPPORT_HID_SERVICE #include "hidService.h" #endif -#ifdef FACTORYTEST_SERVICE +#ifdef SUPPORT_FACTORY_SERVICE #include "factorytestService.h" #endif #ifdef SUPPORT_PPG_BLE_SERVICE @@ -346,8 +346,16 @@ static void svr_ble_adv_data_set(int adv_id) adv_data[adv_data_len++] = 0x0f;//长度 adv_data[adv_data_len++] = 0xff;//数据类型 manufactory data +#if defined(BOARD_W9) + adv_data[adv_data_len++] = 'W'; + adv_data[adv_data_len++] = '9'; +// #elif defined(BOARD_N9) +// adv_data[adv_data_len++] = 'N'; +// adv_data[adv_data_len++] = '9'; +#else adv_data[adv_data_len++] = 'J'; adv_data[adv_data_len++] = 'H'; +#endif adv_data[adv_data_len++] = bond_flag;//是否绑定 adv_data[adv_data_len++] = ble_data_mac_switch[5]; adv_data[adv_data_len++] = ble_data_mac_switch[4]; @@ -356,8 +364,16 @@ static void svr_ble_adv_data_set(int adv_id) adv_data[adv_data_len++] = ble_data_mac_switch[1]; adv_data[adv_data_len++] = ble_data_mac_switch[0]; WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "adv_data_info.adv_length.adv_data_len:%d\r\n",adv_data_len); - adv_data[adv_data_len++] = 0x05;//未知 app +#if defined(BOARD_W9) + adv_data[adv_data_len++] = 0x06; //w9 app + adv_data[adv_data_len++] = 0x06; +// #elif defined(BOARD_N9) +// adv_data[adv_data_len++] = 0x07; //n9 app +// adv_data[adv_data_len++] = 0x07; +#else adv_data[adv_data_len++] = 0x05; + adv_data[adv_data_len++] = 0x05; +#endif uint8_t _major,_mid,_minor; uapi_get_fw_version(&_major,&_mid,&_minor); @@ -995,8 +1011,16 @@ static void srv_ble_add_chart_decr_battery(uint8_t server_id,uint16_t srv_handle battery_point_val[12] = 0;//消息推送开关 默认是关闭 0 battery_point_val[13] = 0;//多媒体开关 + #if defined(BOARD_W9) + battery_point_val[14] = 6;//客户编号 + battery_point_val[15] = 6;//产品编号 + // #elif defined(BOARD_N9) + // battery_point_val[14] = 7;//客户编号 + // battery_point_val[15] = 7;//产品编号 + #else battery_point_val[14] = 5;//客户编号 battery_point_val[15] = 5;//产品编号 + #endif battery_point_val[16] = 0;//硬件版本号 battery_point_val[17] = 1; @@ -1266,7 +1290,7 @@ static void svr_ble_bt_gatts_service_add_cb(uint8_t server_id, bt_uuid_t *uuid, if ( uuid_tmp == BLE_SERVICE_UUID // || uuid_tmp == BLE_UUID_HUMAN_INTERFACE_DEVICE -#ifdef FACTORYTEST_SERVICE +#ifdef SUPPORT_FACTORY_SERVICE || uuid_tmp == BLE_UUID_ATE_FACTORYTEST_SERVICE #endif #ifdef SUPPORT_PPG_BLE_SERVICE @@ -1302,7 +1326,7 @@ static void svr_ble_bt_gatts_service_add_cb(uint8_t server_id, bt_uuid_t *uuid, // // bts_data_to_uuid_len2(ALIPAYY_SERVICE_ID, &alipay_service_uuid);//0x3802 #endif -#ifdef FACTORYTEST_SERVICE +#ifdef SUPPORT_FACTORY_SERVICE bt_uuid_t factory_service_uuid = {0}; bts_data_to_uuid_len2(BLE_UUID_ATE_FACTORYTEST_SERVICE, &factory_service_uuid); #endif @@ -1357,7 +1381,7 @@ static void svr_ble_bt_gatts_service_add_cb(uint8_t server_id, bt_uuid_t *uuid, } #endif -#ifdef FACTORYTEST_SERVICE +#ifdef SUPPORT_FACTORY_SERVICE if (ble_gatts_cmp_uuid(uuid, &factory_service_uuid) == true){ ble_factorytest_add_characters_and_descriptors(server_id,srv_handle); ret = gatts_start_service(server_id, srv_handle); @@ -1414,7 +1438,7 @@ static void svr_ble_bt_gatts_characteristic_add_cb(uint8_t server_id, bt_uuid_t bt_uuid_t chara_uuid_data_2ae2 = {0}; bts_data_to_uuid_len2(BLE_CHARACTERISTIC_READ_BATTERY_ID, &chara_uuid_data_2ae2); -#ifdef FACTORYTEST_SERVICE +#ifdef SUPPORT_HID_SERVICE bt_uuid_t hid_report_uuid_2a4d = {0}; bts_data_to_uuid_len2(BLE_UUID_REPORT, &hid_report_uuid_2a4d); #endif @@ -1529,7 +1553,7 @@ static void svr_ble_bt_gatts_characteristic_add_cb(uint8_t server_id, bt_uuid_t handle_num++; // = result->value_handle; } - #ifdef FACTORYTEST_SERVICE +#ifdef SUPPORT_HID_SERVICE if (ble_gatts_cmp_uuid(uuid, &hid_report_uuid_2a4d) == true) { WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "result->hid_report_uuid_2a4d %d\r\n",result->value_handle); if(g_hid_server_handle == 0){ @@ -1538,7 +1562,9 @@ static void svr_ble_bt_gatts_characteristic_add_cb(uint8_t server_id, bt_uuid_t ble_hid_add_characters_input_report_cbk(g_hid_server_handle); } } +#endif +#ifdef SUPPORT_FACTORY_SERVICE bt_uuid_t factorytest_recv_uuid = {0}; bts_data_to_uuid_len2(BLE_UUID_ATE_TX, &factorytest_recv_uuid); @@ -1573,8 +1599,7 @@ static void svr_ble_bt_gatts_characteristic_add_cb(uint8_t server_id, bt_uuid_t ble_factorytest_store_ota_recv_handle(result->value_handle) ; // } } - #endif - #ifdef FACTORYTEST_SERVICE + bt_uuid_t factorytest_ota_report_uuid = {0}; bts_data_to_uuid_len2(BLE_UUID_OTA_RX, &factorytest_ota_report_uuid); @@ -1585,7 +1610,7 @@ static void svr_ble_bt_gatts_characteristic_add_cb(uint8_t server_id, bt_uuid_t ble_factorytest_store_ota_report_handle(result->value_handle); // } } - #endif +#endif #ifdef SUPPORT_PPG_BLE_SERVICE bt_uuid_t ppgtest_report_uuid = {0}; @@ -1610,8 +1635,10 @@ static void svr_ble_bt_gatts_characteristic_add_cb(uint8_t server_id, bt_uuid_t ble_cywee_store_report_handle(result->value_handle); // } - ble_cywee_store_recv_handle(69); + ble_cywee_store_recv_handle(73); } + else + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ble_gatts_cmp_uuid(uuid, &cywee_report_uuid) != true\r\n"); #endif return; } @@ -1742,8 +1769,17 @@ errcode_t svr_ble_read_data_value_updata_noyify(void)//2ae2 battery_point_val[12] = 0;//消息推送开关 默认是关闭 0 battery_point_val[13] = 0;//多媒体开关 + + #if defined(BOARD_W9) + battery_point_val[14] = 6;//客户编号 + battery_point_val[15] = 6;//产品编号 + // #elif defined(BOARD_N9) + // battery_point_val[14] = 7;//客户编号 + // battery_point_val[15] = 7;//产品编号 + #else battery_point_val[14] = 5;//客户编号 battery_point_val[15] = 5;//产品编号 + #endif battery_point_val[16] = 0;//硬件版本号 battery_point_val[17] = 1; @@ -1794,8 +1830,17 @@ errcode_t svr_ble_read_data_value_updata_noyify_test(uint8_t test)//2ae2 battery_point_val[12] = 0;//消息推送开关 默认是关闭 0 battery_point_val[13] = 0;//多媒体开关 + + #if defined(BOARD_W9) + battery_point_val[14] = 6;//客户编号 + battery_point_val[15] = 6;//产品编号 + // #elif defined(BOARD_N9) + // battery_point_val[14] = 7;//客户编号 + // battery_point_val[15] = 7;//产品编号 + #else battery_point_val[14] = 5;//客户编号 battery_point_val[15] = 5;//产品编号 + #endif battery_point_val[16] = 0;//硬件版本号 battery_point_val[17] = 1; @@ -1851,8 +1896,17 @@ static void svr_ble_bt_gatts_req_read_cb(uint8_t server_id, uint16_t conn_id, ga battery_point_val[12] = 0;//消息推送开关 默认是关闭 0 battery_point_val[13] = 0;//多媒体开关 + + #if defined(BOARD_W9) + battery_point_val[14] = 6;//客户编号 + battery_point_val[15] = 6;//产品编号 + // #elif defined(BOARD_N9) + // battery_point_val[14] = 7;//客户编号 + // battery_point_val[15] = 7;//产品编号 + #else battery_point_val[14] = 5;//客户编号 battery_point_val[15] = 5;//产品编号 + #endif battery_point_val[16] = 0;//硬件版本号 battery_point_val[17] = 1; @@ -2007,7 +2061,7 @@ void srv_ble_server_register_gatt_callbacks(void) g_ble_gatts_cbs.write_request_cb = svr_ble_bt_gatts_req_write_cb; g_ble_gatts_cbs.mtu_changed_cb = svr_ble_mtu_exchange; -#ifndef SUPPORT_OHOSFWK +#ifndef SUPPORT_AT_OHOSFWK gatts_register_callbacks(&g_ble_gatts_cbs); #else wrapper_gatts_register_callbacks(&g_ble_gatts_cbs); @@ -2097,7 +2151,7 @@ void svr_ble_bluetooth_init(void) #ifdef SUPPORT_ALIPAY_SEC svr_alipay_bluetooth_init(g_ble_server_id); #endif - #ifdef FACTORYTEST_SERVICE + #ifdef SUPPORT_FACTORY_SERVICE ble_factory_server_init(g_ble_server_id); #endif #ifdef SUPPORT_PPG_BLE_SERVICE @@ -2269,17 +2323,18 @@ static void blesrv_service_check_task(void const *arg) // mail.msg_data[2]); #if 1 - if(server_handle == 0) - {} - // if (server_handle == get_factory_ate_write_handl()) - // { - // factory_recv_cmd_data(p_msgbuf,msg_len,server_handle); - // } - // else if (server_handle == get_factory_ota_write_handl()) - // { - // factory_recv_ota_data(p_msgbuf,msg_len,server_handle); - // } - + // if(server_handle == 0) + // {} +#ifdef SUPPORT_FACTORY_SERVICE + if (server_handle == get_factory_ate_write_handl()) + { + factory_recv_cmd_data(p_msgbuf,msg_len,server_handle); + } + else if (server_handle == get_factory_ota_write_handl()) + { + factory_recv_ota_data(p_msgbuf,msg_len,server_handle); + } +#endif #ifdef SUPPORT_CYWEE_BLE_SERVICE else if (server_handle == get_cywee_ate_write_handl()) { diff --git a/code/sdk/zhihui/services/ble_service/bleservice/bleService.h b/code/sdk/zhihui/services/ble_service/bleservice/bleService.h index 5b7eaf73f..f7974c93a 100644 --- a/code/sdk/zhihui/services/ble_service/bleservice/bleService.h +++ b/code/sdk/zhihui/services/ble_service/bleservice/bleService.h @@ -35,6 +35,8 @@ extern uint16_t g_ble_server_handle; #ifdef CUSTOM_Z1 #define BLE_DEFAULT_NAME "Z1"//"KUMI U6" +#elif defined(BOARD_N9) +#define BLE_DEFAULT_NAME "NWO N9" #else #define BLE_DEFAULT_NAME "WATCH Soar"//"KUMI U6" #endif diff --git a/code/sdk/zhihui/services/factorytest_service/factorytestService.c b/code/sdk/zhihui/services/factorytest_service/factorytestService.c index c3e559e8d..cb7c7f0d0 100644 --- a/code/sdk/zhihui/services/factorytest_service/factorytestService.c +++ b/code/sdk/zhihui/services/factorytest_service/factorytestService.c @@ -11,7 +11,7 @@ #include "bts_gatt_server.h" #include "securec.h" #include "wearable_log.h" -#ifdef SUPPORT_OHOSFWK +#ifdef SUPPORT_AT_OHOSFWK #include "BluetoothWrapper.h" #endif @@ -52,7 +52,7 @@ static void ble_factorytest_add_service(uint8_t server_id) bts_data_to_uuid_len2(BLE_UUID_ATE_FACTORYTEST_SERVICE, &factory_service_uuid); //只有一个服务,永远是1 errcode_t ret = 0; -#ifndef SUPPORT_OHOSFWK +#ifndef SUPPORT_AT_OHOSFWK ret = gatts_add_service(server_id, &factory_service_uuid, true); // printf("ble_factorytest_add_service gatts_add_service ret: 0x%x serverId = 0x%x uuid.uuid_len:%d\n", ret, server_id,factory_service_uuid.uuid_len); #else diff --git a/code/sdk/zhihui/services/factorytest_service/factorytest_protocol.c b/code/sdk/zhihui/services/factorytest_service/factorytest_protocol.c index 88db3e428..27d0fbbda 100644 --- a/code/sdk/zhihui/services/factorytest_service/factorytest_protocol.c +++ b/code/sdk/zhihui/services/factorytest_service/factorytest_protocol.c @@ -2,7 +2,7 @@ * @Author: penglei 1624952103@qq.com * @Date: 2024-06-17 14:31:08 * @LastEditors: penglei 1624952103@qq.com - * @LastEditTime: 2025-07-31 16:23:18 + * @LastEditTime: 2025-08-16 18:15:33 * @FilePath: /FD230/code/sdk/application/wearable/service/factorytest_service/factorytest_protocol.c * @Description: * @@ -81,6 +81,9 @@ static gps_data_t send_gps_data = {0}; #include "touch_screen_drv.h" #include "rotary_encoder_drv.h" +#include "pm_veto.h" +#include "pm.h" + #pragma pack(1) typedef struct factorytest_cmd_header_t { @@ -182,10 +185,11 @@ void ble_acc_check_timer_callback(void) #ifdef SUPPORT_CYWEE_SERVICE gsenson_t t; cywee_get_gsensor_data(1,&t); - uint16_t x,y,z; - x = t.x*2048; - y = t.y*2048; - z = t.z*2048; + printf("x=%.3f, y=%.3f, z=%.3f\n", t.x, t.y, t.z); + int16_t x, y, z; + x = (int16_t)(t.x * 2048); + y = (int16_t)(t.y * 2048); + z = (int16_t)(t.z * 2048); databuf[0] = (uint8_t)((x & 0xFF00) >> 8); databuf[1] = (uint8_t)(x & 0x00FF); @@ -195,6 +199,11 @@ void ble_acc_check_timer_callback(void) databuf[4] = (uint8_t)((z & 0xFF00) >> 8); databuf[5] = (uint8_t)(z & 0x00FF); + + PRINT("%2X %2X %2X %2X %2X %2X\r\n", + databuf[0], databuf[1], + databuf[2], databuf[3], + databuf[4], databuf[5]); #endif factorytest_protocol_replymsg(BLE_TEST_CMD_MODE_SOFT_TEST, @@ -703,7 +712,7 @@ void factorytest_protocol_common_decode(uint8_t submode,uint8_t testitem,uint8_t &send_data, 1); LOS_Mdelay(100); - uapi_sys_shipmode(); + uapi_sys_shipmode(0); } else if(testitem == 0x05) { @@ -1213,7 +1222,12 @@ void factorytest_protocol_soft_test_decode(uint8_t submode,uint8_t testitem,uint //LCD 上电 uint8_t send_data = 0x00; - mcu_pm_lcd_on(0,0); + const power_display_svr_api_t * display_api = power_display_svr_get_api(); + if (display_api) + { + display_api->turn_on_screen(); + } + factorytest_protocol_replymsg(BLE_TEST_CMD_MODE_SOFT_TEST, BLE_TEST_CMD_SOFT_TEST_SUB_MODE_LCD, 0x02, @@ -1224,7 +1238,11 @@ void factorytest_protocol_soft_test_decode(uint8_t submode,uint8_t testitem,uint //LCD下电 uint8_t send_data = 0x00; - mcu_pm_lcd_off(0,0); + const power_display_svr_api_t * display_api = power_display_svr_get_api(); + if (display_api) + { + display_api->turn_off_screen(); + } factorytest_protocol_replymsg(BLE_TEST_CMD_MODE_SOFT_TEST, BLE_TEST_CMD_SOFT_TEST_SUB_MODE_LCD, @@ -1386,11 +1404,12 @@ void factorytest_protocol_soft_test_decode(uint8_t submode,uint8_t testitem,uint #ifdef SUPPORT_CYWEE_SERVICE gsenson_t t; cywee_get_gsensor_data(1,&t); - uint16_t x,y,z; - x = t.x*2048; - y = t.y*2048; - z = t.z*2048; - + printf("x=%.3f, y=%.3f, z=%.3f\n", t.x, t.y, t.z); + int16_t x, y, z; + x = (int16_t)(t.x * 2048); + y = (int16_t)(t.y * 2048); + z = (int16_t)(t.z * 2048); + printf("x=%d, y=%d, z=%d\n", x, y, z); databuf[0] = (uint8_t)((x & 0xFF00) >> 8); databuf[1] = (uint8_t)(x & 0x00FF); @@ -1399,6 +1418,11 @@ void factorytest_protocol_soft_test_decode(uint8_t submode,uint8_t testitem,uint databuf[4] = (uint8_t)((z & 0xFF00) >> 8); databuf[5] = (uint8_t)(z & 0x00FF); + + PRINT("%2X %2X %2X %2X %2X %2X\r\n", + databuf[0], databuf[1], + databuf[2], databuf[3], + databuf[4], databuf[5]); #endif factorytest_protocol_replymsg(BLE_TEST_CMD_MODE_SOFT_TEST, @@ -1452,16 +1476,18 @@ void factorytest_protocol_soft_test_decode(uint8_t submode,uint8_t testitem,uint if(testitem == 0x01) { //获取 ppg_id - uint8_t ppg_id; + uint8_t send_data[2]; #ifdef SUPPORT_PPG_SERVICE - ppg_id = ppg_get_chip_id(); -#endif + uint16_t ppg_id = ppg_get_chip_id(); PRINT("0x%x\n",ppg_id); + send_data[0] = ppg_id >> 8; + send_data[1] = ppg_id; +#endif factorytest_protocol_replymsg(BLE_TEST_CMD_MODE_SOFT_TEST, BLE_TEST_CMD_SOFT_TEST_SUB_MODE_HRS, 0x01, - &ppg_id, - 1); + &send_data, + 2); } else if(testitem == 0x02) { @@ -1726,14 +1752,14 @@ void factorytest_protocol_soft_test_decode(uint8_t submode,uint8_t testitem,uint send_data, 2); - } else if(testitem == 0x03) + } else if(testitem == 0x03) { //获取电量 - uint8_t power; - battery_getvolpower(&power); + float voltage = 0; + uint8_t percent = batteryservice_get_voltage(&voltage); uint8_t send_data[3] = {0}; - send_data[2] = power & 0XFF; + send_data[2] = percent & 0XFF; factorytest_protocol_replymsg(BLE_TEST_CMD_MODE_SOFT_TEST, BLE_TEST_CMD_SOFT_TEST_SUB_MODE_PM, @@ -1745,7 +1771,7 @@ void factorytest_protocol_soft_test_decode(uint8_t submode,uint8_t testitem,uint //获取电压 float voltage; uint16_t vol; - battery_getvoltage(&voltage); + batteryservice_get_voltage(&voltage); uint8_t send_data[3] = {0}; vol = voltage * 1000; @@ -1832,6 +1858,15 @@ void factorytest_protocol_soft_test_decode(uint8_t submode,uint8_t testitem,uint //打开cat1 uint8_t send_data = 0x00; + uint8_t cnt = pm_veto_get_id_cnt(PM_ID_P_TEST); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "cnt : %d\n",cnt); + if (cnt == 0) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "uapi_pm_add_sleep_veto(PM_ID_P_TEST);"); + uapi_pm_add_sleep_veto(PM_ID_P_TEST); + } + + uapi_set4GCapability(true); factorytest_protocol_replymsg(BLE_TEST_CMD_MODE_SOFT_TEST, @@ -1847,6 +1882,14 @@ void factorytest_protocol_soft_test_decode(uint8_t submode,uint8_t testitem,uint uapi_set4GCapability(false); + uint8_t cnt = pm_veto_get_id_cnt(PM_ID_P_TEST); + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "cnt : %d\n",cnt); + if (cnt == 1) + { + WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "uapi_pm_add_sleep_veto(PM_ID_P_TEST);"); + uapi_pm_remove_sleep_veto(PM_ID_P_TEST); + } + factorytest_protocol_replymsg(BLE_TEST_CMD_MODE_SOFT_TEST, BLE_TEST_CMD_SOFT_TEST_SUB_MODE_CAT1, 0x02, @@ -2280,7 +2323,7 @@ errcode_t factorytest_protocol_decode(uint8_t *buf, uint16_t event_size) printf("crc16 0x%04X vs 0x%04X\n",crc16,crc16_2); - // if( crc16 == crc16_2) //校验通过,开始正式解析 + if( crc16 == crc16_2) //校验通过,开始正式解析 { if(factorytest_mode_flag == 0 && header.submod != BLE_TEST_CMD_COMMON_SUB_MODE_SWITCH_MODE) return ERRCODE_FAIL; diff --git a/code/sdk/zhihui/services/gnss/driver/product_porting/porting/tiot_board_uart_port.c b/code/sdk/zhihui/services/gnss/driver/product_porting/porting/tiot_board_uart_port.c index 1717c3963..5b2584a50 100644 --- a/code/sdk/zhihui/services/gnss/driver/product_porting/porting/tiot_board_uart_port.c +++ b/code/sdk/zhihui/services/gnss/driver/product_porting/porting/tiot_board_uart_port.c @@ -15,7 +15,7 @@ #include "pinctrl.h" #include "pinctrl_porting.h" -#define TIOT_UAPI_RW_TIMEOUT 0xFFFFFFFF +#define TIOT_UAPI_RW_TIMEOUT 0xFFFFFFF3 #define UART_RX_BUFFER_SIZE 56 #define TIOT_UAPI_UART_RX_MAX 1024 diff --git a/code/sdk/zhihui/services/gnss/sample/gnss_sample/gnss_sample.c b/code/sdk/zhihui/services/gnss/sample/gnss_sample/gnss_sample.c index a4984ce2c..bdc307031 100644 --- a/code/sdk/zhihui/services/gnss/sample/gnss_sample/gnss_sample.c +++ b/code/sdk/zhihui/services/gnss/sample/gnss_sample/gnss_sample.c @@ -11,10 +11,6 @@ #include "pm_definition.h" #include "gnss_ctl.h" -#ifdef SUPPORT_CYWEE_SERVICE -#include "cywee_hal.h" -#include "cywee_service.h" -#endif #define COLDSTART_FIXMODEGPS_NMEAALL_SAMPLE 0 #define AUTOSTART_FIXMODEALL_NMEADEF_SAMPLE 1 @@ -102,10 +98,6 @@ static int decode_nmea(char c) memcpy_s(&g_global_gpsData,sizeof(gps_data_t),&(g_nmeadata.gpsData),sizeof(gps_data_t)); ret = 1; memset(&g_nmeadata,0,sizeof(g_nmeadata)); -#ifdef SUPPORT_CYWEE_SERVICE - if(uapi_dev_runtime_get_train_status()) - do_cywee_service_check_msg(CYWEE_SERVICE_CMD_GNSS_UPDATE,NULL); -#endif } } @@ -322,6 +314,7 @@ void GnssServerStart(void) #endif g_is_gnss_poweron = 1; g_gnss_stopflag = 0; + sw_debug_uart_deinit(); // Step1: init int32_t ret = tiot_service_init(); if (ret != 0) { @@ -395,5 +388,7 @@ void GnssServerStart(void) #endif uapi_pm_remove_sleep_veto(PM_ID_SYS); g_is_gnss_poweron=0; + sw_debug_uart_deinit(); + uart_config_init(); printf("\nfinish gnss samples\n"); } \ No newline at end of file diff --git a/code/sdk/zhihui/services/gnss/src/uart_gnss.c b/code/sdk/zhihui/services/gnss/src/uart_gnss.c index 506b3b2ec..c6a6baaff 100644 --- a/code/sdk/zhihui/services/gnss/src/uart_gnss.c +++ b/code/sdk/zhihui/services/gnss/src/uart_gnss.c @@ -31,6 +31,7 @@ #include "gnss_ctl.h" #include "tiot_board_pin_port.h" #include "pgnss_sample.h" +// #include "gnss_sample.h" // errcode_t gnss_get_next_cmd(uint8_t cmd_index,uint8_t** cmdbuf,int *cmdlen); // errcode_t gnss_get_current_cmd(uint8_t cmd_index,uint8_t** cmdbuf,int *cmdlen); // errcode_t gnss_get_nmea_cfg_cmd(uint8_t** cmdbuf,int *cmdlen); @@ -112,11 +113,11 @@ void do_gnss_cmd(int cmd,uint8_t *buffer,uint32_t size) uint32_t gnss_write_cmd(uint8_t * cmdbuf,uint16_t cmdlen) { - return uapi_uart_write(TIOT_UART_PORT, cmdbuf, cmdlen,0); + return uapi_uart_write(TIOT_UART_PORT, cmdbuf, cmdlen,0xFFFFFFF3); } uint32_t gnss_data_read(uint8_t * cmdbuf,uint16_t cmdlen) { - return uapi_uart_read(TIOT_UART_PORT, cmdbuf, cmdlen,0); + return uapi_uart_read(TIOT_UART_PORT, cmdbuf, cmdlen,0xFFFFFFF3); } static void uart_event_task(void const *arg) { diff --git a/code/sdk/zhihui/utils/custom_cmd_service.c b/code/sdk/zhihui/utils/custom_cmd_service.c index c7d74b180..48aa1695e 100644 --- a/code/sdk/zhihui/utils/custom_cmd_service.c +++ b/code/sdk/zhihui/utils/custom_cmd_service.c @@ -223,6 +223,7 @@ static void custom_cmd_service_check_task(void const *arg) uaip_cmd_update_request(); break; case CUSTOM_CMD_MSG_TYPE_LCD_TEST: +#ifdef SUPPORT_FACTORY_SERVICE if(mail.data[0] == 1) { uapi_set_screen_on_api(); @@ -239,8 +240,10 @@ static void custom_cmd_service_check_task(void const *arg) { uapi_factorytest_enter_test_view(0); } +#endif break; case CUSTOM_CMD_MSG_TYPE_LCD_COLOR_TEST: +#ifdef SUPPORT_FACTORY_SERVICE switch (mail.data[0]) { case 1: @@ -262,22 +265,26 @@ static void custom_cmd_service_check_task(void const *arg) default: break; } +#endif break; case CUSTOM_CMD_MSG_TYPE_TP_TEST: +#ifdef SUPPORT_FACTORY_SERVICE if(mail.data[0] == 1) { - uapi_set_screen_on_api(); - uapi_factorytest_enter_test_view(1); - uapi_factorytest_enter_test_tp_view(); - // HandleUpdatelcdMode(2); - uapi_factorytest_hide_test_tp_button(); + //uapi_set_screen_on_api(); + //uapi_factorytest_enter_test_view(1); + //uapi_factorytest_enter_test_tp_view(); + HandleUpdatelcdMode(2); + //uapi_factorytest_hide_test_tp_button(); } else { uapi_factorytest_enter_test_view(0); } +#endif break; case CUSTOM_CMD_MSG_TYPE_CROWN_TEST: +#ifdef SUPPORT_FACTORY_SERVICE if(mail.data[0] == 1) { //uapi_set_screen_on_api(); @@ -289,6 +296,7 @@ static void custom_cmd_service_check_task(void const *arg) { uapi_factorytest_enter_test_view(0); } +#endif break; case CUSTOM_CMD_MSG_TYPE_VIBRATOR_TEST: uapi_vibrator_test(2 * 60 * 60); diff --git a/code/sdk/zhihui/utils/custom_utils.c b/code/sdk/zhihui/utils/custom_utils.c index 043b12d7a..52354fe18 100644 --- a/code/sdk/zhihui/utils/custom_utils.c +++ b/code/sdk/zhihui/utils/custom_utils.c @@ -36,7 +36,7 @@ #include "lwip/sys.h" #endif #include "system/include/SystemLogModelC.h" -#ifdef FD230_COMPONENT +#ifdef FD230 #include "soundandvibration/include/SoundAndVibrationVolumeSettingC.h" #include "networkandcall/include/NetworkAndCallC.h" #include "producttest/include/testmicrophoneC.h" @@ -64,6 +64,10 @@ #include "custom_runtime.h" #include "pm_definition.h" +#ifdef SUPPORT_ALIPAY_SEC +#include "alipay_feature.h" +#endif + #define SUPPORT_NV #ifdef SUPPORT_NV @@ -75,6 +79,7 @@ /* Use lwip time functions instead of musl */ #include "time.h" +#include "uart.h" /* Define time structures to avoid musl dependency */ typedef long suseconds_t; /* microseconds (signed) */ @@ -107,7 +112,7 @@ extern time_t __tm_to_secs(const struct tm *tm); #include "service/a5133_service.h" #include "input_app.h" #endif -#ifdef FD230_COMPONENT +#ifdef FD230 #include "bluetooth/include/BluetoothModelC.h" #endif @@ -338,7 +343,7 @@ void shutdown_reboot_prejobs_task(void) { // printf(); #ifdef SUPPORT_BLE_SERVICE -#ifdef FD230_COMPONENT +#ifdef FD230 C_ScheduleDataWriteToFile(); //同步的时候进行保存 #endif #endif @@ -357,7 +362,7 @@ void shutdown_reboot_prejobs_task(void) //ble_sos_data_save();//同步数据存储 //保存信息文件 - #ifdef FD230_COMPONENT + #ifdef FD230 saveancsdata(); //接收到信息进行保存 暂时不修改 #endif //保存当天心率数据 @@ -490,7 +495,7 @@ bool start_custom_ble_service(void) //加锁避免bt 初始化失败 // uint32_t irq_sts = osal_irq_lock(); #ifdef SUPPORT_BLE_SERVICE -#ifdef FD230_COMPONENT +#ifdef FD230 PRINT("start custom protocol classic bt ble service !\r\n"); bluetooth_enable_all(); @@ -510,7 +515,7 @@ bool stop_custom_ble_service(void) { #ifdef SUPPORT_BLE_SERVICE PRINT("stop custom protocol classic bt ble service !\r\n"); -// #ifdef FD230_COMPONENT +// #ifdef FD230 bluetooth_close_all(); // #endif @@ -2798,9 +2803,9 @@ void uapi_exit_power_saving_mode(void) //cywee清空每日数据 void uapi_cywee_reset_daily_data(void) { - #ifdef FD230_650 +#ifdef SUPPORT_CYWEE_SERVICE do_cywee_service_check_msg(CYWEE_SERVICE_CMD_RESET_DAILY_DATA,NULL); - #endif +#endif } //cywee时间更新 @@ -2819,9 +2824,9 @@ void uapi_cywee_get_id(uint8_t *id) void uapi_cywee_get_chipinfo(char *databuf,uint8_t len) { - #ifdef FD230_650 +#ifdef SUPPORT_CYWEE_SERVICE cywee_get_chipinfo(databuf,len); - #endif +#endif } void uapi_cywee_get_version(char *databuf,uint8_t len) @@ -2831,11 +2836,10 @@ void uapi_cywee_get_version(char *databuf,uint8_t len) #endif } -#ifdef SUPPORT_ALIPAY_SEC -#include "alipay_feature.h" int custom_exit_lpm(void) { - int ret; + int ret = 0; +#ifdef SUPPORT_ALIPAY_SEC const alipay_svr_api_t *alipay_api = alipay_svr_get_api(); ret = alipay_api->exit_lpm(); @@ -2843,19 +2847,14 @@ int custom_exit_lpm(void) PRINT("ALIPAY TEST SUCCED !!! \r\n"); else PRINT("ALIPAY TEST FAILED !!! \r\n"); - +#endif return ret; } -#else -int custom_exit_lpm(void) -{ - return 0; -} -#endif + int32_t uapi_microhone_switch(bool isopen) { - #ifdef FD230_COMPONENT + #ifdef FD230 return microhone_switch(isopen); #else return 0; @@ -2865,63 +2864,63 @@ int32_t uapi_microhone_switch(bool isopen) void uapi_check_spk(uint8_t isopen) { - #ifdef FD230_COMPONENT + #ifdef FD230 check_spk(isopen); #endif } void uapi_check_mic(bool isopen) { - #ifdef FD230_COMPONENT + #ifdef FD230 check_mic(isopen); #endif } void uapi_factorytest_set_lcd_color(int color) { - #ifdef FD230_COMPONENT + #ifdef FD230 factorytest_set_LCD_color(color); #endif } void uapi_factorytest_enter_test_view(int cmd) { - #ifdef FD230_COMPONENT + #ifdef FD230 factorytest_enter_test_view(cmd); #endif } void uapi_factorytest_enter_test_tp_view(void) { - #ifdef FD230_COMPONENT + #ifdef FD230 factorytest_enter_test_tp_view(); #endif } void uapi_factorytest_enter_test_lcd_view(void) { - #ifdef FD230_COMPONENT + #ifdef FD230 factorytest_enter_test_lcd_view(); #endif } void uapi_factorytest_enter_test_button_view(void) { - #ifdef FD230_COMPONENT + #ifdef FD230 factorytest_enter_test_button_view(); #endif } void uapi_factorytest_hide_test_lcd_button(void) { - #ifdef FD230_COMPONENT + #ifdef FD230 factorytest_hide_test_lcd_button(); #endif } void uapi_factorytest_hide_test_tp_button(void) { - #ifdef FD230_COMPONENT + #ifdef FD230 factorytest_hide_test_tp_button(); #endif } @@ -4261,18 +4260,22 @@ void uapi_cat1_add_cat1_vote(void) void uapi_get_lcd_id(uint32_t *id) { - if(id == NULL) - return; - lcd_drv_common *lcd_drv_comm_api = NULL; + lcd_drv_cfg *lcd_cfg = NULL; lcd_drv_comm_api = lcd_drv_get_common_api(); - if (lcd_drv_comm_api == NULL) - { + if (lcd_drv_comm_api == NULL) { PRINT("lcd_drv_comm_api is null.\r\n"); } else { - lcd_drv_comm_api->get_chip_id(id); + lcd_cfg = lcd_drv_comm_api->get_lcd_config(); + if (lcd_cfg == NULL) { + PRINT("lcd_cfg is null.\r\n"); + }else + { + PRINT("LCD ID : 0x%x\r\n",(uint32_t)lcd_cfg->lcd_id); + *id = (uint32_t)lcd_cfg->lcd_id; + } } } \ No newline at end of file