From 900d307e54e7f2dbb2e16b41a3a46b59c884d589 Mon Sep 17 00:00:00 2001 From: payton Date: Tue, 26 Sep 2023 15:17:34 +0800 Subject: [PATCH] =?UTF-8?q?1.=E7=94=B5=E6=B1=A0=E8=AF=BB=E5=8F=96=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Dx/565_HUNTING_EVB_LINUX_4G_S530/IOCfg.h | 3 +++ .../Dx/565_HUNTING_EVB_LINUX_4G_S550/IOCfg.h | 3 +++ .../sf_app/code/source/battery/sf_battery.c | 20 +++++++++---------- .../Dx/565_HUNTING_EVB_LINUX_4G_S530/IOCfg.h | 3 +++ .../Dx/565_HUNTING_EVB_LINUX_4G_S550/IOCfg.h | 3 +++ .../driver/na51089/source/mcu/sf_battery.c | 20 +++++++++---------- 6 files changed, 32 insertions(+), 20 deletions(-) diff --git a/code/application/source/cardv/SrcCode/Dx/565_HUNTING_EVB_LINUX_4G_S530/IOCfg.h b/code/application/source/cardv/SrcCode/Dx/565_HUNTING_EVB_LINUX_4G_S530/IOCfg.h index ebefa3505..1dd3b7ffa 100755 --- a/code/application/source/cardv/SrcCode/Dx/565_HUNTING_EVB_LINUX_4G_S530/IOCfg.h +++ b/code/application/source/cardv/SrcCode/Dx/565_HUNTING_EVB_LINUX_4G_S530/IOCfg.h @@ -342,6 +342,9 @@ extern BOOL GPIOMap_DetPoweroff(void); #define LED_FOCUS_BY_PWM 2 //use PWM to control LED brightness #define LED_FOCUS_BY_MCU 3 +#define SF_ADC_MUXA P_GPIO_0 +#define SF_ADC_MUXB P_GPIO_1 + #define LED_FOCUS_CTRL LED_RED_DUMMY #define GPIO_FOCUS_LED x_GPIO_x //FPGA #define PAD_FOCUS_LED PAD_PIN_xGPIOx diff --git a/code/application/source/cardv/SrcCode/Dx/565_HUNTING_EVB_LINUX_4G_S550/IOCfg.h b/code/application/source/cardv/SrcCode/Dx/565_HUNTING_EVB_LINUX_4G_S550/IOCfg.h index 63b609d05..19d13afc3 100755 --- a/code/application/source/cardv/SrcCode/Dx/565_HUNTING_EVB_LINUX_4G_S550/IOCfg.h +++ b/code/application/source/cardv/SrcCode/Dx/565_HUNTING_EVB_LINUX_4G_S550/IOCfg.h @@ -342,6 +342,9 @@ extern BOOL GPIOMap_DetPoweroff(void); #define LED_FOCUS_BY_PWM 2 //use PWM to control LED brightness #define LED_FOCUS_BY_MCU 3 +#define SF_ADC_MUXA DSI_GPIO_0 +#define SF_ADC_MUXB DSI_GPIO_1 + #define LED_FOCUS_CTRL LED_RED_DUMMY #define GPIO_FOCUS_LED x_GPIO_x //FPGA #define PAD_FOCUS_LED PAD_PIN_xGPIOx diff --git a/code/application/source/sf_app/code/source/battery/sf_battery.c b/code/application/source/sf_app/code/source/battery/sf_battery.c index 937f2aa15..553aea4b3 100755 --- a/code/application/source/sf_app/code/source/battery/sf_battery.c +++ b/code/application/source/sf_app/code/source/battery/sf_battery.c @@ -192,8 +192,8 @@ void sf_adc_init(void) // Enable adc control logic adc_setEnable(TRUE); - gpio_direction_output(P_GPIO_0,0); - gpio_direction_output(P_GPIO_1,0); + gpio_direction_output(SF_ADC_MUXA,0); + gpio_direction_output(SF_ADC_MUXB,0); } /************************************************* @@ -220,27 +220,27 @@ UINT32 sf_adc_value_get(UINT32 mux, UINT32 *pval) if(SF_ADC_BATT == mux)//bat_det { //B:0 A:0 - gpio_set_value(P_GPIO_0, 0);//adc_muxa - gpio_set_value(P_GPIO_1, 0);//adc_muxb + gpio_set_value(SF_ADC_MUXA, 0);//adc_muxa + gpio_set_value(SF_ADC_MUXB, 0);//adc_muxb } else if(SF_ADC_LI == mux)//v-li_det { //B:0 A:1 - gpio_set_value(P_GPIO_0, 1);//adc_muxa - gpio_set_value(P_GPIO_1, 0);//adc_muxb + gpio_set_value(SF_ADC_MUXA, 1);//adc_muxa + gpio_set_value(SF_ADC_MUXB, 0);//adc_muxb } else if(SF_ADC_DC == mux)//dc12_det { //B:1 A:0 - gpio_set_value(P_GPIO_0, 0);//adc_muxa - gpio_set_value(P_GPIO_1, 1);//adc_muxb + gpio_set_value(SF_ADC_MUXA, 0);//adc_muxa + gpio_set_value(SF_ADC_MUXB, 1);//adc_muxb } else if(SF_ADC_TEMP == mux)//temp_det { //B:1 A:1 - gpio_set_value(P_GPIO_0, 1);//adc_muxa - gpio_set_value(P_GPIO_1, 1);//adc_muxb + gpio_set_value(SF_ADC_MUXA, 1);//adc_muxa + gpio_set_value(SF_ADC_MUXB, 1);//adc_muxb } vos_util_delay_ms(1); diff --git a/rtos/code/application/source/cardv/SrcCode/Dx/565_HUNTING_EVB_LINUX_4G_S530/IOCfg.h b/rtos/code/application/source/cardv/SrcCode/Dx/565_HUNTING_EVB_LINUX_4G_S530/IOCfg.h index bb6146148..2b924b1d7 100755 --- a/rtos/code/application/source/cardv/SrcCode/Dx/565_HUNTING_EVB_LINUX_4G_S530/IOCfg.h +++ b/rtos/code/application/source/cardv/SrcCode/Dx/565_HUNTING_EVB_LINUX_4G_S530/IOCfg.h @@ -309,6 +309,9 @@ extern BOOL GPIOMap_DetPoweroff(void); #define LED_FOCUS_BY_PWM 2 //use PWM to control LED brightness #define LED_FOCUS_BY_MCU 3 +#define SF_ADC_MUXA P_GPIO_0 +#define SF_ADC_MUXB P_GPIO_1 + #define LED_FOCUS_CTRL LED_FOCUS_BY_GPIO #define GPIO_FOCUS_LED x_GPIO_x //FPGA #define PAD_FOCUS_LED PAD_PIN_xGPIOx diff --git a/rtos/code/application/source/cardv/SrcCode/Dx/565_HUNTING_EVB_LINUX_4G_S550/IOCfg.h b/rtos/code/application/source/cardv/SrcCode/Dx/565_HUNTING_EVB_LINUX_4G_S550/IOCfg.h index 9848fd964..09b82a59e 100755 --- a/rtos/code/application/source/cardv/SrcCode/Dx/565_HUNTING_EVB_LINUX_4G_S550/IOCfg.h +++ b/rtos/code/application/source/cardv/SrcCode/Dx/565_HUNTING_EVB_LINUX_4G_S550/IOCfg.h @@ -309,6 +309,9 @@ extern BOOL GPIOMap_DetPoweroff(void); #define LED_FOCUS_BY_PWM 2 //use PWM to control LED brightness #define LED_FOCUS_BY_MCU 3 +#define SF_ADC_MUXA DSI_GPIO_0 +#define SF_ADC_MUXB DSI_GPIO_1 + #define LED_FOCUS_CTRL LED_FOCUS_BY_GPIO #define GPIO_FOCUS_LED x_GPIO_x //FPGA #define PAD_FOCUS_LED PAD_PIN_xGPIOx diff --git a/rtos/code/driver/na51089/source/mcu/sf_battery.c b/rtos/code/driver/na51089/source/mcu/sf_battery.c index 32628d96a..4be6f2fa4 100755 --- a/rtos/code/driver/na51089/source/mcu/sf_battery.c +++ b/rtos/code/driver/na51089/source/mcu/sf_battery.c @@ -197,8 +197,8 @@ void sf_adc_init(void) // Enable adc control logic adc_setEnable(TRUE); - gpio_direction_output(P_GPIO_0,0); - gpio_direction_output(P_GPIO_1,0); + gpio_direction_output(SF_ADC_MUXA,0); + gpio_direction_output(SF_ADC_MUXB,0); } /************************************************* @@ -225,27 +225,27 @@ UINT32 sf_adc_value_get(UINT32 mux, UINT32 *pval) if(SF_ADC_BATT == mux)//bat_det { //B:0 A:0 - gpio_set_value(P_GPIO_0, 0);//adc_muxa - gpio_set_value(P_GPIO_1, 0);//adc_muxb + gpio_set_value(SF_ADC_MUXA, 0);//adc_muxa + gpio_set_value(SF_ADC_MUXB, 0);//adc_muxb } else if(SF_ADC_LI == mux)//v-li_det { //B:0 A:1 - gpio_set_value(P_GPIO_0, 1);//adc_muxa - gpio_set_value(P_GPIO_1, 0);//adc_muxb + gpio_set_value(SF_ADC_MUXA, 1);//adc_muxa + gpio_set_value(SF_ADC_MUXB, 0);//adc_muxb } else if(SF_ADC_DC == mux)//dc12_det { //B:1 A:0 - gpio_set_value(P_GPIO_0, 0);//adc_muxa - gpio_set_value(P_GPIO_1, 1);//adc_muxb + gpio_set_value(SF_ADC_MUXA, 0);//adc_muxa + gpio_set_value(SF_ADC_MUXB, 1);//adc_muxb } else if(SF_ADC_TEMP == mux)//temp_det { //B:1 A:1 - gpio_set_value(P_GPIO_0, 1);//adc_muxa - gpio_set_value(P_GPIO_1, 1);//adc_muxb + gpio_set_value(SF_ADC_MUXA, 1);//adc_muxa + gpio_set_value(SF_ADC_MUXB, 1);//adc_muxb } //vos_util_delay_ms(1);