Revision 516
commenting out some prints
| trunk/code/projects/colonet/server/Command.cpp | ||
|---|---|---|
| 168 | 168 |
return -1; |
| 169 | 169 |
} |
| 170 | 170 |
|
| 171 |
printf("parsed command from internet client: ");
|
|
| 171 |
//printf("parsed command from internet client: ");
|
|
| 172 | 172 |
for (int i = 0; i < number_int_tokens - ROBOT_COMMAND_OFFSET; i++) {
|
| 173 | 173 |
printf("%d ", int_tokens[i]);
|
| 174 | 174 |
} |
| ... | ... | |
| 230 | 230 |
break; |
| 231 | 231 |
|
| 232 | 232 |
default: |
| 233 |
char * my_current_message = "Invalid request!\n";
|
|
| 234 |
printf("Sending %s\n", my_current_message);
|
|
| 233 |
char* my_current_message = "Invalid request!\n"; |
|
| 234 |
//printf("Sending %s\n", my_current_message);
|
|
| 235 | 235 |
connection_pool->write_to_client(pool_index, my_current_message, strlen(my_current_message)); |
| 236 | 236 |
break; |
| 237 | 237 |
} |
| ... | ... | |
| 269 | 269 |
} |
| 270 | 270 |
strcat(response_bom_matrix_buffer,"\n"); |
| 271 | 271 |
connection_pool->write_to_client(pool_index, response_bom_matrix_buffer, strlen(response_bom_matrix_buffer)); |
| 272 |
printf("Sending %s", response_bom_matrix_buffer);
|
|
| 272 |
//printf("Sending %s", response_bom_matrix_buffer);
|
|
| 273 | 273 |
|
| 274 | 274 |
for (int i = 0; i < num_robots; i++) {
|
| 275 | 275 |
free(bom_matrix[i]); |
| ... | ... | |
| 282 | 282 |
} |
| 283 | 283 |
|
| 284 | 284 |
int Command::parse_request_robot_positions(int pool_index) {
|
| 285 |
printf("*****parse_request_robot_positions\n");
|
|
| 285 |
//printf("*****parse_request_robot_positions\n");
|
|
| 286 | 286 |
|
| 287 | 287 |
map<int, VisionPosition> positions = colonet_server->getPositionMonitor()->getAllRobotPositions(); |
| 288 | 288 |
map<int, VisionPosition>::iterator iter; |
| ... | ... | |
| 299 | 299 |
|
| 300 | 300 |
strcat(position_buffer, "\n"); |
| 301 | 301 |
|
| 302 |
printf("position buffer is: %s\n", position_buffer);
|
|
| 302 |
//printf("position buffer is: %s\n", position_buffer);
|
|
| 303 | 303 |
|
| 304 | 304 |
connection_pool->write_to_client(pool_index, position_buffer, strlen(position_buffer)); |
| 305 | 305 |
|
| ... | ... | |
| 313 | 313 |
int num_robots; |
| 314 | 314 |
int* xbee_ids = colonet_get_xbee_ids(&num_robots); |
| 315 | 315 |
|
| 316 |
printf("num_robots: %d\n", num_robots);
|
|
| 317 |
printf("xbee_ids: ");
|
|
| 318 |
for (int i = 0; i < num_robots; i++) {
|
|
| 319 |
printf("%d ", xbee_ids[i]);
|
|
| 320 |
} |
|
| 321 |
printf("\n");
|
|
| 316 |
//printf("num_robots: %d\n", num_robots);
|
|
| 317 |
//printf("xbee_ids: ");
|
|
| 318 |
//for (int i = 0; i < num_robots; i++) {
|
|
| 319 |
// printf("%d ", xbee_ids[i]);
|
|
| 320 |
//}
|
|
| 321 |
//printf("\n");
|
|
| 322 | 322 |
|
| 323 | 323 |
if (!connection_pool) {
|
| 324 | 324 |
return -1; |
| ... | ... | |
| 335 | 335 |
} |
| 336 | 336 |
strcat(xbee_id_buffer, "\n"); |
| 337 | 337 |
connection_pool->write_to_client(pool_index, xbee_id_buffer, strlen(xbee_id_buffer)); |
| 338 |
printf("Sending %s", xbee_id_buffer);
|
|
| 338 |
//printf("Sending %s", xbee_id_buffer);
|
|
| 339 | 339 |
|
| 340 | 340 |
free(xbee_ids); |
| 341 | 341 |
|
| trunk/code/projects/colonet/server/colonet_wireless.cpp | ||
|---|---|---|
| 95 | 95 |
|
| 96 | 96 |
int colonet_wl_send(short client_source, short dest, ColonetRobotMessageType msg_type, unsigned char msg_code, |
| 97 | 97 |
unsigned char* args) {
|
| 98 |
printf("colonet_wl_send: client_source:%d, dest:%d, msg_code:%d\n", client_source, dest, msg_code);
|
|
| 98 |
//printf("colonet_wl_send: client_source:%d, dest:%d, msg_code:%d\n", client_source, dest, msg_code);
|
|
| 99 | 99 |
|
| 100 | 100 |
ColonetRobotServerPacket pkt; |
| 101 | 101 |
pkt.client_id = client_source; |
| ... | ... | |
| 180 | 180 |
//TODO: These are just here to get rid of compiler warnings |
| 181 | 181 |
type = type; |
| 182 | 182 |
|
| 183 |
printf("handle receive\n");
|
|
| 183 |
printf("!!!***Got packet from robots***!!!\n");
|
|
| 184 | 184 |
|
| 185 | 185 |
ColonetRobotServerPacket* pkt = (ColonetRobotServerPacket*)data; |
| 186 | 186 |
|
| trunk/code/projects/colonet/server/ConnectionPool.cpp | ||
|---|---|---|
| 198 | 198 |
return ERROR_NOT_ENOUGH_ROOM; |
| 199 | 199 |
} |
| 200 | 200 |
|
| 201 |
printf("Connection pool: attempting to write [%s], length %i to index %i.\n", message, length, pool_index);
|
|
| 201 |
//printf("Connection pool: attempting to write [%s], length %i to index %i.\n", message, length, pool_index);
|
|
| 202 | 202 |
|
| 203 | 203 |
memcpy(write_buffer[pool_index], message, length); |
| 204 | 204 |
write_buffer_size[pool_index] += length; |
| ... | ... | |
| 291 | 291 |
memmove(temporary_buffer, temporary_buffer+length, READ_BUFFER_SIZE - length); |
| 292 | 292 |
} |
| 293 | 293 |
|
| 294 |
printf("read_data: Read buffer is %s\n", read_buffer[pool_index]);
|
|
| 294 |
//printf("read_data: Read buffer is %s\n", read_buffer[pool_index]);
|
|
| 295 | 295 |
|
| 296 | 296 |
char* newline_position; |
| 297 | 297 |
|
Also available in: Unified diff