Merge branch 'master' of https://gitlab.com/ArmarX/RobotAPI
No related branches found
No related tags found
Showing
- CMakeLists.txt 1 addition, 1 deletionCMakeLists.txt
- data/RobotAPI/sensors/OptoForceCalibration.xml 17 additions, 5 deletionsdata/RobotAPI/sensors/OptoForceCalibration.xml
- scenarios/LaserScannerTest/config/HokuyoLaserUnitApp.cfg 2 additions, 2 deletionsscenarios/LaserScannerTest/config/HokuyoLaserUnitApp.cfg
- scenarios/OptoForceUnit/OptoForceUnit.scx 1 addition, 1 deletionscenarios/OptoForceUnit/OptoForceUnit.scx
- scenarios/OptoForceUnit/config/OptoForceUnitApp.cfg 16 additions, 0 deletionsscenarios/OptoForceUnit/config/OptoForceUnitApp.cfg
- scenarios/OptoForceUnit/config/OptoForceUnitObserverApp.cfg 1 addition, 6 deletionsscenarios/OptoForceUnit/config/OptoForceUnitObserverApp.cfg
- source/RobotAPI/drivers/OptoForceUnit/OptoForceUnit.cpp 75 additions, 16 deletionssource/RobotAPI/drivers/OptoForceUnit/OptoForceUnit.cpp
- source/RobotAPI/drivers/OptoForceUnit/OptoForceUnit.h 15 additions, 0 deletionssource/RobotAPI/drivers/OptoForceUnit/OptoForceUnit.h
- source/RobotAPI/gui-plugins/LaserScannerPlugin/LaserScannerPluginWidgetController.cpp 6 additions, 8 deletions...LaserScannerPlugin/LaserScannerPluginWidgetController.cpp
- source/RobotAPI/gui-plugins/LaserScannerPlugin/LaserScannerPluginWidgetController.h 1 addition, 1 deletion...s/LaserScannerPlugin/LaserScannerPluginWidgetController.h
- source/RobotAPI/interface/units/OptoForceUnit.ice 3 additions, 1 deletionsource/RobotAPI/interface/units/OptoForceUnit.ice
Loading
Please register or sign in to comment