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.

Sign up for GitHub

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

Jump to bottom

Disable Solo Gimbal except on CubeSolo and CubeGreen-solo #20328

Merged
merged 4 commits into from
Mar 28, 2022
Merged

Disable Solo Gimbal except on CubeSolo and CubeGreen-solo #20328

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
720f8d5
AP_HAL_ChibiOS: enable Solo Gimbal only on CubeGreen
peterbarker Mar 18, 2022
69b9966
AP_Mount: enable Solo Gimbal only on CubeGreen
peterbarker Mar 18, 2022
376266b
hwdef: enable both OreoLED and Solo gimbal on CubeOrange
peterbarker Mar 23, 2022
2b92e42
hwdef: enable both OreoLED and Solo gimbal on fmuv3
peterbarker Mar 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions libraries/AP_HAL_ChibiOS/hwdef/CubeGreen-solo/hwdef.dat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,6 @@ env DEFAULT_PARAMETERS 'Tools/Frame_params/Solo_Copter-4_GreenCube.param'

define HAL_OREO_LED_ENABLED 1

define HAL_SOLO_GIMBAL_ENABLED HAL_MOUNT_ENABLED

AUTOBUILD_TARGETS Copter
3 changes: 3 additions & 0 deletions libraries/AP_HAL_ChibiOS/hwdef/CubeOrange/hwdef.dat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,3 +333,6 @@ ROMFS io_firmware.bin Tools/IO_Firmware/iofirmware_highpolh.bin

DMA_NOSHARE SPI1* SPI4* USART6*

# for users who have replaced their CubeSolo with a CubeOrange:
define HAL_OREO_LED_ENABLED 1
define HAL_SOLO_GIMBAL_ENABLED HAL_MOUNT_ENABLED
2 changes: 2 additions & 0 deletions libraries/AP_HAL_ChibiOS/hwdef/CubeSolo/hwdef.dat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,4 +52,6 @@ define HAL_PROBE_EXTERNAL_I2C_COMPASSES
define HAL_OREO_LED_ENABLED 1
define HAL_IMU_TEMP_MARGIN_LOW_DEFAULT 5

define HAL_SOLO_GIMBAL_ENABLED HAL_MOUNT_ENABLED

AUTOBUILD_TARGETS Copter
4 changes: 4 additions & 0 deletions libraries/AP_HAL_ChibiOS/hwdef/fmuv3/hwdef.dat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -468,3 +468,7 @@ DMA_PRIORITY USART6* SPI*
# is "ROMFS ROMFS-filename source-filename". Paths are relative to the
# ardupilot root.
ROMFS io_firmware.bin Tools/IO_Firmware/iofirmware_lowpolh.bin

# for users running fmuv3 on their Solo:
define HAL_OREO_LED_ENABLED (BOARD_FLASH_SIZE > 1024)
define HAL_SOLO_GIMBAL_ENABLED (HAL_MOUNT_ENABLED && BOARD_FLASH_SIZE > 1024)
2 changes: 1 addition & 1 deletion libraries/AP_Mount/AP_Mount.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
#endif

#ifndef HAL_SOLO_GIMBAL_ENABLED
#define HAL_SOLO_GIMBAL_ENABLED HAL_MOUNT_ENABLED && BOARD_FLASH_SIZE > 1024
#define HAL_SOLO_GIMBAL_ENABLED 0
#endif

#if HAL_MOUNT_ENABLED
Expand Down