Colony

Revision 1891

Merged highway code into main to test switching states between intersection and highway. Highway code doesn't behave as it should, but I may be calling it wrong. Switching states is currently based on button1, until bar codes get integrated. State switches are weird, and don't aways go into the correct state or wait for the button.

	case 0: // Normal Drive

		{

		int theCode = doDrive(225);

		if(theCode != NORMAL && theCode >= 0)

/*		if(theCode != NORMAL && theCode >= 0)

			return theCode;

		int range = range_read_distance(IR2);

*/

			int range = range_read_distance(IR2);

	        usb_puti(range);

       		usb_puts(" : ");

	        usb_puti(averagei);

Also available in: Unified diff