john sandstedt
|
9407b57429
|
Merge branch 'master' into logging
|
2016-02-26 17:12:09 -05:00 |
|
Aidan Ferguson
|
ae5a32a176
|
merged DriveBase into master
|
2016-02-26 16:46:50 -05:00 |
|
john sandstedt
|
4dff0d765d
|
logging code might have been merged with master
|
2016-02-26 16:20:37 -05:00 |
|
Aidan Ferguson
|
a7a0574fba
|
Forgot to initialize arcade
|
2016-02-22 21:26:11 -05:00 |
|
Aidan Ferguson
|
2a0a5095a8
|
untested tweaks: different TURN_FACTOR, buttons toggle between piecewise and arcade drive
|
2016-02-22 21:19:51 -05:00 |
|
john sandstedt
|
3475afb664
|
potato... also maybe fixed driverstation::GetInstance() again potentially
|
2016-02-22 19:13:09 -05:00 |
|
john sandstedt
|
9d2e8f3675
|
logging code... fixed the error initializing the DriverStation Object potentially, and fixed a few of the syntax errors
'
|
2016-02-22 19:04:27 -05:00 |
|
Jason Cox
|
46e5a428b1
|
Added a defined TURN_FACTOR for easily testing variations of the SimpleDrive method
|
2016-02-21 20:50:24 -05:00 |
|
Jason Cox
|
62819bc05c
|
More Tweaking
|
2016-02-20 18:32:40 -05:00 |
|
Jason Cox
|
4d13792643
|
Tweaking pickup
|
2016-02-20 18:15:28 -05:00 |
|
dkbug
|
d914ecf5e0
|
invert the driving
|
2016-02-20 17:12:23 -05:00 |
|
dkbug
|
e92e036a5c
|
Merge branch 'arms'
# Conflicts:
# Robot2016/src/Robot.cpp
# Robot2016/src/Shooter.h
|
2016-02-20 16:56:51 -05:00 |
|
Aidan Ferguson
|
91831a1326
|
Actually sane now. Really, I mean it. ...although the turning circle is somewhat ... elephantine ...
|
2016-02-20 16:47:00 -05:00 |
|
dkbug
|
d0dad2237c
|
Driving is more sane now.
|
2016-02-20 16:22:05 -05:00 |
|
john sandstedt
|
70fd1304a2
|
adam style csv logging code
|
2016-02-20 15:22:53 -05:00 |
|
Aidan Ferguson
|
98fa52cf26
|
-launch_spinny
+ramp
|
2016-02-20 15:14:51 -05:00 |
|
Aidan Ferguson
|
37458e6d5c
|
Spelling is the foundation upon which our society stands.
|
2016-02-20 13:30:42 -05:00 |
|
Aidan Ferguson
|
bbcd3ed494
|
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
|
39d7ff7c4d
|
merged master into shooter
|
2016-02-19 15:55:13 -05:00 |
|
Jason Cox
|
6b3bcbe38d
|
Sane code for the Demo
|
2016-02-19 15:48:18 -05:00 |
|
Aidan Ferguson
|
5b47a61a78
|
Updated for simpler picewise function.
|
2016-02-19 15:47:52 -05:00 |
|
Aidan Ferguson
|
4392dd348e
|
Well, ... it's a rough draft, but it SHOULD match the behavior requested.
|
2016-02-17 16:39:08 -05:00 |
|
Aidan Ferguson
|
5710edfadd
|
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
|
439cf34a70
|
whitespace bad!
|
2016-02-15 21:11:45 -05:00 |
|
Aidan Ferguson
|
17bd06f9c2
|
Merge branch 'shooter'
|
2016-02-15 20:15:07 -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
|
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
|
08bc03df1c
|
Made shooter_power private instead of global because that actually makes sense.
|
2016-02-11 16:18:58 -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
|
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
|
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 |
|