From: SnickerSun Date: Tue, 26 Dec 2023 09:00:56 +0000 (+0800) Subject: 添加Cat1电源开关,Cat1 Rest开关,电池电压的 AT指令 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=9b476c94e67e8c9403f5e6e34860e2e54f085d42;p=mirrors%2FFD230.git 添加Cat1电源开关,Cat1 Rest开关,电池电压的 AT指令 默认配置Cat1电源关闭 --- diff --git a/code/sdk/application/wstp/at_service/app/app_at_process.c b/code/sdk/application/wstp/at_service/app/app_at_process.c index 2be8e1a47..b0edae7e6 100755 --- a/code/sdk/application/wstp/at_service/app/app_at_process.c +++ b/code/sdk/application/wstp/at_service/app/app_at_process.c @@ -1568,7 +1568,66 @@ static uint32_t adc_auto_sample_disable(uint8_t *para, uint32_t para_len) return(uapi_adc_auto_scan_ch_disable(channel)); } #endif +extern bool battery_get_voltage_by_channel(float *voltage, uint8_t channel); +extern uint8_t battery_get_voltage(float *voltage); +static uint32_t adc_manu_sample_adc(uint8_t *para, uint32_t para_len) +{ + char *ptr = (char *)para; + uint32_t ret = 0; + float voltage = 0.0F ; + uint32_t channel = strtoul(ptr, NULL, 10); // 10: 十进制 + + // battery_get_voltage_by_channel(&voltage,channel); + uint8_t percent = battery_get_voltage(&voltage); + wstp_print("manu adc sample , channel = %x , voltage = %.03f , percent = %u\r\n", channel,voltage,percent); + return 0; +} +static uint32_t cat1_power_on(uint8_t *para, uint32_t para_len) +{ + uint32_t pwron = 0; + if(para_len > 0) + { + char *ptr = (char *)para; + pwron = strtoul(ptr, NULL, 10); // 10: 十进制 + } + if( pwron == 0) + { + uapi_gpio_set_dir(S_AGPIO_L23, HAL_GPIO_DIRECTION_OUTPUT); + uapi_gpio_set_val(S_AGPIO_L23, HAL_GPIO_LEVEL_LOW); + wstp_print("Power OFF Cat1! L23 low \r\n"); + }else{ + uapi_gpio_set_dir(S_AGPIO_L23, HAL_GPIO_DIRECTION_OUTPUT); + uapi_gpio_set_val(S_AGPIO_L23, HAL_GPIO_LEVEL_HIGH); + wstp_print("Power ON Cat1! L23 high \r\n"); + } + + wstp_print("cat1_power_on\r\n" ); + return 0; +} +static uint32_t cat1_reset(uint8_t *para, uint32_t para_len) +{ + uint32_t pwron = 0; + if(para_len > 0) + { + char *ptr = (char *)para; + pwron = strtoul(ptr, NULL, 10); // 10: 十进制 + } + + if( pwron == 0) + { + uapi_gpio_set_dir(S_AGPIO_L28, HAL_GPIO_DIRECTION_OUTPUT); + uapi_gpio_set_val(S_AGPIO_L28, HAL_GPIO_LEVEL_HIGH); + wstp_print("clear reset Cat1! L28 high \r\n"); + }else{ + uapi_gpio_set_dir(S_AGPIO_L28, HAL_GPIO_DIRECTION_OUTPUT); + uapi_gpio_set_val(S_AGPIO_L28, HAL_GPIO_LEVEL_LOW); + wstp_print("Reset Cat1! L28 low\r\n"); + } + + wstp_print("cat1_reset\r\n" ); + return 0; +} static void pm_lcd_off_handle(void) { writew(0x570000c0, 0x0); // display logic crg reset @@ -2524,6 +2583,7 @@ static const app_process_table g_app_funcs[] = { { ADCCLOSEAUTOSAMPLE, adc_auto_sample_disable }, { ADCSHOWDATA, adc_auto_sample_show_data }, #endif + { ADCMANUDATA, adc_manu_sample_adc}, { BUTTON, mcu_button_sample }, { POWERKEY, mcu_power_key_config }, #ifdef SUPPROT_EXECUTE_CORMARK @@ -2557,6 +2617,8 @@ static const app_process_table g_app_funcs[] = { #ifdef SUPPORT_ALIPAY_SEC { ALIPAYSECTEST, mcu_alipay_sec_test }, #endif + { CAT1PWRON, cat1_power_on}, + { CAT1RESET, cat1_reset}, }; void app_at_process(uint8_t *data, uint32_t data_len) diff --git a/code/sdk/application/wstp/at_service/app/app_cmd_manager.c b/code/sdk/application/wstp/at_service/app/app_cmd_manager.c index de073a397..8ce8f23db 100755 --- a/code/sdk/application/wstp/at_service/app/app_cmd_manager.c +++ b/code/sdk/application/wstp/at_service/app/app_cmd_manager.c @@ -622,6 +622,33 @@ static uint32_t app_adc_disableautosample(uint8_t *para, uint32_t para_len, char return ERRCODE_SUCC; } #endif +static uint32_t app_adc_manu_data(uint8_t *para, uint32_t para_len, char *str_cmd) +{ + unused(str_cmd); + if (para == NULL) { + return ERRCODE_FAIL; + } + app_pkg_msg_send(ADCMANUDATA, DIAG_CONTROL_FALSE, para, para_len); + return ERRCODE_SUCC; +} +static uint32_t app_cat1pwron(uint8_t *para, uint32_t para_len, char *str_cmd) +{ + unused(str_cmd); + if (para == NULL) { + return ERRCODE_FAIL; + } + app_pkg_msg_send(CAT1PWRON, DIAG_CONTROL_FALSE, para, para_len); + return ERRCODE_SUCC; +} +static uint32_t app_cat1reset(uint8_t *para, uint32_t para_len, char *str_cmd) +{ + unused(str_cmd); + if (para == NULL) { + return ERRCODE_FAIL; + } + app_pkg_msg_send(CAT1RESET, DIAG_CONTROL_FALSE, para, para_len); + return ERRCODE_SUCC; +} static uint32_t app_button_sample(uint8_t *para, uint32_t para_len, char *str_cmd) { @@ -898,6 +925,7 @@ static const at_cmd_table_t g_app_cmd[] = { { "AT^CLOSEADCSCAN", app_adc_disableautosample, "" }, { "AT^SHOWADCDATA", app_adc_show_data, "" }, #endif + { "AT^MANUADCDATA", app_adc_manu_data, "" }, { "AT^NANDW", app_nand_write, "" }, { "AT^NANDR", app_nand_read, "" }, { "AT^NANDE", app_nand_erase, "" }, @@ -942,6 +970,9 @@ static const at_cmd_table_t g_app_cmd[] = { { "AT^I2CWRITE", app_i2c_write, "" }, { "AT^I2CREAD", app_i2c_read, "" }, { "AT^ALIPAYSECTEST", app_alipay_sec_test, "" }, + { "AT^CAT1PWRON", app_cat1pwron, "" }, + { "AT^CAT1RESET", app_cat1reset, ""}, + }; at_cmd_table_t *get_app_cmd_table(uint32_t *cmd_count) diff --git a/code/sdk/application/wstp/at_service/app/app_msg_manager.h b/code/sdk/application/wstp/at_service/app/app_msg_manager.h index c16dcbc73..7114e5bc7 100755 --- a/code/sdk/application/wstp/at_service/app/app_msg_manager.h +++ b/code/sdk/application/wstp/at_service/app/app_msg_manager.h @@ -99,6 +99,9 @@ typedef enum { SETCALENDAR = 0x44, GETCALENDAR = 0x45, ALIPAYSECTEST = 0x46, + ADCMANUDATA = 0x47, + CAT1PWRON = 0x48, + CAT1RESET = 0x49, MSG_ID_MAX_BUTT, } app_msg_id; 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 eaa87e4fb..2e28e1ae4 100755 --- a/code/sdk/drivers/boards/brandy_evb/board_config/board_evb.h +++ b/code/sdk/drivers/boards/brandy_evb/board_config/board_evb.h @@ -170,12 +170,12 @@ const hal_pio_config_t g_pio_function_config[PIN_MAX_NUMBER] = { #else { HAL_PIO_FUNC_TE, HAL_PIO_DRIVE_MAX, HAL_PIO_PULL_MAX, HAL_PIO_IE_ENBALE }, // S_AGPIO_L22 MIPI TE #endif - { HAL_PIO_FUNC_GPIO, HAL_PIO_DRIVE_MAX, HAL_PIO_PULL_MAX, HAL_PIO_IE_DISABLE }, // S_AGPIO_L23 CAT_1_PWR_ON 控制CAT_1开机脚,或者控制 CAT1电源 + { HAL_PIO_FUNC_GPIO, HAL_PIO_DRIVE_MAX, HAL_PIO_PULL_NONE, HAL_PIO_IE_DISABLE }, // S_AGPIO_L23 CAT_1_PWR_ON 控制CAT_1开机脚,或者控制 CAT1电源 拉高有效 { HAL_PIO_FUNC_GPIO, HAL_PIO_DRIVE_MAX, HAL_PIO_PULL_MAX, HAL_PIO_IE_DISABLE }, // S_AGPIO_L24 LCM_EN { HAL_PIO_FUNC_GPIO, HAL_PIO_DRIVE_MAX, HAL_PIO_PULL_MAX, HAL_PIO_IE_DISABLE }, // S_AGPIO_L25 //////////// audio pa reset { HAL_PIO_FUNC_GPIO, HAL_PIO_DRIVE_MAX, HAL_PIO_PULL_MAX, HAL_PIO_IE_DISABLE }, // S_AGPIO_L26 心率复位 PPG reset { HAL_PIO_FUNC_GPIO, HAL_PIO_DRIVE_MAX, HAL_PIO_PULL_MAX, HAL_PIO_IE_DISABLE }, // S_AGPIO_L27 LCM reset - { 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_NONE, 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_MAX, HAL_PIO_IE_ENBALE }, // S_AGPIO_L31 KP_MKOUIT1 唤醒 蓝牙 ,输入 @@ -225,17 +225,33 @@ const hal_pio_config_t g_pio_function_config[PIN_MAX_NUMBER] = { } hal_gpio_config_t; */ + +#define DEFAULT_POWERON_CAT1 0 //需要配置默认输出的,以及需要配置默认输入中断函数的。 const hal_gpio_config_t g_gpio_function_config[PIN_MAX_NUMBER] = { - // S_AGPIO_L28 Cat1 reset ---- low reset +#if DEFAULT_POWERON_CAT1 + // S_AGPIO_L23 CAT_1_PWR_ON ----- high power on + { S_AGPIO_L23, HAL_GPIO_DIRECTION_OUTPUT, HAL_GPIO_LEVEL_HIGH, 0, NULL }, + // S_AGPIO_L28 Cat1 reset ---- low reset + { S_AGPIO_L28, HAL_GPIO_DIRECTION_OUTPUT, HAL_GPIO_LEVEL_HIGH, 0, NULL }, +#else + // S_AGPIO_L23 CAT_1_PWR_ON ----- high power on + { S_AGPIO_L23, HAL_GPIO_DIRECTION_OUTPUT, HAL_GPIO_LEVEL_LOW, 0, NULL }, + // S_AGPIO_L28 Cat1 reset ---- low reset { S_AGPIO_L28, HAL_GPIO_DIRECTION_OUTPUT, HAL_GPIO_LEVEL_LOW, 0, NULL }, +#endif // // S_AGPIO_L17 HX3507_INT // { S_AGPIO_L17, HAL_GPIO_DIRECTION_INPUT, NULL, 0, NULL }, // // S_AGPIO_L12 SDIO_BT // { S_AGPIO_L12, HAL_GPIO_DIRECTION_INPUT, NULL, 0, NULL }, // // S_AGPIO_L13 SCLK_BT // { S_AGPIO_L13, HAL_GPIO_DIRECTION_INPUT, NULL, 0, NULL }, + + //S_AGPIO_L21 NTC_VDD_ON 给低打开 NTC上拉电源 + { S_AGPIO_L21, HAL_GPIO_DIRECTION_OUTPUT, HAL_GPIO_LEVEL_LOW, 0, NULL }, + + }; /** * @}