Project

General

Profile

Statistics
| Revision:

root / trunk / code / projects / traffic_navigation / main.c @ 1949

History | View | Annotate | Download (7.54 KB)

# Date Author Comment
1949 03/28/2011 05:08 PM Devendra Gurjar

Added mapping capabilites

1913 12/05/2010 09:56 PM Ben Wasserman

Demo now MOSTLY WORKS. Yay. It just has trouble making turns and for some reason (which may be hardware caused) switches into intersection mode without a button press. It also needs barcodes. In order to run the demo, turn it on, press button 1 to make it stop at an intersection, and when it exits an intersection, press button 1 to make it go into highway mode, or button 2 to make it go into road mode. Highway mode only sometimes works, but not often.

1912 12/05/2010 07:58 PM Priyanka Deo

Made compatibility of lineDrive.h and validTurns.h.

1908 12/02/2010 11:28 PM Priyanka Deo

reorganized stuff in intersectData. made new function getTurningIntersect
that can be used to input directly into dan's code. made new functions to get
information about road nodes stored int he intersection database. eventually
should convert it to the node database.

1907 12/02/2010 10:48 PM Priyanka Deo

Bickles stopped working after revision 1906, so I tested it and changed
stuff in main so that it works.

1906 12/02/2010 07:48 PM Jeff Cooper

Added a function getTurnIntType(), which converts the intersection types into something usable by the turning code. Updated main to use it

1905 12/02/2010 07:37 PM Priyanka Deo

Changed the randomNumGen so that it stopps reading IR and does stuff
with a seed. More random? Maybe.

1901 11/29/2010 08:49 PM Ben Wasserman

Updated main to work for the demo. It now switches states properly, but button1 seems to trigger accidentally sometimes (but strangely consistently at the same point in the program). Also edited the random turn generator to use the rtc instead of a rangefinder for the seed.

1899 11/29/2010 08:17 PM Mark Williams

Merging works

1896 11/29/2010 08:07 PM Ben Wasserman

Changed main and validTurns to get the test going. Should theoretically drive through the cloverleaf, switching between road and intersection mode, but has trouble following the line and keeps reading phantom barcodes.

1891 11/22/2010 09:03 PM Ben Wasserman

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.

1890 11/22/2010 08:15 PM Mark Williams

Did stuff, but its not complete yet

1889 11/22/2010 07:26 PM Mark Williams

Updated main to include a break and highways.h to prototype files

1888 11/22/2010 07:18 PM Ben Wasserman

Edited intersection behavior to break it into separate functions, and moved the #defines around.

1877 11/18/2010 08:14 PM Mark Williams

added highways.h to the traffic_navigation.h file, made highways.c/h actually work for merging left. changed main.c to run the new highways.c code.

1876 11/15/2010 08:03 PM Mark Williams

Worked on highways and object avoidance and now uses doDrive and not lineFollow

1872 11/15/2010 07:20 PM Joseph Lee

Uploaded traffic_navigation.h

1869 11/12/2010 05:34 PM Ben Wasserman

Added code for pinging in intersections, but it currently doesn't work so its commented out. Intersections should work. Unfortunately some of Alex's doxygen code might be gone. Sorry.

1867 11/11/2010 08:46 PM Jeff Cooper

fixed priya's bugs, left her questionable sytlistic choices

1864 11/11/2010 07:58 PM Alex Zirbel

Added comments (doxygen style) to linefollow and linedrive.

1863 11/10/2010 01:16 PM Ben Wasserman

Completed adding ping capabilities for intersections. Code compiles, but untested on robots. Bots will ping each other in an intersection, and adapt if a bot disappears from the queue. Can only accept 1 robot disappearing at a time, unless vanishing robots aren't adjacent in the queue.

1861 11/08/2010 08:41 PM Ben Wasserman

Added function to reply to pings, and come calls to ping robots in the queue. Won't yet do anything to check if a bot disappeared, but it will compile.

1860 11/08/2010 07:47 PM Dan Jacobs

removed old code

1859 11/08/2010 07:37 PM Ben Wasserman

Added code to make it demo that the queue works. Mostly orbs and buttons, but some variables changed. Also started work on wireless reliability.

1846 10/26/2010 07:08 PM Ben Wasserman

Fixed the #include so it can find the linefollow header. This should be fixed so it can find the .h file in the proper directory. Also added lineFollow.c and lineFollow.h to this directory so main can find them. They will not be updated when the real copies update.

1844 10/22/2010 04:11 PM Ben Wasserman

Added beginning of wireless protocol for traffic navigation, and added code for handling intersections, with the exception of that code that involves navigating the intersection (so just the code that deals with wireless, the intersection queue (as I see it), and deciding when to go).

1843 10/22/2010 12:20 PM Ben Wasserman

Added the traffic_navigation directory to projects in trunk, and inserted my preliminary main function. As of now, it relies on the linefollowing code in the other project directory.

1549 11/16/2009 07:31 PM John Sexton

Updated IR rangefinder lookup table. Now reports in millimeters with an accuracy of +-10mm.

1419 09/19/2009 04:11 PM John Sexton

Added a folder for developing Target Practice Demo.

1394 09/08/2009 07:56 PM Chris Mar

changed template main to use new basic wireless

1380 09/04/2009 01:17 PM Chris Mar

fixed doxygen problems in wireless library, added new docs

967 01/27/2009 06:08 PM Abraham Levkoy

now it will work

951 01/14/2009 06:30 PM Chris Mar

testing commit on new svn (just template directory)

857 09/23/2008 06:32 PM Brian Coltin

Removed KWoo's crap from template.

773 05/05/2008 10:13 PM Kevin Woo

Commented some of the encoder functions.

733 04/23/2008 07:11 PM Chris Mar

reverted projects/template/ directory to pre-demo state. moved run_around demo code into behaviors/smart_run_around_fsm/ directory.

696 04/09/2008 09:12 PM Chris Mar

recompiled library - orb_init was called twice by dragonfly init. template folder contains run around demo code (to be restored post-demo). the ords appear to work (at least for demo).

156 10/10/2007 08:43 PM Eugene Marinelli

Updated robot_slave code; reformatted a lot of stuff

16 09/10/2007 09:51 PM Brian Coltin

Added template file.