History | View | Annotate | Download (3.44 KB)
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.hI 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....
Fixed small bug in new main where if barcode was invalid, forgot to restartmotors for line following.
Traffic Navigation:Fixed some various issues with the new main (bad calls & added barcode errorhandling)It compiles by default now.
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 becausethey were interfering with each other. To turn some orb control statements on,...
Added test map data encoding to intersectData.c. Fixe a whole bunch of stuff sothat at least this traffic_navigation compiles without warnings. Symlinked toneeded files in linefollow. Changed function declaration style. Addeddelclaration of read_line to analog.h. You're welcome. Fixed several #includes....
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
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.
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.
adding traffic_navigation.h