zrzk
/
ardupilot
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

hwdef: fix redefinition of Solo values in CubeSolo/CubeGreen-Solo 

adding fmuv3 into the list of firmwares we might run on Solo was a late
addition to the recent PRs.  It was forgotten that the inheritance would
cause a redefition failure
apm_2208
Peter Barker 3 years ago committed by Andrew Tridgell
parent
37d8feb928
commit
717edae9ef
2 changed files with 5 additions and 0 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      libraries/AP_HAL_ChibiOS/hwdef/CubeGreen-solo/hwdef.dat
  2. 3
      libraries/AP_HAL_ChibiOS/hwdef/CubeSolo/hwdef.dat

2
libraries/AP_HAL_ChibiOS/hwdef/CubeGreen-solo/hwdef.dat
Unescape View File

@ -10,8 +10,10 @@ include ../CubeBlack/hwdef.dat @@ -10,8 +10,10 @@ include ../CubeBlack/hwdef.dat
# these are parameters the Solo requires for proper operation that are different from the 4 standard defaults.
env DEFAULT_PARAMETERS 'Tools/Frame_params/Solo_Copter-4_GreenCube.param'
undef HAL_OREO_LED_ENABLED
define HAL_OREO_LED_ENABLED 1
undef HAL_SOLO_GIMBAL_ENABLED
define HAL_SOLO_GIMBAL_ENABLED HAL_MOUNT_ENABLED
AUTOBUILD_TARGETS Copter

3
libraries/AP_HAL_ChibiOS/hwdef/CubeSolo/hwdef.dat
Unescape View File

@ -49,9 +49,12 @@ COMPASS AK09916:probe_ICM20948 0 ROTATION_ROLL_180_YAW_90 @@ -49,9 +49,12 @@ COMPASS AK09916:probe_ICM20948 0 ROTATION_ROLL_180_YAW_90
# also probe for external compasses
define HAL_PROBE_EXTERNAL_I2C_COMPASSES
undef HAL_OREO_LED_ENABLED
define HAL_OREO_LED_ENABLED 1
define HAL_IMU_TEMP_MARGIN_LOW_DEFAULT 5
undef HAL_SOLO_GIMBAL_ENABLED
define HAL_SOLO_GIMBAL_ENABLED HAL_MOUNT_ENABLED
AUTOBUILD_TARGETS Copter

Write Preview
Loading…
Cancel
Save