Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
SOAAP
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Terraform modules
Monitor
Incidents
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
Martin Streitenberger
SOAAP
Commits
489dd1eb
Commit
489dd1eb
authored
2 years ago
by
RobertPatzke
Browse files
Options
Downloads
Patches
Plain Diff
Update 20221111
parent
5a2e4eed
No related branches found
No related tags found
1 merge request
!5
Update Dev-Branch
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
libraries/ProcMeas/ProcMeas.cpp
+4
-2
4 additions, 2 deletions
libraries/ProcMeas/ProcMeas.cpp
libraries/environment/arduinoDefs.h
+40
-0
40 additions, 0 deletions
libraries/environment/arduinoDefs.h
with
44 additions
and
2 deletions
libraries/ProcMeas/ProcMeas.cpp
+
4
−
2
View file @
489dd1eb
...
...
@@ -9,6 +9,8 @@
#include
"ProcMeas.h"
#include
"arduinoDefs.h"
// ---------------------------------------------------------------------------
// Konstruktoren und Initialisierungen
// ---------------------------------------------------------------------------
...
...
@@ -58,8 +60,8 @@ void ProcMeas::run()
#ifdef ProcMeasDebug
statistics
.
pmCalcCnt
++
;
#endif
posture
.
pitch
=
euler
.
getPitchFromGravity
(
gravAngles
.
x
,
gravAngles
.
y
,
gravAngles
.
z
)
*
RAD_TO_DEG
;
posture
.
roll
=
euler
.
getRollFromGravity
(
gravAngles
.
y
,
gravAngles
.
z
)
*
RAD_TO_DEG
;
posture
.
pitch
=
euler
.
getPitchFromGravity
(
gravAngles
.
x
,
gravAngles
.
y
,
gravAngles
.
z
)
*
smn
RAD_TO_DEG
;
posture
.
roll
=
euler
.
getRollFromGravity
(
gravAngles
.
y
,
gravAngles
.
z
)
*
smn
RAD_TO_DEG
;
posture
.
yaw
=
0.0
;
pMeas
->
sync
(
1
,
1
);
gravAnglesAvail
=
true
;
...
...
This diff is collapsed.
Click to expand it.
libraries/environment/arduinoDefs.h
+
40
−
0
View file @
489dd1eb
...
...
@@ -13,6 +13,46 @@
#ifndef _arduinoDefs_h
#define _arduinoDefs_h
// ---------------------------------------------------------------------------
// Constant Values
// ---------------------------------------------------------------------------
//
#ifndef PI
#define PI 3.1415926535897932384626433832795
#endif
#ifndef HALF_PI
#define HALF_PI 1.5707963267948966192313216916398
#endif
#ifndef TWO_PI
#define TWO_PI 6.283185307179586476925286766559
#endif
#ifndef DEG_TO_RAD
#define DEG_TO_RAD 0.017453292519943295769236907684886
#endif
#ifndef RAD_TO_DEG
#define RAD_TO_DEG 57.295779513082320876798154814105
#endif
#ifndef EULER
#define EULER 2.718281828459045235360287471352
#endif
//
// Es tritt hier das Problem auf, dass obige Werte beim Nano BLE 33 im <core/api> in der Datei common.h
// definiert werden, diese aber bei Eclipse nicht im Indexer von C++ sauber sind oder es zu Problemen bei
// der Abfolge der Definitionen im Build-Vorgang kommt.
// Der Wert RAD_TO_DEG wird im Syntax-Check (lokaler C++ Compiler) nicht erkannt, das Kompilieren über den
// GCC des Arduino-Board hingegen ist fehlerfrei. Möglicherweise werden dort irgendwelche Default-Includes
// vorgenommen, die sich beim Indexer in Eclipse nicht zeigen.
// Es wurde deshalb hier eine extra Definition der Konstanten mit neuem Bezeichner eingeführt, die das
// beschriebene Problem nicht aufwirft.
//
#define smnPI 3.1415926535897932384626433832795
#define smnHALF_PI 1.5707963267948966192313216916398
#define smnTWO_PI 6.283185307179586476925286766559
#define smnDEG_TO_RAD 0.017453292519943295769236907684886
#define smnRAD_TO_DEG 57.295779513082320876798154814105
#define smnEULER 2.718281828459045235360287471352
// ---------------------------------------------------------------------------
// Simple type definitions and settings
// ---------------------------------------------------------------------------
...
...
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