Skip to content
Snippets Groups Projects
Commit 8f733b5e authored by Franz Bethke's avatar Franz Bethke
Browse files

Add nodlet for camera

parent 7672bcb1
No related merge requests found
...@@ -33,6 +33,7 @@ catkin_package( ...@@ -33,6 +33,7 @@ catkin_package(
LIBRARIES main_node LIBRARIES main_node
LIBRARIES environment LIBRARIES environment
LIBRARIES ultrasonic LIBRARIES ultrasonic
LIBRARIES camera
CATKIN_DEPENDS roscpp std_msgs nodelet rospy #message_runtime CATKIN_DEPENDS roscpp std_msgs nodelet rospy #message_runtime
) )
...@@ -53,11 +54,16 @@ add_library(ultrasonic src/ultrasonic/ultrasonic.cpp) ...@@ -53,11 +54,16 @@ add_library(ultrasonic src/ultrasonic/ultrasonic.cpp)
add_dependencies(ultrasonic ${catkin_EXPORTED_TARGETS} ${PROJECT_NAME}_generate_messages_cpp) add_dependencies(ultrasonic ${catkin_EXPORTED_TARGETS} ${PROJECT_NAME}_generate_messages_cpp)
target_link_libraries(ultrasonic ${catkin_LIBRARIES}) 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( install(
TARGETS TARGETS
main_node main_node
environment environment
ultrasonic ultrasonic
camera
ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION} ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION} LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION} RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
......
...@@ -3,7 +3,9 @@ ...@@ -3,7 +3,9 @@
#include <nodelet/nodelet.h> #include <nodelet/nodelet.h>
#include <ros/ros.h> #include <ros/ros.h>
#include "car/ussDataMsg.h" #include "car/ussDataMsg.h"
#include "car/camDataMsg.h"
namespace car namespace car
{ {
...@@ -27,6 +29,7 @@ namespace car ...@@ -27,6 +29,7 @@ namespace car
void ussDataCallback(const ussDataMsg::ConstPtr& inMsg); void ussDataCallback(const ussDataMsg::ConstPtr& inMsg);
void camDataCallback(const camDataMsg::ConstPtr& inMsg);
}; };
} }
#endif #endif
...@@ -6,6 +6,7 @@ ...@@ -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_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_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_ultrasonic" args="load car/ultrasonic Master"/>
<node pkg="nodelet" type="nodelet" name="nodelet_camera" args="load car/camera Master"/>
</launch> </launch>
<!-- <!--
......
...@@ -33,3 +33,13 @@ ...@@ -33,3 +33,13 @@
</description> </description>
</class> </class>
</library> </library>
<library path="lib/libcamera">
<class name="car/camera"
type="car::Camera"
base_class_type="nodelet::Nodelet">
<description>
Missing
</description>
</class>
</library>
...@@ -26,9 +26,7 @@ namespace car ...@@ -26,9 +26,7 @@ namespace car
NODELET_INFO("Environment::onInit -- START"); NODELET_INFO("Environment::onInit -- START");
environmentData = nh_.advertise<environmentDataMsg>("environmentData", 1); environmentData = nh_.advertise<environmentDataMsg>("environmentData", 1);
ussData = nh_.subscribe("ussData", 1, &Environment::ussDataCallback, this); ussData = nh_.subscribe("ussData", 1, &Environment::ussDataCallback, this);
camData = nh_.subscribe("camData", 1, &Environment::camDataCallback, this);
// CODE GOES HERE
NODELET_INFO("Environment::onInit -- END"); NODELET_INFO("Environment::onInit -- END");
} }
...@@ -44,4 +42,11 @@ namespace car ...@@ -44,4 +42,11 @@ namespace car
environmentData.publish(outMsg); environmentData.publish(outMsg);
} }
void Environment::camDataCallback(const camDataMsg::ConstPtr& inMsg)
{
std::cout << "Environment recived new cam data ( ).\n";
}
} }
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