Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

hwdef: include defaults.parm files from other identical defaults.parm #24838

Merged
merged 2 commits into from Sep 5, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions libraries/AP_HAL/SIMState.cpp
Expand Up @@ -232,8 +232,8 @@ void SIMState::fdm_input_local(void)
vectornav->update();
}

if (microstrain != nullptr) {
microstrain->update();
if (microstrain5 != nullptr) {
microstrain5->update();
}

#if HAL_SIM_AIS_ENABLED
Expand Down
20 changes: 1 addition & 19 deletions 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
19 changes: 1 addition & 18 deletions 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
@@ -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
13 changes: 1 addition & 12 deletions 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
5 changes: 1 addition & 4 deletions 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
@include ../HEEWING-F405/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
@@ -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