Commit Graph

53 Commits

Author SHA1 Message Date
Keenan D. Buckley 8cb9292bee Update LICENSE so FIRST doesn't sue us 2020-02-17 10:50:20 -07:00
Keenan D. Buckley 46ca69f2fa Merge branch 'develop' 2019-02-18 15:56:24 -07:00
Keenan D. Buckley a6c4c5bdbc Clear Master 2019-02-18 15:51:20 -07:00
lukesta182 0ee6755097 Climber Quickfix 2019-02-18 13:19:22 -07:00
Keenan D. Buckley 49f10c4725 Merge pull request #12 from Team4388/smartdash-update
Update SmartDashboard
2019-02-18 11:34:57 -07:00
Keenan D. Buckley f09bf2d2da Update SmartDashboard
- Added functionallity needed for Unity Code

Co-Authored-By: ryan123rudder <ryan123rudder@users.noreply.github.com>
2019-02-18 09:24:22 -07:00
Keenan D. Buckley 3e2d8f4169 Merge branch 'arm-merge' into develop 2019-02-17 16:26:49 -07:00
lukesta182 2f8480b56e added in robot init stuff 2019-02-17 16:21:58 -07:00
lukesta182 5bf04716bb chanmged varables 2019-02-17 14:40:17 -07:00
lukesta182 a0bbd82051 added in wrist and last pnumatics pid dosent work yet, talk with maya 2019-02-17 13:34:16 -07:00
Keenan D. Buckley de0249018b Change Climber to be Manual 2019-02-17 13:09:41 -07:00
Keenan D. Buckley 39b0d94b19 Delete Initiate Climber 2019-02-17 12:39:52 -07:00
Keenan D. Buckley b32a060093 Climber Adjustments 2019-02-17 12:35:09 -07:00
lukesta182 6fdaa28e3c added arm functionality
arm works on manuel, pid needs work
2019-02-16 20:50:21 -07:00
Keenan D. Buckley 89c3489f79 Add button to lift both intakes 2019-02-16 20:47:58 -07:00
Keenan D. Buckley f1cff88862 Test Climber and Reprogram to Fix Bugs 2019-02-16 19:42:25 -07:00
Keenan D. Buckley eddd8468c3 Add a climber retract to mapped to the left driver trigger 2019-02-16 18:25:50 -07:00
Keenan D. Buckley d7307d4a95 Fix Climber Code Logic 2019-02-16 18:01:53 -07:00
lukesta182 1381a6504c added in parent code structure
utility and drive changes, removed elevator, 2019 code worked on lukes computer, modeled off of parent code
2019-02-16 17:14:32 -07:00
Keenan D. Buckley 9bca7665ce Disable Climber
For now until it works
2019-02-16 16:26:34 -07:00
Keenan D. Buckley 500faccd3d Fix rachetFlip 2019-02-16 16:26:06 -07:00
Keenan D. Buckley dde0cdf4fa Merge branch 'climber-merge' into develop 2019-02-16 15:06:50 -07:00
Keenan D. Buckley fac3d58db9 Fix Syntax Error in Climber.java 2019-02-16 14:54:55 -07:00
lukesta182 97e599da3e added in ball intake motor and pnumatics 2019-02-16 14:44:47 -07:00
Keenan D. Buckley 259b7495e7 Add in missed Climber.java from last commit
Co-Authored-By: ryan123rudder <ryan123rudder@users.noreply.github.com>
2019-02-16 13:26:23 -07:00
Keenan D. Buckley 979a957f1f Merge in Climber Code
Co-Authored-By: ryan123rudder <ryan123rudder@users.noreply.github.com>
2019-02-16 13:16:51 -07:00
lukesta182 b02c9b2cb1 integration started with pnumatic intakes
drive dreain and ball and hatch intake
2019-02-16 12:15:53 -07:00
Keenan D. Buckley 67f4b8bece Merge pull request #4 from Team4388/fix-dependencies
Remove Pathfinder Dependency
2019-01-28 19:02:30 -07:00
Keenan D. Buckley bd104642aa Remove pathfinder dependency 2019-01-28 19:00:51 -07:00
Keenan D. Buckley 344e055e70 Merge pull request #3 from Team4388/Arm
Arm
2019-01-22 16:24:53 -07:00
mayabartels c6700a3560 Changed more Elevator to arm 2019-01-22 14:46:56 -08:00
mayabartels f364065fec Saved from last change 2019-01-21 14:49:23 -08:00
mayabartels 5fbc5c78df Changed Arm to arm
Note: Not done editing
2019-01-21 14:48:55 -08:00
Daniel Williams 733557ecaf Arm Fix 2019-01-21 15:06:55 -07:00
mayabartels d7d7a13d4e Edit Arm to ARM in Encoder code 2019-01-21 13:58:57 -08:00
Daniel Williams 337bfa1778 Changed all Elevators to Arms 2019-01-21 14:57:43 -07:00
Daniel Williams e8ed8886f6 Merge branch 'Arm' of https://github.com/Team4388/2019-Hit-or-Miss into Arm 2019-01-21 14:26:03 -07:00
mayabartels 0888637bb2 Merge branch 'Arm' of https://github.com/Team4388/2019-Hit-or-Miss into Arm 2019-01-21 13:23:22 -08:00
Luke Staudacher c8c3c1489a Revert "Create fsdf.code-workspace"
This reverts commit cf9bde39eb.
2019-01-21 14:23:00 -07:00
mayabartels b247af6d4f Renamed Elevator Subsystem to Arm Subsystem 2019-01-21 13:19:39 -08:00
Luke Staudacher cf9bde39eb Create fsdf.code-workspace 2019-01-21 14:17:14 -07:00
mayabartels 80d52fc209 Edited Robot Map for Arm
Changed Elevator motor IDs to say Arm motor IDs
2019-01-21 13:14:56 -08:00
Fred18295 120b7ff5b8 eliot changes 2019-01-19 13:19:49 -07:00
Evan Lanham f749752b45 Partial Conversion
Changed motors to SparkMax, encoded both drive-trains, and defined all four motors.
Set the second left/right drive to follow the leader
2019-01-19 10:12:07 -08:00
CW 3615e5c257 fix so it will build - cw
Please enter the commit message for your changes. Lines starting
2019-01-18 17:52:34 -07:00
lukesta182 caa182fa28 initial commit
hitormiss
2019-01-14 19:51:11 -07:00
Keenan D. Buckley 3f0943acd7 Merge pull request #2 from Team4388/revert
Revert "Update README.md"
2019-01-14 18:58:17 -07:00
lukesta182 a1b854e698 Revert "Update README.md"
This reverts commit 4d25f24496.
2019-01-14 18:55:00 -07:00
lukesta182 4d25f24496 Update README.md 2019-01-14 18:51:04 -07:00
Keenan D. Buckley 147c493080 Merge pull request #1 from Team4388/youve-got-a-boyfriend
Update README.md
2019-01-14 17:55:53 -07:00