Commit 78a4cffe authored 1 year ago by ARMAR-DE

Merge branch 'master' of git.h2t.iar.kit.edu:sw/armarx/robot-api

parents 3ab1888a 811232eb

No related branches found

No related tags found

No related merge requests found

Expand all Hide whitespace changes

Inline Side-by-side

Showing

source/RobotAPI/components/RobotHealth/RobotHealth.cpp 27 additions, 33 deletions

source/RobotAPI/components/RobotHealth/RobotHealth.cpp
source/RobotAPI/components/RobotHealth/RobotHealth.h 28 additions, 28 deletions

source/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/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 deletions

source/RobotAPI/libraries/armem_locations/CMakeLists.txt
source/RobotAPI/libraries/armem_locations/aron/Location.xml 2 additions, 31 deletions

source/RobotAPI/libraries/armem_locations/aron/Location.xml
source/RobotAPI/libraries/armem_locations/client/Reader.cpp 107 additions, 0 deletions

source/RobotAPI/libraries/armem_locations/client/Reader.cpp
source/RobotAPI/libraries/armem_locations/client/Reader.h 54 additions, 0 deletions

source/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
source/RobotAPI/libraries/armem_objects/server/instance/Segment.cpp 382 additions, 347 deletions

...otAPI/libraries/armem_objects/server/instance/Segment.cpp
source/RobotAPI/libraries/armem_objects/server/instance/Segment.h 49 additions, 53 deletions

...obotAPI/libraries/armem_objects/server/instance/Segment.h

with 1080 additions and 739 deletions

Please register or to comment