Commit Graph

94 Commits

Author SHA1 Message Date
1c51dc6e41 Basic auto mode 2016-03-05 14:16:28 -05:00
07b2b64f3d Update hostname in Makefile, make it slightly more verbose 2016-03-05 13:43:43 -05:00
Aidan Ferguson
159d6183cf Merge branch 'cleanup' of git://10.17.86.101/home/adam/Programs/FRC2016/ into cleanup 2016-03-05 12:26:58 -05:00
Aidan Ferguson
7f734dbb57 changed ramp power 2016-03-05 10:31:25 -05:00
e819c4a73c Fix public and private placement
Also fix using LogCSVData and UpdateDrive before they are declared
2016-03-05 01:52:40 -05:00
3bf7d756a2 Remove unused code and generic comment 2016-03-05 01:51:16 -05:00
b7a28ce29c Simplify Makefile and correct for new file name 2016-03-05 01:51:06 -05:00
1ade41bf50 Remove old files, add some to .gitignore, move Makefile 2016-03-05 01:25:21 -05:00
Aidan Ferguson
0ed78e6902 TYPOS 2016-02-27 14:30:47 -05:00
Aidan Ferguson
a40be9e589 fixed typo 2016-02-27 13:29:41 -05:00
dkbug
7634ea77f5 Merge branch 'logging' into release 2016-02-27 13:26:00 -05:00
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
john sandstedt
d0ef743af7 Merge branch 'master' into logging 2016-02-26 17:12:09 -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
john sandstedt
fb8087f6f5 logging code might have been merged with master 2016-02-26 16:20:37 -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
john sandstedt
efbe261750 potato... also maybe fixed driverstation::GetInstance() again potentially 2016-02-22 19:13:09 -05:00
john sandstedt
420a5723a7 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
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
john sandstedt
4eb4ccb188 adam style csv logging code 2016-02-20 15:22:53 -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