Merge branch 'RTRobotUnitV2' of https://gitlab.com/ArmarX/RobotAPI into RTRobotUnitV2
# By Raphael # Via Raphael * 'RTRobotUnitV2' of https://gitlab.com/ArmarX/RobotAPI: change some status flags of LVL1Controller to be atomic change RobotUnit to deactivate publishing for every controller on exit (if publishing was active before) change the LVL1Controller publishing hooks to be protected change RobotUnit::publish to also skip RobotUnitState::Exiting and check for skipping again after the lock was acquired change RobotUnit to delete LVL1Controllers potentially beeing forgotten in the queue of controllers to be deleted changes the icon of the button to deactivate a controler to a pause button (RobotUnitPlugin) add the possibility to delete LVL1Controllers (deletion may be impossible for some controllers. e.g.: controllers used by the kinematic unit) extend the gui to be able to delete controllers extended the RobotUnitListener to carry this information (lvl1ControllerDeleted) extended LVL1ControllerDescription to carry this information add LVL1ControllerInterface isDeletable and deleteController Conflicts: source/RobotAPI/gui-plugins/RobotUnitPlugin/RobotUnitPluginWidgetController.cpp
No related branches found
No related tags found
Showing
- source/RobotAPI/components/units/RobotUnit/LVL1Controllers/LVL1Controller.cpp 33 additions, 5 deletions...onents/units/RobotUnit/LVL1Controllers/LVL1Controller.cpp
- source/RobotAPI/components/units/RobotUnit/LVL1Controllers/LVL1Controller.h 14 additions, 11 deletions...mponents/units/RobotUnit/LVL1Controllers/LVL1Controller.h
- source/RobotAPI/components/units/RobotUnit/RobotUnit.cpp 122 additions, 32 deletionssource/RobotAPI/components/units/RobotUnit/RobotUnit.cpp
- source/RobotAPI/components/units/RobotUnit/RobotUnit.h 25 additions, 13 deletionssource/RobotAPI/components/units/RobotUnit/RobotUnit.h
- source/RobotAPI/components/units/RobotUnit/Units/KinematicSubUnit.cpp 7 additions, 7 deletions...API/components/units/RobotUnit/Units/KinematicSubUnit.cpp
- source/RobotAPI/gui-plugins/RobotUnitPlugin/RobotUnitLVL1ControllerClassesWidget.cpp 9 additions, 9 deletions.../RobotUnitPlugin/RobotUnitLVL1ControllerClassesWidget.cpp
- source/RobotAPI/gui-plugins/RobotUnitPlugin/RobotUnitLVL1ControllersWidget.cpp 60 additions, 20 deletions...lugins/RobotUnitPlugin/RobotUnitLVL1ControllersWidget.cpp
- source/RobotAPI/gui-plugins/RobotUnitPlugin/RobotUnitLVL1ControllersWidget.h 23 additions, 17 deletions...-plugins/RobotUnitPlugin/RobotUnitLVL1ControllersWidget.h
- source/RobotAPI/gui-plugins/RobotUnitPlugin/RobotUnitPluginWidgetController.cpp 7 additions, 3 deletions...ugins/RobotUnitPlugin/RobotUnitPluginWidgetController.cpp
- source/RobotAPI/gui-plugins/RobotUnitPlugin/RobotUnitPluginWidgetController.h 2 additions, 1 deletion...plugins/RobotUnitPlugin/RobotUnitPluginWidgetController.h
- source/RobotAPI/interface/units/RobotUnit/LVL1Controller.ice 3 additions, 0 deletionssource/RobotAPI/interface/units/RobotUnit/LVL1Controller.ice
- source/RobotAPI/interface/units/RobotUnit/RobotUnitInterface.ice 12 additions, 9 deletions...RobotAPI/interface/units/RobotUnit/RobotUnitInterface.ice
- source/RobotAPI/statecharts/TrajectoryExecutionCode/PlayTrajectory.cpp 2 additions, 2 deletions...PI/statecharts/TrajectoryExecutionCode/PlayTrajectory.cpp
Loading
Please register or sign in to comment