Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-02-22 15:53:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

SITL: changes for new AP_Baro API

Browse Source
This commit is contained in:
Andrew Tridgell 2015-01-05 15:55:50 +11:00
parent f1891cea1f
commit 8a3d3bed72
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libraries/AP_HAL_AVR_SITL/SITL_State.cpp
View File

@ -64,7 +64,7 @@ uint16_t SITL_State::voltage_pin_value;
uint16_t SITL_State::current_pin_value; uint16_t SITL_State::current_pin_value;
float SITL_State::_current; float SITL_State::_current;
AP_Baro_HIL *SITL_State::_barometer; AP_Baro *SITL_State::_barometer;
AP_InertialSensor *SITL_State::_ins; AP_InertialSensor *SITL_State::_ins;
SITLScheduler *SITL_State::_scheduler; SITLScheduler *SITL_State::_scheduler;
AP_Compass_HIL *SITL_State::_compass; AP_Compass_HIL *SITL_State::_compass;
@ -213,7 +213,7 @@ void SITL_State::_sitl_setup(void)
// find the barometer object if it exists // find the barometer object if it exists
_sitl = (SITL *)AP_Param::find_object("SIM_"); _sitl = (SITL *)AP_Param::find_object("SIM_");
_barometer = (AP_Baro_HIL *)AP_Param::find_object("GND_"); _barometer = (AP_Baro *)AP_Param::find_object("GND_");
_ins = (AP_InertialSensor *)AP_Param::find_object("INS_"); _ins = (AP_InertialSensor *)AP_Param::find_object("INS_");
_compass = (AP_Compass_HIL *)AP_Param::find_object("COMPASS_"); _compass = (AP_Compass_HIL *)AP_Param::find_object("COMPASS_");
_terrain = (AP_Terrain *)AP_Param::find_object("TERRAIN_"); _terrain = (AP_Terrain *)AP_Param::find_object("TERRAIN_");

2
libraries/AP_HAL_AVR_SITL/SITL_State.h
View File

@ -125,7 +125,7 @@ private:
static uint32_t _update_count; static uint32_t _update_count;
static bool _motors_on; static bool _motors_on;
static AP_Baro_HIL *_barometer; static AP_Baro *_barometer;
static AP_InertialSensor *_ins; static AP_InertialSensor *_ins;
static SITLScheduler *_scheduler; static SITLScheduler *_scheduler;
static AP_Compass_HIL *_compass; static AP_Compass_HIL *_compass;