Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Skyward Boardcore
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
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
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
Nicolò Caruso
Skyward Boardcore
Commits
4f2a85b0
Commit
4f2a85b0
authored
1 year ago
by
Matteo Pignataro
Browse files
Options
Downloads
Patches
Plain Diff
[QUAT] Added quaternion data structure to SensorData
parent
a67a97fe
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/shared/sensors/SensorData.h
+44
-0
44 additions, 0 deletions
src/shared/sensors/SensorData.h
src/shared/sensors/VN100/VN100.cpp
+5
-5
5 additions, 5 deletions
src/shared/sensors/VN100/VN100.cpp
src/shared/sensors/VN100/VN100Data.h
+5
-16
5 additions, 16 deletions
src/shared/sensors/VN100/VN100Data.h
with
54 additions
and
21 deletions
src/shared/sensors/SensorData.h
+
44
−
0
View file @
4f2a85b0
...
...
@@ -145,6 +145,50 @@ struct AccelerometerData
}
};
/**
* @brief Structure to handle quaternion data.
*/
struct
QuaternionData
{
uint64_t
quaternionTimestamp
=
0
;
float
quaternionX
=
0
;
float
quaternionY
=
0
;
float
quaternionZ
=
0
;
float
quaternionW
=
0
;
QuaternionData
()
{}
QuaternionData
(
uint64_t
timestamp
,
float
x
,
float
y
,
float
z
,
float
w
)
:
quaternionTimestamp
(
timestamp
),
quaternionX
(
x
),
quaternionY
(
y
),
quaternionZ
(
z
),
quaternionW
(
w
)
{
}
QuaternionData
(
const
QuaternionData
&
data
)
=
default
;
explicit
QuaternionData
(
const
Eigen
::
Vector4f
&
quat
)
:
quaternionX
(
quat
(
0
)),
quaternionY
(
quat
(
1
)),
quaternionZ
(
quat
(
2
)),
quaternionW
(
quat
(
3
))
{
}
static
std
::
string
header
()
{
return
"timestamp,quaternionX,quaternionY,quaternionZ,quaterionW
\n
"
;
}
void
print
(
std
::
ostream
&
os
)
const
{
os
<<
quaternionTimestamp
<<
","
<<
quaternionX
<<
","
<<
quaternionY
<<
","
<<
quaternionZ
<<
","
<<
quaternionW
<<
"
\n
"
;
}
operator
Eigen
::
Vector4f
()
const
{
return
{
quaternionX
,
quaternionY
,
quaternionZ
,
quaternionW
};
}
};
/**
* @brief Structure to handle gyroscope data.
*/
...
...
This diff is collapsed.
Click to expand it.
src/shared/sensors/VN100/VN100.cpp
+
5
−
5
View file @
4f2a85b0
...
...
@@ -484,11 +484,11 @@ QuaternionData VN100::sampleQuaternion()
}
// Parse the data
data
.
quatTimestamp
=
TimestampTimer
::
getTimestamp
();
data
.
quatX
=
strtod
(
recvString
+
indexStart
+
1
,
&
nextNumber
);
data
.
quatY
=
strtod
(
nextNumber
+
1
,
&
nextNumber
);
data
.
quatZ
=
strtod
(
nextNumber
+
1
,
&
nextNumber
);
data
.
quatW
=
strtod
(
nextNumber
+
1
,
NULL
);
data
.
quat
ernion
Timestamp
=
TimestampTimer
::
getTimestamp
();
data
.
quat
ernion
X
=
strtod
(
recvString
+
indexStart
+
1
,
&
nextNumber
);
data
.
quat
ernion
Y
=
strtod
(
nextNumber
+
1
,
&
nextNumber
);
data
.
quat
ernion
Z
=
strtod
(
nextNumber
+
1
,
&
nextNumber
);
data
.
quat
ernion
W
=
strtod
(
nextNumber
+
1
,
NULL
);
return
data
;
}
...
...
This diff is collapsed.
Click to expand it.
src/shared/sensors/VN100/VN100Data.h
+
5
−
16
View file @
4f2a85b0
...
...
@@ -27,18 +27,6 @@
namespace
Boardcore
{
/**
* @brief Structure to handle quaternion data
*/
struct
QuaternionData
{
uint64_t
quatTimestamp
;
float
quatX
;
float
quatY
;
float
quatZ
;
float
quatW
;
};
/**
* @brief data type class
*/
...
...
@@ -90,10 +78,11 @@ struct VN100Data : public QuaternionData,
void
print
(
std
::
ostream
&
os
)
const
{
os
<<
quatTimestamp
<<
","
<<
quatX
<<
","
<<
quatY
<<
","
<<
quatZ
<<
","
<<
quatW
<<
","
<<
magneticFieldTimestamp
<<
","
<<
magneticFieldX
<<
","
<<
magneticFieldY
<<
","
<<
magneticFieldZ
<<
","
<<
accelerationTimestamp
<<
","
<<
accelerationX
<<
","
os
<<
quaternionTimestamp
<<
","
<<
quaternionX
<<
","
<<
quaternionY
<<
","
<<
quaternionZ
<<
","
<<
quaternionW
<<
","
<<
magneticFieldTimestamp
<<
","
<<
magneticFieldX
<<
","
<<
magneticFieldY
<<
","
<<
magneticFieldZ
<<
","
<<
accelerationTimestamp
<<
","
<<
accelerationX
<<
","
<<
accelerationY
<<
","
<<
accelerationZ
<<
","
<<
angularSpeedTimestamp
<<
","
<<
angularSpeedX
<<
","
<<
angularSpeedY
<<
","
<<
angularSpeedZ
<<
","
...
...
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