Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
On-Board Software
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Avionics
Software Development
On-Board Software
Commits
336c8a49
Commit
336c8a49
authored
1 year ago
by
Federico Mandelli
Browse files
Options
Downloads
Patches
Plain Diff
[SensorConfig] Update BMX160_WITH_CORRECTION_SAMPLE_PERIOD to 10ms
parent
19fd91fe
Branches
Branches containing commit
No related tags found
No related merge requests found
Pipeline
#8783
passed
1 year ago
Stage: build-release
Stage: build-debug
Stage: lint
Changes
2
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/boards/Parafoil/Configs/SensorsConfig.h
+2
-2
2 additions, 2 deletions
src/boards/Parafoil/Configs/SensorsConfig.h
src/boards/Parafoil/Sensors/Sensors.cpp
+1
-2
1 addition, 2 deletions
src/boards/Parafoil/Sensors/Sensors.cpp
with
3 additions
and
4 deletions
src/boards/Parafoil/Configs/SensorsConfig.h
+
2
−
2
View file @
336c8a49
...
@@ -120,8 +120,8 @@ constexpr float BATTERY_VOLTAGE_COEFF = (150 + 40.2) / 40.2;
...
@@ -120,8 +120,8 @@ constexpr float BATTERY_VOLTAGE_COEFF = (150 + 40.2) / 40.2;
constexpr
unsigned
int
BMX160_SAMPLE_PERIOD
=
constexpr
unsigned
int
BMX160_SAMPLE_PERIOD
=
BMX160_FIFO_FILL_TIME
*
(
BMX160_FIFO_WATERMARK
+
30
)
*
4
/
1024
;
// [ms]
BMX160_FIFO_FILL_TIME
*
(
BMX160_FIFO_WATERMARK
+
30
)
*
4
/
1024
;
// [ms]
// BMX160_WITH_CORRECTION_SAMPLE_PERIOD should be lower than the
// BMX160_WITH_CORRECTION_SAMPLE_PERIOD should be lower than the
// BMX160_SAMPLE_PERIOD and faster then the NAS
// BMX160_SAMPLE_PERIOD and faster then the NAS
update period.
constexpr
unsigned
int
BMX160_WITH_CORRECTION_SAMPLE_PERIOD
=
10
0
;
// [ms]
constexpr
unsigned
int
BMX160_WITH_CORRECTION_SAMPLE_PERIOD
=
10
;
// [ms]
100Hz
constexpr
unsigned
int
LIS3MDL_SAMPLE_PERIOD
=
15
;
constexpr
unsigned
int
LIS3MDL_SAMPLE_PERIOD
=
15
;
constexpr
unsigned
int
INTERNAL_ADC_SAMPLE_PERIOD
=
1000
;
// [ms]
constexpr
unsigned
int
INTERNAL_ADC_SAMPLE_PERIOD
=
1000
;
// [ms]
...
...
This diff is collapsed.
Click to expand it.
src/boards/Parafoil/Sensors/Sensors.cpp
+
1
−
2
View file @
336c8a49
...
@@ -244,8 +244,7 @@ void Sensors::bmx160WithCorrectionInit()
...
@@ -244,8 +244,7 @@ void Sensors::bmx160WithCorrectionInit()
bmx160WithCorrection
=
bmx160WithCorrection
=
new
BMX160WithCorrection
(
bmx160
,
BMX160_AXIS_ROTATION
);
new
BMX160WithCorrection
(
bmx160
,
BMX160_AXIS_ROTATION
);
SensorInfo
info
(
"BMX160WithCorrection"
,
SensorInfo
info
(
"BMX160WithCorrection"
,
BMX160_SAMPLE_PERIOD
,
BMX160_WITH_CORRECTION_SAMPLE_PERIOD
,
bind
(
&
Sensors
::
bmx160WithCorrectionCallback
,
this
));
bind
(
&
Sensors
::
bmx160WithCorrectionCallback
,
this
));
sensorMap
.
emplace
(
make_pair
(
bmx160WithCorrection
,
info
));
sensorMap
.
emplace
(
make_pair
(
bmx160WithCorrection
,
info
));
...
...
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