Revision 6ebee82c
Moved all messages to the messages/ folder.
This meant changing a lot of includes and things.
scout/scoutsim/src/scout.h | ||
---|---|---|
52 | 52 |
#include <vector> |
53 | 53 |
#include <boost/shared_ptr.hpp> |
54 | 54 |
|
55 |
#include <motors/set_motors.h>
|
|
56 |
#include <encoders/query_encoders.h>
|
|
57 |
#include <linesensor/query_linesensor.h>
|
|
55 |
#include <messages/set_motors.h>
|
|
56 |
#include <messages/query_encoders.h>
|
|
57 |
#include <messages/query_linesensor.h>
|
|
58 | 58 |
#include <messages/sonar_distance.h> |
59 | 59 |
#include <messages/sonar_toggle.h> |
60 | 60 |
#include <messages/sonar_set_scan.h> |
... | ... | |
124 | 124 |
|
125 | 125 |
private: |
126 | 126 |
float absolute_to_mps(int absolute_speed); |
127 |
void setMotors(const motors::set_motors::ConstPtr& msg);
|
|
127 |
void setMotors(const messages::set_motors::ConstPtr& msg);
|
|
128 | 128 |
bool setPenCallback(scoutsim::SetPen::Request&, |
129 | 129 |
scoutsim::SetPen::Response&); |
130 |
bool query_encoders_callback(encoders::query_encoders::Request&,
|
|
131 |
encoders::query_encoders::Response&);
|
|
132 |
bool query_linesensor_callback(linesensor::query_linesensor::Request&,
|
|
133 |
linesensor::query_linesensor::Response&);
|
|
130 |
bool query_encoders_callback(messages::query_encoders::Request&,
|
|
131 |
messages::query_encoders::Response&);
|
|
132 |
bool query_linesensor_callback(messages::query_linesensor::Request&,
|
|
133 |
messages::query_linesensor::Response&);
|
|
134 | 134 |
bool handle_sonar_toggle(messages::sonar_toggle::Request &req, |
135 | 135 |
messages::sonar_toggle::Response &res); |
136 | 136 |
bool handle_sonar_set_scan(messages::sonar_set_scan::Request &req, |
137 |
messages::sonar_set_scan::Response &res);
|
|
137 |
messages::sonar_set_scan::Response &res); |
|
138 | 138 |
unsigned int rgb_to_grey(unsigned char r, |
139 | 139 |
unsigned char g, |
140 | 140 |
unsigned char b); |
Also available in: Unified diff