Skip to content
Snippets Groups Projects
Commit 1919c792 authored by Lennard Karger's avatar Lennard Karger
Browse files

Merge branch 'MergeTest' into 'Developement_Karger' 

# Conflicts:
#   libraries/ProcMeas/ProcMeas.h
parents 9fd0f090 5a2e4eed
No related branches found
No related tags found
2 merge requests!4PIO Projekte in main-Branch implementieren,!3Vorbereitung Main merge PIO - Projektstrukturen
Show whitespace changes
Inline Side-by-side
libraries/ProcMeas/ProcMeas.h
+ 1
− 0
View file @ 1919c792
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
//#define ProcMeasDebug //#define ProcMeasDebug
#define RAD_TO_DEG 57.2957795 #define RAD_TO_DEG 57.2957795
typedef enum _PmState typedef enum _PmState
{ {
pmInit, pmInit,
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment