Commit Graph

209 Commits

Author SHA1 Message Date
Elijah Price 04b5dc0f54 Merge branch 'master' into Climber-and-Leveler-safety-button 2020-02-15 16:18:47 -07:00
Elijah Price ead15b1ec5 Merge pull request #37 from Team4388/vision_camera_final
Update TrackTarget.java
2020-02-15 16:16:09 -07:00
ryan123rudder 99e5c48a76 Merge branch 'master' into vision_camera_final 2020-02-15 15:14:59 -08:00
ryan123rudder 63b430b805 Update TrackTarget.java 2020-02-15 16:14:06 -07:00
mayabartels 77d5075c8d Change IDs from testing
IDs will be changed in the future
2020-02-15 15:12:06 -08:00
Elijah Price 562394733d Merge pull request #24 from Team4388/vision_camera_final
WIP Add Vision to Shooter
2020-02-15 15:50:55 -07:00
ryan123rudder e3f0ce0234 Drive With Input Shooter 2020-02-15 15:47:49 -07:00
ryan123rudder 724a06101a Update TrackTarget.java 2020-02-15 15:42:04 -07:00
ryan123rudder 568dbaa2e9 Merge branch 'master' into vision_camera_final 2020-02-15 14:33:01 -08:00
Elijah Price 15952871d9 Merge pull request #36 from Team4388/Manual-Shooter
FinalManShooter
2020-02-15 15:12:38 -07:00
ryan123rudder e64ed8cf7a Merge branch 'master' into Manual-Shooter 2020-02-15 14:10:49 -08:00
mayabartels 05ec577427 constant changes for testing 2020-02-15 14:08:12 -08:00
ryan123rudder 52cad7d217 Remove comments 2020-02-15 15:06:59 -07:00
mayabartels e2efd0f8d3 Safety added for climber and leveler 2020-02-15 13:29:06 -08:00
ryan123rudder f25900ac91 Merge pull request #34 from Team4388/Manual-Shooter
Made Janky Code
2020-02-15 13:25:39 -08:00
ryan123rudder b467b324ef Fix 2020-02-15 14:23:41 -07:00
ryan123rudder 406e1a03e9 Merge branch 'master' into Manual-Shooter 2020-02-15 13:18:15 -08:00
ryan123rudder 2fd37f8236 m 2020-02-15 13:53:44 -07:00
ryan123rudder 0469897501 Merge pull request #30 from Team4388/add-elijahs-mystery-feature
Add Drive Songs
2020-02-15 12:35:39 -08:00
Kerem 24a2a43a44 Made Janky Code
Added Manual Shooter
2020-02-15 13:34:53 -07:00
ryan123rudder 8787a49e34 Merge branch 'master' into add-elijahs-mystery-feature 2020-02-15 12:34:18 -08:00
ryan123rudder a93932c8d3 Merge pull request #31 from Team4388/Shooter-PID-Integration-Neo-Motors
Shooter pid integration neo motors
2020-02-15 12:11:34 -08:00
ryan123rudder 543c4d320c Merge branch 'master' into Shooter-PID-Integration-Neo-Motors 2020-02-15 12:06:44 -08:00
ryan123rudder 2f7660b938 Update RobotContainer.java 2020-02-15 13:02:10 -07:00
aarav18 83e5fb4bc1 Shooter capabilities 2020-02-15 10:25:26 -08:00
mayabartels 6f8c90751c yeet 2020-02-13 19:12:08 -08:00
mayabartels 29cdf74ea1 PIDs fully added and tested for Neos
When robot is enabled once after robot code is deplyed, the program works. But, after the robot is disabled and re-enabled, the neo attempts to stay at one position and PID loops will no longer run because the Neo is focused on one position.

There were also several commands taken out when testing (ie. the idle shooter command)
2020-02-13 18:57:11 -08:00
Elijah Price aea65c519d make build 2
electric boogaloo
2020-02-13 18:16:02 -07:00
Elijah Price ea05f9d1b2 make it build
whoops, merging is hard
2020-02-13 18:03:17 -07:00
Elijah Price a8306807fe Merge branch 'master' into add-elijahs-mystery-feature 2020-02-13 17:57:25 -07:00
ryan123rudder 4c257acfc1 Add Vision (Untested) 2020-02-13 16:42:54 -07:00
mayabartels 668b57a4f8 commit 2020-02-13 15:31:13 -08:00
Keenan D. Buckley 3e248bd186 Merge pull request #28 from Team4388/add-pid-dead-assist
Add pid dead assist
2020-02-13 03:47:13 +00:00
Keenan D. Buckley ad5125ff4b Messing with Constants to make DriveTrain more responsive when in Dead Assist
- Added a P to Velocity Control to make robot resist being pushed.
- Upped the Output Limit on the Turning PID to allow it to be more aggressive.
2020-02-12 20:42:45 -07:00
Keenan D. Buckley b9919693cd Make Dead Assist default drive mode 2020-02-12 20:37:45 -07:00
Keenan D. Buckley cf061c1170 Update DriveWithJoystickUsingDeadAssist Documentation 2020-02-12 20:33:16 -07:00
Keenan D. Buckley b2fcc3c966 Add dead assist to make the robot stay its course when given no input 2020-02-12 20:30:44 -07:00
Keenan D. Buckley d402a31a16 Update PID method documentation 2020-02-12 20:28:55 -07:00
Keenan D. Buckley 7e250b04ee Merge pull request #27 from Team4388/additional-motor-config
Changed some motor configurations
2020-02-13 02:55:10 +00:00
KyraRivera 4b56ff8a3d Merge branch 'master' into additional-motor-config 2020-02-11 17:37:25 -07:00
KyraRivera ec82e26141 Changed some motor configurations 2020-02-11 17:35:36 -07:00
Keenan D. Buckley 129c8236c8 Merge pull request #23 from Team4388/Storage-Neo-PID-Integration
Added Neo PID stuff in Storage
2020-02-11 17:30:36 -07:00
Keenan D. Buckley 6694b3f289 Merge branch 'master' into Storage-Neo-PID-Integration 2020-02-11 17:28:41 -07:00
mayabartels 5bb1dbc397 Added Neo PID loops to Shooter Subsystem for angle adjustment and rotating the shooter 2020-02-11 16:09:31 -08:00
Keenan D. Buckley d39914ecb3 Make it Work 2020-02-11 16:55:04 -07:00
Keenan D. Buckley 630b99c250 Attempts to make it work 2020-02-11 15:15:31 -07:00
Keenan D. Buckley 83bde7ebe8 Revert "Move deploy to top of folder for easier access"
This reverts commit b53b519172.
2020-02-11 14:58:29 -07:00
Keenan D. Buckley 6596c7f81f Finished Mystery Selector
- For debugging, make sure that getDeployDirectory() points to \deploy\
2020-02-11 00:45:50 -07:00
Keenan D. Buckley b53b519172 Move deploy to top of folder for easier access
- revert this commit if it causes problems on a real robot, as this has only been tested on a simulator
2020-02-11 00:37:00 -07:00
Keenan D. Buckley 4714c0717c Update Y button to properly update the drive subsytem 2020-02-10 22:51:22 -07:00