From 9854d119b0105dc7da4b4ffcff87a8cb36891b2d Mon Sep 17 00:00:00 2001
From: Patrick Hegemann <patrick.hegemann@kit.edu>
Date: Tue, 18 May 2021 13:21:19 +0200
Subject: [PATCH] Move state type conversion maps
---
.../armem_skills/aron_conversions.cpp | 17 +++++++++++++++++
.../libraries/armem_skills/aron_conversions.h | 18 ------------------
2 files changed, 17 insertions(+), 18 deletions(-)
diff --git a/source/RobotAPI/libraries/armem_skills/aron_conversions.cpp b/source/RobotAPI/libraries/armem_skills/aron_conversions.cpp
index 0b6d18a61..db18f5ac2 100644
--- a/source/RobotAPI/libraries/armem_skills/aron_conversions.cpp
+++ b/source/RobotAPI/libraries/armem_skills/aron_conversions.cpp
@@ -2,6 +2,23 @@
namespace armarx::armem
{
+ std::map<armarx::eStateType, armarx::armem::arondto::Statechart::StateType> toAronStateTypeMap =
+ {
+ {eNormalState, armarx::armem::arondto::Statechart::StateType::NORMAL},
+ {eFinalState, armarx::armem::arondto::Statechart::StateType::FINAL},
+ {eRemoteState, armarx::armem::arondto::Statechart::StateType::REMOTE},
+ {eDynamicRemoteState, armarx::armem::arondto::Statechart::StateType::DYNAMIC_REMOTE},
+ {eUndefined, armarx::armem::arondto::Statechart::StateType::UNDEFINED},
+ };
+
+ std::map<armarx::armem::arondto::Statechart::StateType, armarx::eStateType> fromAronStateTypeMap =
+ {
+ {armarx::armem::arondto::Statechart::StateType::NORMAL, eNormalState},
+ {armarx::armem::arondto::Statechart::StateType::FINAL, eFinalState},
+ {armarx::armem::arondto::Statechart::StateType::REMOTE, eRemoteState},
+ {armarx::armem::arondto::Statechart::StateType::DYNAMIC_REMOTE, eDynamicRemoteState},
+ {armarx::armem::arondto::Statechart::StateType::UNDEFINED, eUndefined},
+ };
void fromAron(const arondto::Statechart::StateType& dto, eStateType& bo)
{
diff --git a/source/RobotAPI/libraries/armem_skills/aron_conversions.h b/source/RobotAPI/libraries/armem_skills/aron_conversions.h
index 4315d9745..bc6314b46 100644
--- a/source/RobotAPI/libraries/armem_skills/aron_conversions.h
+++ b/source/RobotAPI/libraries/armem_skills/aron_conversions.h
@@ -7,24 +7,6 @@
namespace armarx::armem
{
- std::map<armarx::eStateType, armarx::armem::arondto::Statechart::StateType> toAronStateTypeMap =
- {
- {eNormalState, armarx::armem::arondto::Statechart::StateType::NORMAL},
- {eFinalState, armarx::armem::arondto::Statechart::StateType::FINAL},
- {eRemoteState, armarx::armem::arondto::Statechart::StateType::REMOTE},
- {eDynamicRemoteState, armarx::armem::arondto::Statechart::StateType::DYNAMIC_REMOTE},
- {eUndefined, armarx::armem::arondto::Statechart::StateType::UNDEFINED},
- };
-
- std::map<armarx::armem::arondto::Statechart::StateType, armarx::eStateType> fromAronStateTypeMap =
- {
- {armarx::armem::arondto::Statechart::StateType::NORMAL, eNormalState},
- {armarx::armem::arondto::Statechart::StateType::FINAL, eFinalState},
- {armarx::armem::arondto::Statechart::StateType::REMOTE, eRemoteState},
- {armarx::armem::arondto::Statechart::StateType::DYNAMIC_REMOTE, eDynamicRemoteState},
- {armarx::armem::arondto::Statechart::StateType::UNDEFINED, eUndefined},
- };
-
void fromAron(const armarx::armem::arondto::Statechart::StateType& dto, armarx::eStateType& bo);
void toAron(armarx::armem::arondto::Statechart::StateType& dto, const armarx::eStateType& bo);
--
GitLab