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

View differences:

scout/scoutsim/src/scout.cpp
88 88

  
89 89
        pose_pub = node.advertise<Pose>("pose", 1);
90 90
        color_pub = node.advertise<Color>("color_sensor", 1);
91
        sonar_pub = node.advertise<sonar::sonar_distance>("sonar_distance", 1);
91
        sonar_pub = node.advertise< ::messages::sonar_distance>("sonar_distance", 1);
92 92
        set_pen_srv = node.advertiseService("set_pen",
93 93
                                            &Scout::setPenCallback,
94 94
                                            this);
......
180 180

  
181 181
    }
182 182

  
183
    bool Scout::handle_sonar_toggle(sonar::sonar_toggle::Request  &req,
184
                         sonar::sonar_toggle::Response &res)
183
    bool Scout::handle_sonar_toggle(::messages::sonar_toggle::Request  &req,
184
                         ::messages::sonar_toggle::Response &res)
185 185
    {
186 186
        if (req.set_on && !sonar_on)
187 187
        {
......
202 202
        return true;
203 203
    }
204 204

  
205
    bool Scout::handle_sonar_set_scan(sonar::sonar_set_scan::Request  &req,
206
                                      sonar::sonar_set_scan::Response &res)
205
    bool Scout::handle_sonar_set_scan(::messages::sonar_set_scan::Request  &req,
206
                                      ::messages::sonar_set_scan::Response &res)
207 207
    {
208 208
        // Code to set the sonar to scan from
209 209
        // req.stop_l to req.stop_r
......
371 371
                                          sonar_position + 24, sonar_dc);
372 372

  
373 373
        // Publish
374
        sonar::sonar_distance msg;
374
        ::messages::sonar_distance msg;
375 375
        msg.pos = sonar_position;
376 376
        msg.distance0 = d_front;
377 377
        msg.distance1 = d_back;

Also available in: Unified diff