Merge branch 'master' into SensorPackage
Conflicts: source/RobotAPI/drivers/OrientedTactileSensor/OrientedTactileSensorUnit.cpp source/RobotAPI/drivers/OrientedTactileSensor/OrientedTactileSensorUnit.h source/RobotAPI/libraries/CMakeLists.txt
No related branches found
No related tags found
Showing
- source/RobotAPI/components/units/KinematicUnitObserver.cpp 23 additions, 6 deletionssource/RobotAPI/components/units/KinematicUnitObserver.cpp
- source/RobotAPI/components/units/MetaWearIMUObserver.cpp 116 additions, 0 deletionssource/RobotAPI/components/units/MetaWearIMUObserver.cpp
- source/RobotAPI/components/units/MetaWearIMUObserver.h 87 additions, 0 deletionssource/RobotAPI/components/units/MetaWearIMUObserver.h
- source/RobotAPI/drivers/CMakeLists.txt 4 additions, 1 deletionsource/RobotAPI/drivers/CMakeLists.txt
- source/RobotAPI/drivers/CMakeLists.txt.orig 0 additions, 8 deletionssource/RobotAPI/drivers/CMakeLists.txt.orig
- source/RobotAPI/drivers/GamepadUnit/CMakeLists.txt 27 additions, 0 deletionssource/RobotAPI/drivers/GamepadUnit/CMakeLists.txt
- source/RobotAPI/drivers/GamepadUnit/GamepadUnit.cpp 123 additions, 0 deletionssource/RobotAPI/drivers/GamepadUnit/GamepadUnit.cpp
- source/RobotAPI/drivers/GamepadUnit/GamepadUnit.h 116 additions, 0 deletionssource/RobotAPI/drivers/GamepadUnit/GamepadUnit.h
- source/RobotAPI/drivers/GamepadUnit/Joystick.h 94 additions, 0 deletionssource/RobotAPI/drivers/GamepadUnit/Joystick.h
- source/RobotAPI/drivers/GamepadUnit/test/CMakeLists.txt 5 additions, 0 deletionssource/RobotAPI/drivers/GamepadUnit/test/CMakeLists.txt
- source/RobotAPI/drivers/GamepadUnit/test/GamepadUnitTest.cpp 16 additions, 4 deletionssource/RobotAPI/drivers/GamepadUnit/test/GamepadUnitTest.cpp
- source/RobotAPI/drivers/HokuyoLaserUnit/HokuyoLaserUnit.cpp 4 additions, 4 deletionssource/RobotAPI/drivers/HokuyoLaserUnit/HokuyoLaserUnit.cpp
- source/RobotAPI/drivers/MetaWearIMU/CMakeLists.txt 24 additions, 0 deletionssource/RobotAPI/drivers/MetaWearIMU/CMakeLists.txt
- source/RobotAPI/drivers/MetaWearIMU/MetaWearIMU.cpp 73 additions, 0 deletionssource/RobotAPI/drivers/MetaWearIMU/MetaWearIMU.cpp
- source/RobotAPI/drivers/MetaWearIMU/MetaWearIMU.h 108 additions, 0 deletionssource/RobotAPI/drivers/MetaWearIMU/MetaWearIMU.h
- source/RobotAPI/drivers/OrientedTactileSensor/OrientedTactileSensorUnit.cpp.orig 363 additions, 0 deletions.../OrientedTactileSensor/OrientedTactileSensorUnit.cpp.orig
- source/RobotAPI/drivers/OrientedTactileSensor/OrientedTactileSensorUnit.h.orig 169 additions, 0 deletions...rs/OrientedTactileSensor/OrientedTactileSensorUnit.h.orig
- source/RobotAPI/gui-plugins/KinematicUnitPlugin/KinematicUnitGuiPlugin.cpp 77 additions, 47 deletions...ui-plugins/KinematicUnitPlugin/KinematicUnitGuiPlugin.cpp
- source/RobotAPI/gui-plugins/KinematicUnitPlugin/KinematicUnitGuiPlugin.h 7 additions, 0 deletions.../gui-plugins/KinematicUnitPlugin/KinematicUnitGuiPlugin.h
- source/RobotAPI/gui-plugins/KinematicUnitPlugin/kinematicunitguiplugin.ui 0 additions, 13 deletions...gui-plugins/KinematicUnitPlugin/kinematicunitguiplugin.ui
Loading
Please register or sign in to comment