source/RobotAPI/libraries/core/LinkedPose.h · 025cde5b0abc76f75e5a721eb6ba8aeaa07618bb · Lennard Hofmann / RobotAPI

Forked from Florian Leander Singer / RobotAPI

Source project has a limited visibility.

3 years ago

Merge branch 'master' into aron/image · 025cde5b

Rainer Kartmann authored 3 years ago

# Conflicts:
#	source/RobotAPI/libraries/core/FramedPose.cpp
#	source/RobotAPI/libraries/core/LinkedPose.h
#	source/RobotAPI/libraries/core/checks/ConditionCheckMagnitudeChecks.h
#	source/RobotAPI/libraries/core/observerfilters/MedianDerivativeFilterV3.cpp
#	source/RobotAPI/libraries/core/observerfilters/OffsetFilter.h
#	source/RobotAPI/libraries/core/observerfilters/PoseAverageFilter.cpp
#	source/RobotAPI/libraries/core/observerfilters/PoseMedianFilter.h

025cde5b

History

Merge branch 'master' into aron/image

Rainer Kartmann authored 3 years ago

# Conflicts:
#	source/RobotAPI/libraries/core/FramedPose.cpp
#	source/RobotAPI/libraries/core/LinkedPose.h
#	source/RobotAPI/libraries/core/checks/ConditionCheckMagnitudeChecks.h
#	source/RobotAPI/libraries/core/observerfilters/MedianDerivativeFilterV3.cpp
#	source/RobotAPI/libraries/core/observerfilters/OffsetFilter.h
#	source/RobotAPI/libraries/core/observerfilters/PoseAverageFilter.cpp
#	source/RobotAPI/libraries/core/observerfilters/PoseMedianFilter.h