From f6f6b08af885aa2a1a7d63391d24ccc39b37dc04 Mon Sep 17 00:00:00 2001
From: Peter Barker <pbarker@barker.dropbear.id.au>
Date: Fri, 1 Sep 2023 10:36:40 +1000
Subject: [PATCH] hwdef: include defaults.parm files from other identical
 defaults.parm

where the files were identical and the board an obvious derivative, grab the defaults.parm from the other place.
---
 .../hwdef/CUAV-Nora-bdshot/defaults.parm      | 20 +------------------
 .../hwdef/CUAV-X7-bdshot/defaults.parm        | 19 +-----------------
 .../defaults.parm                             | 12 +----------
 .../hwdef/FlywooF745Nano/defaults.parm        | 13 +-----------
 .../hwdef/HEEWING-F405v2/defaults.parm        |  5 +----
 .../hwdef/Pixhawk6C-bdshot/defaults.parm      |  6 +-----
 .../hwdef/mRoPixracerPro-bdshot/defaults.parm |  8 +-------
 7 files changed, 7 insertions(+), 76 deletions(-)

diff --git a/libraries/AP_HAL_ChibiOS/hwdef/CUAV-Nora-bdshot/defaults.parm b/libraries/AP_HAL_ChibiOS/hwdef/CUAV-Nora-bdshot/defaults.parm
index 2bda2f0d4b..55debfdcc4 100644
--- a/libraries/AP_HAL_ChibiOS/hwdef/CUAV-Nora-bdshot/defaults.parm
+++ b/libraries/AP_HAL_ChibiOS/hwdef/CUAV-Nora-bdshot/defaults.parm
@@ -1,19 +1 @@
-# setup the temperature compensation
-BRD_HEAT_TARG 45
-BRD_HEAT_P 50
-BRD_HEAT_I 0.07
-
-# turn on the CAN power monitoring(default)
-CAN_P1_DRIVER 1
-BATT_MONITOR 8
-
-# setup the parameter for the ADC power module
-BATT_VOLT_PIN 16
-BATT_CURR_PIN 17
-BATT_VOLT_MULT 18.000
-BATT_AMP_PERVLT 24.000
-
-# turn on CAN RGB LED
-
-EK2_IMU_MASK 7
-
+@include ../CUAV-Nora/defaults.parm
diff --git a/libraries/AP_HAL_ChibiOS/hwdef/CUAV-X7-bdshot/defaults.parm b/libraries/AP_HAL_ChibiOS/hwdef/CUAV-X7-bdshot/defaults.parm
index d8d35f2931..e870f9f967 100644
--- a/libraries/AP_HAL_ChibiOS/hwdef/CUAV-X7-bdshot/defaults.parm
+++ b/libraries/AP_HAL_ChibiOS/hwdef/CUAV-X7-bdshot/defaults.parm
@@ -1,18 +1 @@
-# temperature control. We need lower P/I values
-# to prevent oscillation of the BMI088 temperature
-# the ADIS16470 is factory temperature calibrated,
-# but the BMI088 isn't, so temperature control is still
-# worthwhile
-BRD_HEAT_TARG 45
-BRD_HEAT_P 50
-BRD_HEAT_I 0.07
-
-# turn on the CAN power monitoring(default)
-CAN_P1_DRIVER 1
-BATT_MONITOR 8
-
-# setup the parameter for the ADC power module
-BATT_VOLT_PIN 16
-BATT_CURR_PIN 17
-BATT_VOLT_MULT 18.000
-BATT_AMP_PERVLT 24.000
+@include ../CUAV-X7/defaults.parm
diff --git a/libraries/AP_HAL_ChibiOS/hwdef/CubeOrangePlus-SimOnHardWare/defaults.parm b/libraries/AP_HAL_ChibiOS/hwdef/CubeOrangePlus-SimOnHardWare/defaults.parm
index 05d30c8e6f..591b784776 100644
--- a/libraries/AP_HAL_ChibiOS/hwdef/CubeOrangePlus-SimOnHardWare/defaults.parm
+++ b/libraries/AP_HAL_ChibiOS/hwdef/CubeOrangePlus-SimOnHardWare/defaults.parm
@@ -1,11 +1 @@
-# setup correct defaults for battery monitoring for cube power brick
-BATT2_CURR_PIN 4
-BATT2_VOLT_PIN 13
-BATT_AMP_PERVLT 39.877
-BATT_VOLT_MULT 12.02
-BATT2_AMP_PERVLT 39.877
-BATT2_VOLT_MULT 12.02
-# setup ADSB
-ADSB_TYPE 1
-SERIAL5_BAUD 57
-SERIAL5_PROTOCOL 1
+@include ../CubeOrangePlus/defaults.parm
diff --git a/libraries/AP_HAL_ChibiOS/hwdef/FlywooF745Nano/defaults.parm b/libraries/AP_HAL_ChibiOS/hwdef/FlywooF745Nano/defaults.parm
index 4ea8172db9..1a30c27a59 100644
--- a/libraries/AP_HAL_ChibiOS/hwdef/FlywooF745Nano/defaults.parm
+++ b/libraries/AP_HAL_ChibiOS/hwdef/FlywooF745Nano/defaults.parm
@@ -1,12 +1 @@
-# setup the four built-in Neopixel LEDs on chan 9
-SERVO9_FUNCTION 120
-NTF_LED_LEN 4
-
-# setup SERIAL3 for RCIN
-SERIAL3_PROTOCOL 23
-
-# disable GPS on Serial 4
-SERIAL4_PROTOCOL -1
-
-# setup SERIAL6 for GPS
-SERIAL6_PROTOCOL 5
+@include ../FlywooF745/defaults.parm
diff --git a/libraries/AP_HAL_ChibiOS/hwdef/HEEWING-F405v2/defaults.parm b/libraries/AP_HAL_ChibiOS/hwdef/HEEWING-F405v2/defaults.parm
index 8099863e70..bd97dbfc61 100644
--- a/libraries/AP_HAL_ChibiOS/hwdef/HEEWING-F405v2/defaults.parm
+++ b/libraries/AP_HAL_ChibiOS/hwdef/HEEWING-F405v2/defaults.parm
@@ -1,4 +1 @@
-ALT_HOLD_RTL,5000
-ARMING_RUDDER,2
-# GPS RX DMA conflicts with CRSF and I2C1
-GPS_DRV_OPTIONS,4
\ No newline at end of file
+@include ../HEEWING-F405/defaults.parm
diff --git a/libraries/AP_HAL_ChibiOS/hwdef/Pixhawk6C-bdshot/defaults.parm b/libraries/AP_HAL_ChibiOS/hwdef/Pixhawk6C-bdshot/defaults.parm
index 311a84783e..d39cac82a5 100644
--- a/libraries/AP_HAL_ChibiOS/hwdef/Pixhawk6C-bdshot/defaults.parm
+++ b/libraries/AP_HAL_ChibiOS/hwdef/Pixhawk6C-bdshot/defaults.parm
@@ -1,5 +1 @@
-# setup correct defaults for battery monitoring for holybro power brick
-BATT_MONITOR 4
-
-BATT2_CURR_PIN 14
-BATT2_VOLT_PIN 5
+@include ../Pixhawk6C/defaults.parm
diff --git a/libraries/AP_HAL_ChibiOS/hwdef/mRoPixracerPro-bdshot/defaults.parm b/libraries/AP_HAL_ChibiOS/hwdef/mRoPixracerPro-bdshot/defaults.parm
index 3f37627939..4a803c32d9 100644
--- a/libraries/AP_HAL_ChibiOS/hwdef/mRoPixracerPro-bdshot/defaults.parm
+++ b/libraries/AP_HAL_ChibiOS/hwdef/mRoPixracerPro-bdshot/defaults.parm
@@ -1,7 +1 @@
-#Default Parameters for the mRo Pixracer Pro
-
-CAN_P1_DRIVER 1
-CAN_P2_DRIVER 2
-CAN_SLCAN_CPORT 1
-SERIAL6_PROTOCOL 22
-
+@include ../mRoPixracerPro/defaults.parm