Revision 6ebee82c scout/scoutsim/src/scout.cpp

View differences:

scout/scoutsim/src/scout.cpp
134 134
     * request.
135 135
     * @todo Use "callback" in all callback function names? Or remove?
136 136
     */
137
    void Scout::setMotors(const motors::set_motors::ConstPtr& msg)
137
    void Scout::setMotors(const ::messages::set_motors::ConstPtr& msg)
138 138
    {
139 139
        last_command_time = ros::WallTime::now();
140 140

  
......
244 244
        return true;
245 245
    }
246 246

  
247
    bool Scout::query_encoders_callback(encoders::query_encoders::Request&,
248
                                        encoders::query_encoders::Response& res)
247
    bool Scout::query_encoders_callback(::messages::query_encoders::Request&,
248
                                        ::messages::query_encoders::Response& res)
249 249
    {
250 250
        res.fl_distance = fl_ticks;
251 251
        res.fr_distance = fr_ticks;
......
255 255
        return true;
256 256
    }
257 257

  
258
    bool Scout::query_linesensor_callback(linesensor::query_linesensor::Request&,
259
                                          linesensor::query_linesensor::Response& res)
258
    bool Scout::query_linesensor_callback(::messages::query_linesensor::Request&,
259
                                          ::messages::query_linesensor::Response& res)
260 260
    {
261 261
        res.readings = linesensor_readings;
262 262

  

Also available in: Unified diff