Revision 071926c2 scout/scoutsim/src/scout.h

View differences:

scout/scoutsim/src/scout.h
55 55
#include <motors/set_motors.h>
56 56
#include <encoders/query_encoders.h>
57 57
#include <linesensor/query_linesensor.h>
58
#include <sonar/sonar_distance.h>
59
#include <sonar/sonar_toggle.h>
60
#include <sonar/sonar_set_scan.h>
58
#include <messages/sonar_distance.h>
59
#include <messages/sonar_toggle.h>
60
#include <messages/sonar_set_scan.h>
61 61

  
62 62
#include <scoutsim/Pose.h>
63 63
#include <scoutsim/SetPen.h>
......
131 131
                                         encoders::query_encoders::Response&);
132 132
            bool query_linesensor_callback(linesensor::query_linesensor::Request&,
133 133
                                           linesensor::query_linesensor::Response&);
134
            bool handle_sonar_toggle(sonar::sonar_toggle::Request  &req,
135
                                     sonar::sonar_toggle::Response &res);
136
            bool handle_sonar_set_scan(sonar::sonar_set_scan::Request  &req,
137
                                       sonar::sonar_set_scan::Response &res);
134
            bool handle_sonar_toggle(messages::sonar_toggle::Request  &req,
135
                                     messages::sonar_toggle::Response &res);
136
            bool handle_sonar_set_scan(messages::sonar_set_scan::Request  &req,
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