Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
A
Ardupilot
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
OpenSource
Ardupilot
Commits
8a3d3bed
Commit
8a3d3bed
authored
10 years ago
by
Andrew Tridgell
Browse files
Options
Downloads
Patches
Plain Diff
SITL: changes for new AP_Baro API
parent
f1891cea
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
libraries/AP_HAL_AVR_SITL/SITL_State.cpp
+2
-2
2 additions, 2 deletions
libraries/AP_HAL_AVR_SITL/SITL_State.cpp
libraries/AP_HAL_AVR_SITL/SITL_State.h
+1
-1
1 addition, 1 deletion
libraries/AP_HAL_AVR_SITL/SITL_State.h
with
3 additions
and
3 deletions
libraries/AP_HAL_AVR_SITL/SITL_State.cpp
+
2
−
2
View file @
8a3d3bed
...
...
@@ -64,7 +64,7 @@ uint16_t SITL_State::voltage_pin_value;
uint16_t
SITL_State
::
current_pin_value
;
float
SITL_State
::
_current
;
AP_Baro
_HIL
*
SITL_State
::
_barometer
;
AP_Baro
*
SITL_State
::
_barometer
;
AP_InertialSensor
*
SITL_State
::
_ins
;
SITLScheduler
*
SITL_State
::
_scheduler
;
AP_Compass_HIL
*
SITL_State
::
_compass
;
...
...
@@ -213,7 +213,7 @@ void SITL_State::_sitl_setup(void)
// find the barometer object if it exists
_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_"
);
_compass
=
(
AP_Compass_HIL
*
)
AP_Param
::
find_object
(
"COMPASS_"
);
_terrain
=
(
AP_Terrain
*
)
AP_Param
::
find_object
(
"TERRAIN_"
);
...
...
This diff is collapsed.
Click to expand it.
libraries/AP_HAL_AVR_SITL/SITL_State.h
+
1
−
1
View file @
8a3d3bed
...
...
@@ -125,7 +125,7 @@ private:
static
uint32_t
_update_count
;
static
bool
_motors_on
;
static
AP_Baro
_HIL
*
_barometer
;
static
AP_Baro
*
_barometer
;
static
AP_InertialSensor
*
_ins
;
static
SITLScheduler
*
_scheduler
;
static
AP_Compass_HIL
*
_compass
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment