History | View | Annotate | Download (1.84 KB)
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....
Edited the .h and .c file so that global variables can be seen by other files with the .h file is included.
now it really works, for real this time!
Merging works
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.
Did stuff, but its not complete yet
Updated main to include a break and highways.h to prototype files
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.
Worked on highways and object avoidance and now uses doDrive and not lineFollow