Project

General

Profile

Statistics
| Revision:

root / trunk @ 1899

# Date Author Comment
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.

1849 10/28/2010 07:20 PM Ben Wasserman

Removed all the unnecessary files that get added when compiling in James' hunter prey directory.

1848 10/26/2010 10:37 PM James Carroll

added Carroll James' hunter prey corrected to bosserman's wireless specifications

1847 10/26/2010 10:15 PM Alex Zirbel

Added james' hunter-prey folder.

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.

1845 10/22/2010 05:03 PM Devendra Gurjar

Updated linefollowing/barcode code.
Makefile is configured to OSX to annoy Dan.

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.

1842 10/19/2010 08:30 PM Dan Jacobs

Some barcode code

1841 10/16/2010 06:34 PM Dan Jacobs

Added line following

1840 10/14/2010 07:51 PM Alex Zirbel

Added james and ben's hunter prey code.

1839 10/07/2010 10:17 PM Devendra Gurjar

implemented bad line following, which dan will make magical.

1838 10/07/2010 10:01 PM Devendra Gurjar

Working code that outputs orbs for the darker side

1837 10/07/2010 08:54 PM Devendra Gurjar

Updated unit tests (correctly this time)

1836 10/07/2010 08:47 PM Devendra Gurjar

update the ir unit test

1835 10/07/2010 08:29 PM Devendra Gurjar

Inserted linefollowing code into main.c
Updated test_ir unit test

1834 10/07/2010 07:30 PM Devendra Gurjar

Copied template to linefollowing directory

1833 10/07/2010 07:27 PM Devendra Gurjar

Removed the linefollowing folder

1832 10/07/2010 07:26 PM Devendra Gurjar

Accidently added linefollowing folder in /projects

1830 10/05/2010 06:42 PM Ben Wasserman

Removed the _ from the function head in test_lights.c so all unit tests compile.

1827 08/28/2010 02:49 PM Ben Wasserman

Unittests: Added test_ir.c to test new IR receivers for line following, and modified main.c to only use testir.

1826 05/12/2010 08:57 PM Emily Hart

Added Butterworth filtering code.

1815 05/04/2010 10:40 PM Chris Mar

added MoM 2010 poster on formation control

1809 05/04/2010 03:57 PM Joel Rey

Woking version

1808 04/28/2010 11:13 PM Alex Zirbel

Circle.c in formation control works, but shakily. Some of the best robots can execute the code, but sloppily. More recovery code and error checking code needs to be integrated. Higher level code works. Turning as a group was implemented. This is a relatively stable version of circle.

1807 04/28/2010 09:36 PM Alex Zirbel

Added a turn method to the code, which theoretically works now. Circle.c.

1806 04/28/2010 03:20 PM Alex Zirbel

Made some slight upgrades to cicle.c, cincluding formatting.

1805 04/28/2010 03:06 AM Alex Zirbel

Changed the turning methods to simpler versions which should work more consistently -circle.c

1800 04/21/2010 08:58 PM Abraham Levkoy

Robots still oscillate while facing in wrong direction

1799 04/21/2010 08:09 PM Abraham Levkoy

This is broken

1796 04/21/2010 07:50 PM Alex Zirbel

Trying to refresh circle aboutFace()

1787 04/19/2010 08:24 PM David Schultz

added fall 09 surg to the repository

1786 04/19/2010 08:07 PM John Sexton

Cleaned up joystickPlayer folder.

1785 04/19/2010 08:05 PM John Sexton

Rearranged hunter_prey joystickPlayer file structure.

1778 04/16/2010 01:19 PM Brad Neuman

changed joystick player robot to have dleays between motion states. It's now less responsive but also resets much less

1777 04/16/2010 12:23 PM Brad Neuman

made human tagging easier and added joystick control code from colonet in a subdir of joystickPlayer

1776 04/16/2010 02:12 AM Alex Zirbel

Updated the correctTurn method to the more general aboutFace code

1775 04/16/2010 02:06 AM Alex Zirbel

Fixed the code so it works again with the restructuring; working on a better turning algorithm.

1774 04/16/2010 01:12 AM Alex Zirbel

Restructured the code to include higher-level programming and states devoted to certain actions.

1771 04/12/2010 09:24 PM Brad Neuman

noob mistake: forgot to add files before checking in joystick stuff

1764 04/10/2010 06:06 PM David Schultz

update to makefile for Brad

1750 04/08/2010 02:21 AM Hanzhang Hu

1. added a folder: encoder_censored_forward, which contains a c file that has this function. Still under testing. And cannot control speed well.
2. test result files for encoder_get_x() for robots 3,4,5,6.

1749 04/07/2010 07:49 PM Alex Zirbel

Documented the circle code extensively. Starting reorganization from procedural to funtion-calling code.

1733 04/02/2010 06:07 PM David Schultz

update to makefile for make demo option. now works under linux

1729 04/02/2010 05:46 PM David Schultz

updated makefile to new make demo code

1725 04/02/2010 01:10 AM Alex Zirbel

Updated circle, trying to fix 3-character packet sending.

1724 04/02/2010 01:03 AM Alex Zirbel

Starting to make the circle move as a group.

1723 04/01/2010 11:41 PM Alex Zirbel

Still editing counting code in circle.c

1722 04/01/2010 11:29 PM Alex Zirbel

Fixed the updated circle code.

1721 04/01/2010 11:26 PM Alex Zirbel

Updated circle so the robot counting should be less buggy.

1720 04/01/2010 11:15 PM Alex Zirbel

Cut out unused parts of circle.c, organized program, fixed a couple bugs

1719 04/01/2010 12:48 AM Alex Zirbel

Fixed circle.c, added comments, tested the program. Added terminal states.

1718 04/01/2010 12:44 AM Alex Zirbel
1717 04/01/2010 12:40 AM Alex Zirbel