Merge remote-tracking branch 'origin/master' into...
Merge remote-tracking branch 'origin/master' into feature/move-laser-scanner-feature-extraction-to-navigation
Showing
- source/RobotAPI/components/ArViz/Client/Client.h 2 additions, 2 deletionssource/RobotAPI/components/ArViz/Client/Client.h
- source/RobotAPI/components/ArViz/Client/elements/MeshCGALExtensions.h 2 additions, 2 deletions...API/components/ArViz/Client/elements/MeshCGALExtensions.h
- source/RobotAPI/components/ArViz/Client/elements/PointCloud.h 4 additions, 6 deletions...ce/RobotAPI/components/ArViz/Client/elements/PointCloud.h
- source/RobotAPI/components/GamepadControlUnit/CMakeLists.txt 1 addition, 1 deletionsource/RobotAPI/components/GamepadControlUnit/CMakeLists.txt
- source/RobotAPI/components/GamepadControlUnit/GamepadControlUnit.cpp 125 additions, 106 deletions...tAPI/components/GamepadControlUnit/GamepadControlUnit.cpp
- source/RobotAPI/components/GamepadControlUnit/GamepadControlUnit.h 6 additions, 2 deletions...botAPI/components/GamepadControlUnit/GamepadControlUnit.h
- source/RobotAPI/components/RobotHealth/RobotHealth.cpp 421 additions, 176 deletionssource/RobotAPI/components/RobotHealth/RobotHealth.cpp
- source/RobotAPI/components/RobotHealth/RobotHealth.h 105 additions, 85 deletionssource/RobotAPI/components/RobotHealth/RobotHealth.h
- source/RobotAPI/components/RobotHealth/RobotHealthDummy.cpp 44 additions, 27 deletionssource/RobotAPI/components/RobotHealth/RobotHealthDummy.cpp
- source/RobotAPI/components/RobotHealth/RobotHealthDummy.h 14 additions, 11 deletionssource/RobotAPI/components/RobotHealth/RobotHealthDummy.h
- source/RobotAPI/components/armem/client/ExampleMemoryClient/CMakeLists.txt 2 additions, 1 deletion...omponents/armem/client/ExampleMemoryClient/CMakeLists.txt
- source/RobotAPI/components/armem/server/ExampleMemory/aron/ExampleData.xml 3 additions, 3 deletions...omponents/armem/server/ExampleMemory/aron/ExampleData.xml
- source/RobotAPI/components/units/RobotUnit/util/ControlThreadOutputBuffer.cpp 5 additions, 5 deletions...onents/units/RobotUnit/util/ControlThreadOutputBuffer.cpp
- source/RobotAPI/drivers/HokuyoLaserUnit/HokuyoLaserUnit.cpp 86 additions, 52 deletionssource/RobotAPI/drivers/HokuyoLaserUnit/HokuyoLaserUnit.cpp
- source/RobotAPI/drivers/HokuyoLaserUnit/HokuyoLaserUnit.h 33 additions, 15 deletionssource/RobotAPI/drivers/HokuyoLaserUnit/HokuyoLaserUnit.h
- source/RobotAPI/gui-plugins/GuiHealthClient/GuiHealthClientWidget.ui 39 additions, 52 deletions...tAPI/gui-plugins/GuiHealthClient/GuiHealthClientWidget.ui
- source/RobotAPI/gui-plugins/GuiHealthClient/GuiHealthClientWidgetController.cpp 179 additions, 57 deletions...ugins/GuiHealthClient/GuiHealthClientWidgetController.cpp
- source/RobotAPI/gui-plugins/GuiHealthClient/GuiHealthClientWidgetController.h 1 addition, 5 deletions...plugins/GuiHealthClient/GuiHealthClientWidgetController.h
- source/RobotAPI/interface/aron/Aron.ice 217 additions, 37 deletionssource/RobotAPI/interface/aron/Aron.ice
- source/RobotAPI/interface/components/RobotHealthInterface.ice 60 additions, 6 deletions...ce/RobotAPI/interface/components/RobotHealthInterface.ice
Loading
Please register or sign in to comment