Merge branch 'master' into arviz
Showing
- data/RobotAPI/VariantInfo-RobotAPI.xml 8 additions, 0 deletionsdata/RobotAPI/VariantInfo-RobotAPI.xml
- source/RobotAPI/components/FrameTracking/FrameTracking.cpp 11 additions, 6 deletionssource/RobotAPI/components/FrameTracking/FrameTracking.cpp
- source/RobotAPI/components/RobotHealth/RobotHealth.cpp 21 additions, 0 deletionssource/RobotAPI/components/RobotHealth/RobotHealth.cpp
- source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointCartesianWaypointController.cpp 31 additions, 7 deletions...t/NJointControllers/NJointCartesianWaypointController.cpp
- source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointCartesianWaypointController.h 11 additions, 4 deletions...nit/NJointControllers/NJointCartesianWaypointController.h
- source/RobotAPI/components/units/RobotUnit/RobotUnitModules/RobotUnitModuleControllerManagement.cpp 16 additions, 0 deletions.../RobotUnitModules/RobotUnitModuleControllerManagement.cpp
- source/RobotAPI/components/units/RobotUnit/RobotUnitModules/RobotUnitModuleControllerManagement.h 10 additions, 0 deletions...it/RobotUnitModules/RobotUnitModuleControllerManagement.h
- source/RobotAPI/drivers/GamepadUnit/GamepadUnit.cpp 26 additions, 0 deletionssource/RobotAPI/drivers/GamepadUnit/GamepadUnit.cpp
- source/RobotAPI/gui-plugins/CartesianWaypointControlGui/CartesianWaypointControlGuiWidget.ui 21 additions, 14 deletions...anWaypointControlGui/CartesianWaypointControlGuiWidget.ui
- source/RobotAPI/gui-plugins/CartesianWaypointControlGui/CartesianWaypointControlGuiWidgetController.cpp 4 additions, 2 deletions...ontrolGui/CartesianWaypointControlGuiWidgetController.cpp
- source/RobotAPI/gui-plugins/CartesianWaypointControlGui/CartesianWaypointControlGuiWidgetController.h 1 addition, 1 deletion...tControlGui/CartesianWaypointControlGuiWidgetController.h
- source/RobotAPI/interface/units/GraspCandidateProviderInterface.ice 3 additions, 3 deletions...otAPI/interface/units/GraspCandidateProviderInterface.ice
- source/RobotAPI/interface/units/RobotUnit/NJointCartesianWaypointController.ice 9 additions, 5 deletions...ace/units/RobotUnit/NJointCartesianWaypointController.ice
- source/RobotAPI/interface/units/RobotUnit/RobotUnitInterface.ice 3 additions, 0 deletions...RobotAPI/interface/units/RobotUnit/RobotUnitInterface.ice
- source/RobotAPI/libraries/ControllerUIUtility/NJointCartesianWaypointControllerConfig/RemoteGui.cpp 12 additions, 3 deletions...ity/NJointCartesianWaypointControllerConfig/RemoteGui.cpp
- source/RobotAPI/libraries/ControllerUIUtility/NJointCartesianWaypointControllerConfig/RemoteGui.h 2 additions, 2 deletions...ility/NJointCartesianWaypointControllerConfig/RemoteGui.h
- source/RobotAPI/libraries/RobotAPINJointControllers/DMPController/NJointAdaptiveWipingController.cpp 1 addition, 4 deletions...trollers/DMPController/NJointAdaptiveWipingController.cpp
Loading
Please register or sign in to comment