Revision 1367
Matched this main.c to /trunk/code/projects/test/main.c
branches/library_refactor/projects/test/main.c | ||
---|---|---|
6 | 6 |
|
7 | 7 |
int main(void) { |
8 | 8 |
//testlcd(); |
9 |
testrangefinders(); |
|
9 |
//testrangefinders();
|
|
10 | 10 |
//testanalog(); |
11 | 11 |
//testtokenring(); |
12 |
<<<<<<< .mine |
|
13 | 12 |
//testencoders(); |
14 |
======= |
|
15 | 13 |
//testencoders(); |
16 | 14 |
//testlights(); |
17 |
testmotors(); |
|
18 |
>>>>>>> .r995 |
|
15 |
//testmotors(); |
|
19 | 16 |
|
20 | 17 |
return 0; |
21 | 18 |
} |
Also available in: Unified diff