Commit Graph

27 Commits

Author SHA1 Message Date
mayabartels fcd28bc782 Minor fixes. Added to wrist
Added function to get angle
2019-01-22 16:47:17 -08:00
mayabartels d9e861e7dc Arm-elevator error fixed 2019-01-22 15:32:10 -08:00
mayabartels 3b3e2dca30 Merge branch 'master' into Wrist 2019-01-22 15:27:32 -08: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
mayabartels eb470a2106 Nothing
Indented but need to create arm branch but can't save
2019-01-21 13:10:46 -08:00
mayabartels f0fdfabc2e Created Wrist Subsystem
Created the wrist subsystem, commented out compile pathfinder in build.gradle. Edited Robot Map by changing carriage to wrist motors
2019-01-21 13:07:41 -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
ryan123rudder b96c2dc388 Remove Mwah 2019-01-14 16:53:59 -08:00
ryan123rudder 2a2e599cea Update README.md 2019-01-14 16:50:06 -08:00
Keenan D. Buckley 0050f87a63 Initial commit 2019-01-14 17:20:40 -07:00