Revision 6ebee82c
Moved all messages to the messages/ folder.
This meant changing a lot of includes and things.
| scout/libscout/src/MotorControl.cpp | ||
|---|---|---|
| 50 | 50 |
: node(libscout_node) |
| 51 | 51 |
{
|
| 52 | 52 |
set_motors_pub = |
| 53 |
node.advertise<motors::set_motors>(scoutname + "/set_motors",
|
|
| 53 |
node.advertise< ::messages::set_motors>(scoutname + "/set_motors",
|
|
| 54 | 54 |
QUEUE_SIZE, true); |
| 55 | 55 |
query_motors_client = |
| 56 |
node.serviceClient<motors::query_motors>(scoutname + "/query_motors");
|
|
| 56 |
node.serviceClient< ::messages::query_motors>(scoutname + "/query_motors");
|
|
| 57 | 57 |
} |
| 58 | 58 |
|
| 59 | 59 |
MotorControl::~MotorControl() |
| ... | ... | |
| 125 | 125 |
{
|
| 126 | 126 |
check_which_ok(which); |
| 127 | 127 |
|
| 128 |
motors::set_motors msg;
|
|
| 128 |
::messages::set_motors msg;
|
|
| 129 | 129 |
|
| 130 | 130 |
|
| 131 | 131 |
/* Tell the motors node which motors need to be updated */ |
| ... | ... | |
| 223 | 223 |
*/ |
| 224 | 224 |
float MotorControl::query(int which) |
| 225 | 225 |
{
|
| 226 |
motors::query_motors srv;
|
|
| 226 |
::messages::query_motors srv;
|
|
| 227 | 227 |
if(query_motors_client.call(srv)) |
| 228 | 228 |
{
|
| 229 | 229 |
switch(which) |
Also available in: Unified diff