Revision 337
Minor updates to recharging, but the charging board no longer appears to tell us when we're done.
wl_token_ring.c | ||
---|---|---|
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 |
/** |
|
27 |
* @file wl_token_ring.c |
|
28 |
* @brief Token Ring Implementation |
|
29 |
* |
|
30 |
* Implementation of the token ring packet group. |
|
31 |
* |
|
32 |
* @author Brian Coltin, Colony Project, CMU Robotics Club |
|
33 |
**/ |
|
34 |
|
|
1 | 35 |
#include <wl_token_ring.h> |
2 | 36 |
|
3 | 37 |
#include <stdlib.h> |
... | ... | |
296 | 330 |
**/ |
297 | 331 |
int wl_token_get_sensor_reading(int source, int dest) |
298 | 332 |
{ |
299 |
return sensor_matrix_get_reading(sensorMatrix, source, dest); |
|
333 |
if (wl_token_is_robot_in_ring(dest) && |
|
334 |
(source == wl_get_xbee_id() || wl_token_is_robot_in_ring(source))) |
|
335 |
return sensor_matrix_get_reading(sensorMatrix, source, dest); |
|
336 |
return -1; |
|
300 | 337 |
} |
301 | 338 |
|
302 | 339 |
/** |
Also available in: Unified diff