فهرست منبع

adc 采集只有v3后的需要判断硬件子版本号

Signed-off-by: huhui <huhui@sharkgulf.com>
huhui 2 سال پیش
والد
کامیت
d0a9935726
1فایلهای تغییر یافته به همراه14 افزوده شده و 2 حذف شده
  1. 14 2
      Applications/bsp/gd32/adc.c

+ 14 - 2
Applications/bsp/gd32/adc.c

@@ -438,6 +438,10 @@ static void adc_gpio_init(void) {
 	gpio_init(ZERO_ADC_GROUP, ZERO_ADC_MODE, GPIO_OSPEED_50MHZ, ZERO_ADC_PIN);
 	gpio_init(ZERO_ADC_GROUP, ZERO_ADC_MODE, GPIO_OSPEED_50MHZ, ZERO_ADC_PIN);
 #endif
 #endif
 
 
+#ifdef DC5V_ADC_GROUP
+	rcu_periph_clock_enable(DC5V_ADC_RCU);
+	gpio_init(DC5V_ADC_GROUP, DC5V_ADC_MODE, GPIO_OSPEED_50MHZ, DC5V_ADC_PIN);
+#endif
 }
 }
 
 
 void adc_init(void) {
 void adc_init(void) {
@@ -509,11 +513,15 @@ u16 adc_get_ibus(void) {
 }
 }
 
 
 u16 adc_get_throttle(void) {
 u16 adc_get_throttle(void) {
-	if (gpio_board_id() == BOARD_105_VERSION_3) {
+#if CONFIG_HW_VERSION==3
+	if (gpio_board_id() == BOARD_105_VERSION_3) { //v3 和 V4 adc 通道交换了一下
 		return adc_buffer[THROTTLE_BUFF_IDX] * VREF_3V3_COMPESTION();
 		return adc_buffer[THROTTLE_BUFF_IDX] * VREF_3V3_COMPESTION();
 	}else {
 	}else {
-		return adc_buffer[MOTOR_TEMP_BUFF_IDX];
+		return adc_buffer[MOTOR_TEMP_BUFF_IDX] * VREF_3V3_COMPESTION();
 	}
 	}
+#else
+	return adc_buffer[THROTTLE_BUFF_IDX]
+#endif
 }
 }
 
 
 u16 adc_get_throttle2(void) {
 u16 adc_get_throttle2(void) {
@@ -551,11 +559,15 @@ u16 adc_get_mos_temp(void) {
 }
 }
 
 
 u16 adc_get_motor_temp(void) {
 u16 adc_get_motor_temp(void) {
+#if CONFIG_HW_VERSION==3
 	if (gpio_board_id() == BOARD_105_VERSION_3) {
 	if (gpio_board_id() == BOARD_105_VERSION_3) {
 		return adc_buffer[MOTOR_TEMP_BUFF_IDX];
 		return adc_buffer[MOTOR_TEMP_BUFF_IDX];
 	}else {
 	}else {
 		return adc_buffer[THROTTLE_BUFF_IDX];
 		return adc_buffer[THROTTLE_BUFF_IDX];
 	}
 	}
+#else
+	return adc_buffer[MOTOR_TEMP_BUFF_IDX];
+#endif
 }
 }
 
 
 u16 adc_get_vref(void) {
 u16 adc_get_vref(void) {