Skip to content
Snippets Groups Projects
Commit 029c9126 authored by Mirko Wächter's avatar Mirko Wächter
Browse files

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
parents bdca5dcb bc4bb216
No related branches found
No related tags found
1 merge request!26Rt robot unit v2
Showing
with 319 additions and 129 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment