Merge remote-tracking branch 'origin/master' into armar6-2023-07-28
# Conflicts: # source/RobotAPI/libraries/armem_robot_state/common/localization/TransformHelper.cpp # source/RobotAPI/libraries/armem_robot_state/server/proprioception/RobotUnitReader.cpp
No related branches found
No related tags found
Showing
- source/RobotAPI/components/RobotHealth/RobotHealth.cpp 27 additions, 33 deletionssource/RobotAPI/components/RobotHealth/RobotHealth.cpp
- source/RobotAPI/components/RobotHealth/RobotHealth.h 28 additions, 28 deletionssource/RobotAPI/components/RobotHealth/RobotHealth.h
- source/RobotAPI/components/units/RobotUnit/Units/KinematicSubUnit.cpp 1 addition, 2 deletions...API/components/units/RobotUnit/Units/KinematicSubUnit.cpp
- source/RobotAPI/gui-plugins/ObjectPoseGui/ObjectPoseGuiWidget.ui 23 additions, 0 deletions...RobotAPI/gui-plugins/ObjectPoseGui/ObjectPoseGuiWidget.ui
- source/RobotAPI/gui-plugins/ObjectPoseGui/ObjectPoseGuiWidgetController.cpp 235 additions, 160 deletions...i-plugins/ObjectPoseGui/ObjectPoseGuiWidgetController.cpp
- source/RobotAPI/gui-plugins/ObjectPoseGui/ObjectPoseGuiWidgetController.h 12 additions, 16 deletions...gui-plugins/ObjectPoseGui/ObjectPoseGuiWidgetController.h
- source/RobotAPI/libraries/ArmarXObjects/ObjectFinder.cpp 7 additions, 1 deletionsource/RobotAPI/libraries/ArmarXObjects/ObjectFinder.cpp
- source/RobotAPI/libraries/ArmarXObjects/ObjectFinder.h 6 additions, 0 deletionssource/RobotAPI/libraries/ArmarXObjects/ObjectFinder.h
- source/RobotAPI/libraries/PriorKnowledge/util/LocationLoader/LocationLoader.cpp 8 additions, 1 deletion...ies/PriorKnowledge/util/LocationLoader/LocationLoader.cpp
- source/RobotAPI/libraries/PriorKnowledge/util/LocationLoader/datatypes/Location.cpp 8 additions, 11 deletions...PriorKnowledge/util/LocationLoader/datatypes/Location.cpp
- source/RobotAPI/libraries/PriorKnowledge/util/LocationLoader/datatypes/Location.h 2 additions, 4 deletions...s/PriorKnowledge/util/LocationLoader/datatypes/Location.h
- source/RobotAPI/libraries/RobotAPIComponentPlugins/ArVizComponentPlugin.cpp 22 additions, 17 deletions...braries/RobotAPIComponentPlugins/ArVizComponentPlugin.cpp
- source/RobotAPI/libraries/RobotUnitDataStreamingReceiver/RobotUnitDataStreamingReceiver.cpp 50 additions, 36 deletions...tDataStreamingReceiver/RobotUnitDataStreamingReceiver.cpp
- source/RobotAPI/libraries/armem/client/util/SimpleReaderBase.h 4 additions, 0 deletions...e/RobotAPI/libraries/armem/client/util/SimpleReaderBase.h
- source/RobotAPI/libraries/armem_locations/CMakeLists.txt 8 additions, 0 deletionssource/RobotAPI/libraries/armem_locations/CMakeLists.txt
- source/RobotAPI/libraries/armem_locations/aron/Location.xml 2 additions, 31 deletionssource/RobotAPI/libraries/armem_locations/aron/Location.xml
- source/RobotAPI/libraries/armem_locations/client/Reader.cpp 107 additions, 0 deletionssource/RobotAPI/libraries/armem_locations/client/Reader.cpp
- source/RobotAPI/libraries/armem_locations/client/Reader.h 54 additions, 0 deletionssource/RobotAPI/libraries/armem_locations/client/Reader.h
- source/RobotAPI/libraries/armem_locations/frame_conversions.cpp 6 additions, 0 deletions.../RobotAPI/libraries/armem_locations/frame_conversions.cpp
- source/RobotAPI/libraries/armem_locations/frame_conversions.h 52 additions, 0 deletions...ce/RobotAPI/libraries/armem_locations/frame_conversions.h
Loading
Please register or sign in to comment