Team4388/2019-Hit-or-Miss
1
0
Fork 0
mirror of https://github.com/Team4388/2019-Hit-or-Miss.git synced 2026-06-09 00:28:05 -06:00
Code Issues Packages Projects Releases Wiki Activity
54 Commits 28 Branches 0 Tags
6a44db8417d1351e1365f078ea5ab6c0d15a9a73
Commit Graph

54 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
lukesta182 6a44db8417 Merge branch 'Wrist' of https://github.com/Team4388/2019-Hit-or-Miss into Wrist 2019-02-01 19:29:41 -07:00
lukesta182 65e955defb attempt to get manuel joystick in 
didnt work, pulling mayas code to se if hers works
 2019-02-01 19:29:34 -07:00
mayabartels 52ba717ffc PID adds 
Also, joystick for wrist changed from left to right
 2019-02-01 18:29:10 -08:00
mayabartels b937837046 Nothing 2019-02-01 15:32:39 -08:00
mayabartels 11220abce3 Controling flip for wrist 
added control mode, changed encoder ticks to degrees, added method for controlling the flip. The angle may need to be adjusted depending on the mechanical design
 2019-02-01 15:31:22 -08:00
mayabartels 56f674578b Additions to PID loop in wrist 2019-02-01 15:08:46 -08:00
lukesta182 f6426c9324 changes to arm, make it able to work and not time out 
times out becase of choosers in robot
 2019-01-31 19:37:31 -07:00
lukesta182 6b51a76153 arm changes 2019-01-29 16:00:12 -07:00
lukesta182 8659fa2830 adding in drive with arm pid and man 
change to oi, arm, add arm set mode
 2019-01-29 15:57:45 -07:00
mayabartels 2cd409e807 Added arm angle to determine wrist angle 2019-01-28 17:58:02 -08:00
mayabartels 4d9b855342 Added command group to grab ball 
Also added control mode in wrist to change to grab ball control mode
 2019-01-28 16:35:32 -08:00
mayabartels f6cd6accec Changed angle stuff from wrist to arm 2019-01-28 16:28:12 -08:00
mayabartels 0fc322ec56 Added to initial angle change 2019-01-28 16:25:05 -08:00
mayabartels 260699ef4a Added method for setting initial Angle below 0 deg 
Added to robot.java in robot initial to make initial angle correct
 2019-01-28 16:03:16 -08:00
lukesta182 e9df63ded0 should fix the issue with mayas code 2019-01-28 15:55:49 -07:00
lukesta182 021e5eab71 pls work, 
works on lukes laptop,  not mayas
 2019-01-28 15:45:31 -07:00
lukesta182 1b24f7b0ed Arm added, All IDS updated 2019-01-26 15:52:00 -07:00
lukesta182 b5dc7177ea checked merge errors and fixed 2019-01-26 13:55:31 -07:00
lukesta182 567dfcf228 Inches- Degrees, pid loop on arm 
arm to a pid loop, need to add commands to use it, change constans for for arm and wrist  from inshes to degree, need to add trigonomic functions for x,y cordinates
 2019-01-26 13:48:06 -07:00
mayabartels 21493bac46 Converting position in inches to degrees 
Changed wrist subsystem and added to constants
 2019-01-26 12:32:44 -08:00
mayabartels 05ea5026e3 PID loop edits 
Added some comments, added variables for PID control
 2019-01-25 19:58:30 -08:00
mayabartels 7393656103 Added wrist mode changing in OI 2019-01-25 19:03:07 -08:00
mayabartels 291abc6aa7 Additions made to control mode for Wrist 
WristSetMode created and Wrist subsystem updated
 2019-01-25 17:26:04 -08:00
mayabartels 747e1eee79 Created start for manual wrist movement 
This is unfinished code
 2019-01-25 16:27:42 -08:00
mayabartels cc4ff1a22b Fixed errors with PID integration 2019-01-25 15:44:07 -08:00
mayabartels 856f0175e0 Incomplete PID code update 2019-01-24 15:59:14 -08:00
mayabartels 4395a5be64 Added incomplete PID code 
Edited Motor Controller for PID and methods to Wrist
 2019-01-24 15:45:14 -08:00
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