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/libraries/RTRobotUnit/DataUnits/ForceTorqueDataUnit.h 0 additions, 0 deletions...API/libraries/RTRobotUnit/DataUnits/ForceTorqueDataUnit.h
- source/RobotAPI/libraries/RTRobotUnit/DataUnits/HapticDataUnit.h 0 additions, 0 deletions...RobotAPI/libraries/RTRobotUnit/DataUnits/HapticDataUnit.h
- source/RobotAPI/libraries/RTRobotUnit/DataUnits/IMUDataUnit.h 0 additions, 0 deletions...ce/RobotAPI/libraries/RTRobotUnit/DataUnits/IMUDataUnit.h
- source/RobotAPI/libraries/RTRobotUnit/DataUnits/KinematicDataUnit.h 0 additions, 0 deletions...otAPI/libraries/RTRobotUnit/DataUnits/KinematicDataUnit.h
- source/RobotAPI/libraries/RTRobotUnit/DataUnits/PlatformDataUnit.h 0 additions, 0 deletions...botAPI/libraries/RTRobotUnit/DataUnits/PlatformDataUnit.h
- source/RobotAPI/libraries/RTRobotUnit/LVL0Controllers/LVL0Controller.cpp 0 additions, 0 deletions.../libraries/RTRobotUnit/LVL0Controllers/LVL0Controller.cpp
- source/RobotAPI/libraries/RTRobotUnit/LVL0Controllers/LVL0Controller.h 12 additions, 8 deletions...PI/libraries/RTRobotUnit/LVL0Controllers/LVL0Controller.h
- source/RobotAPI/libraries/RTRobotUnit/LVL1Controllers/LVL1Controller.cpp 0 additions, 0 deletions.../libraries/RTRobotUnit/LVL1Controllers/LVL1Controller.cpp
- source/RobotAPI/libraries/RTRobotUnit/LVL1Controllers/LVL1Controller.h 34 additions, 17 deletions...PI/libraries/RTRobotUnit/LVL1Controllers/LVL1Controller.h
- source/RobotAPI/libraries/RTRobotUnit/LVL1Controllers/LVL1HolonomicPlatformVelocityPassThroughController.cpp 67 additions, 0 deletions...rs/LVL1HolonomicPlatformVelocityPassThroughController.cpp
- source/RobotAPI/libraries/RTRobotUnit/LVL1Controllers/LVL1HolonomicPlatformVelocityPassThroughController.h 64 additions, 0 deletions...lers/LVL1HolonomicPlatformVelocityPassThroughController.h
- source/RobotAPI/libraries/RTRobotUnit/LVL1Controllers/LVL1KinematicUnitPositionController.cpp 107 additions, 0 deletions...t/LVL1Controllers/LVL1KinematicUnitPositionController.cpp
- source/RobotAPI/libraries/RTRobotUnit/LVL1Controllers/LVL1KinematicUnitPositionController.h 79 additions, 0 deletions...nit/LVL1Controllers/LVL1KinematicUnitPositionController.h
- source/RobotAPI/libraries/RTRobotUnit/LVL1Controllers/LVL1KinematicUnitTorqueController.cpp 44 additions, 0 deletions...nit/LVL1Controllers/LVL1KinematicUnitTorqueController.cpp
- source/RobotAPI/libraries/RTRobotUnit/LVL1Controllers/LVL1KinematicUnitTorqueController.h 84 additions, 0 deletions...tUnit/LVL1Controllers/LVL1KinematicUnitTorqueController.h
- source/RobotAPI/libraries/RTRobotUnit/LVL1Controllers/LVL1KinematicUnitVelocityController.cpp 95 additions, 0 deletions...t/LVL1Controllers/LVL1KinematicUnitVelocityController.cpp
- source/RobotAPI/libraries/RTRobotUnit/LVL1Controllers/LVL1KinematicUnitVelocityController.h 78 additions, 0 deletions...nit/LVL1Controllers/LVL1KinematicUnitVelocityController.h
- source/RobotAPI/libraries/RTRobotUnit/LVL1Controllers/LVL1PassThroughController.cpp 28 additions, 0 deletions...RTRobotUnit/LVL1Controllers/LVL1PassThroughController.cpp
- source/RobotAPI/libraries/RTRobotUnit/LVL1Controllers/LVL1PassThroughController.h 36 additions, 39 deletions...s/RTRobotUnit/LVL1Controllers/LVL1PassThroughController.h
- source/RobotAPI/libraries/RTRobotUnit/RobotUnit.cpp 29 additions, 29 deletionssource/RobotAPI/libraries/RTRobotUnit/RobotUnit.cpp
Loading
Please register or sign in to comment