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
37fefd3e
Commit
37fefd3e
authored
2 years ago
by
Alberto Nidasio
Browse files
Options
Downloads
Patches
Plain Diff
[Sensors] Updated bmx160 rotation and enabled load cell
parent
08a10d9a
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/boards/Main/Configs/SensorsConfig.h
+1
-4
1 addition, 4 deletions
src/boards/Main/Configs/SensorsConfig.h
src/boards/Main/Sensors/Sensors.cpp
+3
-1
3 additions, 1 deletion
src/boards/Main/Sensors/Sensors.cpp
with
4 additions
and
5 deletions
src/boards/Main/Configs/SensorsConfig.h
+
1
−
4
View file @
37fefd3e
...
@@ -104,10 +104,7 @@ constexpr unsigned int IMU_BMX_FIFO_FILL_TIME =
...
@@ -104,10 +104,7 @@ constexpr unsigned int IMU_BMX_FIFO_FILL_TIME =
// Axis rotation
// Axis rotation
static
const
Boardcore
::
AxisOrthoOrientation
BMX160_AXIS_ROTATION
=
{
static
const
Boardcore
::
AxisOrthoOrientation
BMX160_AXIS_ROTATION
=
{
Boardcore
::
Direction
::
POSITIVE_Z
,
Boardcore
::
Direction
::
POSITIVE_Y
};
Boardcore
::
Direction
::
POSITIVE_Z
,
Boardcore
::
Direction
::
NEGATIVE_Y
};
// Correction parameter file
constexpr
char
BMX160_CORRECTION_PARAMETERS_FILE
[
30
]
=
"/sd/bmx160_params.csv"
;
// GPS
// GPS
constexpr
unsigned
int
GPS_SAMPLE_RATE
=
5
;
constexpr
unsigned
int
GPS_SAMPLE_RATE
=
5
;
...
...
This diff is collapsed.
Click to expand it.
src/boards/Main/Sensors/Sensors.cpp
+
3
−
1
View file @
37fefd3e
...
@@ -283,7 +283,7 @@ Sensors::Sensors()
...
@@ -283,7 +283,7 @@ Sensors::Sensors()
dplPressureInit
();
dplPressureInit
();
// Problems on the signal still not solved
// Problems on the signal still not solved
//
loadCellInit();
loadCellInit
();
batteryVoltageInit
();
batteryVoltageInit
();
internalAdcInit
();
internalAdcInit
();
...
@@ -468,6 +468,8 @@ void Sensors::vn100Init()
...
@@ -468,6 +468,8 @@ void Sensors::vn100Init()
[
&
]()
[
&
]()
{
Logger
::
getInstance
().
log
(
vn100
->
getLastSample
());
});
{
Logger
::
getInstance
().
log
(
vn100
->
getLastSample
());
});
sensorsMap
.
emplace
(
make_pair
(
vn100
,
info
));
sensorsMap
.
emplace
(
make_pair
(
vn100
,
info
));
LOG_INFO
(
logger
,
"VN100 setup done!"
);
}
}
void
Sensors
::
ads131m04Init
()
void
Sensors
::
ads131m04Init
()
...
...
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