Merge branch 'master' into aron/image
# 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
No related branches found
No related tags found
Showing
- scenarios/RobotSkillsMemory/config/SkillsMemory.cfg 0 additions, 16 deletionsscenarios/RobotSkillsMemory/config/SkillsMemory.cfg
- scenarios/SickLaserUnitTest/config/SickLaserUnit.cfg 57 additions, 26 deletionsscenarios/SickLaserUnitTest/config/SickLaserUnit.cfg
- source/RobotAPI/applications/RobotControlUI/CMakeLists.txt 1 addition, 1 deletionsource/RobotAPI/applications/RobotControlUI/CMakeLists.txt
- source/RobotAPI/components/DynamicObstacleManager/ManagedObstacle.cpp 3 additions, 0 deletions...API/components/DynamicObstacleManager/ManagedObstacle.cpp
- source/RobotAPI/components/EarlyVisionGraph/CMakeLists.txt 5 additions, 1 deletionsource/RobotAPI/components/EarlyVisionGraph/CMakeLists.txt
- source/RobotAPI/components/units/RobotUnit/util/introspection/DataFieldsInfo.h 1 addition, 0 deletions...nents/units/RobotUnit/util/introspection/DataFieldsInfo.h
- source/RobotAPI/drivers/SickLaserUnit/SickLaserUnit.cpp 12 additions, 23 deletionssource/RobotAPI/drivers/SickLaserUnit/SickLaserUnit.cpp
- source/RobotAPI/drivers/SickLaserUnit/SickLaserUnit.h 5 additions, 4 deletionssource/RobotAPI/drivers/SickLaserUnit/SickLaserUnit.h
- source/RobotAPI/drivers/SickLaserUnit/SickScanAdapter.cpp 23 additions, 84 deletionssource/RobotAPI/drivers/SickLaserUnit/SickScanAdapter.cpp
- source/RobotAPI/drivers/SickLaserUnit/SickScanAdapter.h 7 additions, 7 deletionssource/RobotAPI/drivers/SickLaserUnit/SickScanAdapter.h
- source/RobotAPI/drivers/WeissHapticSensor/WeissHapticSensor.cpp 2 additions, 0 deletions.../RobotAPI/drivers/WeissHapticSensor/WeissHapticSensor.cpp
- source/RobotAPI/drivers/WeissHapticSensor/WeissHapticSensor.h 7 additions, 5 deletions...ce/RobotAPI/drivers/WeissHapticSensor/WeissHapticSensor.h
- source/RobotAPI/libraries/GraspingUtility/box_to_grasp_candidates.ipp 1 addition, 2 deletions...API/libraries/GraspingUtility/box_to_grasp_candidates.ipp
- source/RobotAPI/libraries/core/LinkedPose.h 1 addition, 0 deletionssource/RobotAPI/libraries/core/LinkedPose.h
- source/RobotAPI/libraries/core/checks/ConditionCheckMagnitudeChecks.cpp 1 addition, 0 deletions...I/libraries/core/checks/ConditionCheckMagnitudeChecks.cpp
- source/RobotAPI/libraries/core/checks/ConditionCheckMagnitudeChecks.h 3 additions, 4 deletions...API/libraries/core/checks/ConditionCheckMagnitudeChecks.h
- source/RobotAPI/libraries/core/math/StatUtils.h 3 additions, 1 deletionsource/RobotAPI/libraries/core/math/StatUtils.h
- source/RobotAPI/libraries/core/observerfilters/MatrixFilters.h 4 additions, 1 deletion...e/RobotAPI/libraries/core/observerfilters/MatrixFilters.h
- source/RobotAPI/libraries/core/observerfilters/MedianDerivativeFilterV3.cpp 1 addition, 0 deletions...braries/core/observerfilters/MedianDerivativeFilterV3.cpp
- source/RobotAPI/libraries/core/observerfilters/PoseMedianOffsetFilter.cpp 1 addition, 0 deletions...libraries/core/observerfilters/PoseMedianOffsetFilter.cpp
Loading
Please register or sign in to comment