Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
ardupilot
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
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
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
SASC
ardupilot
Commits
2f01dfe8
Commit
2f01dfe8
authored
8 years ago
by
Andrew Tridgell
Browse files
Options
Downloads
Patches
Plain Diff
AP_InertialSensor: fixed from review by Lucas
parent
81b933d9
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_InertialSensor/AP_InertialSensor_MPU6000.cpp
+0
-2
0 additions, 2 deletions
libraries/AP_InertialSensor/AP_InertialSensor_MPU6000.cpp
libraries/AP_InertialSensor/AP_InertialSensor_MPU6000.h
+2
-2
2 additions, 2 deletions
libraries/AP_InertialSensor/AP_InertialSensor_MPU6000.h
with
2 additions
and
4 deletions
libraries/AP_InertialSensor/AP_InertialSensor_MPU6000.cpp
+
0
−
2
View file @
2f01dfe8
...
@@ -568,8 +568,6 @@ void AP_InertialSensor_MPU6000::_read_fifo()
...
@@ -568,8 +568,6 @@ void AP_InertialSensor_MPU6000::_read_fifo()
uint16_t
bytes_read
;
uint16_t
bytes_read
;
uint8_t
*
rx
=
_fifo_buffer
;
uint8_t
*
rx
=
_fifo_buffer
;
//static_assert(MAX_DATA_READ <= 100, "Too big to keep on stack");
if
(
!
_block_read
(
MPUREG_FIFO_COUNTH
,
rx
,
2
))
{
if
(
!
_block_read
(
MPUREG_FIFO_COUNTH
,
rx
,
2
))
{
hal
.
console
->
printf
(
"MPU60x0: error in fifo read
\n
"
);
hal
.
console
->
printf
(
"MPU60x0: error in fifo read
\n
"
);
return
;
return
;
...
...
This diff is collapsed.
Click to expand it.
libraries/AP_InertialSensor/AP_InertialSensor_MPU6000.h
+
2
−
2
View file @
2f01dfe8
...
@@ -108,10 +108,10 @@ private:
...
@@ -108,10 +108,10 @@ private:
AP_MPU6000_AuxiliaryBus
*
_auxiliary_bus
;
AP_MPU6000_AuxiliaryBus
*
_auxiliary_bus
;
// is this an ICM-20608?
// is this an ICM-20608?
bool
_is_icm_device
:
1
;
bool
_is_icm_device
;
// are we doing more than 1kHz sampling?
// are we doing more than 1kHz sampling?
bool
_fast_sampling
:
1
;
bool
_fast_sampling
;
// last time we read temperature
// last time we read temperature
uint32_t
_last_temp_read_ms
;
uint32_t
_last_temp_read_ms
;
...
...
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