Revision 1198
Added server communication parameter parsing
Misc. fixes
main.c | ||
---|---|---|
9 | 9 |
#include "tests.h" |
10 | 10 |
#include "self_test.h" |
11 | 11 |
#include "comm_server.h" |
12 |
#include "comm_robot.h" |
|
12 | 13 |
|
13 | 14 |
void interactive_main (void) |
14 | 15 |
{ |
... | ... | |
40 | 41 |
dragonfly_init (0); |
41 | 42 |
orb_init (); |
42 | 43 |
orbs_set (0, 0,255,0,0,0); |
44 |
while (1); |
|
45 |
return 0; |
|
43 | 46 |
} |
44 | 47 |
|
45 | 48 |
int main_john (void) |
... | ... | |
53 | 56 |
|
54 | 57 |
rbom_debug(); |
55 | 58 |
|
59 |
return 0; |
|
56 | 60 |
} |
57 | 61 |
|
58 | 62 |
|
59 | 63 |
int main_evan (void) |
60 | 64 |
{ |
61 |
#include <dragonfly_lib.h> |
|
62 |
#include <wireless.h> |
|
63 |
|
|
64 | 65 |
dragonfly_init(0); |
65 | 66 |
|
66 | 67 |
usb_init (); |
... | ... | |
71 | 72 |
orb_init_pwm (); |
72 | 73 |
hardware_init (); |
73 | 74 |
comm_server_init (); |
75 |
comm_robot_init (); |
|
74 | 76 |
|
75 | 77 |
orb1_set (255, 0, 0); usb_puts("# Initializing wireless" NL); |
76 | 78 |
xbee_init (); |
77 | 79 |
wl_init(); |
78 | 80 |
orb2_set (255, 0, 0); usb_puts("# Done" NL); |
79 | 81 |
|
80 |
PacketGroupHandler receive_handler = {robot_station_group, NULL, NULL, &robot_station_receive, NULL}; |
|
81 |
wl_register_packet_group(&receive_handler); |
|
82 | 82 |
|
83 | 83 |
// If button 1 is pressed after initialization of the wireless (which takes about 1s), run all tests. |
84 | 84 |
if (button1_read ()) |
... | ... | |
96 | 96 |
} |
97 | 97 |
|
98 | 98 |
while (1); |
99 |
return 0; |
|
99 | 100 |
} |
100 | 101 |
|
101 | 102 |
int main_default (void) |
102 | 103 |
{ |
103 |
#include <dragonfly_lib.h> |
|
104 |
#include <wireless.h> |
|
105 |
|
|
106 | 104 |
dragonfly_init(0); |
107 | 105 |
|
108 | 106 |
usb_init (); |
... | ... | |
135 | 133 |
} |
136 | 134 |
|
137 | 135 |
while (1); |
138 |
} |
|
136 |
} |
Also available in: Unified diff