Commit 1d79b174 authored by Mohamed Ahmed's avatar Mohamed Ahmed

Adding time_msgs

parent 609ee104
......@@ -10,7 +10,6 @@ add_compile_options(-std=c++11)
find_package(catkin REQUIRED COMPONENTS
roscpp
std_msgs
time_msgs
message_generation
)
......@@ -108,7 +107,7 @@ generate_messages(
catkin_package(
# INCLUDE_DIRS include
# LIBRARIES timeClient
CATKIN_DEPENDS message_runtime time_msgs
CATKIN_DEPENDS message_runtime
# DEPENDS system_lib
)
......
......@@ -51,11 +51,8 @@
<buildtool_depend>catkin</buildtool_depend>
<build_depend>roscpp</build_depend>
<build_depend>std_msgs</build_depend>
<build_depend>time_msgs</build_depend>
<build_depend>message_generation</build_depend>
<exec_depend>message_runtime</exec_depend>
<exec_depend>time_msgs</exec_depend>
<build_export_depend>time_msgs</build_export_depend>
<build_export_depend>roscpp</build_export_depend>
<build_export_depend>std_msgs</build_export_depend>
<exec_depend>roscpp</exec_depend>
......
......@@ -10,7 +10,7 @@
#include "timeServiceEvent.hpp"
void callback(const time_msgs::srv_info &msg);
void callback(const timeClient::srv_info &msg);
void initialize_startingRosHandler();
namespace ara
......@@ -149,7 +149,7 @@ public:
events::BrakeEvent BrakeEvent;
void callback(const time_msgs::srv_info &msg);
void callback(const timeClient::srv_info &msg);
};
} // namespace proxy
......
......@@ -59,5 +59,5 @@ set(ADAPTIVEAUTOSARAPPLICATION_src
add_executable(${APP_NAME} ${ADAPTIVEAUTOSARAPPLICATION_src})
target_link_libraries(${APP_NAME} ${CMAKE_THREAD_LIBS_INIT} ${catkin_LIBRARIES})
add_dependencies(${APP_NAME} ${catkin_EXPORTED_TARGETS})
add_dependencies(${APP_NAME} timeClient_generate_messages_cpp)
......@@ -61,7 +61,7 @@ void initialize_startingRosHandler()
timeServiceProxy::srvInfoSubscriber = global_rosHandler.subscribe("/timeService_info",5, callback);
}
void callback(const time_msgs::srv_info &msg)
void callback(const timeClient::srv_info &msg)
{
std::string str = msg.srv_ns.substr(1);
timeServiceProxy::instanceID_ = std::stoi(str);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment