7634ea77f5Merge branch 'logging' into release
dkbug
2016-02-27 13:26:00 -0500
a937e84eaeno more settings
dkbug
2016-02-27 13:25:33 -0500
d90d6b9a79Merge branch 'shooter' into release
dkbug
2016-02-27 13:24:39 -0500
a42226c489Merge branch 'master' of code.dublinschool.org:repos/FRC/FRC2016
Jason Cox
2016-02-27 13:06:46 -0500
d0ef743af7Merge branch 'master' into logging
john sandstedt
2016-02-26 17:12:09 -0500
5e26cc78aeCox wanted TURN_FACTOR upped. He gets what he wants.
Aidan Ferguson
2016-02-26 17:06:28 -0500
8a30acf1b7merged DriveBase into master
Aidan Ferguson
2016-02-26 16:46:50 -0500
fb8087f6f5logging code might have been merged with master
john sandstedt
2016-02-26 16:20:37 -0500
5cc26334acsomething halled
Jason Cox
2016-02-23 17:39:21 -0500
fa5ed36025Forgot to initialize arcade
Aidan Ferguson
2016-02-22 21:26:11 -0500
2f010032dauntested tweaks: different TURN_FACTOR, buttons toggle between piecewise and arcade drive
Aidan Ferguson
2016-02-22 21:19:51 -0500
efbe261750potato... also maybe fixed driverstation::GetInstance() again potentially
john sandstedt
2016-02-22 19:13:09 -0500
420a5723a7logging code... fixed the error initializing the DriverStation Object potentially, and fixed a few of the syntax errors '
john sandstedt
2016-02-22 19:04:27 -0500
5153aaa161Added a defined TURN_FACTOR for easily testing variations of the SimpleDrive method
Jason Cox
2016-02-21 20:50:24 -0500
53e12c5051slowed down the arms
Jason Cox
2016-02-20 18:34:55 -0500
d61fdffc3dMore Tweaking
Jason Cox
2016-02-20 18:32:40 -0500
1e9af3ce6dTweaking pickup
Jason Cox
2016-02-20 18:15:28 -0500
ae402ff1ceinvert the driving
dkbug
2016-02-20 17:12:23 -0500
868f9f0a27fixed some git conflicts
dkbug
2016-02-20 17:01:51 -0500
6caf8c0965make ramp more sensitive.
dkbug
2016-02-20 16:53:38 -0500
d9142146dcMerged
Jason Cox
2016-02-20 16:48:00 -0500
4044f448d7Actually sane now. Really, I mean it. ...although the turning circle is somewhat ... elephantine ...
Aidan Ferguson
2016-02-20 16:47:00 -0500
c32e95768cDriving is more sane now.
dkbug
2016-02-20 16:22:05 -0500
a57a9c7611fixed a stupid logic error
dkbug
2016-02-20 16:07:26 -0500
a983987fa2Spelling is the foundation upon which our society stands.
Aidan Ferguson
2016-02-20 13:30:42 -0500
11d90f4557debug code to tell what the H-E-double-hockey-sticks the int the encoder returns is doing.
Aidan Ferguson
2016-02-20 13:28:56 -0500
5217a7fcd5merged master into shooter
Aidan Ferguson
2016-02-19 15:55:13 -0500
91e91369b8Sane code for the Demo
Jason Cox
2016-02-19 15:48:18 -0500
bfea1eb3edUpdated for simpler picewise function.
Aidan Ferguson
2016-02-19 15:47:52 -0500
b65b7e5cc8Well, ... it's a rough draft, but it SHOULD match the behavior requested.
Aidan Ferguson
2016-02-17 16:39:08 -0500
0f1004bc8bauto raising ramp test
Jason Cox
2016-02-17 15:28:33 -0500
e0265bb516It now only twists when the thumb button is pressed and I added the beginnings of an UpdateDrive method.
Aidan Ferguson
2016-02-17 15:22:32 -0500
4fe84f0017Added check on limit switches to prevent uneccessary motor power setting on the RAMP
Jason Cox
2016-02-17 15:22:25 -0500
86e6a1b33cMerge branch 'arms' of code.dublinschool.org:repos/FRC/FRC2016 into arms
Jason Cox
2016-02-13 17:17:56 -0500
57fb961f22Code for moving arms... boring
Jason Cox
2016-02-13 16:47:57 -0500
38eb49a964removed a redundant if statement because I'm a doofus.
Aidan Ferguson
2016-02-13 16:46:09 -0500
bf184ca305Initial Arm stuff
Jason Cox
2016-02-13 16:44:57 -0500
e6934c9117enum ShooterState, starts of associated switch, etc.
Aidan Ferguson
2016-02-13 16:40:07 -0500
71e2ec4ebaremoved old debug statements
Jason Cox
2016-02-13 12:09:08 -0500
c3a621a5c4some more bug fixes.
Jason Cox
2016-02-13 12:00:28 -0500
eccd90ea8aNow has Sane pickup logic~
Jason Cox
2016-02-13 11:26:07 -0500
2ad0f975b3Fixed some really bad logic in the shooter...
Jason Cox
2016-02-13 11:12:20 -0500
99d2397f9bFixed a bunch of logic errors.
Jason Cox
2016-02-12 21:17:45 -0500
deef7fcf20ramp reinstated
Jason Cox
2016-02-12 19:37:36 -0500
3c3d14f01badded SPINUP_TIME define for the shotClock Timer. Adjust the value of this define to wait longer before shooting the ball into the launch wheel.
Jason
2016-02-11 22:26:11 -0500
5211275da5Added comments and info for the shooter logic. I emailed you a flow chart also...
Jason
2016-02-11 21:24:32 -0500
b4bbdf092bAdded a define for DEADZONE_RADIUS and implemented it in the shooter power setting within TeleopPeriodic.
Jason
2016-02-11 20:48:03 -0500
a51cdfcb07Added comments about the use of the boolean variables in the TeleopPeriodic method
Jason
2016-02-11 20:40:41 -0500
7b6b6f3397launch spinny does stuff
Aidan Ferguson
2016-02-11 17:17:42 -0500
8c91ac34dbpurged the concept of a ramp
Aidan Ferguson
2016-02-11 16:51:13 -0500
0fdb206098Swapped Talon objects for TalonSRX objects.
Aidan Ferguson
2016-02-11 16:35:41 -0500
21f26a8907Merge branch 'shooter' of code.dublinschool.org:repos/FRC/FRC2016 into shooter
Aidan Ferguson
2016-02-11 16:20:17 -0500
eee7649da7Made shooter_power private instead of global because that actually makes sense.
Aidan Ferguson
2016-02-11 16:18:58 -0500
99fb8c19e6Changed todo to reflect lack of ramp.
Dieter Brehm
2016-02-10 21:24:35 -0500
35cd776a48more of LogData(). still not done, but I'm tired.
Aidan Ferguson
2016-02-10 21:19:18 -0500
3be566a2beLots of includes (for real this time) and a LogData() embryo
Aidan Ferguson
2016-02-10 20:43:45 -0500
9ae56635ceLots of includes and a LogData() embryo
Aidan Ferguson
2016-02-10 20:43:09 -0500
ffb9d1a637fixed meaningless conflicts because I totally know how to manage my time.
Aidan Ferguson
2016-02-10 20:17:55 -0500
2534f700f1raised PICKUP_POWER to 0.8
Aidan Ferguson
2016-02-10 20:13:33 -0500
c36024a86dplaceholder for encoder code in Shooter.h
Aidan Ferguson
2016-02-10 19:55:20 -0500
Adam Goldsmith
Aidan Ferguson