Revision 326
Oops, ignore last edit.
| trunk/code/projects/libwireless/lib/xbee.h | ||
|---|---|---|
| 43 | 43 |
* Also, a backup port if the other is used. |
| 44 | 44 |
**/ |
| 45 | 45 |
#ifndef ROBOT |
| 46 |
<<<<<<< .mine |
|
| 47 |
#ifndef XBEE_PORT |
|
| 48 |
#define XBEE_PORT "/dev/ttyUSB0" |
|
| 49 |
======= |
|
| 50 | 46 |
#define XBEE_PORT_DEFAULT "/dev/ttyUSB1" |
| 51 |
>>>>>>> .r324 |
|
| 52 | 47 |
#endif |
| 53 | 48 |
|
| 54 | 49 |
/** |
Also available in: Unified diff