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
- CMakeLists.txt 8 additions, 2 deletionsCMakeLists.txt
- data/RobotAPI/VariantInfo-RobotAPI.xml 21 additions, 15 deletionsdata/RobotAPI/VariantInfo-RobotAPI.xml
- etc/cmake/ArmarXPackageVersion.cmake 1 addition, 1 deletionetc/cmake/ArmarXPackageVersion.cmake
- scenarios/GamepadControlUnit/GamepadControlUnit.scx 5 additions, 0 deletionsscenarios/GamepadControlUnit/GamepadControlUnit.scx
- scenarios/GamepadControlUnit/config/GamepadControlUnitApp.cfg 172 additions, 0 deletions...arios/GamepadControlUnit/config/GamepadControlUnitApp.cfg
- scenarios/GamepadControlUnit/config/global.cfg 7 additions, 0 deletionsscenarios/GamepadControlUnit/config/global.cfg
- scenarios/GamepadUnit/GamepadUnit.scx 7 additions, 0 deletionsscenarios/GamepadUnit/GamepadUnit.scx
- scenarios/GamepadUnit/config/GamepadControlUnitApp.cfg 191 additions, 0 deletionsscenarios/GamepadUnit/config/GamepadControlUnitApp.cfg
- scenarios/GamepadUnit/config/GamepadUnitApp.cfg 167 additions, 0 deletionsscenarios/GamepadUnit/config/GamepadUnitApp.cfg
- scenarios/GamepadUnit/config/GamepadUnitObserverApp.cfg 183 additions, 0 deletionsscenarios/GamepadUnit/config/GamepadUnitObserverApp.cfg
- scenarios/GamepadUnit/config/global.cfg 7 additions, 0 deletionsscenarios/GamepadUnit/config/global.cfg
- scenarios/MetaWearIMU/MetaWearIMU.scx 6 additions, 0 deletionsscenarios/MetaWearIMU/MetaWearIMU.scx
- scenarios/MetaWearIMU/config/MetaWearIMUApp.cfg 172 additions, 0 deletionsscenarios/MetaWearIMU/config/MetaWearIMUApp.cfg
- scenarios/MetaWearIMU/config/MetaWearIMUObserverApp.cfg 196 additions, 0 deletionsscenarios/MetaWearIMU/config/MetaWearIMUObserverApp.cfg
- scenarios/MetaWearIMU/config/global.cfg 7 additions, 0 deletionsscenarios/MetaWearIMU/config/global.cfg
- source/RobotAPI/applications/CMakeLists.txt 8 additions, 2 deletionssource/RobotAPI/applications/CMakeLists.txt
- source/RobotAPI/applications/CMakeLists.txt.orig 0 additions, 33 deletionssource/RobotAPI/applications/CMakeLists.txt.orig
- source/RobotAPI/applications/GamepadControlUnit/CMakeLists.txt 20 additions, 0 deletions...e/RobotAPI/applications/GamepadControlUnit/CMakeLists.txt
- source/RobotAPI/applications/GamepadControlUnit/main.cpp 32 additions, 0 deletionssource/RobotAPI/applications/GamepadControlUnit/main.cpp
- source/RobotAPI/applications/GamepadUnit/CMakeLists.txt 20 additions, 0 deletionssource/RobotAPI/applications/GamepadUnit/CMakeLists.txt
scenarios/GamepadUnit/GamepadUnit.scx
0 → 100644
scenarios/GamepadUnit/config/global.cfg
0 → 100644
scenarios/MetaWearIMU/MetaWearIMU.scx
0 → 100644
scenarios/MetaWearIMU/config/global.cfg
0 → 100644
Please register or sign in to comment