Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

AP_HAL: adjust for renaming of Gimbal to SoloGimbal

This commit is contained in:
Peter Barker 2024-07-17 16:46:42 +10:00 committed by Peter Barker
parent ae4254bba8
commit 1ce6aa7e38
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/AP_HAL/SIMState.cpp
View File

@ -131,7 +131,7 @@ void SIMState::fdm_input_local(void)
// output JSON state to ride along flight controllers // output JSON state to ride along flight controllers
// ride_along.send(_sitl->state,sitl_model->get_position_relhome()); // ride_along.send(_sitl->state,sitl_model->get_position_relhome());
#if HAL_SIM_GIMBAL_ENABLED #if AP_SIM_SOLOGIMBAL_ENABLED
if (gimbal != nullptr) { if (gimbal != nullptr) {
gimbal->update(); gimbal->update();
} }

6
libraries/AP_HAL/SIMState.h
View File

@ -7,7 +7,7 @@
#include <AP_HAL/AP_HAL.h> #include <AP_HAL/AP_HAL.h>
#include <SITL/SITL_Input.h> #include <SITL/SITL_Input.h>
#include <SITL/SIM_Gimbal.h> #include <SITL/SIM_SoloGimbal.h>
#include <SITL/SIM_ADSB.h> #include <SITL/SIM_ADSB.h>
#include <SITL/SIM_Vicon.h> #include <SITL/SIM_Vicon.h>
#include <SITL/SIM_RF_Benewake_TF02.h> #include <SITL/SIM_RF_Benewake_TF02.h>
@ -109,10 +109,10 @@ private:
// internal SITL model // internal SITL model
SITL::Aircraft *sitl_model; SITL::Aircraft *sitl_model;
#if HAL_SIM_GIMBAL_ENABLED #if AP_SIM_SOLOGIMBAL_ENABLED
// simulated gimbal // simulated gimbal
bool enable_gimbal; bool enable_gimbal;
SITL::Gimbal *gimbal; SITL::SoloGimbal *gimbal;
#endif #endif
#if HAL_SIM_ADSB_ENABLED #if HAL_SIM_ADSB_ENABLED