Commit Graph

36 Commits

Author SHA1 Message Date
Jason Cox 1e9af3ce6d Tweaking pickup 2016-02-20 18:15:28 -05:00
dkbug ae402ff1ce invert the driving 2016-02-20 17:12:23 -05:00
dkbug 2bb3baeb05 Merge branch 'arms'
# Conflicts:
#	Robot2016/src/Robot.cpp
#	Robot2016/src/Shooter.h
2016-02-20 16:56:51 -05:00
Aidan Ferguson a786907f72 -launch_spinny
+ramp
2016-02-20 15:14:51 -05:00
Aidan Ferguson a983987fa2 Spelling is the foundation upon which our society stands. 2016-02-20 13:30:42 -05:00
Aidan Ferguson 11d90f4557 debug code to tell what the H-E-double-hockey-sticks the int the encoder returns is doing. 2016-02-20 13:28:56 -05:00
Jason Cox 91e91369b8 Sane code for the Demo 2016-02-19 15:48:18 -05:00
Aidan Ferguson deb31d3f0a Merge branch 'shooter' 2016-02-15 20:15:07 -05:00
Jason Cox 86e6a1b33c Merge branch 'arms' of code.dublinschool.org:repos/FRC/FRC2016 into arms 2016-02-13 17:17:56 -05:00
Jason Cox 57fb961f22 Code for moving arms... boring 2016-02-13 16:47:57 -05:00
Aidan Ferguson 38eb49a964 removed a redundant if statement because I'm a doofus. 2016-02-13 16:46:09 -05:00
Jason Cox bf184ca305 Initial Arm stuff 2016-02-13 16:44:57 -05:00
Aidan Ferguson e6934c9117 enum ShooterState, starts of associated switch, etc. 2016-02-13 16:40:07 -05:00
Jason Cox 71e2ec4eba removed old debug statements 2016-02-13 12:09:08 -05:00
Jason Cox c3a621a5c4 some more bug fixes. 2016-02-13 12:00:28 -05:00
Jason Cox eccd90ea8a Now has Sane pickup logic~ 2016-02-13 11:26:07 -05:00
Jason Cox 2ad0f975b3 Fixed some really bad logic in the shooter... 2016-02-13 11:12:20 -05:00
Jason Cox 99d2397f9b Fixed a bunch of logic errors. 2016-02-12 21:17:45 -05:00
Jason Cox deef7fcf20 ramp reinstated 2016-02-12 19:37:36 -05:00
Jason 5211275da5 Added comments and info for the shooter logic. I emailed you a flow chart also... 2016-02-11 21:24:32 -05:00
Jason b4bbdf092b 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 a51cdfcb07 Added comments about the use of the boolean variables in the TeleopPeriodic method 2016-02-11 20:40:41 -05:00
Aidan Ferguson 7b6b6f3397 launch spinny does stuff 2016-02-11 17:17:42 -05:00
Aidan Ferguson 8c91ac34db purged the concept of a ramp 2016-02-11 16:51:13 -05:00
Aidan Ferguson 0fdb206098 Swapped Talon objects for TalonSRX objects. 2016-02-11 16:35:41 -05:00
Aidan Ferguson eee7649da7 Made shooter_power private instead of global because that actually makes sense. 2016-02-11 16:18:58 -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 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 0a5d0bf84d Formatting fix 2016-02-09 19:47:17 -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 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