Commit Graph

90 Commits

Author SHA1 Message Date
Aidan Ferguson
17bd06f9c2 Merge branch 'shooter' 2016-02-15 20:15:07 -05:00
Aidan Ferguson
043707478d fixed a typo 2016-02-15 20:14:48 -05:00
Aidan Ferguson
dedcbe4bf7 Finished shooter switch. 2016-02-15 15:14:20 -05:00
Jason Cox
cc7eee8975 Merge branch 'arms' of code.dublinschool.org:repos/FRC/FRC2016 into arms 2016-02-13 17:17:56 -05:00
Jason Cox
fee9a526e1 Code for moving arms... boring 2016-02-13 16:47:57 -05:00
Aidan Ferguson
0644b08316 removed a redundant if statement because I'm a doofus. 2016-02-13 16:46:09 -05:00
Jason Cox
19ed530a85 Initial Arm stuff 2016-02-13 16:44:57 -05:00
Aidan Ferguson
9e14cfd246 enum ShooterState, starts of associated switch, etc. 2016-02-13 16:40:07 -05:00
Jason Cox
21138d6bc6 removed old debug statements 2016-02-13 12:09:08 -05:00
Jason Cox
c649161283 some more bug fixes. 2016-02-13 12:00:28 -05:00
Jason Cox
bf3c89bd6e Now has Sane pickup logic~ 2016-02-13 11:26:07 -05:00
Jason Cox
ae2dfe0047 Fixed some really bad logic in the shooter... 2016-02-13 11:12:20 -05:00
Jason Cox
63f3c48267 Fixed a bunch of logic errors. 2016-02-12 21:17:45 -05:00
Jason Cox
e061b741cb ramp reinstated 2016-02-12 19:37:36 -05:00
Jason
91acd20f7d added SPINUP_TIME define for the shotClock Timer. Adjust the value of this define to wait longer before shooting the ball into the launch wheel.
:
2016-02-11 22:26:11 -05:00
Jason
83cbc89a0f Added comments and info for the shooter logic. I emailed you a flow chart also... 2016-02-11 21:24:32 -05:00
Jason
c083f6cd10 Added a define for DEADZONE_RADIUS and implemented it in the shooter power setting within TeleopPeriodic. 2016-02-11 20:48:03 -05:00
Jason
86e7e2e3be Added comments about the use of the boolean variables in the TeleopPeriodic method 2016-02-11 20:40:41 -05:00
Aidan Ferguson
71b8e5eeff launch spinny does stuff 2016-02-11 17:17:42 -05:00
Aidan Ferguson
9ce495f073 purged the concept of a ramp 2016-02-11 16:51:13 -05:00
Aidan Ferguson
7ac2c9904a Swapped Talon objects for TalonSRX objects. 2016-02-11 16:35:41 -05:00
Aidan Ferguson
6070e534e3 Merge branch 'shooter' of code.dublinschool.org:repos/FRC/FRC2016 into shooter 2016-02-11 16:20:17 -05:00
Aidan Ferguson
08bc03df1c Made shooter_power private instead of global because that actually makes sense. 2016-02-11 16:18:58 -05:00
Dieter Brehm
323627dbb7 Changed todo to reflect lack of ramp. 2016-02-10 21:24:35 -05:00
Aidan Ferguson
91124a0ff0 more of LogData(). still not done, but I'm tired. 2016-02-10 21:19:18 -05:00
Aidan Ferguson
8039c16b70 Lots of includes (for real this time) and a LogData() embryo 2016-02-10 20:43:45 -05:00
Aidan Ferguson
4a6b8c74fa Lots of includes and a LogData() embryo 2016-02-10 20:43:09 -05:00
Aidan Ferguson
f5e438f15f raised PICKUP_POWER to 0.8 2016-02-10 20:13:33 -05:00
Aidan Ferguson
d171b3c8d2 placeholder for encoder code in Shooter.h 2016-02-10 19:55:20 -05:00
Aidan Ferguson
2fa9ebf254 Switched the shooter controller addresses to reflect reality. 2016-02-10 19:11:51 -05:00
Aidan Ferguson
38c09abe08 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
fac8abd43e impotent debug code! 2016-02-10 15:23:07 -05:00
Aidan Ferguson
2abec47ce0 bugfix, debug code for encoder. 2016-02-10 14:56:58 -05:00
Aidan Ferguson
f240caf121 missed an instance of the counter 2016-02-10 14:48:39 -05:00
Aidan Ferguson
f29e218345 removed counter object in preparation for encoder over cantalon 2016-02-10 14:42:20 -05:00
Aidan Ferguson
2e196a8fab 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
fc1e9f3803 Formatting fix 2016-02-09 19:47:17 -05:00
Jason Cox
4488d771b4 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
71bdaab9bb Added some comments and sanity to the new robot project. 2016-02-09 17:22:17 -05:00
Jason
01c462c0c6 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