604e96e0c3Merge branch 'logging' into release
dkbug
2016-02-27 13:26:00 -0500
6384820aefno more settings
dkbug
2016-02-27 13:25:33 -0500
2cbfd58934Merge branch 'shooter' into release
dkbug
2016-02-27 13:24:39 -0500
b88e1c48dbMerge branch 'master' of code.dublinschool.org:repos/FRC/FRC2016
Jason Cox
2016-02-27 13:06:46 -0500
9407b57429Merge branch 'master' into logging
john sandstedt
2016-02-26 17:12:09 -0500
0187183f46Cox wanted TURN_FACTOR upped. He gets what he wants.
Aidan Ferguson
2016-02-26 17:06:28 -0500
ae5a32a176merged DriveBase into master
Aidan Ferguson
2016-02-26 16:46:50 -0500
4dff0d765dlogging code might have been merged with master
john sandstedt
2016-02-26 16:20:37 -0500
5e7a390bd4something halled
Jason Cox
2016-02-23 17:39:21 -0500
a7a0574fbaForgot to initialize arcade
Aidan Ferguson
2016-02-22 21:26:11 -0500
2a0a5095a8untested tweaks: different TURN_FACTOR, buttons toggle between piecewise and arcade drive
Aidan Ferguson
2016-02-22 21:19:51 -0500
3475afb664potato... also maybe fixed driverstation::GetInstance() again potentially
john sandstedt
2016-02-22 19:13:09 -0500
9d2e8f3675logging 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
46e5a428b1Added a defined TURN_FACTOR for easily testing variations of the SimpleDrive method
Jason Cox
2016-02-21 20:50:24 -0500
99175b1bfbslowed down the arms
Jason Cox
2016-02-20 18:34:55 -0500
62819bc05cMore Tweaking
Jason Cox
2016-02-20 18:32:40 -0500
4d13792643Tweaking pickup
Jason Cox
2016-02-20 18:15:28 -0500
d914ecf5e0invert the driving
dkbug
2016-02-20 17:12:23 -0500
bff46f5476fixed some git conflicts
dkbug
2016-02-20 17:01:51 -0500
d0ebd066cbmake ramp more sensitive.
dkbug
2016-02-20 16:53:38 -0500
7b4dc9cb71Merged
Jason Cox
2016-02-20 16:48:00 -0500
91831a1326Actually sane now. Really, I mean it. ...although the turning circle is somewhat ... elephantine ...
Aidan Ferguson
2016-02-20 16:47:00 -0500
d0dad2237cDriving is more sane now.
dkbug
2016-02-20 16:22:05 -0500
de785512d6fixed a stupid logic error
dkbug
2016-02-20 16:07:26 -0500
37458e6d5cSpelling is the foundation upon which our society stands.
Aidan Ferguson
2016-02-20 13:30:42 -0500
bbcd3ed494debug 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
39d7ff7c4dmerged master into shooter
Aidan Ferguson
2016-02-19 15:55:13 -0500
6b3bcbe38dSane code for the Demo
Jason Cox
2016-02-19 15:48:18 -0500
5b47a61a78Updated for simpler picewise function.
Aidan Ferguson
2016-02-19 15:47:52 -0500
4392dd348eWell, ... it's a rough draft, but it SHOULD match the behavior requested.
Aidan Ferguson
2016-02-17 16:39:08 -0500
139ae70b1bauto raising ramp test
Jason Cox
2016-02-17 15:28:33 -0500
5710edfaddIt 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
9ac893271fAdded check on limit switches to prevent uneccessary motor power setting on the RAMP
Jason Cox
2016-02-17 15:22:25 -0500
cc7eee8975Merge branch 'arms' of code.dublinschool.org:repos/FRC/FRC2016 into arms
Jason Cox
2016-02-13 17:17:56 -0500
fee9a526e1Code for moving arms... boring
Jason Cox
2016-02-13 16:47:57 -0500
0644b08316removed a redundant if statement because I'm a doofus.
Aidan Ferguson
2016-02-13 16:46:09 -0500
19ed530a85Initial Arm stuff
Jason Cox
2016-02-13 16:44:57 -0500
9e14cfd246enum ShooterState, starts of associated switch, etc.
Aidan Ferguson
2016-02-13 16:40:07 -0500
21138d6bc6removed old debug statements
Jason Cox
2016-02-13 12:09:08 -0500
c649161283some more bug fixes.
Jason Cox
2016-02-13 12:00:28 -0500
bf3c89bd6eNow has Sane pickup logic~
Jason Cox
2016-02-13 11:26:07 -0500
ae2dfe0047Fixed some really bad logic in the shooter...
Jason Cox
2016-02-13 11:12:20 -0500
63f3c48267Fixed a bunch of logic errors.
Jason Cox
2016-02-12 21:17:45 -0500
e061b741cbramp reinstated
Jason Cox
2016-02-12 19:37:36 -0500
91acd20f7dadded 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
83cbc89a0fAdded comments and info for the shooter logic. I emailed you a flow chart also...
Jason
2016-02-11 21:24:32 -0500
c083f6cd10Added a define for DEADZONE_RADIUS and implemented it in the shooter power setting within TeleopPeriodic.
Jason
2016-02-11 20:48:03 -0500
86e7e2e3beAdded comments about the use of the boolean variables in the TeleopPeriodic method
Jason
2016-02-11 20:40:41 -0500
71b8e5eefflaunch spinny does stuff
Aidan Ferguson
2016-02-11 17:17:42 -0500
9ce495f073purged the concept of a ramp
Aidan Ferguson
2016-02-11 16:51:13 -0500
7ac2c9904aSwapped Talon objects for TalonSRX objects.
Aidan Ferguson
2016-02-11 16:35:41 -0500
6070e534e3Merge branch 'shooter' of code.dublinschool.org:repos/FRC/FRC2016 into shooter
Aidan Ferguson
2016-02-11 16:20:17 -0500
08bc03df1cMade shooter_power private instead of global because that actually makes sense.
Aidan Ferguson
2016-02-11 16:18:58 -0500
323627dbb7Changed todo to reflect lack of ramp.
Dieter Brehm
2016-02-10 21:24:35 -0500
91124a0ff0more of LogData(). still not done, but I'm tired.
Aidan Ferguson
2016-02-10 21:19:18 -0500
8039c16b70Lots of includes (for real this time) and a LogData() embryo
Aidan Ferguson
2016-02-10 20:43:45 -0500
4a6b8c74faLots of includes and a LogData() embryo
Aidan Ferguson
2016-02-10 20:43:09 -0500
f5e438f15fraised PICKUP_POWER to 0.8
Aidan Ferguson
2016-02-10 20:13:33 -0500
d171b3c8d2placeholder for encoder code in Shooter.h
Aidan Ferguson
2016-02-10 19:55:20 -0500
2fa9ebf254Switched the shooter controller addresses to reflect reality.
Aidan Ferguson
2016-02-10 19:11:51 -0500
Adam Goldsmith
Aidan Ferguson