dkbug
|
a937e84eae
|
no more settings
|
2016-02-27 13:25:33 -05:00 |
|
dkbug
|
d90d6b9a79
|
Merge branch 'shooter' into release
# Conflicts:
# Robot2016/src/Robot.cpp
# Robot2016/src/Shooter.h
|
2016-02-27 13:24:39 -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 |
|
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
|
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 |
|
dkbug
|
a57a9c7611
|
fixed a stupid logic error
if ramp is not raising, raise the ramp :P
|
2016-02-20 16:07:26 -05:00 |
|
dkbug
|
7ec489f846
|
button mis-choice.
|
2016-02-20 16:02:05 -05:00 |
|
dkbug
|
ce69ef14b6
|
added good ramp code
|
2016-02-20 15:45:47 -05:00 |
|
dkbug
|
52ecff29e8
|
Merge branch 'master' into shooter
# Conflicts:
# Robot2016/src/Shooter.h
|
2016-02-20 15:32:14 -05:00 |
|
Aidan Ferguson
|
a786907f72
|
-launch_spinny
+ramp
|
2016-02-20 15:14:51 -05:00 |
|
Aidan Ferguson
|
f8b90aaa73
|
TalonSRX, not Talon
|
2016-02-20 14:51:59 -05:00 |
|
john sandstedt
|
4755bf7c46
|
added ramp status to the smartdashboard
|
2016-02-20 14:27:43 -05:00 |
|
Aidan Ferguson
|
e34f59b5ca
|
vomits ramp current onto console
|
2016-02-20 14:08:32 -05:00 |
|
Aidan Ferguson
|
485945986b
|
SPELLING
|
2016-02-20 14:05:56 -05:00 |
|
Aidan Ferguson
|
f5bdcf7553
|
SPELLING
|
2016-02-20 14:05:01 -05:00 |
|
Aidan Ferguson
|
0c67d00109
|
untested one-touch shooting
|
2016-02-20 13:58:35 -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 |
|
Jason Cox
|
0f1004bc8b
|
auto raising ramp test
|
2016-02-17 15:28:33 -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 |
|
Jason Cox
|
4fe84f0017
|
Added check on limit switches to prevent uneccessary motor power setting on the RAMP
|
2016-02-17 15:22:25 -05:00 |
|
Aidan Ferguson
|
95cdac514d
|
whitespace bad!
|
2016-02-15 21:11:45 -05:00 |
|
Aidan Ferguson
|
1f09e12f2d
|
tweaks - untested
|
2016-02-15 20:54:20 -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 |
|