Commit Graph

  • 96d59feb5d Update Drive.java nathanrsxtn 2019-03-07 15:31:07 -08:00
  • cfcbf2ce4a Potential fix for arm motor control mode Dave Staudacher 2019-03-07 07:33:20 -07:00
  • 1b120ac85c arm pid works lukesta182 2019-03-06 21:51:23 -07:00
  • 363df64422 Merge branch 'develop' of https://github.com/Team4388/2019-Hit-or-Miss into develop Dave Staudacher 2019-03-06 11:56:44 -07:00
  • edaf45b6ca Fix armControlMode vs controlMode conflict Dave Staudacher 2019-03-06 05:56:54 -07:00
  • 5e200b191e changed to timed robot lukesta182 2019-03-05 21:26:46 -07:00
  • 2d33d7204d spell check lukesta182 2019-03-05 21:24:34 -07:00
  • 009e3d1443 work on arm pid lukesta182 2019-03-05 19:59:15 -07:00
  • ba554eb1b4 climb working, drive encoder fix lukesta182 2019-03-03 13:08:05 -07:00
  • 26825d10b4 climb testing lukesta182 2019-03-02 16:42:48 -07:00
  • 8614a6b683 Update drive tain new_talon+sparktest lukesta182 2019-03-02 16:04:05 -07:00
  • 4add2e05bc DO AT COMP, update spark maxes, makde changes to optimize driving lukesta182 2019-03-02 14:21:13 -07:00
  • b6f05d1be7 Finished laser code electronicsSubsystem Elijah 2019-02-28 16:13:40 -07:00
  • 7d6e9aa060 small fixes from 2/18/19 lukesta182 2019-02-18 17:35:29 -07:00
  • 46ca69f2fa Merge branch 'develop' Keenan D. Buckley 2019-02-18 15:56:24 -07:00
  • a6c4c5bdbc Clear Master Keenan D. Buckley 2019-02-18 15:51:20 -07:00
  • 0ee6755097 Climber Quickfix lukesta182 2019-02-18 13:19:22 -07:00
  • 49f10c4725 Merge pull request #12 from Team4388/smartdash-update Keenan D. Buckley 2019-02-18 11:34:57 -07:00
  • f09bf2d2da Update SmartDashboard Keenan D. Buckley 2019-02-18 09:24:22 -07:00
  • 3e2d8f4169 Merge branch 'arm-merge' into develop Keenan D. Buckley 2019-02-17 16:26:49 -07:00
  • 2f8480b56e added in robot init stuff lukesta182 2019-02-17 16:21:58 -07:00
  • 9924fcb27d Merge using meld to put PID wrist into arm-develop wrist-PID-integration Maya Bartels 2019-02-17 14:36:39 -08:00
  • 5bf04716bb chanmged varables lukesta182 2019-02-17 14:40:17 -07:00
  • a0bbd82051 added in wrist and last pnumatics pid dosent work yet, talk with maya lukesta182 2019-02-17 13:34:16 -07:00
  • de0249018b Change Climber to be Manual Keenan D. Buckley 2019-02-17 13:09:41 -07:00
  • 39b0d94b19 Delete Initiate Climber Keenan D. Buckley 2019-02-17 12:39:52 -07:00
  • b32a060093 Climber Adjustments Keenan D. Buckley 2019-02-17 12:35:09 -07:00
  • 6fdaa28e3c added arm functionality lukesta182 2019-02-16 20:50:21 -07:00
  • 89c3489f79 Add button to lift both intakes Keenan D. Buckley 2019-02-16 20:47:58 -07:00
  • f1cff88862 Test Climber and Reprogram to Fix Bugs Keenan D. Buckley 2019-02-16 19:42:25 -07:00
  • eddd8468c3 Add a climber retract to mapped to the left driver trigger Keenan D. Buckley 2019-02-16 18:25:50 -07:00
  • d7307d4a95 Fix Climber Code Logic Keenan D. Buckley 2019-02-16 18:01:53 -07:00
  • 1381a6504c added in parent code structure lukesta182 2019-02-16 17:14:32 -07:00
  • 9bca7665ce Disable Climber Keenan D. Buckley 2019-02-16 16:26:34 -07:00
  • 500faccd3d Fix rachetFlip Keenan D. Buckley 2019-02-16 16:26:06 -07:00
  • dde0cdf4fa Merge branch 'climber-merge' into develop Keenan D. Buckley 2019-02-16 15:06:50 -07:00
  • fac3d58db9 Fix Syntax Error in Climber.java Keenan D. Buckley 2019-02-16 14:54:55 -07:00
  • 97e599da3e added in ball intake motor and pnumatics lukesta182 2019-02-16 14:44:47 -07:00
  • 259b7495e7 Add in missed Climber.java from last commit Keenan D. Buckley 2019-02-16 13:26:23 -07:00
  • 979a957f1f Merge in Climber Code Keenan D. Buckley 2019-02-16 13:16:51 -07:00
  • b02c9b2cb1 integration started with pnumatic intakes lukesta182 2019-02-16 12:15:53 -07:00
  • 0e33b367c3 Updated Motor IDs climber ryan123rudder 2019-02-15 22:11:06 -07:00
  • 78f923e380 Untested 2laser code Elijah Price 2019-02-15 18:43:38 -08:00
  • 860fb33c5a Revert "Revert "Merge branch 'Wrist' of https://github.com/Team4388/2019-Hit-or-Miss into Wrist"" Wrist lukesta182 2019-02-15 17:12:24 -07:00
  • 1dab4878f0 Revert "Merge branch 'Wrist' of https://github.com/Team4388/2019-Hit-or-Miss into Wrist" Keenan D. Buckley 2019-02-15 17:06:04 -07:00
  • fd8ab18ebb Added ratchet systems ryan123rudder 2019-02-15 16:47:35 -07:00
  • 47fa9bbf87 Merge branch 'Wrist' of https://github.com/Team4388/2019-Hit-or-Miss into Wrist lukesta182 2019-02-15 16:42:09 -07:00
  • eebb5ecedf evertything has been redone lukesta182 2019-02-15 16:38:17 -07:00
  • d7ce32e5c8 Slight edit mayabartels 2019-02-14 15:55:12 -08:00
  • 3e2b0dc235 Limit Switch Added to Wrist mayabartels 2019-02-14 15:52:14 -08:00
  • f220a68867 Comment Changes ryan123rudder 2019-02-13 17:45:43 -07:00
  • 50bae17a56 Minor updates ryan123rudder 2019-02-13 17:06:10 -07:00
  • 8baf229bc6 Bug Fixes to Trigger values ryan123rudder 2019-02-12 20:47:00 -07:00
  • 40271c4d04 safety fixes ryan123rudder 2019-02-12 20:35:09 -07:00
  • 288fef00d0 Update to climber systems ryan123rudder 2019-02-12 17:43:35 -07:00
  • 8c6b2a399e Fixed variables ryan123rudder 2019-02-11 20:34:04 -07:00
  • 97dec38fd6 Updates to climber WIP ryan123rudder 2019-02-11 20:10:50 -07:00
  • 3efed01c47 Climber Updates WPI ryan123rudder 2019-02-11 18:11:30 -07:00
  • 0161b26877 Revert "Revert "Revert "Merge branch 'climber2' into climber""" ryan123rudder 2019-02-11 17:59:45 -07:00
  • 7bcb15749f Revert "Revert "Merge branch 'climber2' into climber"" ryan123rudder 2019-02-11 17:58:47 -07:00
  • 2eeb3b8e5a Revert "Merge branch 'climber2' into climber" ryan123rudder 2019-02-11 17:56:08 -07:00
  • ae01c7f5db Merge branch 'climber2' into climber ryan123rudder 2019-02-11 17:48:30 -07:00
  • 5bba588af9 Climber Updates WIP ryan123rudder 2019-02-11 17:10:17 -07:00
  • a728e1dda3 Added commands for grabbing ball and hatch out of robot mayabartels 2019-02-02 15:02:19 -08:00
  • 085d348598 rs232 configuration Elijah 2019-02-02 15:17:28 -07:00
  • 9cc06f7825 Wrist PID update mayabartels 2019-02-01 20:44:07 -08:00
  • 31b7e9ed0d Wrist PID update mayabartels 2019-02-01 20:01:17 -08:00
  • 0015398804 Added to PID loop for wrist mayabartels 2019-02-01 18:51:24 -08:00
  • ae502b8af8 Merge branch 'Wrist' of https://github.com/Team4388/2019-Hit-or-Miss into Wrist mayabartels 2019-02-01 18:32:40 -08:00
  • b64c23c620 Left to right motor name change mayabartels 2019-02-01 18:32:21 -08:00
  • 6a44db8417 Merge branch 'Wrist' of https://github.com/Team4388/2019-Hit-or-Miss into Wrist lukesta182 2019-02-01 19:29:41 -07:00
  • 65e955defb attempt to get manuel joystick in lukesta182 2019-02-01 19:29:34 -07:00
  • 52ba717ffc PID adds mayabartels 2019-02-01 18:29:10 -08:00
  • b937837046 Nothing mayabartels 2019-02-01 15:32:39 -08:00
  • 11220abce3 Controling flip for wrist mayabartels 2019-02-01 15:31:22 -08:00
  • 56f674578b Additions to PID loop in wrist mayabartels 2019-02-01 15:08:46 -08:00
  • f6426c9324 changes to arm, make it able to work and not time out lukesta182 2019-01-31 19:37:31 -07:00
  • 6b51a76153 arm changes lukesta182 2019-01-29 16:00:12 -07:00
  • 8659fa2830 adding in drive with arm pid and man lukesta182 2019-01-29 15:57:45 -07:00
  • 67f4b8bece Merge pull request #4 from Team4388/fix-dependencies initial-robot-test Keenan D. Buckley 2019-01-28 19:02:30 -07:00
  • bd104642aa Remove pathfinder dependency Keenan D. Buckley 2019-01-28 19:00:51 -07:00
  • 2cd409e807 Added arm angle to determine wrist angle mayabartels 2019-01-28 17:58:02 -08:00
  • 4d9b855342 Added command group to grab ball mayabartels 2019-01-28 16:35:32 -08:00
  • f6cd6accec Changed angle stuff from wrist to arm mayabartels 2019-01-28 16:28:12 -08:00
  • 0fc322ec56 Added to initial angle change mayabartels 2019-01-28 16:25:05 -08:00
  • 260699ef4a Added method for setting initial Angle below 0 deg mayabartels 2019-01-28 16:03:16 -08:00
  • e9df63ded0 should fix the issue with mayas code lukesta182 2019-01-28 15:55:49 -07:00
  • 021e5eab71 pls work, lukesta182 2019-01-28 15:45:31 -07:00
  • 1b24f7b0ed Arm added, All IDS updated lukesta182 2019-01-26 15:52:00 -07:00
  • b5dc7177ea checked merge errors and fixed lukesta182 2019-01-26 13:55:31 -07:00
  • 567dfcf228 Inches- Degrees, pid loop on arm lukesta182 2019-01-26 13:48:06 -07:00
  • 21493bac46 Converting position in inches to degrees mayabartels 2019-01-26 12:32:44 -08:00
  • 05ea5026e3 PID loop edits mayabartels 2019-01-25 19:58:30 -08:00
  • 7393656103 Added wrist mode changing in OI mayabartels 2019-01-25 19:03:07 -08:00
  • 291abc6aa7 Additions made to control mode for Wrist mayabartels 2019-01-25 17:26:04 -08:00
  • 747e1eee79 Created start for manual wrist movement mayabartels 2019-01-25 16:27:42 -08:00
  • cc4ff1a22b Fixed errors with PID integration mayabartels 2019-01-25 15:44:07 -08:00
  • 856f0175e0 Incomplete PID code update mayabartels 2019-01-24 15:59:14 -08:00
  • 4395a5be64 Added incomplete PID code mayabartels 2019-01-24 15:45:14 -08:00
  • fcd28bc782 Minor fixes. Added to wrist mayabartels 2019-01-22 16:47:17 -08:00