From 2c82fb5f38573d7b3c5e243bd74e3aab054200aa Mon Sep 17 00:00:00 2001 From: Andy Piper Date: Mon, 26 Sep 2022 08:12:05 +0100 Subject: [PATCH] AP_HAL_ChibiOS: make sure SkystarsH7HD has functioning VTX on Camera 1 by default --- .../AP_HAL_ChibiOS/hwdef/SkystarsH7HD-bdshot/hwdef.dat | 1 - libraries/AP_HAL_ChibiOS/hwdef/SkystarsH7HD/hwdef-bl.dat | 3 ++- libraries/AP_HAL_ChibiOS/hwdef/SkystarsH7HD/hwdef.dat | 8 +++++--- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/libraries/AP_HAL_ChibiOS/hwdef/SkystarsH7HD-bdshot/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/SkystarsH7HD-bdshot/hwdef.dat index 9ca86ed2e1..807301c22d 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/SkystarsH7HD-bdshot/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/SkystarsH7HD-bdshot/hwdef.dat @@ -18,7 +18,6 @@ define STM32_I2C_USE_DMA FALSE define RELAY2_PIN_DEFAULT 81 # Pit-1 define RELAY3_PIN_DEFAULT 82 # PIN-EN -define RELAY4_PIN_DEFAULT 83 # CAM-C # Motor order Betaflight/X define HAL_FRAME_TYPE_DEFAULT 12 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/SkystarsH7HD/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/SkystarsH7HD/hwdef-bl.dat index baeef27d05..2bae841c56 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/SkystarsH7HD/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/SkystarsH7HD/hwdef-bl.dat @@ -51,5 +51,6 @@ PE11 BMI270_CS2 CS ## pull up VTX power so that it is enabled in bootloader PC5 VTX_PWR OUTPUT HIGH # labelled as "Pit-1" -PC2 VID_SELECT OUTPUT LOW # labelled as "PIN-EN" +# pull up PIN-EN so that Video 1 is selected by default +PC2 VID_SELECT OUTPUT HIGH # labelled as "PIN-EN" PD2 CAM_C OUTPUT LOW # labelled as "CAM-C" diff --git a/libraries/AP_HAL_ChibiOS/hwdef/SkystarsH7HD/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/SkystarsH7HD/hwdef.dat index 2af2e99154..b14d1053cb 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/SkystarsH7HD/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/SkystarsH7HD/hwdef.dat @@ -96,9 +96,11 @@ PC0 BATT_VOLTAGE_SENS ADC1 SCALE(1) PC1 BATT_CURRENT_SENS ADC1 SCALE(1) # VTX Power control - should be high at startup to ensure power -PC5 VTX_PWR OUTPUT LOW GPIO(81) # labelled as "Pit-1" -PC2 VID_SELECT OUTPUT LOW GPIO(82) # labelled as "PIN-EN" -PD2 CAM_C OUTPUT LOW GPIO(83) # labelled as "CAM-C" +PC5 VTX_PWR OUTPUT HIGH GPIO(81) # labelled as "Pit-1" +# Camera selection - should be high so that Video 1 is selected by default +PC2 VID_SELECT OUTPUT HIGH GPIO(82) # labelled as "PIN-EN" +# OSD pad for TTL based OSD control, not supported by AP +PD2 CAM_C OUTPUT LOW GPIO(83) # labelled as "CAM-C" # define default battery setup