Commit 4e643bc1 authored 1 year ago by Fabian Reister

Merge branch 'feature/armarde-tof' into 'master'

added uint support and 2 more tof sensor values

See merge request !436

parents 07369a39 2250292c

No related branches found

No related tags found

Checking pipeline status

Hide whitespace changes

Inline Side-by-side

Showing

source/RobotAPI/gui-plugins/SkillManagerPlugin/aronTreeWidget/visitors/AronTreeWidgetConverter.cpp 18 additions, 0 deletions

...lugin/aronTreeWidget/visitors/AronTreeWidgetConverter.cpp
source/RobotAPI/gui-plugins/SkillManagerPlugin/aronTreeWidget/visitors/AronTreeWidgetCreator.cpp 12 additions, 0 deletions

...rPlugin/aronTreeWidget/visitors/AronTreeWidgetCreator.cpp
source/RobotAPI/gui-plugins/SkillManagerPlugin/aronTreeWidget/visitors/AronTreeWidgetSetter.cpp 24 additions, 0 deletions

...erPlugin/aronTreeWidget/visitors/AronTreeWidgetSetter.cpp
source/RobotAPI/gui-plugins/SkillManagerPlugin/aronTreeWidget/widgets/EditMatrixWidget.cpp 12 additions, 0 deletions

...ManagerPlugin/aronTreeWidget/widgets/EditMatrixWidget.cpp
source/RobotAPI/interface/aron/Aron.ice 4 additions, 0 deletions

source/RobotAPI/interface/aron/Aron.ice
source/RobotAPI/libraries/armem_robot/types.h 8 additions, 3 deletions

source/RobotAPI/libraries/armem_robot/types.h
source/RobotAPI/libraries/armem_robot_state/aron/Exteroception.xml 12 additions, 1 deletion

...botAPI/libraries/armem_robot_state/aron/Exteroception.xml
source/RobotAPI/libraries/armem_robot_state/aron_conversions.cpp 8 additions, 4 deletions

...RobotAPI/libraries/armem_robot_state/aron_conversions.cpp
source/RobotAPI/libraries/armem_robot_state/aron_conversions.h 2 additions, 2 deletions

...e/RobotAPI/libraries/armem_robot_state/aron_conversions.h
source/RobotAPI/libraries/armem_robot_state/client/common/RobotReader.cpp 4 additions, 4 deletions

...libraries/armem_robot_state/client/common/RobotReader.cpp
source/RobotAPI/libraries/armem_robot_state/client/common/RobotReader.h 2 additions, 2 deletions

...I/libraries/armem_robot_state/client/common/RobotReader.h
source/RobotAPI/libraries/armem_robot_state/server/exteroception/converters/ArmarDEConverter.cpp 139 additions, 11 deletions

...tate/server/exteroception/converters/ArmarDEConverter.cpp
source/RobotAPI/libraries/armem_robot_state/server/exteroception/converters/ArmarDEConverter.h 23 additions, 3 deletions

..._state/server/exteroception/converters/ArmarDEConverter.h
source/RobotAPI/libraries/aron/codegeneration/codegenerator/codewriter/cpp/generator/ndarray/Matrix.cpp 6 additions, 0 deletions

...codegenerator/codewriter/cpp/generator/ndarray/Matrix.cpp
source/RobotAPI/libraries/aron/codegeneration/typereader/xml/Factory.cpp 4 additions, 0 deletions

.../libraries/aron/codegeneration/typereader/xml/Factory.cpp
source/RobotAPI/libraries/aron/codegeneration_util/TypeName.h 30 additions, 0 deletions

...ce/RobotAPI/libraries/aron/codegeneration_util/TypeName.h
source/RobotAPI/libraries/aron/core/data/rw/json/Data.h 4 additions, 0 deletions

source/RobotAPI/libraries/aron/core/data/rw/json/Data.h
source/RobotAPI/libraries/aron/core/data/rw/reader/nlohmannJSON/NlohmannJSONReaderWithoutTypeCheck.cpp 16 additions, 0 deletions

...eader/nlohmannJSON/NlohmannJSONReaderWithoutTypeCheck.cpp
source/RobotAPI/libraries/aron/core/type/rw/json/Data.h 4 additions, 0 deletions

source/RobotAPI/libraries/aron/core/type/rw/json/Data.h
source/RobotAPI/libraries/aron/core/type/variant/ndarray/Matrix.cpp 4 additions, 0 deletions

...otAPI/libraries/aron/core/type/variant/ndarray/Matrix.cpp

with 336 additions and 30 deletions

Please register or to comment