adam
/
FRC2016
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
106 Commits 4 Branches 0 Tags 112 KiB
Commit Graph

106 Commits

Author SHA1 Message Date
Adam Goldsmith 165507277e Merge branch 'release' 2016-03-15 21:37:56 -04:00
Adam Goldsmith d115ea3782 Add gimble control code 
Untested, but did previously work
 2016-03-10 09:04:45 -05:00
Adam Goldsmith 3d076984f5 Remove extra call to ArcadeDrive that snuck back in 2016-03-10 08:58:55 -05:00
Adam Goldsmith 09cbe471a9 Actually use the autonomous chooser 2016-03-09 19:11:28 -05:00
Adam Goldsmith 623a4022ae Switch Limit checking code 2016-03-06 10:11:44 -05:00
Adam Goldsmith 5cf6d6ed36 Switch arms movement from buttons to operator_stick Y axis 2016-03-05 16:43:40 -05:00
Adam Goldsmith 5d85047728 Change drivePower to 1, driveTime to 3 (seconds) 2016-03-05 15:55:20 -05:00
Adam Goldsmith 9c3a89684c Add real TestPeriodic 2016-03-05 15:55:07 -05:00
Adam Goldsmith 8ac21a9058 Add Limits to SmartDashboard 2016-03-05 14:16:42 -05:00
Adam Goldsmith af2ba558f1 Basic auto mode 2016-03-05 14:16:28 -05:00
Adam Goldsmith 609f96e15d Update hostname in Makefile, make it slightly more verbose 2016-03-05 13:43:43 -05:00
Aidan Ferguson cc99328dec 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 a09be7343a changed ramp power 2016-03-05 10:31:25 -05:00
Adam Goldsmith 56f043bcd0 Fix public and private placement 
Also fix using LogCSVData and UpdateDrive before they are declared
 2016-03-05 01:52:40 -05:00
Adam Goldsmith 7422635b49 Remove unused code and generic comment 2016-03-05 01:51:16 -05:00
Adam Goldsmith fbf547f536 Simplify Makefile and correct for new file name 2016-03-05 01:51:06 -05:00
Adam Goldsmith 234753f050 Remove old files, add some to .gitignore, move Makefile 2016-03-05 01:25:21 -05:00
Aidan Ferguson 5db889090c TYPOS 2016-02-27 14:30:47 -05:00
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
Jason Cox b88e1c48db Merge branch 'master' of code.dublinschool.org:repos/FRC/FRC2016 2016-02-27 13:06:46 -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
Jason Cox 5e7a390bd4 something halled 2016-02-23 17:39:21 -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 99175b1bfb slowed down the arms 2016-02-20 18:34:55 -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