Commit Graph

52 Commits

Author SHA1 Message Date
Aidan Ferguson
35cd776a48 more of LogData(). still not done, but I'm tired. 2016-02-10 21:19:18 -05:00
Aidan Ferguson
3be566a2be Lots of includes (for real this time) and a LogData() embryo 2016-02-10 20:43:45 -05:00
Aidan Ferguson
9ae56635ce Lots of includes and a LogData() embryo 2016-02-10 20:43:09 -05:00
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
2534f700f1 raised PICKUP_POWER to 0.8 2016-02-10 20:13:33 -05:00
Aidan Ferguson
c36024a86d placeholder for encoder code in Shooter.h 2016-02-10 19:55:20 -05:00
Aidan Ferguson
fbae5efebf Switched the shooter controller addresses to reflect reality. 2016-02-10 19:11:51 -05:00
Aidan Ferguson
a8642a87d9 Made sure shooter power from the throttle will only be used when the throttle is moved. Probably. 2016-02-10 18:56:38 -05:00
Aidan Ferguson
470a4b6f4b impotent debug code! 2016-02-10 15:23:07 -05:00
Aidan Ferguson
b4d5ead23a bugfix, debug code for encoder. 2016-02-10 14:56:58 -05:00
Aidan Ferguson
ef9db9032b missed an instance of the counter 2016-02-10 14:48:39 -05:00
Aidan Ferguson
fb39b56c90 removed counter object in preparation for encoder over cantalon 2016-02-10 14:42:20 -05:00
Aidan Ferguson
afad5d4660 numerous drive changes because of reasons, plus the starts of a counter object that will probably have to be nixed. Not our brightest moment. 2016-02-10 13:39:48 -05:00
Aidan Ferguson
72e16d55c5 Merge branch 'master' into shooter 2016-02-09 20:56:37 -05:00
Aidan Ferguson
0a5d0bf84d Formatting fix 2016-02-09 19:47:17 -05:00
Aidan Ferguson
8cca3ff8df It no worky. 2016-02-09 19:32:27 -05:00
Jason Cox
9ceafdec80 Added some more sane code that has no effect because it only calls empty methods. 2016-02-09 17:27:58 -05:00
Jason Cox
48b4e2292d Added some comments and sanity to the new robot project. 2016-02-09 17:22:17 -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
ea8d9899d8 Added another TODO comment.
Signed-off-by: Jason <jason@dublinschool.org>
2016-02-07 22:54:31 -05:00
Jason
be23bd6664 Merge branch 'shooter' 2016-02-07 22:54:03 -05:00
Jason
2299016c7e Added some more comments. 2016-02-07 22:42:43 -05:00
Jason
62a93449cb Added an 'unjam' method to the shooter 2016-02-07 22:37:10 -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
a0bcd18711 Cqqq
C
C
C
C
C
C
C
C
2016-02-03 19:05:03 -05:00
Jason Cox
5e58bfd2f9 Fixed reversed rotation. 2016-02-03 18:15:36 -05:00
Jason Cox
eb9c9b3415 Merge branch 'shooter' 2016-02-03 07:55:55 -05:00
Jason Cox
425e79ea0f stuff from remote 2016-02-03 07:55:46 -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
72c9268b13 removed metadata from repo... 2016-02-02 09:48:19 -05:00
Jason
5f36411af7 Added comments to TankDrive 2016-02-02 09:46:08 -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 Cox
6aa5db759a commit... 2016-01-28 14:14:46 -05:00
Jason
41aa90f7e2 Robot Drive? 2016-01-28 14:08:18 -05:00
Jason
8c9803a35b Added TankDrive.h 2016-01-28 13:08:37 -05:00
Jason
949b53c98f Added elcipse metadata. 2016-01-28 11:33:46 -05:00
Jason
d265820037 Initial Commit 2016-01-28 11:33:19 -05:00
Aidan Ferguson
3df7e9b128 updated roborio hostname in the makefile. 2016-01-27 20:20:35 -05:00