diff options
| author | Peter de Kok <p.j.s.d.kok@gmail.com> | 2015-06-03 14:14:42 +0200 |
|---|---|---|
| committer | Peter de Kok <p.j.s.d.kok@gmail.com> | 2015-06-03 14:14:42 +0200 |
| commit | 30cf1d155e5fe5794bb78cba6298963dbc52555d (patch) | |
| tree | 8e07ac39eb2aa65c8517066d97c2150e3c5dd7b3 /Venus_Skeleton/dataTypes.h | |
| parent | 5fff3a8971639788e135906f69acc68b624e0bb0 (diff) | |
| download | code-30cf1d155e5fe5794bb78cba6298963dbc52555d.tar.gz | |
Fixed definition locations > extracted to file
Diffstat (limited to 'Venus_Skeleton/dataTypes.h')
| -rw-r--r-- | Venus_Skeleton/dataTypes.h | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/Venus_Skeleton/dataTypes.h b/Venus_Skeleton/dataTypes.h index 9a77ae1..3829da1 100644 --- a/Venus_Skeleton/dataTypes.h +++ b/Venus_Skeleton/dataTypes.h @@ -10,15 +10,18 @@ typedef enum { // Sensor data typedef struct { - // ir bool IR_left_detected; bool IR_right_detected; - bool sample_turret_detected; bool sample_gripper_detected; - int distance; + bool sample_turret_detected[NUM_TURRET_DIRECTIONS]; + bool beacon_detected[NUM_TURRET_DIRECTIONS]; long obstacle_turret_distances[NUM_TURRET_DIRECTIONS]; - // .. - long timer; // 32-bit + int robot_x[NUM_TURRET_DIRECTIONS]; + int robot_y[NUM_TURRET_DIRECTIONS]; + int robot_deg[NUM_TURRET_DIRECTIONS]; + int robot_curr_x; + int robot_curr_y; + int robot_curr_deg; } data_t; enum { CHANGED_SENS_COMPASS = 1 << 0, |