diff --git a/source/armarx/navigation/platform_controller/controller_descriptions.h b/source/armarx/navigation/platform_controller/controller_descriptions.h index 4fa54a758b0cb1c432cc0ba685209d63551f12cc..d352bed138bb228ce71ca0fd0ec3d1a28a936ea7 100644 --- a/source/armarx/navigation/platform_controller/controller_descriptions.h +++ b/source/armarx/navigation/platform_controller/controller_descriptions.h @@ -22,8 +22,8 @@ #pragma once #include <armarx/control/client/ControllerDescription.h> - #include <armarx/navigation/common/controller_types.h> +#include <armarx/navigation/platform_controller/PlatformTrajectoryController.h> #include <armarx/navigation/platform_controller/aron/PlatformTrajectoryControllerConfig.aron.generated.h> namespace armarx::control::client @@ -34,6 +34,8 @@ namespace armarx::control::client using AronDTO = armarx::navigation::platform_controller::platform_trajectory::arondto::Config; + using BO = armarx::navigation::platform_controller::platform_trajectory::Config; + // constexpr static const char* name = armarx::navigation::common::ControllerTypeNames.to_name(armarx::navigation::common::ControllerType::PlatformTrajectory); constexpr static const char* name = armarx::navigation::common::PlatformTrajectoryControllerName; diff --git a/source/armarx/navigation/platform_controller/json_conversions.cpp b/source/armarx/navigation/platform_controller/json_conversions.cpp new file mode 100644 index 0000000000000000000000000000000000000000..7134777562b10432cd1dcab066daf3e3dd045f69 --- /dev/null +++ b/source/armarx/navigation/platform_controller/json_conversions.cpp @@ -0,0 +1,6 @@ +#include "json_conversions.h" + +namespace armarx_navigation::platform_controller +{ + +} diff --git a/source/armarx/navigation/platform_controller/json_conversions.h b/source/armarx/navigation/platform_controller/json_conversions.h new file mode 100644 index 0000000000000000000000000000000000000000..6abd40df00ce418f7da923763f8fc2e8ab684893 --- /dev/null +++ b/source/armarx/navigation/platform_controller/json_conversions.h @@ -0,0 +1,30 @@ +/** + * This file is part of ArmarX. + * + * ArmarX is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * ArmarX is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + * @author Fabian Reister ( fabian dot reister at kit dot edu ) + * @date 2022 + * @copyright http://www.gnu.org/licenses/gpl-2.0.txt + * GNU General Public License + */ + +#pragma once + +#include <SimoxUtility/json.h> + + +namespace armarx::navigation::platform_controller::platform_trajectory +{ + +} // namespace armarx::navigation::platform_controller::platform_trajectory