Project

General

Profile

Revision 340

We're ready to do a two robot autonomous recharging video with run around, aside from some docking problems. There seem to be wireless issues with three robots, however.

View differences:

sensor_matrix.h
1 1
/**
2
 * Copyright (c) 2007 Colony Project
3
 * 
4
 * Permission is hereby granted, free of charge, to any person
5
 * obtaining a copy of this software and associated documentation
6
 * files (the "Software"), to deal in the Software without
7
 * restriction, including without limitation the rights to use,
8
 * copy, modify, merge, publish, distribute, sublicense, and/or sell
9
 * copies of the Software, and to permit persons to whom the
10
 * Software is furnished to do so, subject to the following
11
 * conditions:
12
 * 
13
 * The above copyright notice and this permission notice shall be
14
 * included in all copies or substantial portions of the Software.
15
 * 
16
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
17
 * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
18
 * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
19
 * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
20
 * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
21
 * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
22
 * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
23
 * OTHER DEALINGS IN THE SOFTWARE.
24
 **/
25

  
26
/**
2 27
 * @file sensor_matrix.h
3 28
 * @brief Definitions for sensor matrices
4 29
 *
......
7 32
 * @author Brian Coltin, Colony Project, CMU Robotics Club
8 33
 **/
9 34

  
35
#ifndef SENSOR_MATRIX_H
36
#define SENSOR_MATRIX_H
37

  
38

  
10 39
/**
11 40
 * @defgroup sensormatrix Sensor Matrix
12 41
 * @brief the robot sensor matrix
......
27 56
	/**
28 57
	 * The size of the sensor matrix.
29 58
	**/
30
	unsigned int size;
59
	int size;
31 60
	/**
32 61
	 * The matrix. Each row represents the readings of one
33 62
	 * robot.
......
49 78
/**@brief Destroy a sensor matrix **/
50 79
void sensor_matrix_destroy(SensorMatrix* m);
51 80
/**@brief Add a robot to a sensor matrix **/
52
void sensor_matrix_add_robot(SensorMatrix* m, unsigned int id);
81
void sensor_matrix_add_robot(SensorMatrix* m, int id);
53 82
/**@brief Remove a robot from a sensor matrix **/
54
void sensor_matrix_remove_robot(SensorMatrix* m, unsigned int id);
83
void sensor_matrix_remove_robot(SensorMatrix* m, int id);
55 84
/**@brief Set a reading in a sensor matrix **/
56 85
void sensor_matrix_set_reading(SensorMatrix* m, int observer, int robot, int reading);
57 86
/**@brief Get a reading in a sensor matrix **/
......
67 96

  
68 97
/** @} **/ //end defgroup
69 98

  
99

  
100
#endif

Also available in: Unified diff