Merge branch 'master' of https://github.com/Roboy/roboy_communication

Roboy · May 26, 2017 · 99a149c · 99a149c
2 parents d575159 + ac6133f
commit 99a149c
Show file tree

Hide file tree

Showing 28 changed files with 6 additions and 14 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -3,3 +3,5 @@ project( roboy_communication )
 
 add_subdirectory( middleware )
 add_subdirectory( simulation )
+add_subdirectory( roboy_communication_control )
+add_subdirectory( roboy_communication_cognition )
diff --git a/cognition/CMakeLists.txt → roboy_communication_cognition/CMakeLists.txt b/cognition/CMakeLists.txt → roboy_communication_cognition/CMakeLists.txt
@@ -4,9 +4,7 @@ project( roboy_communication_cognition )
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
 
 find_package(catkin REQUIRED cmake_modules COMPONENTS
-        roscpp
         std_msgs
-        std_srvs
         message_generation
 )
 
@@ -16,15 +14,11 @@ include_directories(
 )
 
 add_message_files(
-        DIRECTORY
-        msg
         FILES
         SpeechSynthesis.msg
 )
 
 add_service_files(
-        DIRECTORY
-        srv
         FILES
         AssertProperty.srv
         CallQuery.srv
@@ -47,8 +41,9 @@ add_service_files(
 )
 
 generate_messages(
-        DEPENDENCIES std_msgs std_srvs
+  DEPENDENCIES
+  std_msgs
 )
 
-catkin_package( CATKIN_DEPENDS roscpp message_runtime message_generation
+catkin_package( CATKIN_DEPENDS message_runtime std_msgs
                 INCLUDE_DIRS)
diff --git a/cognition/msg/SpeechSynthesis.msg → ...ication_cognition/msg/SpeechSynthesis.msg b/cognition/msg/SpeechSynthesis.msg → ...ication_cognition/msg/SpeechSynthesis.msg
diff --git a/cognition/package.xml → roboy_communication_cognition/package.xml b/cognition/package.xml → roboy_communication_cognition/package.xml
@@ -6,17 +6,12 @@
   <maintainer email="[email protected]">Alona Kharchenko</maintainer>
   <license>BSD-3</license>
   <buildtool_depend>catkin</buildtool_depend>
-  <build_depend>roscpp</build_depend>
-  <build_depend>rospy</build_depend>
   <build_depend>std_msgs</build_depend>
   <build_depend>message_generation</build_depend>
-  <build_depend>message_runtime</build_depend>
   <run_depend>message_runtime</run_depend>
-  <run_depend>message_generation</run_depend>
-  <run_depend>roscpp</run_depend>
-  <run_depend>rospy</run_depend>
   <run_depend>std_msgs</run_depend>
 
   <export>
+    <architecture_independent/>
   </export>
 </package>
diff --git a/cognition/srv/AssertProperty.srv → ...nication_cognition/srv/AssertProperty.srv b/cognition/srv/AssertProperty.srv → ...nication_cognition/srv/AssertProperty.srv
diff --git a/cognition/srv/CallQuery.srv → ...communication_cognition/srv/CallQuery.srv b/cognition/srv/CallQuery.srv → ...communication_cognition/srv/CallQuery.srv
diff --git a/cognition/srv/CheckProperty.srv → ...unication_cognition/srv/CheckProperty.srv b/cognition/srv/CheckProperty.srv → ...unication_cognition/srv/CheckProperty.srv
diff --git a/cognition/srv/CheckQuery.srv → ...ommunication_cognition/srv/CheckQuery.srv b/cognition/srv/CheckQuery.srv → ...ommunication_cognition/srv/CheckQuery.srv
diff --git a/cognition/srv/CreateInstance.srv → ...nication_cognition/srv/CreateInstance.srv b/cognition/srv/CreateInstance.srv → ...nication_cognition/srv/CreateInstance.srv
diff --git a/cognition/srv/DetectFace.srv → ...ommunication_cognition/srv/DetectFace.srv b/cognition/srv/DetectFace.srv → ...ommunication_cognition/srv/DetectFace.srv
diff --git a/cognition/srv/EvalSeq2Seq.srv → ...mmunication_cognition/srv/EvalSeq2Seq.srv b/cognition/srv/EvalSeq2Seq.srv → ...mmunication_cognition/srv/EvalSeq2Seq.srv
diff --git a/cognition/srv/FindInstances.srv → ...unication_cognition/srv/FindInstances.srv b/cognition/srv/FindInstances.srv → ...unication_cognition/srv/FindInstances.srv
diff --git a/cognition/srv/GenerateAnswer.srv → ...nication_cognition/srv/GenerateAnswer.srv b/cognition/srv/GenerateAnswer.srv → ...nication_cognition/srv/GenerateAnswer.srv
diff --git a/cognition/srv/GetObject.srv → ...communication_cognition/srv/GetObject.srv b/cognition/srv/GetObject.srv → ...communication_cognition/srv/GetObject.srv
diff --git a/cognition/srv/RecognizeObject.srv → ...ication_cognition/srv/RecognizeObject.srv b/cognition/srv/RecognizeObject.srv → ...ication_cognition/srv/RecognizeObject.srv
diff --git a/cognition/srv/RecognizeSpeech.srv → ...ication_cognition/srv/RecognizeSpeech.srv b/cognition/srv/RecognizeSpeech.srv → ...ication_cognition/srv/RecognizeSpeech.srv
diff --git a/cognition/srv/SaveObject.srv → ...ommunication_cognition/srv/SaveObject.srv b/cognition/srv/SaveObject.srv → ...ommunication_cognition/srv/SaveObject.srv
diff --git a/cognition/srv/ShowInstances.srv → ...unication_cognition/srv/ShowInstances.srv b/cognition/srv/ShowInstances.srv → ...unication_cognition/srv/ShowInstances.srv
diff --git a/cognition/srv/ShowProperty.srv → ...munication_cognition/srv/ShowProperty.srv b/cognition/srv/ShowProperty.srv → ...munication_cognition/srv/ShowProperty.srv
diff --git a/cognition/srv/ShowPropertyValue.srv → ...ation_cognition/srv/ShowPropertyValue.srv b/cognition/srv/ShowPropertyValue.srv → ...ation_cognition/srv/ShowPropertyValue.srv
diff --git a/cognition/srv/Talk.srv → roboy_communication_cognition/srv/Talk.srv b/cognition/srv/Talk.srv → roboy_communication_cognition/srv/Talk.srv
diff --git a/cognition/srv/TrainSeq2Seq.srv → ...munication_cognition/srv/TrainSeq2Seq.srv b/cognition/srv/TrainSeq2Seq.srv → ...munication_cognition/srv/TrainSeq2Seq.srv
diff --git a/control/CMakeLists.txt → roboy_communication_control/CMakeLists.txt b/control/CMakeLists.txt → roboy_communication_control/CMakeLists.txt
diff --git a/control/msg/Emotion.msg → roboy_communication_control/msg/Emotion.msg b/control/msg/Emotion.msg → roboy_communication_control/msg/Emotion.msg
diff --git a/control/package.xml → roboy_communication_control/package.xml b/control/package.xml → roboy_communication_control/package.xml
diff --git a/control/srv/MoveYaw.srv → roboy_communication_control/srv/MoveYaw.srv b/control/srv/MoveYaw.srv → roboy_communication_control/srv/MoveYaw.srv
diff --git a/control/srv/PerformMovement.srv → ...unication_control/srv/PerformMovement.srv b/control/srv/PerformMovement.srv → ...unication_control/srv/PerformMovement.srv
diff --git a/control/srv/ShowEmotion.srv → ...communication_control/srv/ShowEmotion.srv b/control/srv/ShowEmotion.srv → ...communication_control/srv/ShowEmotion.srv