From ecacd513c2871a14f8eb5e5e7881518df2f0ae8f Mon Sep 17 00:00:00 2001 From: Joshua Henderson Date: Wed, 2 Feb 2022 04:10:23 -0500 Subject: [PATCH] hwdef: f405-MatekGPS add debug pin info, set default arspd, batt 0 and remove ADSB from build --- .../AP_HAL_ChibiOS/hwdef/f405-MatekGPS/defaults.parm | 2 -- libraries/AP_HAL_ChibiOS/hwdef/f405-MatekGPS/hwdef.dat | 10 ++++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libraries/AP_HAL_ChibiOS/hwdef/f405-MatekGPS/defaults.parm b/libraries/AP_HAL_ChibiOS/hwdef/f405-MatekGPS/defaults.parm index abaa8f8a19..7e43f428f0 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/f405-MatekGPS/defaults.parm +++ b/libraries/AP_HAL_ChibiOS/hwdef/f405-MatekGPS/defaults.parm @@ -9,5 +9,3 @@ NTF_LED_LEN 8 #| USART1 | USART2 | USART3 | UART4 | UART5 | GPS_PORT 3 MSP_PORT 4 -RNGFND_PORT -1 -ADSB_PORT -1 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/f405-MatekGPS/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/f405-MatekGPS/hwdef.dat index 43482087a9..29c900b546 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/f405-MatekGPS/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/f405-MatekGPS/hwdef.dat @@ -35,6 +35,10 @@ define HAL_NO_GPIO_IRQ define SERIAL_BUFFERS_SIZE 512 define PORT_INT_REQUIRED_STACK 64 +# debug (disabled to allow for PA14 LED above), to enable debugging disable the use of PA14 above +#PA13 JTMS-SWDIO SWD +#PA14 JTCK-SWCLK SWD + # avoid timer and RCIN threads to save memory define HAL_NO_RCIN_THREAD @@ -192,8 +196,6 @@ define RANGEFINDER_MAX_INSTANCES 1 # disable rangefinder by default define AP_PERIPH_RANGEFINDER_PORT_DEFAULT -1 -define HAL_PERIPH_ENABLE_ADSB - # ------------------ BATTERY Monitor ----------------------- define HAL_PERIPH_ENABLE_BATTERY @@ -211,8 +213,8 @@ PC5 BATT2_VOLTAGE_SENS ADC1 SCALE(1) # define BOARD_RSSI_ANA_PIN 12 # define HAL_DEFAULT_AIRSPEED_PIN 13 -define HAL_BATT_MONITOR_DEFAULT 4 -define HAL_BATT2_MONITOR_DEFAULT 4 +# Set the Default Battery Monitor Type to be Off +define HAL_BATT_MONITOR_DEFAULT 0 define HAL_BATT_VOLT_PIN 10 define HAL_BATT_VOLT_SCALE 21.0