Revision e5ac3afb

View differences:

scout/scoutsim/src/scout.cpp
323 323
            }
324 324
        }
325 325

  
326
        return d;
326
        // Convert from pixels to mm and return
327
        return (unsigned int) (1000 * d / PIX_PER_METER);
327 328
    }
328 329

  
329 330
    // x and y is current position of the sonar
scout/scoutsim/src/sonar_viz.cpp
4 4
#include <ros/ros.h>
5 5
#include <sonar/sonar_distance.h>
6 6

  
7
#include "scout_teleop.h"
8

  
9 7
#define QUEUE_SIZE 10
10 8

  
11 9
using namespace std;

Also available in: Unified diff