From 5e33b0c5214d57fe6d5396d4825c95b4eafecc15 Mon Sep 17 00:00:00 2001 From: Jacob Dahl Date: Mon, 16 Dec 2024 15:02:30 -0900 Subject: [PATCH] tested 12V output en and adc --- .../AP_HAL_ChibiOS/hwdef/ARK_FPV/hwdef-bl.dat | 3 --- .../AP_HAL_ChibiOS/hwdef/ARK_FPV/hwdef.dat | 20 +++++++++++-------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/libraries/AP_HAL_ChibiOS/hwdef/ARK_FPV/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/ARK_FPV/hwdef-bl.dat index ef809c34a2..c1e876006c 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/ARK_FPV/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/ARK_FPV/hwdef-bl.dat @@ -26,9 +26,6 @@ PB7 USART1_RX USART1 # Armed indication PE6 nARMED OUTPUT HIGH -# 12V peripheral enable -PG4 nVDD_5V_PERIPH_EN OUTPUT HIGH - # LEDs PE3 LED_ACTIVITY OUTPUT OPENDRAIN HIGH # red PE5 LED_BOOTLOADER OUTPUT OPENDRAIN HIGH # blue diff --git a/libraries/AP_HAL_ChibiOS/hwdef/ARK_FPV/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/ARK_FPV/hwdef.dat index aff6a91909..20312d2f26 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/ARK_FPV/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/ARK_FPV/hwdef.dat @@ -48,7 +48,8 @@ define DEFAULT_SERIAL3_PROTOCOL SerialProtocol_GPS # VTX (DJI Air Unit, RX only) PA3 USART2_RX USART2 PD5 USART2_TX USART2 NODMA -define DEFAULT_SERIAL4_PROTOCOL SerialProtocol_None # TODO: DJI HDL? +# TODO: DJI HDL? +define DEFAULT_SERIAL4_PROTOCOL SerialProtocol_None # ESC Telem (RX only) PH13 UART4_TX UART4 NODMA @@ -66,8 +67,8 @@ define DEFAULT_SERIAL6_PROTOCOL SerialProtocol_RCIN # ADCs PA0 SCALED1_V3V3 ADC1 SCALE(2) PB1 VDD_5V_SENS ADC1 SCALE(2) -# TODO: 12V monitor -# PA4 SCALED2_V3V3 ADC1 SCALE(7.66) +# 12V monitor +PA4 FMU_SERVORAIL_VCC_SENS ADC1 SCALE(7.66) PB0 BATT_VOLTAGE_SENS ADC1 SCALE(1) PC2 BATT_CURRENT_SENS ADC1 SCALE(1) @@ -148,13 +149,16 @@ PE6 nARMED OUTPUT HIGH PC13 VDD_3V3_SD_CARD_EN OUTPUT HIGH PI11 VDD_3V3_SENSORS1_EN OUTPUT HIGH -# 12V enable, start with it off -PG4 nVDD_5V_PERIPH_EN OUTPUT HIGH +# 12V enable, start with it ON +PG4 VDD_5V_PERIPH_EN OUTPUT HIGH # Power sensing -PE15 VDD_5V_PERIPH_nOC INPUT PULLUP -PF13 VDD_5V_HIPOWER_nOC INPUT PULLUP -PG1 VDD_BRICK_nVALID INPUT PULLUP +# 12V PGOOD +PE15 VDD_5V_PERIPH_nOC INPUT FLOATING +# 5V PGOOD +PF13 VDD_5V_HIPOWER_nOC INPUT FLOATING +# 5V_ON_BATn +PG1 VDD_BRICK_nVALID INPUT FLOATING # MicroSD PD6 SDMMC2_CK SDMMC2