Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
G
gnss
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Model registry
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor 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
mobile_robotics
wolf_projects
wolf_lib
plugins
gnss
Commits
9448feed
Commit
9448feed
authored
5 years ago
by
Joan Solà Ortega
Browse files
Options
Downloads
Patches
Plain Diff
Replace setStateBlockPtrStatic --> addStateBlock
parent
a5dbc70c
No related branches found
Branches containing commit
No related tags found
3 merge requests
!28
release after RAL
,
!27
After 2nd RAL submission
,
!12
Resolve "Adapt to state block map"
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
include/gnss/sensor/sensor_gnss.h
+4
-4
4 additions, 4 deletions
include/gnss/sensor/sensor_gnss.h
src/sensor/sensor_gnss.cpp
+8
-10
8 additions, 10 deletions
src/sensor/sensor_gnss.cpp
with
12 additions
and
14 deletions
include/gnss/sensor/sensor_gnss.h
+
4
−
4
View file @
9448feed
...
...
@@ -102,22 +102,22 @@ inline bool SensorGnss::isEnuMapInitialized() const
inline
StateBlockPtr
SensorGnss
::
getEnuMapTranslation
()
const
{
return
getStateBlock
PtrStatic
(
3
);
return
getStateBlock
(
"t"
);
}
inline
StateBlockPtr
SensorGnss
::
getEnuMapRoll
()
const
{
return
getStateBlock
PtrStatic
(
4
);
return
getStateBlock
(
"r"
);
}
inline
StateBlockPtr
SensorGnss
::
getEnuMapPitch
()
const
{
return
getStateBlock
PtrStatic
(
5
);
return
getStateBlock
(
"p"
);
}
inline
StateBlockPtr
SensorGnss
::
getEnuMapYaw
()
const
{
return
getStateBlock
PtrStatic
(
6
);
return
getStateBlock
(
"y"
);
}
inline
const
Eigen
::
Matrix3s
&
SensorGnss
::
getREnuEcef
()
const
...
...
This diff is collapsed.
Click to expand it.
src/sensor/sensor_gnss.cpp
+
8
−
10
View file @
9448feed
...
...
@@ -23,11 +23,10 @@ SensorGnss::SensorGnss(StateBlockPtr _p_ptr, //GNSS antena 3D positi
assert
(
_p_ptr
->
getSize
()
==
3
&&
"Bad extrinsics size"
);
assert
((
_bias_ptr
==
nullptr
||
_bias_ptr
->
getSize
()
==
1
)
&&
"Bad bias size"
);
getStateBlockVec
().
resize
(
7
);
setStateBlockPtrStatic
(
3
,
std
::
make_shared
<
StateBlock
>
(
3
,
params_
->
translation_fixed_
));
setStateBlockPtrStatic
(
4
,
std
::
make_shared
<
StateBlock
>
(
1
,
params_
->
roll_fixed_
));
setStateBlockPtrStatic
(
5
,
std
::
make_shared
<
StateBlock
>
(
1
,
params_
->
pitch_fixed_
));
setStateBlockPtrStatic
(
6
,
std
::
make_shared
<
StateBlock
>
(
1
,
params_
->
yaw_fixed_
));
addStateBlock
(
"t"
,
std
::
make_shared
<
StateBlock
>
(
3
,
params_
->
translation_fixed_
));
addStateBlock
(
"r"
,
std
::
make_shared
<
StateBlock
>
(
1
,
params_
->
roll_fixed_
));
addStateBlock
(
"p"
,
std
::
make_shared
<
StateBlock
>
(
1
,
params_
->
pitch_fixed_
));
addStateBlock
(
"y"
,
std
::
make_shared
<
StateBlock
>
(
1
,
params_
->
yaw_fixed_
));
}
SensorGnss
::
SensorGnss
(
StateBlockPtr
_p_ptr
,
//GNSS sensor position with respect to the car frame (base frame)
...
...
@@ -49,11 +48,10 @@ SensorGnss::SensorGnss(StateBlockPtr _p_ptr, //GNSS sensor position
assert
(
_pitch_ENU_MAP_ptr
->
getSize
()
==
1
&&
"Bad ENU_MAP pitch size"
);
assert
(
_yaw_ENU_MAP_ptr
->
getSize
()
==
1
&&
"Bad ENU_MAP yaw size"
);
getStateBlockVec
().
resize
(
7
);
setStateBlockPtrStatic
(
3
,
_t_ENU_MAP_ptr
);
setStateBlockPtrStatic
(
4
,
_roll_ENU_MAP_ptr
);
setStateBlockPtrStatic
(
5
,
_pitch_ENU_MAP_ptr
);
setStateBlockPtrStatic
(
6
,
_yaw_ENU_MAP_ptr
);
addStateBlock
(
"t"
,
_t_ENU_MAP_ptr
);
addStateBlock
(
"r"
,
_roll_ENU_MAP_ptr
);
addStateBlock
(
"p"
,
_pitch_ENU_MAP_ptr
);
addStateBlock
(
"y"
,
_yaw_ENU_MAP_ptr
);
}
SensorGnss
::~
SensorGnss
()
...
...
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