-
Notifications
You must be signed in to change notification settings - Fork 11
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
2a303a0
commit bff5c76
Showing
5 changed files
with
826 additions
and
706 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
67 changes: 34 additions & 33 deletions
67
micro_epsilon_scancontrol_driver/include/micro_epsilon_scancontrol_driver/nodelet.h
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,42 +1,43 @@ | ||
#ifndef _SCANCONTROL_NODELET_H_ | ||
#define _SCANCONTROL_NODELET_H_ | ||
|
||
#include <string> | ||
#include <boost/thread.hpp> | ||
|
||
#include <ros/ros.h> | ||
#include <pluginlib/class_list_macros.h> | ||
#include <nodelet/nodelet.h> | ||
#include <pluginlib/class_list_macros.h> | ||
#include <ros/ros.h> | ||
|
||
#include <boost/thread.hpp> | ||
#include <string> | ||
|
||
#include "micro_epsilon_scancontrol_driver/nodelet.h" | ||
#include "micro_epsilon_scancontrol_driver/driver.h" | ||
#include "micro_epsilon_scancontrol_driver/nodelet.h" | ||
|
||
namespace scancontrol_driver | ||
{ | ||
class DriverNodelet: public nodelet::Nodelet | ||
{ | ||
public: | ||
DriverNodelet(): | ||
running_(false) | ||
{} | ||
~DriverNodelet() | ||
{ | ||
// if (running_) | ||
// { | ||
// NODELET_INFO("Shutting down driver thread."); | ||
// running_ = false; | ||
// device_thread_->join(); | ||
// NODELET_INFO("Driver thread stopped."); | ||
// } | ||
} | ||
|
||
private: | ||
virtual void onInit(); | ||
|
||
volatile bool running_; | ||
boost::shared_ptr<ScanControlDriver> driver_; | ||
}; | ||
|
||
} | ||
|
||
#endif // _SCANCONTROL_NODELET_H_ | ||
class DriverNodelet : public nodelet::Nodelet | ||
{ | ||
public: | ||
DriverNodelet() | ||
: running_(false) | ||
{ | ||
} | ||
~DriverNodelet() | ||
{ | ||
// if (running_) | ||
// { | ||
// NODELET_INFO("Shutting down driver thread."); | ||
// running_ = false; | ||
// device_thread_->join(); | ||
// NODELET_INFO("Driver thread stopped."); | ||
// } | ||
} | ||
|
||
private: | ||
virtual void onInit(); | ||
|
||
volatile bool running_; | ||
boost::shared_ptr<ScanControlDriver> driver_; | ||
}; | ||
|
||
} // namespace scancontrol_driver | ||
|
||
#endif // _SCANCONTROL_NODELET_H_ |
Oops, something went wrong.