diff --git a/modules/catkin_ws/src/car/include/mainNode/mainNode.h b/modules/catkin_ws/src/car/include/mainNode/mainNode.h index 0d497c2877e65f3d87e5bce5cc6dc485f90de027..91c5f5d4e04f14366c4a6ecbcb9dd2a86cc11fa5 100644 --- a/modules/catkin_ws/src/car/include/mainNode/mainNode.h +++ b/modules/catkin_ws/src/car/include/mainNode/mainNode.h @@ -1,5 +1,9 @@ +#ifndef MAINNODE_H +#define MAINNODE_H + #include <nodelet/nodelet.h> #include <ros/ros.h> +#include "bost/thread.hpp" namespace car { @@ -13,5 +17,8 @@ namespace car private: ros::NodeHandle nh_; std::string name_; + boost::thread loggerModule; + ros::Publisher logEnabled; }; } +#endif diff --git a/modules/catkin_ws/src/car/launch/fullstart.launch b/modules/catkin_ws/src/car/launch/fullstart.launch new file mode 100644 index 0000000000000000000000000000000000000000..068f3cd51933dc082045e7c22edfa946d645dcf9 --- /dev/null +++ b/modules/catkin_ws/src/car/launch/fullstart.launch @@ -0,0 +1,11 @@ +<launch> + <node pkg="nodelet" type="nodelet" name="Master" args="manager" output="screen"> + <param name="num_worker_threads" value="16" /> + </node> + + <node pkg="nodelet" type="nodelet" name="nodelet_main_node" args="load car/main_node Master"/> +</launch> + +<!-- + <node pkg="nodelet" type="nodelet" name="" args="load car/ Master"/> +--> diff --git a/modules/catkin_ws/src/car/plugins/nodelet_plugins.xml b/modules/catkin_ws/src/car/plugins/nodelet_plugins.xml index fa3511274563bc383bbaf7031a25532c64779b02..6715ecbb767d5753cdb12625c52301185064bb3c 100644 --- a/modules/catkin_ws/src/car/plugins/nodelet_plugins.xml +++ b/modules/catkin_ws/src/car/plugins/nodelet_plugins.xml @@ -1,6 +1,6 @@ <library path="lib/libmain_node"> <class name="car/main_node" - type="car::mainNode" + type="car::MainNode" base_class_type="nodelet::Nodelet"> <description> This node holds the threads: diff --git a/modules/catkin_ws/src/car/src/mainNode/mainNode.cpp b/modules/catkin_ws/src/car/src/mainNode/mainNode.cpp index 265ad0c0b5dafdb172acaf600dd324fa256f837f..872ede66ce8a0231419d13268ec6bac52fa03e8b 100644 --- a/modules/catkin_ws/src/car/src/mainNode/mainNode.cpp +++ b/modules/catkin_ws/src/car/src/mainNode/mainNode.cpp @@ -3,6 +3,15 @@ #include "mainNode/mainNode.h" +#include "car/camDataMsg.h" +#include "car/ccDataMsg.h" +#include "car/environmentDataMsg.h" +#include "car/logEnabledMsg.h" +#include "car/logStringMsg.h" +#include "car/rcEnabledMsg.h" +#include "car/stmDataMsg.h" +#include "car/ussDataMsg.h" + PLUGINLIB_EXPORT_CLASS(car::MainNode, nodelet::Nodelet); namespace car @@ -13,7 +22,10 @@ namespace car void MainNode::onInit() { NODELET_INFO("MainNode::onInit -- START"); - // CODE GOES HERE + logEnabled = nh_.advertise<logEnabledMsg>("logEnabled", 5); + + + // CODE GOES HERE NODELET_INFO("MainNode::onInit -- END"); } }