Commit Graph

21 Commits

Author SHA1 Message Date
Aidan Ferguson
ffb9d1a637 fixed meaningless conflicts because I totally know how to manage my time. 2016-02-10 20:17:55 -05:00
Aidan Ferguson
72e16d55c5 Merge branch 'master' into shooter 2016-02-09 20:56:37 -05:00
Aidan Ferguson
8cca3ff8df It no worky. 2016-02-09 19:32:27 -05:00
Jason
79c8e891d6 Merge branch 'master' of code.dublinschool.org:repos/FRC/FRC2016 2016-02-09 16:24:33 -05:00
Jason
6d0e75aa64 Added new Robot project using PWM drive train... Much simpler...
Signed-off-by: Jason <jason@dublinschool.org>
2016-02-09 16:23:45 -05:00
Aidan Ferguson
44eb125279 Merged master into logging, fixed conflicts. The logging's still terribad. 2016-02-08 19:42:46 -05:00
Jason Cox
bc81c928a8 Shooter Test COde... 2016-02-08 19:26:44 -05:00
Aidan Ferguson
370dc154c6 started migrating LogData() from last year. not operational 2016-02-08 18:43:18 -05:00
Jason
51741fe33b Some updates to mixing driving and shooting... More TODOs also 2016-02-07 23:05:59 -05:00
Jason
81c3876537 Added CANTalon for the ramp control to robot.cpp and added some methods for the Ramp and PickUp to the Shooter class. 2016-02-07 21:22:23 -05:00
Aidan Ferguson
d9137085c3 moar reformatting 2016-02-06 15:30:45 -05:00
Aidan Ferguson
15a7ee4cae added more includes because I will need to do things like moving strings around, knowing what time it is, and vectors, because we already have enough spagetti. 2016-02-06 14:04:20 -05:00
Jason Cox
9b8b4ff845 Forgot throttle needs inverting. Actually drives now. 2016-02-03 07:50:19 -05:00
Jason
fae8d71f03 Added Shooter class. 2016-02-02 10:18:19 -05:00
Jason
acbf4923ff fixed formatting in source files and fixed the destructor for the TankDrive class. 2016-02-02 09:41:15 -05:00
Jason
27b2b418fc Moved drive code back into the TankDrive class. 2016-02-02 09:39:51 -05:00
Jason Cox
d4ae350953 Added shooter Talons to the program. Controlled by opperator throttle. 2016-02-01 15:16:25 -05:00
Jason Cox
6d903af729 Slightly more sane, using IterativeRobot and DriveTrain. 2016-01-28 16:47:25 -05:00
Jason Cox
3d0cb6be07 Insane TankDrive code. NOT FUNCTIONAL 2016-01-28 15:47:56 -05:00
Jason
41aa90f7e2 Robot Drive? 2016-01-28 14:08:18 -05:00
Jason
d265820037 Initial Commit 2016-01-28 11:33:19 -05:00