Jason Cox
|
4d13792643
|
Tweaking pickup
|
2016-02-20 18:15:28 -05:00 |
|
dkbug
|
bff46f5476
|
fixed some git conflicts
|
2016-02-20 17:01:51 -05:00 |
|
dkbug
|
e92e036a5c
|
Merge branch 'arms'
# Conflicts:
# Robot2016/src/Robot.cpp
# Robot2016/src/Shooter.h
|
2016-02-20 16:56:51 -05:00 |
|
dkbug
|
d0ebd066cb
|
make ramp more sensitive.
|
2016-02-20 16:53:38 -05:00 |
|
Jason Cox
|
7b4dc9cb71
|
Merged
|
2016-02-20 16:48:00 -05:00 |
|
Aidan Ferguson
|
98fa52cf26
|
-launch_spinny
+ramp
|
2016-02-20 15:14:51 -05:00 |
|
john sandstedt
|
bcae44fdb1
|
added ramp status to the smartdashboard
|
2016-02-20 14:27:43 -05:00 |
|
Jason Cox
|
6b3bcbe38d
|
Sane code for the Demo
|
2016-02-19 15:48:18 -05:00 |
|
Aidan Ferguson
|
043707478d
|
fixed a typo
|
2016-02-15 20:14:48 -05:00 |
|
Aidan Ferguson
|
dedcbe4bf7
|
Finished shooter switch.
|
2016-02-15 15:14:20 -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
|
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
|
91acd20f7d
|
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
|
83cbc89a0f
|
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
|
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 |
|
Dieter Brehm
|
323627dbb7
|
Changed todo to reflect lack of ramp.
|
2016-02-10 21:24:35 -05:00 |
|
Aidan Ferguson
|
f5e438f15f
|
raised PICKUP_POWER to 0.8
|
2016-02-10 20:13:33 -05:00 |
|
Aidan Ferguson
|
d171b3c8d2
|
placeholder for encoder code in Shooter.h
|
2016-02-10 19:55:20 -05:00 |
|
Aidan Ferguson
|
fac8abd43e
|
impotent debug code!
|
2016-02-10 15:23:07 -05:00 |
|
Aidan Ferguson
|
f29e218345
|
removed counter object in preparation for encoder over cantalon
|
2016-02-10 14:42:20 -05:00 |
|
Aidan Ferguson
|
2e196a8fab
|
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
|
4488d771b4
|
Added some more sane code that has no effect because it only calls empty methods.
|
2016-02-09 17:27:58 -05:00 |
|
Jason
|
01c462c0c6
|
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 |
|