Aidan Ferguson
|
7f734dbb57
|
changed ramp power
|
2016-03-05 10:31:25 -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 |
|
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
|
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 |
|
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 |
|
john sandstedt
|
4755bf7c46
|
added ramp status to the smartdashboard
|
2016-02-20 14:27:43 -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 |
|
Jason Cox
|
91e91369b8
|
Sane code for the Demo
|
2016-02-19 15:48:18 -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
|
1f09e12f2d
|
tweaks - untested
|
2016-02-15 20:54:20 -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 |
|
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
|
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 |
|
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 |
|
Dieter Brehm
|
99fb8c19e6
|
Changed todo to reflect lack of ramp.
|
2016-02-10 21:24:35 -05:00 |
|
Aidan Ferguson
|
2534f700f1
|
raised PICKUP_POWER to 0.8
|
2016-02-10 20:13:33 -05:00 |
|
Aidan Ferguson
|
c36024a86d
|
placeholder for encoder code in Shooter.h
|
2016-02-10 19:55:20 -05:00 |
|
Aidan Ferguson
|
470a4b6f4b
|
impotent debug code!
|
2016-02-10 15:23:07 -05:00 |
|
Aidan Ferguson
|
fb39b56c90
|
removed counter object in preparation for encoder over cantalon
|
2016-02-10 14:42:20 -05:00 |
|
Aidan Ferguson
|
afad5d4660
|
numerous drive changes because of reasons, plus the starts of a counter object that will probably have to be nixed. Not our brightest moment.
|
2016-02-10 13:39:48 -05:00 |
|
Jason Cox
|
9ceafdec80
|
Added some more sane code that has no effect because it only calls empty methods.
|
2016-02-09 17:27:58 -05:00 |
|
Jason
|
6d0e75aa64
|
Added new Robot project using PWM drive train... Much simpler...
Signed-off-by: Jason <jason@dublinschool.org>
|
2016-02-09 16:23:45 -05:00 |