Commit Graph

85 Commits

Author SHA1 Message Date
Aidan Ferguson
7135c0b27d fixed typo 2016-02-27 13:29:41 -05:00
dkbug
604e96e0c3 Merge branch 'logging' into release 2016-02-27 13:26:00 -05:00
dkbug
6384820aef no more settings 2016-02-27 13:25:33 -05:00
dkbug
2cbfd58934 Merge branch 'shooter' into release
# Conflicts:
#	Robot2016/src/Robot.cpp
#	Robot2016/src/Shooter.h
2016-02-27 13:24:39 -05:00
john sandstedt
9407b57429 Merge branch 'master' into logging 2016-02-26 17:12:09 -05:00
Aidan Ferguson
0187183f46 Cox wanted TURN_FACTOR upped. He gets what he wants. 2016-02-26 17:06:28 -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
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
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
dkbug
de785512d6 fixed a stupid logic error
if ramp is not raising, raise the ramp :P
2016-02-20 16:07:26 -05:00
dkbug
cca8a07f68 button mis-choice. 2016-02-20 16:02:05 -05:00
dkbug
220862a63e added good ramp code 2016-02-20 15:45:47 -05:00
dkbug
d6d7a52a6a Merge branch 'master' into shooter
# Conflicts:
#	Robot2016/src/Shooter.h
2016-02-20 15:32:14 -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
8f8c64a450 TalonSRX, not Talon 2016-02-20 14:51:59 -05:00
john sandstedt
bcae44fdb1 added ramp status to the smartdashboard 2016-02-20 14:27:43 -05:00
Aidan Ferguson
904a30ab8b vomits ramp current onto console 2016-02-20 14:08:32 -05:00
Aidan Ferguson
8327823bd1 SPELLING 2016-02-20 14:05:56 -05:00
Aidan Ferguson
fea200cca5 SPELLING 2016-02-20 14:05:01 -05:00
Aidan Ferguson
3584fc4634 untested one-touch shooting 2016-02-20 13:58:35 -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
Jason Cox
139ae70b1b auto raising ramp test 2016-02-17 15:28:33 -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
Jason Cox
9ac893271f Added check on limit switches to prevent uneccessary motor power setting on the RAMP 2016-02-17 15:22:25 -05:00
Aidan Ferguson
439cf34a70 whitespace bad! 2016-02-15 21:11:45 -05:00
Aidan Ferguson
1938d4b935 tweaks - untested 2016-02-15 20:54:20 -05:00
Aidan Ferguson
17bd06f9c2 Merge branch 'shooter' 2016-02-15 20:15:07 -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
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