Statistics
| Revision:

root / trunk

# Date Author Comment
2012 05/06/2012 07:10 pm Priyanka Deo

Adding this years SURG MOM poster.

2011 05/05/2012 04:16 pm Thomas Mullins

Some fixes to forklift demo, and added most recent forklift code to warehouse project.

2010 04/19/2012 07:05 pm Thomas Mullins

Some changes to the forklift demo

2009 04/17/2012 05:34 pm James Carroll

Rewrote some of the WH_Robot.h code to make it c-compatible. Most of the c++ was commented out instead of deleted.

2008 04/16/2012 09:44 pm Thomas Mullins

More forklift demo fixes.

2007 04/16/2012 07:54 pm Julian Binder

Demo Code for forklift on colony 3.

2006 04/16/2012 07:24 pm Thomas Mullins

Fixed forklift_demo to compile and download

2005 04/16/2012 06:58 pm Thomas Mullins

Added forklift_demo for carnival

2004 04/02/2012 08:04 pm Thomas Mullins

Added api for communicating with the forklift over i2c, minus line following,
which is handled elsewhere.

2003 03/27/2012 06:16 pm James Carroll

Added the helper classes for the warehouse code that we are also going to have to port over. Things are looking grim boys

2002 03/27/2012 05:50 pm James Carroll

added the warehouse behavior section that will be used on the colony 3's. Currently only contains the c++ files that we are going to port over

2001 09/07/2011 12:50 am Alexander Lam

Commited activities_fair_demo for activites fair Fall 2011

2000 09/07/2011 12:28 am Alexander Lam

Added Priya Deo's and Jeff Cooper's (CS class of 2014) tetris dance code (complete with chip-tune music)!

Priya Deo:
Jeff Cooper:

Written for intro lab 0: Dance competition, Fall 2010

1999 05/03/2011 07:53 pm Alexander Lam

Refactored main_new timings so that bots travel through intersections more
fluidly

1998 05/03/2011 07:27 pm Alexander Lam

Fixed issue where if bot had no other bot in front it would still wait the time
for the imaginary bot in front to drive out of intersection.

1997 05/03/2011 05:02 pm Alex Zirbel

Added auto-calibration for barcode reading.

1996 05/02/2011 01:42 pm Alex Zirbel

Final version of Traffic Navigation Poster.

1995 05/01/2011 08:24 pm Abraham Levkoy

Made poster more concise.

1994 04/28/2011 06:38 pm Matthew McKay

Updated 2011 MoM Poster, added pictures.

1993 04/28/2011 05:22 pm Alexander Lam

I screwed the last commit, fixed it

1992 04/28/2011 05:16 pm Alexander Lam

Temporary hack to make sure bot that announces it has exited is really clear of
intersection.

1991 04/28/2011 05:11 pm Alexander Lam

Updated some random number generators to have more entropy.

1990 04/28/2011 04:58 pm Joseph Lee

adding tests for graph script

1989 04/28/2011 04:53 pm Jeff Cooper

changed map_gen.py to account for new spec

1988 04/27/2011 06:40 am Ben Wasserman

This is a working version of the code for the demo. It works on Bot 7, and partially on Bot 14. Due to the number of changes here, I'll list them by file:

traffic_navigation.h
I added a #define for sendGraph, so its main won't be compiled unless defined. Uncomment the #define line at the top of this file to turn its main on. Make sure you also comment out the #define for main-new. Also, has the new #define for the node wireless packet type....

1987 04/26/2011 06:55 pm Devendra Gurjar

Updated mapping code. Fixed some bugs.
Usure about something - see the TODO. Will fix soon.

1986 04/25/2011 06:51 pm Matthew McKay

Rough Sketch of Poster for MoM for Traffic Navigation

1985 04/25/2011 06:37 pm Alex Zirbel

Fixed barcodes first read problem.

Barcodes used to always read gray for the first bit, but this problem is now fixed by better initializiation in lineFollow init.

1984 04/25/2011 06:15 pm Devendra Gurjar

Created some mapping code that compiles!
Lower level mapping functions finalized!

Higher level random mapping still needs some work.
It is probably buggy.

1983 04/25/2011 06:06 pm Alex Zirbel

Modified barcodes again - after reading the first barcode, should work like normal.

1982 04/25/2011 05:39 pm Abraham Levkoy

Update intersectData.{c,h} to reflect new demo map. Renumbered intersections.
Created macro UNUSED_INTER, an intersection number that signifies that a node is
not in use. Use it to initialize the arrray for indices that do not correspond
to meaningful barcodes.

1981 04/25/2011 04:35 pm Alex Zirbel

Added new barcode reading to linefollowing project - first barcode is still wrong, however.

1980 04/21/2011 07:45 pm Abraham Levkoy

Fixed all compilation errors and warnings in traffic_navigation. If you committed these
abominations, I hope you're sorry. I only made things compile. If I fixed your code, it
might no longer do what you intended, but I can pretty much guarantee that it didn't do...

1979 04/21/2011 06:40 pm Devendra Gurjar

Added old files that used to compile,
new main in sendGraph that sends a graph packet - temporary

1978 04/21/2011 04:39 pm Jeff Cooper

Added the map generation script

1977 04/18/2011 06:36 pm Alexander Lam

Fixed small bug in new main where if barcode was invalid, forgot to restart
motors for line following.

1976 04/18/2011 06:24 pm Priyanka Deo

Added function that creates the edges used for mapping in mapping.c. Note: code does not yet compile.

1975 04/18/2011 06:03 pm Alexander Lam

Fixed location of pound define to enable wireless watcher

1974 04/18/2011 06:02 pm Alex Zirbel

Back to most recent version of barcode reading.

1973 04/18/2011 05:56 pm Devendra Gurjar
1972 04/18/2011 05:54 pm Alexander Lam

Traffic Navigation:
Fixed some various issues with the new main (bad calls & added barcode error
handling)
It compiles by default now.

1971 04/18/2011 05:18 pm Alexander Lam

Turned on orbs for linefollowing

1970 04/17/2011 03:33 am Alexander Lam

Linefollowing:

added #defines around orb statements to keep them from interfering with other
orb control statements.

1969 04/17/2011 03:32 am Alexander Lam

Traffic Navigation:
Started integration of the new intersection queue code.
(main-intersectionDebug.c, main-new.c, & traffic_navigation.h).
The new code will not be compiled by default.
Additionally, I added #defines to all orb control statements because
they were interfering with each other. To turn some orb control statements on,...

1968 04/17/2011 02:32 am Alexander Lam

Added an alternate main that merely outputs the wireless
packets that are being thrown across the air to usb.

It translates Traffic Navigation packet id's into names.

1967 04/11/2011 05:06 pm Joseph Lee

adding parser test script

1966 04/07/2011 07:28 pm Abraham Levkoy

Added test map data encoding to intersectData.c. Fixe a whole bunch of stuff so
that at least this traffic_navigation compiles without warnings. Symlinked to
needed files in linefollow. Changed function declaration style. Added
delclaration of read_line to analog.h. You're welcome. Fixed several #includes....

1965 04/07/2011 05:42 pm Ben Wasserman

Added readSerail.sh which reads from a robot on USB and prints to a file named graphData. I'll modify it soon to print to stdout instead, but for now this works.

1964 04/07/2011 05:40 pm Ben Wasserman

Removed the 'x bytes:' from each line for easier parsing by the mapping programs.

1963 04/07/2011 05:24 pm Joseph Lee

Redoing grapher script...

1962 04/07/2011 05:17 pm Joseph Lee

added grapher script

1961 04/07/2011 04:40 pm Alex Zirbel

Added new linefollowing code for barcodes.

Debug statements are still included, but this is the latest version of the code.

Bot14 at least reads all barcodes consistently. Thresholds may have to be adjusted for other robots.

1960 04/04/2011 05:07 pm Alex Zirbel

Fixed lineFollow.h compile issues.

1959 04/04/2011 04:58 pm Alex Zirbel

Added new linefollow function with bucketing.

1958 03/31/2011 06:25 pm Priyanka Deo

Added more functionality to database for mapping things.

1957 03/31/2011 06:23 pm Alexander Lam

Reverted revisions 1949 and 1950 due to broken code (main.c contained some sort
of wierd unresolved merge?)

1956 03/31/2011 06:06 pm Alexander Lam

Added a unit test for the new (mux-ed) line following sensors
(test_linefollow.c)

Deprecated the old line following test (test_ir.t)

1955 03/31/2011 05:30 pm Ben Wasserman

Status bot works!! The main function will listen and print to USB all wireless packets on whatever channel it is set to. The second function is still untested.

1954 03/31/2011 05:10 pm Willis Chang

changed black_value

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.