开机兼容a5133配置

diff --git a/code/sdk/drivers/boards/brandy_evb/board_config/board_evb.h b/code/sdk/drivers/boards/brandy_evb/board_config/board_evb.h
index d28642a..59a9dc9 100755 (executable)
--- a/code/sdk/drivers/boards/brandy_evb/board_config/board_evb.h
+++ b/code/sdk/drivers/boards/brandy_evb/board_config/board_evb.h
@@ -197,7 +197,11 @@ const hal_pio_config_t g_pio_function_config[PIN_MAX_NUMBER] = {
     { HAL_PIO_FUNC_GPIO, HAL_PIO_DRIVE_MAX, HAL_PIO_PULL_MAX, HAL_PIO_IE_DISABLE },   // S_AGPIO_L28    CAT_1复位 CAT1_RESET_N  拉低有效
     { HAL_PIO_FUNC_GPIO, HAL_PIO_DRIVE_MAX, HAL_PIO_PULL_MAX, HAL_PIO_IE_ENBALE },   // S_AGPIO_L29    charge done info 检测是否充满电
     { HAL_PIO_FUNC_GPIO, HAL_PIO_DRIVE_MAX, HAL_PIO_PULL_MAX, HAL_PIO_IE_DISABLE },   // S_AGPIO_L30   KP_MKIN1 唤醒 CAT1 ，输出
-    { HAL_PIO_FUNC_GPIO, HAL_PIO_DRIVE_MAX, HAL_PIO_PULL_DOWN, HAL_PIO_IE_DISABLE },   // S_AGPIO_L31    KP_MKOUIT1 唤醒 蓝牙 ,输入
+#ifdef SUPPORT_A5133_SERVICE
+    { HAL_PIO_FUNC_GPIO, HAL_PIO_DRIVE_MAX, HAL_PIO_PULL_DOWN, HAL_PIO_IE_DISABLE },   // S_AGPIO_L31  控制A5133开关
+#else
+    { HAL_PIO_FUNC_GPIO, HAL_PIO_DRIVE_MAX, HAL_PIO_PULL_MAX, HAL_PIO_IE_ENBALE },   // S_AGPIO_L31    KP_MKOUIT1 唤醒 蓝牙 ,输入
+#endif
     { HAL_PIO_FUNC_GPIO, HAL_PIO_DRIVE_MAX, HAL_PIO_PULL_DOWN, HAL_PIO_IE_DISABLE },   // S_AGPIO_L32    NC
 
     { HAL_PIO_FUNC_GPIO, HAL_PIO_DRIVE_MAX, HAL_PIO_PULL_MAX, HAL_PIO_IE_DISABLE },   // S_AGPIO_R0   PRG_LED_POWER ON  心率等电源控制脚
@@ -252,7 +256,11 @@ const hal_pio_config_t g_pio_function_config[PIN_MAX_NUMBER] = {
 
 //默认开启Cat1 然后再根据配置决定是否关闭. 
 //默认不开启 ppg checkid失败，原因未知，暂时开机开启cat1
+#ifdef SUPPORT_A5133_SERVICE
+#define DEFAULT_POWERON_CAT1 1
+#else
 #define DEFAULT_POWERON_CAT1 0
+#endif
 
 //需要配置默认输出的，以及需要配置默认输入中断函数的。
 const hal_gpio_config_t g_gpio_function_config[PIN_MAX_NUMBER] = {

diff --git a/code/sdk/drivers/peripheral/config/include/ConfigModel.h b/code/sdk/drivers/peripheral/config/include/ConfigModel.h
index 8282eb5..4210bec 100644 (file)
--- a/code/sdk/drivers/peripheral/config/include/ConfigModel.h
+++ b/code/sdk/drivers/peripheral/config/include/ConfigModel.h
@@ -285,7 +285,11 @@ namespace OHOS
             {ConfigDataType::DATATYPE_BOOL,    "classicbt_service_on",     "true"  },// CONFIGMODEL_ITEM_CLASSIC_BT_SERVICE_ON, //关机前经典蓝牙服务状态,启动时仍然恢复其当时状态
             {ConfigDataType::DATATYPE_INT,     "screen_brightness",         "204"    },//CONFIGMODEL_ITEM_SCREEN_BRIGHTNESS_VALUE,   //屏幕亮度
             {ConfigDataType::DATATYPE_INT,     "screenoff_timeout_value",    "5000"  },//CONFIGMODEL_ITEM_SCREEN_OFF_TIMEOUT_VALUE,   //屏幕自动息屏时间 默认 5秒 5000ms
+        #ifdef SUPPORT_A5133_SERVICE
+            {ConfigDataType::DATATYPE_BOOL,    "cat1_service_on",          "true" },//CONFIGMODEL_ITEM_CAT1_SERVICE_ON, // 关机前Cat1 Service启动着,则重启仍然启动,反之亦然
+        #else
             {ConfigDataType::DATATYPE_BOOL,    "cat1_service_on",          "false" },//CONFIGMODEL_ITEM_CAT1_SERVICE_ON, // 关机前Cat1 Service启动着,则重启仍然启动,反之亦然
+        #endif
             {ConfigDataType::DATATYPE_STRING,  "cat1_imei",                "pls poweron 4G first"      },//CONFIGMODEL_ITEM_CAT1_IMEI,
             {ConfigDataType::DATATYPE_STRING,  "cat1_modemver",            "pls poweron 4G first"      },//CONFIGMODEL_ITEM_CAT1_MODEMVER,
             {ConfigDataType::DATATYPE_STRING,  "cat1_pyver",               "pls poweron 4G first"      },//CONFIGMODEL_ITEM_CAT1_PYVER,