diff --git a/modules/catkin_ws/src/car/CMakeLists.txt b/modules/catkin_ws/src/car/CMakeLists.txt index 4bdfad45b594abc338948b8e00c1a54624dd2bb0..5633fb5ec625f552d4c2e022b0c04f9693b6c905 100644 --- a/modules/catkin_ws/src/car/CMakeLists.txt +++ b/modules/catkin_ws/src/car/CMakeLists.txt @@ -33,6 +33,7 @@ catkin_package( LIBRARIES main_node LIBRARIES environment LIBRARIES ultrasonic + LIBRARIES camera CATKIN_DEPENDS roscpp std_msgs nodelet rospy #message_runtime ) @@ -53,11 +54,16 @@ add_library(ultrasonic src/ultrasonic/ultrasonic.cpp) add_dependencies(ultrasonic ${catkin_EXPORTED_TARGETS} ${PROJECT_NAME}_generate_messages_cpp) target_link_libraries(ultrasonic ${catkin_LIBRARIES}) +add_library(camera src/camera/camera.cpp) +add_dependencies(camera ${catkin_EXPORTED_TARGETS} ${PROJECT_NAME}_generate_messages_cpp) +target_link_libraries(camera ${catkin_LIBRARIES}) + install( TARGETS main_node environment ultrasonic + camera ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION} LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION} RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION} diff --git a/modules/catkin_ws/src/car/include/environment/environment.h b/modules/catkin_ws/src/car/include/environment/environment.h index 29d948e0b796c5ea8a6ace0da63bec3f973acafc..58e7ab6871bb5e039e28367aaf389a2e8a222296 100644 --- a/modules/catkin_ws/src/car/include/environment/environment.h +++ b/modules/catkin_ws/src/car/include/environment/environment.h @@ -3,7 +3,9 @@ #include <nodelet/nodelet.h> #include <ros/ros.h> + #include "car/ussDataMsg.h" +#include "car/camDataMsg.h" namespace car { @@ -27,6 +29,7 @@ namespace car void ussDataCallback(const ussDataMsg::ConstPtr& inMsg); + void camDataCallback(const camDataMsg::ConstPtr& inMsg); }; } #endif diff --git a/modules/catkin_ws/src/car/launch/fullstart.launch b/modules/catkin_ws/src/car/launch/fullstart.launch index ec74c6bcb9f233d3b5caa6f47e51a77e8f086fef..a0971bf81285e51db6cbd9a1edede9b64120ef84 100644 --- a/modules/catkin_ws/src/car/launch/fullstart.launch +++ b/modules/catkin_ws/src/car/launch/fullstart.launch @@ -6,6 +6,7 @@ <node pkg="nodelet" type="nodelet" name="nodelet_main_node" args="load car/main_node Master"/> <node pkg="nodelet" type="nodelet" name="nodelet_environment" args="load car/environment Master"/> <node pkg="nodelet" type="nodelet" name="nodelet_ultrasonic" args="load car/ultrasonic Master"/> + <node pkg="nodelet" type="nodelet" name="nodelet_camera" args="load car/camera Master"/> </launch> <!-- diff --git a/modules/catkin_ws/src/car/plugins/nodelet_plugins.xml b/modules/catkin_ws/src/car/plugins/nodelet_plugins.xml index 0767fe032dc22b7bcfd711bd95ceb9a0112f7344..38af8257faf35a8b914d1930f4b3b1eac87cf404 100644 --- a/modules/catkin_ws/src/car/plugins/nodelet_plugins.xml +++ b/modules/catkin_ws/src/car/plugins/nodelet_plugins.xml @@ -33,3 +33,13 @@ </description> </class> </library> + +<library path="lib/libcamera"> + <class name="car/camera" + type="car::Camera" + base_class_type="nodelet::Nodelet"> + <description> + Missing + </description> + </class> +</library> diff --git a/modules/catkin_ws/src/car/src/environment/environment.cpp b/modules/catkin_ws/src/car/src/environment/environment.cpp index 63934b43a8f670783aa37f3e9512c2270da48625..b1b7e684748bb4fd951ed8c4f79c5ac419c6f03a 100644 --- a/modules/catkin_ws/src/car/src/environment/environment.cpp +++ b/modules/catkin_ws/src/car/src/environment/environment.cpp @@ -26,9 +26,7 @@ namespace car NODELET_INFO("Environment::onInit -- START"); environmentData = nh_.advertise<environmentDataMsg>("environmentData", 1); ussData = nh_.subscribe("ussData", 1, &Environment::ussDataCallback, this); - - - // CODE GOES HERE + camData = nh_.subscribe("camData", 1, &Environment::camDataCallback, this); NODELET_INFO("Environment::onInit -- END"); } @@ -44,4 +42,11 @@ namespace car environmentData.publish(outMsg); } + + void Environment::camDataCallback(const camDataMsg::ConstPtr& inMsg) + { + std::cout << "Environment recived new cam data ( ).\n"; + } + + }