Revision 1899
Merging works
| main.c | ||
|---|---|---|
| 31 | 31 |
sign = 0; |
| 32 | 32 |
|
| 33 | 33 |
//Test code |
| 34 |
state = SROAD;
|
|
| 34 |
state = SHIGHWAY;
|
|
| 35 | 35 |
|
| 36 | 36 |
sendBuffer[1] = id; |
| 37 |
|
|
| 37 |
/* |
|
| 38 | 38 |
doDrive(255); |
| 39 | 39 |
turn(DOUBLE, ILEFT); |
| 40 |
|
|
| 40 |
*/ |
|
| 41 | 41 |
/* while(1) |
| 42 | 42 |
doDrive(255); |
| 43 | 43 |
*/ |
| ... | ... | |
| 98 | 98 |
} |
| 99 | 99 |
break; |
| 100 | 100 |
case SHIGHWAY:/*On highway*/ |
| 101 |
orb1_set_color(CYAN); |
|
| 102 |
while(!button1_click()){
|
|
| 101 |
// while(!button1_click()){
|
|
| 103 | 102 |
highwayFSM(); |
| 104 |
} |
|
| 105 |
state = SINTERSECTION; |
|
| 103 |
// }
|
|
| 104 |
//state = SINTERSECTION;
|
|
| 106 | 105 |
break; |
| 107 | 106 |
default: |
| 108 | 107 |
usb_puts("I got stuck in an unknown state! My state is ");
|
| ... | ... | |
| 263 | 262 |
*/ |
| 264 | 263 |
} |
| 265 | 264 |
} |
| 266 |
} |
|
| 265 |
} |
|
Also available in: Unified diff