brata-hsdc / brata.station

Automatically exported from code.google.com/p/brata.station
Apache License 2.0
0 stars 0 forks source link

Integrate dock flight profile #20

Closed ellerychan closed 8 years ago

ellerychan commented 8 years ago

Merging changes into the main branch so that everyone can stay synced.

ellerychan commented 8 years ago

@scortiz1: I merged your add_secure_station branch into my integrate_dock_flight_profile and am now merging that into the hsdc2016 branch. There might be a couple of things to sew up after the merge.

Also, there will be a few changes to follow. @scortiz1 and @sminster: You will need to add one more state to your station subclass: onProcessingCompleted().