Revision 743
Fixed compilation errors.
sensor_matrix.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 sensor_matrix.c |
|
28 |
* @brief Sensor Matrix implementation |
|
29 |
* |
|
30 |
* Implementation of a sensor matrix for storing localization implementation. |
|
31 |
* |
|
32 |
* @author Brian Coltin, Colony Project, CMU Robotics Club |
|
33 |
**/ |
|
34 |
|
|
1 | 35 |
#include <stdlib.h> |
2 | 36 |
#include <stdio.h> |
3 | 37 |
#include <wl_defs.h> |
... | ... | |
19 | 53 |
SensorMatrix* m; |
20 | 54 |
int i; |
21 | 55 |
|
22 |
m = malloc(sizeof(SensorMatrix)); |
|
56 |
m = (SensorMatrix*)malloc(sizeof(SensorMatrix));
|
|
23 | 57 |
if (!m) |
24 | 58 |
{ |
25 | 59 |
WL_DEBUG_PRINT("Out of memory - create sensor matrix.\r\n"); |
26 | 60 |
return NULL; |
27 | 61 |
} |
28 | 62 |
m->size = DEFAULT_SENSOR_MATRIX_SIZE; |
29 |
m->matrix = malloc(m->size * sizeof(int*)); |
|
30 |
m->joined = malloc(m->size * sizeof(int)); |
|
63 |
m->matrix = (int**)malloc(m->size * sizeof(int*));
|
|
64 |
m->joined = (int*)malloc(m->size * sizeof(int));
|
|
31 | 65 |
m->numJoined = 0; |
32 | 66 |
if (!(m->matrix) || !(m->joined)) |
33 | 67 |
{ |
... | ... | |
65 | 99 |
* @param m the sensor matrix |
66 | 100 |
* @param id the XBee ID of the robot to add |
67 | 101 |
**/ |
68 |
void sensor_matrix_add_robot(SensorMatrix* m, unsigned int id)
|
|
102 |
void sensor_matrix_add_robot(SensorMatrix* m, int id) |
|
69 | 103 |
{ |
70 | 104 |
int i; |
71 | 105 |
if (id >= m->size) |
... | ... | |
73 | 107 |
if (m->matrix[id] != NULL) |
74 | 108 |
return; |
75 | 109 |
|
76 |
m->matrix[id] = malloc(m->size * sizeof(int)); |
|
110 |
m->matrix[id] = (int*)malloc(m->size * sizeof(int));
|
|
77 | 111 |
if (!(m->matrix[id])) |
78 | 112 |
{ |
79 | 113 |
WL_DEBUG_PRINT("Out of memory - add robot.\r\n"); |
... | ... | |
92 | 126 |
* @param m the sensor matrix |
93 | 127 |
* @param id the XBee ID of the robot to remove |
94 | 128 |
**/ |
95 |
void sensor_matrix_remove_robot(SensorMatrix* m, unsigned int id)
|
|
129 |
void sensor_matrix_remove_robot(SensorMatrix* m, int id) |
|
96 | 130 |
{ |
97 | 131 |
int i; |
98 | 132 |
|
... | ... | |
125 | 159 |
int i, j; |
126 | 160 |
WL_DEBUG_PRINT("Expanding sensor matrix.\r\n"); |
127 | 161 |
|
128 |
int** tempMatrix = malloc(nextSize * sizeof(int*)); |
|
162 |
int** tempMatrix = (int**)malloc(nextSize * sizeof(int*));
|
|
129 | 163 |
if (!tempMatrix) |
130 | 164 |
{ |
131 | 165 |
WL_DEBUG_PRINT("Out of memory - expand matrix.\r\n"); |
... | ... | |
139 | 173 |
for (i = 0; i < m->size; i++) |
140 | 174 |
if (m->matrix[i] != NULL) |
141 | 175 |
{ |
142 |
tempMatrix[i] = malloc(nextSize * sizeof(int));
|
|
176 |
tempMatrix[i] = (int *)malloc(nextSize * sizeof(int));
|
|
143 | 177 |
if (!tempMatrix[i]) |
144 | 178 |
{ |
145 | 179 |
WL_DEBUG_PRINT("Out of memory - expand matrix 2.\r\n"); |
... | ... | |
158 | 192 |
m->size = nextSize; |
159 | 193 |
|
160 | 194 |
//expand the size of joined |
161 |
int* tempJoined = malloc(nextSize * sizeof(int)); |
|
195 |
int* tempJoined = (int *)malloc(nextSize * sizeof(int));
|
|
162 | 196 |
if (!tempJoined) |
163 | 197 |
{ |
164 | 198 |
WL_DEBUG_PRINT("Out of memory - expand matrix 3.\r\n"); |
Also available in: Unified diff