Commit bdf52b8f authored 7 years ago by Stefan Reither

Merge branch 'master' into TCPSubUnit

Conflicts:
	source/RobotAPI/components/units/RobotUnit/RobotUnit.cpp
	source/RobotAPI/components/units/RobotUnit/RobotUnit.h

parents 9947325e c07c86dc

Expand all Hide whitespace changes

Inline Side-by-side

Showing

data/RobotAPI/robots/Armar3/ArmarIII.xml 51 additions, 0 deletions

data/RobotAPI/robots/Armar3/ArmarIII.xml
source/RobotAPI/components/units/RobotUnit/CMakeLists.txt 17 additions, 2 deletions

source/RobotAPI/components/units/RobotUnit/CMakeLists.txt
source/RobotAPI/components/units/RobotUnit/ControlTargets/ControlTarget1DoFActuator.h 5 additions, 3 deletions

...nits/RobotUnit/ControlTargets/ControlTarget1DoFActuator.h
source/RobotAPI/components/units/RobotUnit/ControlTargets/ControlTargetBase.h 81 additions, 28 deletions

...onents/units/RobotUnit/ControlTargets/ControlTargetBase.h
source/RobotAPI/components/units/RobotUnit/ControlTargets/ControlTargetHolonomicPlatformVelocity.h 8 additions, 9 deletions

...t/ControlTargets/ControlTargetHolonomicPlatformVelocity.h
source/RobotAPI/components/units/RobotUnit/Devices/ControlDevice.h 1 addition, 2 deletions

...botAPI/components/units/RobotUnit/Devices/ControlDevice.h
source/RobotAPI/components/units/RobotUnit/Devices/DeviceBase.h 1 addition, 2 deletions

.../RobotAPI/components/units/RobotUnit/Devices/DeviceBase.h
source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointController.h 2 additions, 1 deletion

...ents/units/RobotUnit/NJointControllers/NJointController.h
source/RobotAPI/components/units/RobotUnit/RobotSynchronization.h 0 additions, 1 deletion

...obotAPI/components/units/RobotUnit/RobotSynchronization.h
source/RobotAPI/components/units/RobotUnit/RobotUnit.cpp 497 additions, 105 deletions

source/RobotAPI/components/units/RobotUnit/RobotUnit.cpp
source/RobotAPI/components/units/RobotUnit/RobotUnit.h 232 additions, 419 deletions

source/RobotAPI/components/units/RobotUnit/RobotUnit.h
source/RobotAPI/components/units/RobotUnit/RobotUnit.ipp 400 additions, 0 deletions

source/RobotAPI/components/units/RobotUnit/RobotUnit.ipp
source/RobotAPI/components/units/RobotUnit/SensorValues/SensorValue1DoFActuator.h 47 additions, 35 deletions

...ts/units/RobotUnit/SensorValues/SensorValue1DoFActuator.h
source/RobotAPI/components/units/RobotUnit/SensorValues/SensorValueBase.cpp 27 additions, 0 deletions

...mponents/units/RobotUnit/SensorValues/SensorValueBase.cpp
source/RobotAPI/components/units/RobotUnit/SensorValues/SensorValueBase.h 82 additions, 28 deletions

...components/units/RobotUnit/SensorValues/SensorValueBase.h
source/RobotAPI/components/units/RobotUnit/SensorValues/SensorValueForceTorque.h 9 additions, 9 deletions

...nts/units/RobotUnit/SensorValues/SensorValueForceTorque.h
source/RobotAPI/components/units/RobotUnit/SensorValues/SensorValueHolonomicPlatform.h 35 additions, 37 deletions

...its/RobotUnit/SensorValues/SensorValueHolonomicPlatform.h
source/RobotAPI/components/units/RobotUnit/SensorValues/SensorValueIMU.h 8 additions, 8 deletions

.../components/units/RobotUnit/SensorValues/SensorValueIMU.h
source/RobotAPI/components/units/RobotUnit/SensorValues/SensorValueRTThreadTimings.h 21 additions, 22 deletions

...units/RobotUnit/SensorValues/SensorValueRTThreadTimings.h
source/RobotAPI/components/units/RobotUnit/SyntaxCheck.cpp 1 addition, 1 deletion

source/RobotAPI/components/units/RobotUnit/SyntaxCheck.cpp

with 1525 additions and 712 deletions

Please register or to comment