Revision f34d6221
ID | f34d6221684d4fffd096c9993f00d63c17377537 |
Ok fixed compilation issues from last commit
scout/libscout/src/EncodersControl.h | ||
---|---|---|
31 | 31 |
* @author Alex Zirbel |
32 | 32 |
**/ |
33 | 33 |
|
34 |
#ifndef _SONAR_CONTROL_H_
|
|
35 |
#define _SONAR_CONTROL_H_
|
|
34 |
#ifndef _ENCODERS_CONTROL_H_
|
|
35 |
#define _ENCODERS_CONTROL_H_
|
|
36 | 36 |
|
37 | 37 |
#include <ros/ros.h> |
38 | 38 |
#include <encoders/query_encoders.h> |
... | ... | |
41 | 41 |
|
42 | 42 |
typedef struct encoder_readings |
43 | 43 |
{ |
44 |
unsigned int fl_distance;
|
|
45 |
unsigned int fr_distance;
|
|
44 |
unsigned int fl_ticks;
|
|
45 |
unsigned int fr_ticks;
|
|
46 | 46 |
unsigned int bl_ticks; |
47 | 47 |
unsigned int br_ticks; |
48 | 48 |
} encoder_readings; |
... | ... | |
55 | 55 |
std::string scoutname); |
56 | 56 |
|
57 | 57 |
/** Use ROS to get the current encoder position. */ |
58 |
void query();
|
|
58 |
encoder_readings query();
|
|
59 | 59 |
|
60 | 60 |
private: |
61 | 61 |
|
Also available in: Unified diff