From 914c3c702d7748fbe9a9925e422f8aa0a4c42701 Mon Sep 17 00:00:00 2001 From: yjuav Date: Thu, 7 Sep 2023 17:01:42 +0800 Subject: [PATCH] hwdef: Modify YJUAV_A6SE board TIME12 to TIM8 --- libraries/AP_HAL_ChibiOS/hwdef/YJUAV_A6SE/README.md | 2 +- .../AP_HAL_ChibiOS/hwdef/YJUAV_A6SE/defaults.parm | 2 +- libraries/AP_HAL_ChibiOS/hwdef/YJUAV_A6SE/hwdef.dat | 11 +++++++---- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/libraries/AP_HAL_ChibiOS/hwdef/YJUAV_A6SE/README.md b/libraries/AP_HAL_ChibiOS/hwdef/YJUAV_A6SE/README.md index f6e14532de..370716c572 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/YJUAV_A6SE/README.md +++ b/libraries/AP_HAL_ChibiOS/hwdef/YJUAV_A6SE/README.md @@ -194,7 +194,7 @@ The pin numbers for these PWM channels in ArduPilot are shown below: The A6SE flight controller has 5 analog inputs - ADC Pin4 -> Battery Current - - ADC Pin12 -> Battery Voltage + - ADC Pin2 -> Battery Voltage - ADC Pin8 -> ADC 3V3 Sense - ADC Pin10 -> ADC 6V6 Sense - ADC Pin11 -> RSSI voltage monitoring diff --git a/libraries/AP_HAL_ChibiOS/hwdef/YJUAV_A6SE/defaults.parm b/libraries/AP_HAL_ChibiOS/hwdef/YJUAV_A6SE/defaults.parm index 1439a3e6bc..bd31bbe1fd 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/YJUAV_A6SE/defaults.parm +++ b/libraries/AP_HAL_ChibiOS/hwdef/YJUAV_A6SE/defaults.parm @@ -6,7 +6,7 @@ CAN_P1_DRIVER 1 BATT_MONITOR 4 # setup the parameter for the ADC power module -BATT_VOLT_PIN 12 +BATT_VOLT_PIN 2 BATT_CURR_PIN 4 BATT_VOLT_MULT 18.000 BATT_AMP_PERVLT 24.000 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/YJUAV_A6SE/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/YJUAV_A6SE/hwdef.dat index c4aac3ff28..bc59ca460b 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/YJUAV_A6SE/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/YJUAV_A6SE/hwdef.dat @@ -130,11 +130,14 @@ PB1 TIM3_CH4 TIM3 PWM(11) GPIO(60) PD14 TIM4_CH3 TIM4 GPIO(77) ALARM # RC input -PB14 TIM12_CH1 TIM12 RCININT PULLUP LOW +PI7 TIM8_CH3 TIM8 RCININT PULLUP LOW # Analog in PC4 BATT_CURRENT_SENS ADC1 SCALE(1) -PC2 BATT_VOLTAGE_SENS ADC1 SCALE(1) +PF11 BATT_VOLTAGE_SENS ADC1 SCALE(1) + +# Analog sys 5v +PF12 VDD_5V_SENS ADC1 SCALE(2) # ADC3.3/ADC6.6 PC5 SPARE1_ADC1 ADC1 SCALE(1) @@ -161,7 +164,7 @@ PC14 VDD_3V3_SENSORS_EN OUTPUT LOW # red LED marked as B/E PE15 LED_R1 OUTPUT OPENDRAIN HIGH GPIO(0) -PD10 LED_G1 OUTPUT OPENDRAIN HIGH GPIO(1) +PD10 LED_G1 OUTPUT OPENDRAIN LOW GPIO(1) PG0 LED_B1 OUTPUT OPENDRAIN HIGH GPIO(2) define HAL_GPIO_A_LED_PIN 0 @@ -196,7 +199,7 @@ IMU Invensensev3 SPI:imu2 ROTATION_NONE define HAL_DEFAULT_INS_FAST_SAMPLE 5 -# baro or bmp388 +# baro BARO DPS310 SPI:dps310 BARO MS56XX SPI:ms5611 BARO ICP201XX I2C:0:0x64