Project

General

Profile

Statistics
| Revision:

root / trunk / code @ 1953

# Date Author Comment
1953 03/31/2011 05:08 PM Willis Chang
1952 03/28/2011 06:01 PM Alex Zirbel

Small edits to the barcode reader

With proper setup of the barcodes (printed on rather than taped), this barcode reader is working.

1951 03/28/2011 05:45 PM Dan Jacobs

changed constant in linefollowing

1950 03/28/2011 05:09 PM Devendra Gurjar

Added mapping capabilites

1949 03/28/2011 05:08 PM Devendra Gurjar

Added mapping capabilites

1948 03/24/2011 05:08 PM Alex Zirbel

Fixed tiny bug

1947 03/24/2011 04:51 PM Ben Wasserman

Added the logic tester. It still needs development, and won't compile with most library functions. Don't use yet.

1946 03/20/2011 02:58 AM John Sexton

Added Java code to listen to serial port. Also included development notes (DEV-NOTES.txt) which describe the process I had to go through to get serial ports to work in Java.

1945 03/17/2011 06:10 PM Alex Zirbel

Changed to use Alex's barcode code.

1944 03/15/2011 06:36 PM John Sexton

Added objects and some object functions to server Python script.

1943 03/15/2011 06:18 PM John Sexton

Updated calibration station robot code to print values for more sensors.

1942 03/15/2011 02:00 AM Alex Zirbel

Updated barcode code to use the new line sensor, and to work better.

1941 03/06/2011 12:43 AM John Sexton

Modified python script to read from Arduino over serial and write values into a SQLite3 database. Also adjusted the Arduino station code to read from two sensors every five seconds and send the information over serial to the server.

1940 02/28/2011 05:37 PM Dan Jacobs

updated linefollowing for new line sensors

1939 02/25/2011 04:59 PM Ben Wasserman

ifdef'ed main-intersectionTest.c so it won't be found by gcc when compiling. Hopefully this won't break anything.

1938 02/24/2011 06:12 PM Alexander Lam

Some bugfixes for collision avoidance.

1937 02/24/2011 04:33 PM Joseph Lee

removed shell script

1936 02/21/2011 05:50 PM Joseph Lee

added spec for proposed robustness improvement of intersection handling

1934 02/21/2011 05:11 PM Joseph Lee

Adding specs

1933 02/17/2011 06:36 PM Ben Wasserman

Vinay added data for the intersection and roads for the barcode table. Compiles.

1932 02/17/2011 06:27 PM John Sexton

Renamed arduino file name. Python script can read from both robot and arduino at the same time.

1931 02/17/2011 06:24 PM Dan Jacobs

fixed ??? trunk

1930 02/17/2011 05:51 PM John Sexton

Used template file instead of cicles file to start cal_sta_robot.c. Removed .h file. Figured out baud rates for arduino and robot. Python script can read from both sources.

1929 02/17/2011 05:31 PM Joseph Lee

forgot to uncomment some things in update_linefollow.pl

1928 02/17/2011 05:26 PM Joseph Lee

more general script for updating linefollowing code into traffic_navigation

1927 02/17/2011 05:12 PM Joseph Lee

added a init script in traffic_navigation

1926 02/17/2011 04:59 PM John Sexton

Copied over files for robot code to Calibration Station folder. Renamed files to more appropriately describe what the files should do.

1925 02/09/2011 11:04 PM Dan Jacobs

improved read_line to reduce delay

1924 02/07/2011 08:02 PM Alex Zirbel

Fixed line following readings, addded 1ms delay to fix the mux.

1923 02/03/2011 06:41 PM Priyanka Deo

Made the serial output of line sensor values print in order and documented it on the top of main.

1922 02/03/2011 04:34 PM Alex Zirbel

Added Dan's line following code

1921 01/27/2011 06:04 PM Abraham Levkoy

Added whitespace for clarity

1920 01/20/2011 06:09 PM Abraham Levkoy

Changed Makefile to automatically pick AVRDUDE_PORT for all 3 major platforms.

1919 01/17/2011 06:37 PM Alex Zirbel

Added a statusbot project to help me debug the demo by seeing what the bots are thinking.

1918 01/17/2011 06:12 PM Ben Wasserman

Added main-intersectionTest.c for testing intersection code without messing with main.c.

1917 01/16/2011 03:29 PM John Sexton

Added server-side python script and started to develop serial communication with Arduino. Changed Arduino code a little to facilitate development of server-side python code.

1916 01/15/2011 01:36 PM John Sexton

Created folders for station code and for server code. Moved arduino code into station folder.

1915 01/14/2011 09:38 PM John Sexton

Added folder for Calibration Platform.

1914 12/05/2010 11:42 PM Alex Zirbel

Attempting to use rtc to do full left turns - not working at the moment, but does something.

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.

1911 12/05/2010 07:07 PM Alex Zirbel

Redefinitions.

1910 12/05/2010 06:40 PM Alex Zirbel

Updating some documentation for lineFollow

1909 12/03/2010 03:09 AM Willis Chang

Included barcode reader value means, standard deviations, histograms for various materials including printer paper, lined white paper, poster paper (non gloss), duct tape, black electric tape, and black masking tape. Have yet to include glossy poster paper.

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.

1904 12/02/2010 07:27 PM Jeff Cooper

populated the database for the demo.

1903 12/02/2010 07:18 PM Jeff Cooper

Added a "feature id" field in bits 13,14,15,16 of the database ints, documented accordingly

1902 12/02/2010 04:50 PM Mark Williams

Edited the .h and .c file so that global variables can be seen by other files with the .h file is included.

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.

1900 11/29/2010 08:26 PM Mark Williams

now it really works, for real this time!

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

Merging works

1898 11/29/2010 08:14 PM Alexander Lam

More bugfixes (holy crap I'm bad at this)

1897 11/29/2010 08:08 PM Alexander Lam

More bug fixes, and most importantly,
Documentation about how to call the functions.

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.

1895 11/29/2010 07:51 PM Alexander Lam

More bug fixes for collision_avoid

1894 11/29/2010 07:28 PM Alexander Lam

Fixed directions and array indexes to match.

1893 11/22/2010 09:17 PM Alexander Lam

Added todo list to collision_avoid.c (i forgot to do this, sorry for the extra message!)
(HAI!)

1892 11/22/2010 09:10 PM Alexander Lam

First commit of the Collision Avoid Code. It probably doesn't work as-is.
This code is supposed to detect when multiple robots can cross an intersection at the same time.

Authors:
-Alexander Lam
-Willis Chang

How this works
First, a structure:
Dir0...
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.

1887 11/21/2010 10:09 PM Priyanka Deo

forgot to add intersectData.c and .h

1886 11/21/2010 10:09 PM Priyanka Deo

Tested and finished the database and the valid turns and everything!

database:
files: intersectData.c and intersectData.h
database is an array defined in .h that stores all intersections
right now it is defined for our demo map.
it has an intialize function that is unique for each map and all...

1885 11/21/2010 06:24 PM Priyanka Deo

Changed index of INTERSECTION variables and got rid of getCrossPos and
getCrossType that are being implemented in the database.

1884 11/19/2010 04:51 PM Jeff Cooper

Separated the intersection constants from the turning constants, updated fuctions accordingly.

1883 11/18/2010 10:03 PM Jeff Cooper

added code that makes the makefile work again

1882 11/18/2010 09:58 PM Priyanka Deo

random character in one of those files...and the other needed a 7 instead of a 3...
=D

1881 11/18/2010 09:51 PM Priyanka Deo

Merged the types of doubles into the crossing type. Also fixed comments
that were never updated and implements things of type DOUBLE as DOUBLE_T's
if you dont specify because DOUBLE_T is more safe.

1880 11/18/2010 09:41 PM Priyanka Deo

testing file for validTurns.c. Also documents how "barcode" (eventually
will be the value from the table look up) is implemented/used.

1879 11/18/2010 09:33 PM Priyanka Deo

tested validTurns.c and made it more compatible with the upcoming database.

1878 11/18/2010 08:46 PM Devendra Gurjar

Fixed some comments in linefollowing.c

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

1875 11/15/2010 08:00 PM John Sexton

Cleaned up analog.c file. Removed the interrupt handler code and removed the "start analog loop" code from init function.

1873 11/15/2010 07:21 PM Joseph Lee

adding traffic_navigation.h

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.

1868 11/11/2010 09:12 PM Alexander Lam

GARS, source files aren't supposed to be executable. (now my ls output has the right colors!)

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

fixed priya's bugs, left her questionable sytlistic choices

1866 11/11/2010 08:16 PM Priyanka Deo

see comments for validTurns.h

this is the actual code for the function validateTurn that takes a barcode
and returns an integer that corresponds to a valid turn.

1865 11/11/2010 08:15 PM Priyanka Deo

header file for the function called when entering an intersection that
determines whether or not a turn is valid based on the intersection type
and position of the robot. Currently uses random number generators (i.e.
rangefinders) to determine intersection type, position, and turn type.

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.

1862 11/08/2010 08:45 PM Dan Jacobs

killed analog loop

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.

1858 11/08/2010 07:15 PM Matthew McKay

Updated line following code from line following project

1857 11/05/2010 12:36 AM Dan Jacobs

minor bug fix, 2nd attempt

1856 11/05/2010 12:35 AM Dan Jacobs

minor bug fix

1855 11/05/2010 12:27 AM Dan Jacobs

lineFollow now supports merge. line drive is UNTESTED and has NO COMMENTS, but will provide higher level driving control

1854 11/05/2010 12:26 AM Dan Jacobs

lineFollow now supports merge. line drive is UNTESTED and has NO COMMENTS, but will provide higher level driving control

1853 11/03/2010 11:05 PM Dan Jacobs

improved turning

1852 11/02/2010 02:31 PM Ben Wasserman

Moved the old ref code to oldRef, and deleted the files from ref (the .old files).

1851 11/01/2010 08:10 PM Dan Jacobs

Added turning

1850 10/28/2010 10:32 PM Ben Wasserman

Added my RefBot code, and the hunter_prey.* files that it needs. Brad's old code is still existing in main.c.old, and the Makefile for it is in Makefile.old. The new RefBot runs on a robot, not a USB XBee.