Commit Graph

64 Commits

Author SHA1 Message Date
Jason Cox
a42226c489 Merge branch 'master' of code.dublinschool.org:repos/FRC/FRC2016 2016-02-27 13:06:46 -05:00
Aidan Ferguson
5e26cc78ae Cox wanted TURN_FACTOR upped. He gets what he wants. 2016-02-26 17:06:28 -05:00
Aidan Ferguson
8a30acf1b7 merged DriveBase into master 2016-02-26 16:46:50 -05:00
Jason Cox
5cc26334ac something halled 2016-02-23 17:39:21 -05:00
Aidan Ferguson
fa5ed36025 Forgot to initialize arcade 2016-02-22 21:26:11 -05:00
Aidan Ferguson
2f010032da untested tweaks: different TURN_FACTOR, buttons toggle between piecewise and arcade drive 2016-02-22 21:19:51 -05:00
Jason Cox
5153aaa161 Added a defined TURN_FACTOR for easily testing variations of the SimpleDrive method 2016-02-21 20:50:24 -05:00
Jason Cox
53e12c5051 slowed down the arms 2016-02-20 18:34:55 -05:00
Jason Cox
d61fdffc3d More Tweaking 2016-02-20 18:32:40 -05:00
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
868f9f0a27 fixed some git conflicts 2016-02-20 17:01:51 -05:00
dkbug
2bb3baeb05 Merge branch 'arms'
# Conflicts:
#	Robot2016/src/Robot.cpp
#	Robot2016/src/Shooter.h
2016-02-20 16:56:51 -05:00
dkbug
6caf8c0965 make ramp more sensitive. 2016-02-20 16:53:38 -05:00
Jason Cox
d9142146dc Merged 2016-02-20 16:48:00 -05:00
Aidan Ferguson
4044f448d7 Actually sane now. Really, I mean it. ...although the turning circle is somewhat ... elephantine ... 2016-02-20 16:47:00 -05:00
dkbug
c32e95768c Driving is more sane now. 2016-02-20 16:22:05 -05:00
Aidan Ferguson
a786907f72 -launch_spinny
+ramp
2016-02-20 15:14:51 -05:00
john sandstedt
4755bf7c46 added ramp status to the smartdashboard 2016-02-20 14:27:43 -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
Aidan Ferguson
5217a7fcd5 merged master into shooter 2016-02-19 15:55:13 -05:00
Jason Cox
91e91369b8 Sane code for the Demo 2016-02-19 15:48:18 -05:00
Aidan Ferguson
bfea1eb3ed Updated for simpler picewise function. 2016-02-19 15:47:52 -05:00
Aidan Ferguson
b65b7e5cc8 Well, ... it's a rough draft, but it SHOULD match the behavior requested. 2016-02-17 16:39:08 -05:00
Aidan Ferguson
e0265bb516 It now only twists when the thumb button is pressed and I added the beginnings of an UpdateDrive method. 2016-02-17 15:22:32 -05:00
Aidan Ferguson
95cdac514d whitespace bad! 2016-02-15 21:11:45 -05:00
Aidan Ferguson
deb31d3f0a Merge branch 'shooter' 2016-02-15 20:15:07 -05:00
Aidan Ferguson
1b681a3610 fixed a typo 2016-02-15 20:14:48 -05:00
Aidan Ferguson
5bbbf1717e Finished shooter switch. 2016-02-15 15:14:20 -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
3c3d14f01b 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
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
21f26a8907 Merge branch 'shooter' of code.dublinschool.org:repos/FRC/FRC2016 into shooter 2016-02-11 16:20:17 -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