Commit Graph

81 Commits

Author SHA1 Message Date
HFocus 52cf488209 Delete togglemanuel.java 2019-03-18 17:13:37 -06:00
HFocus e418c5b943 Merge edits 2019-03-18 17:08:49 -06:00
HFocus da59a5f681 Merge branch 'develop-2-electric-boogaloo' into develop 2019-03-18 17:08:27 -06:00
HFocus 4b90f82ec1 Reenable old code 2019-03-18 16:58:49 -06:00
lukesta182 a02dc3dfd7 added changes from 3/18/19
changes for drivers.
2019-03-18 15:47:48 -06:00
HFocus df88b29380 fix compile errors 2019-03-17 20:17:01 -06:00
HFocus c18be12edf Merge branch 'relative-wrist' into develop-2-electric-boogaloo 2019-03-17 20:15:55 -06:00
HFocus 10c538d831 The One Commit to Rule Them All 2019-03-17 20:12:30 -06:00
lukesta182 57e4b752d9 preset fixes 2019-03-16 15:34:37 -06:00
HFocus 5a825596a8 Merge branch 'develop' into relative-wrist 2019-03-16 14:18:18 -06:00
HFocus e0947b51d9 Make Wrist move with Arm 2019-03-16 14:17:15 -06:00
lukesta182 6141559282 Merge branch 'develop' of https://github.com/Team4388/2019-Hit-or-Miss into develop 2019-03-16 13:19:24 -06:00
lukesta182 71ab691b46 Arm Led and PID update 2019-03-16 13:19:13 -06:00
HFocus 4c707871f6 Merge branch 'develop' of https://github.com/Team4388/2019-Hit-or-Miss into develop 2019-03-16 13:17:35 -06:00
HFocus 9cf2eac3be Update LED colors 2019-03-16 13:17:20 -06:00
lukesta182 9d17d652e6 Merge branch 'develop' of https://github.com/Team4388/2019-Hit-or-Miss into develop 2019-03-16 13:02:57 -06:00
lukesta182 15f8e76b06 More stuff 2019-03-16 13:02:46 -06:00
HFocus f014297b23 Merge in code from branch led 2019-03-16 11:45:04 -06:00
lukesta182 52aaccf587 added automation 2019-03-16 11:30:39 -06:00
lukesta182 13c5b892fc fix
fixed code so it builds, added toggle to opperator controlor for hatch and ball
2019-03-15 00:18:33 -06:00
lukesta182 8d04cd9b05 Merge branch 'develop' of https://github.com/Team4388/2019-Hit-or-Miss into develop 2019-03-14 20:11:23 -06:00
lukesta182 850c2222a6 customization for josh and max 2019-03-14 20:10:47 -06:00
Keenan D. Buckley 0a11ca4e0c Update LED.java 2019-03-14 18:28:48 -06:00
Keenan D. Buckley bd057897e6 Update LED.java 2019-03-14 17:27:44 -06:00
Keenan D. Buckley a8e14a87d5 Set LED Indicators 2019-03-14 17:00:45 -06:00
Keenan D. Buckley 5bfa21defb LED Values 2019-03-14 16:51:00 -06:00
lukesta182 8eed44a703 added arm auto pos 2019-03-13 18:32:05 -06:00
lukesta182 22a9cfa9b2 motion maggic works 2019-03-12 22:25:21 -06:00
Keenan D. Buckley 4de3492ed0 Command to set LED pattern 2019-03-11 18:13:46 -06:00
Keenan D. Buckley 0d26188761 Set up LEDs 2019-03-11 18:06:51 -06:00
Keenan D. Buckley 76f696d5a6 Climber Fix
Forces the climber wheels to be set to zero when safety switch is off.
2019-03-11 16:07:10 -06:00
lukesta182 8f348820f7 Merge branch 'develop' of https://github.com/Team4388/2019-Hit-or-Miss into develop 2019-03-09 23:03:22 -07:00
lukesta182 ca321c68fb added in motion magic, dose not work
find missing part in code
2019-03-09 23:03:12 -07:00
Keenan D. Buckley 0b025ff367 Arm.java Cleanup 2019-03-09 16:29:28 -07:00
Keenan D. Buckley 61147c2c15 Merge branch 'arm-limit-switches' into develop 2019-03-09 15:52:52 -07:00
Keenan D. Buckley 7269697ac9 Update Limit Switch code in Arm.java 2019-03-09 15:52:24 -07:00
Keenan D. Buckley 387558d635 Introduce Failsafe for if the robot position goes belows negative
(Sets the negative position to the new 0)
2019-03-09 14:54:54 -07:00
lukesta182 9852f11e2c Merge branch 'develop' of https://github.com/Team4388/2019-Hit-or-Miss into develop 2019-03-09 14:23:26 -07:00
lukesta182 2a3e42aeff Constants Adjustments 2019-03-09 14:23:23 -07:00
Keenan D. Buckley 82c8d7814e Begin setting up dpad control 2019-03-09 11:29:51 -07:00
Keenan D. Buckley 73cb92fa3e Cleanup OI 2019-03-09 10:31:33 -07:00
lukesta182 9d67018d89 update 2019-03-08 20:42:49 -07:00
Keenan D. Buckley 99a9f76d16 Add limit switches to code
Encoder position will zero out whenever the arm hits the bottom limit switch. The Digital Output ids still need to be configured.
2019-03-08 19:29:57 -07:00
lukesta182 f74093ca12 added pid to wrist and arm,
arm pid "works" wrist is being worked on
2019-03-08 18:46:38 -07:00
Dave Staudacher cfcbf2ce4a Potential fix for arm motor control mode
This may be a proper fix for the workaround in updatePositionPID, but needs to be verified on the robot.
2019-03-07 07:33:20 -07:00
lukesta182 1b120ac85c arm pid works
added pid to arm subsystem
2019-03-06 21:51:23 -07:00
Dave Staudacher 363df64422 Merge branch 'develop' of https://github.com/Team4388/2019-Hit-or-Miss into develop 2019-03-06 11:56:44 -07:00
Dave Staudacher edaf45b6ca Fix armControlMode vs controlMode conflict
controlLoopUpdate() was reading rogue variable "controlMode", which never changed, instead of "armControlMode" used by the rest of the code
2019-03-06 05:56:54 -07:00
lukesta182 5e200b191e changed to timed robot
timed robot is better becase it calls and checkes things without driver station input
2019-03-05 21:26:46 -07:00
lukesta182 2d33d7204d spell check
we dont look dumb now
2019-03-05 21:24:34 -07:00