From 21dc768adbe65854fb52e78c94211cd2dc12ee87 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Mon, 18 Jul 2022 12:38:58 +1000 Subject: [PATCH] hwdef: added ADC pin comments for 6X --- libraries/AP_HAL_ChibiOS/hwdef/Pixhawk6C/defaults.parm | 8 -------- libraries/AP_HAL_ChibiOS/hwdef/Pixhawk6X/hwdef.dat | 3 +++ 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/libraries/AP_HAL_ChibiOS/hwdef/Pixhawk6C/defaults.parm b/libraries/AP_HAL_ChibiOS/hwdef/Pixhawk6C/defaults.parm index f6ef341a76..311a84783e 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/Pixhawk6C/defaults.parm +++ b/libraries/AP_HAL_ChibiOS/hwdef/Pixhawk6C/defaults.parm @@ -1,13 +1,5 @@ # setup correct defaults for battery monitoring for holybro power brick BATT_MONITOR 4 -BATT_AMP_PERVLT 36.36 -BATT_VOLT_MULT 18.18 - -BATT2_AMP_PERVLT 36.36 -BATT2_VOLT_PIN 18.18 BATT2_CURR_PIN 14 BATT2_VOLT_PIN 5 - -BATT2_AMP_PERVLT 36.36 -BATT2_VOLT_MULT 18.18 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/Pixhawk6X/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/Pixhawk6X/hwdef.dat index a45bd3ba27..86124e0af3 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/Pixhawk6X/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/Pixhawk6X/hwdef.dat @@ -108,7 +108,10 @@ PF12 SCALED4_V3V3 ADC1 SCALE(2) PB1 VDD_5V_SENS ADC1 SCALE(2) +# pin7 on AD&IO, analog 12 PC2 ADC1_6V6 ADC1 SCALE(2) + +# pin6 on AD&IO, analog 13 PC3 ADC1_3V3 ADC1 SCALE(1) # SPI1 - IMU1