Skip to content

Commit

Permalink
Auto shooting and Hanger (#99)
Browse files Browse the repository at this point in the history
* Add AutoPresetSelectorShooter command

* Add shooter commands to auto

* Remove SwerveDrive smartdashboard logs

* Remove uneccessary imports

* Fix TalonFXFactory

* Fix Misc. Errors from Real Testing

* Log Info Msgs Always

* Adds Independence for Zeroing Hanger

* Hanger Retracting for Actually Hanging

* Add Hanger Retract + Run Configs

* Add shooting from selected presets

* Fix gyro offset constant

* Misc Testing + Fixes

* Added Ball Color Tests

* Modifies Shooter Debug and SetShooterFromLocationPreset

* Hood angle bug fix

* More Bug Fixes

* Controls + PID

* Edit auto paths

* added WaitAndVibrateCommand

* fixed auto shooting

* Fix autos and add 2Ball knock auto json

* Add new auto to AutoChooser.java

* Update AutoConstants and fix new auto

* Fix auto order

* LMAO

* fix build fail

* comp ready

* Last Ventura Commit

Co-authored-by: StarDylan <[email protected]>
Co-authored-by: Akhil Datla <[email protected]>
Co-authored-by: Aditya Pawar <[email protected]>
  • Loading branch information
3 people authored Mar 14, 2022
1 parent 0cbdfc5 commit 5363632
Show file tree
Hide file tree
Showing 45 changed files with 1,015 additions and 316 deletions.
23 changes: 23 additions & 0 deletions .run/Deploy DEBUG!!!.run.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Deploy DEBUG" type="GradleRunConfiguration" factoryName="Gradle">
<ExternalSystemSettings>
<option name="executionName" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="externalSystemIdString" value="GRADLE" />
<option name="scriptParameters" value="" />
<option name="taskDescriptions">
<list />
</option>
<option name="taskNames">
<list>
<option value="deploy" />
</list>
</option>
<option name="vmOptions" />
</ExternalSystemSettings>
<ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
<DebugAllEnabled>false</DebugAllEnabled>
<method v="2" />
</configuration>
</component>
23 changes: 23 additions & 0 deletions .run/FRC_Programming_2022 [deploy].run.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Robot Deploy" type="GradleRunConfiguration" factoryName="Gradle">
<ExternalSystemSettings>
<option name="executionName" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="externalSystemIdString" value="GRADLE" />
<option name="scriptParameters" value="" />
<option name="taskDescriptions">
<list />
</option>
<option name="taskNames">
<list>
<option value="deploy" />
</list>
</option>
<option name="vmOptions" />
</ExternalSystemSettings>
<ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
<DebugAllEnabled>false</DebugAllEnabled>
<method v="2" />
</configuration>
</component>
16 changes: 16 additions & 0 deletions .run/Robot Remote Debug.run.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Robot Remote Debug" type="Remote">
<module name="FRC_Programming_2022.main" />
<option name="USE_SOCKET_TRANSPORT" value="true" />
<option name="SERVER_MODE" value="false" />
<option name="SHMEM_ADDRESS" />
<option name="HOST" value="10.32.56.2" />
<option name="PORT" value="8349" />
<option name="AUTO_RESTART" value="false" />
<RunnerSettings RunnerId="Debug">
<option name="DEBUG_PORT" value="8349" />
<option name="LOCAL" value="false" />
</RunnerSettings>
<method v="2" />
</configuration>
</component>
2 changes: 1 addition & 1 deletion src/main/deploy/pathplanner/1BallTaxi-StartTarmac.path
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"waypoints":[{"anchorPoint":{"x":5.999679274749175,"y":4.5},"prevControl":null,"nextControl":{"x":5.7595213603513145,"y":4.521721043197946},"holonomicAngle":180.0,"isReversal":false,"velOverride":1.0,"isLocked":false},{"anchorPoint":{"x":5.2163366851147766,"y":4.5},"prevControl":{"x":5.444694495106697,"y":4.5},"nextControl":{"x":4.964617358629814,"y":4.5},"holonomicAngle":180.0,"isReversal":false,"velOverride":1.0,"isLocked":true},{"anchorPoint":{"x":4.3530699768919074,"y":4.5},"prevControl":{"x":4.769356902610219,"y":4.5},"nextControl":null,"holonomicAngle":180.0,"isReversal":false,"velOverride":1.0,"isLocked":false}],"maxVelocity":1.0,"maxAcceleration":1.0,"isReversed":false}
{"waypoints":[{"anchorPoint":{"x":5.999679274749175,"y":4.5},"prevControl":null,"nextControl":{"x":5.7595213603513145,"y":4.521721043197946},"holonomicAngle":0.0,"isReversal":false,"velOverride":1.0,"isLocked":false},{"anchorPoint":{"x":5.2163366851147766,"y":4.5},"prevControl":{"x":5.444694495106697,"y":4.5},"nextControl":{"x":4.964617358629814,"y":4.5},"holonomicAngle":0.0,"isReversal":false,"velOverride":1.0,"isLocked":true},{"anchorPoint":{"x":4.3530699768919074,"y":4.5},"prevControl":{"x":4.769356902610219,"y":4.5},"nextControl":null,"holonomicAngle":0.0,"isReversal":false,"velOverride":1.0,"isLocked":false}],"maxVelocity":1.0,"maxAcceleration":1.0,"isReversed":false}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"waypoints":[{"anchorPoint":{"x":5.868376293714612,"y":3.6576073152146305},"prevControl":null,"nextControl":{"x":5.868376293714612,"y":3.6576073152146305},"holonomicAngle":92.79270236571342,"isReversal":false,"velOverride":null,"isLocked":false},{"anchorPoint":{"x":5.231767425560168,"y":3.2061937541596603},"prevControl":{"x":5.509929318824555,"y":3.188006245753912},"nextControl":{"x":2.222343685193699,"y":3.4029637679528517},"holonomicAngle":92.7263109939063,"isReversal":false,"velOverride":null,"isLocked":false},{"anchorPoint":{"x":5.7642039334711574,"y":5.810502760246027},"prevControl":{"x":4.869776742471247,"y":5.363289164746063},"nextControl":{"x":5.810502760246026,"y":5.833652173633461},"holonomicAngle":-30.0,"isReversal":false,"velOverride":null,"isLocked":false},{"anchorPoint":{"x":5.0581468251544095,"y":6.169318667751259},"prevControl":{"x":5.5581468251544095,"y":6.169318667751259},"nextControl":{"x":4.5581468251544095,"y":6.169318667751259},"holonomicAngle":-30.0,"isReversal":false,"velOverride":null,"isLocked":false},{"anchorPoint":{"x":5.521135092903097,"y":5.278066252335036},"prevControl":{"x":5.271135092903097,"y":5.278066252335036},"nextControl":null,"holonomicAngle":0.0,"isReversal":false,"velOverride":null,"isLocked":false}]}
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"waypoints":[{"anchorPoint":{"x":6.289543291105276,"y":2.6455762004890357},"prevControl":null,"nextControl":{"x":6.296498445265654,"y":2.641364239855642},"holonomicAngle":-135.0,"isReversal":false,"velOverride":null,"isLocked":false},{"anchorPoint":{"x":5.156302015201513,"y":1.9119632828499056},"prevControl":{"x":5.435922010106088,"y":2.0911909905048893},"nextControl":{"x":5.435922010106088,"y":2.0911909905048893},"holonomicAngle":-135.0,"isReversal":true,"velOverride":null,"isLocked":false},{"anchorPoint":{"x":4.013662124745078,"y":3.4224859805397623},"prevControl":{"x":4.797623481829566,"y":3.8451515584497407},"nextControl":null,"holonomicAngle":-170.0,"isReversal":false,"velOverride":null,"isLocked":false}],"maxVelocity":15.0,"maxAcceleration":10.0,"isReversed":false}
{"waypoints":[{"anchorPoint":{"x":6.289543291105276,"y":2.6455762004890357},"prevControl":null,"nextControl":{"x":6.296498445265654,"y":2.641364239855642},"holonomicAngle":41.08446947812014,"isReversal":false,"velOverride":null,"isLocked":false},{"anchorPoint":{"x":5.156302015201513,"y":1.9119632828499056},"prevControl":{"x":5.435922010106088,"y":2.0911909905048893},"nextControl":{"x":5.435922010106088,"y":2.0911909905048893},"holonomicAngle":38.65930484333265,"isReversal":true,"velOverride":null,"isLocked":false},{"anchorPoint":{"x":4.013662124745078,"y":3.4224859805397623},"prevControl":{"x":4.688087086811568,"y":4.0042011777740685},"nextControl":{"x":3.4087578209374207,"y":2.900734790727394},"holonomicAngle":37.18026567966184,"isReversal":false,"velOverride":null,"isLocked":false},{"anchorPoint":{"x":5.890253176994539,"y":2.6814389004754573},"prevControl":{"x":5.50636900549249,"y":2.4563953595244663},"nextControl":null,"holonomicAngle":36.47,"isReversal":false,"velOverride":null,"isLocked":false}],"maxVelocity":15.0,"maxAcceleration":6.0,"isReversed":false}
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"waypoints":[{"anchorPoint":{"x":7.63,"y":1.7},"prevControl":null,"nextControl":{"x":7.653450135526654,"y":1.6774461712399988},"holonomicAngle":-90.0,"isReversal":false,"velOverride":null,"isLocked":false},{"anchorPoint":{"x":7.628962618758653,"y":0.45},"prevControl":{"x":7.611933856673785,"y":0.4463890503952883},"nextControl":null,"holonomicAngle":-90.0,"isReversal":false,"velOverride":null,"isLocked":false}],"maxVelocity":15.0,"maxAcceleration":5.0,"isReversed":null}
{"waypoints":[{"anchorPoint":{"x":7.63,"y":1.7},"prevControl":null,"nextControl":{"x":7.653450135526654,"y":1.6774461712399988},"holonomicAngle":90.0,"isReversal":false,"velOverride":null,"isLocked":false},{"anchorPoint":{"x":7.628962618758653,"y":0.45},"prevControl":{"x":7.611933856673785,"y":0.4463890503952883},"nextControl":{"x":7.611933856673785,"y":0.4463890503952883},"holonomicAngle":90.0,"isReversal":true,"velOverride":null,"isLocked":false},{"anchorPoint":{"x":7.236702056411925,"y":1.2024183130397512},"prevControl":{"x":7.223969784850417,"y":1.2027678551939136},"nextControl":null,"holonomicAngle":75.0,"isReversal":false,"velOverride":null,"isLocked":false}],"maxVelocity":15.0,"maxAcceleration":5.0,"isReversed":null}

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"waypoints":[{"anchorPoint":{"x":7.24,"y":1.2},"prevControl":null,"nextControl":{"x":7.24,"y":1.041421258261644},"holonomicAngle":75.0,"isReversal":false,"velOverride":null,"isLocked":true},{"anchorPoint":{"x":5.805555851836037,"y":2.382999775770551},"prevControl":{"x":6.23531222510611,"y":2.8127561490406365},"nextControl":{"x":5.790209414166037,"y":2.367653338100551},"holonomicAngle":35.0,"isReversal":false,"velOverride":3.0,"isLocked":false},{"anchorPoint":{"x":5.161533409005995,"y":1.9064911640619213},"prevControl":{"x":5.155033327646457,"y":1.909772830781505},"nextControl":{"x":5.155033327646457,"y":1.909772830781505},"holonomicAngle":35.0,"isReversal":true,"velOverride":3.0,"isLocked":false},{"anchorPoint":{"x":5.717905106696289,"y":2.7663548997984067},"prevControl":{"x":5.720762259180123,"y":2.757258992891049},"nextControl":null,"holonomicAngle":30.0,"isReversal":false,"velOverride":null,"isLocked":false}],"maxVelocity":15.0,"maxAcceleration":8.0,"isReversed":false}
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"waypoints":[{"anchorPoint":{"x":4.01,"y":3.0},"prevControl":null,"nextControl":{"x":4.265743670729333,"y":2.3995184682961446},"holonomicAngle":-170.0,"isReversal":false,"velOverride":null,"isLocked":false},{"anchorPoint":{"x":1.7327712666039827,"y":1.4221544929121523},"prevControl":{"x":1.7824111100155753,"y":1.4489480937754433},"nextControl":{"x":1.7824111100155753,"y":1.4489480937754433},"holonomicAngle":-140.38415093743433,"isReversal":true,"velOverride":null,"isLocked":false},{"anchorPoint":{"x":1.2895853677962723,"y":1.2157175943118623},"prevControl":{"x":1.4313796957705658,"y":1.2801303197036498},"nextControl":{"x":1.4313796957705658,"y":1.2801303197036498},"holonomicAngle":-145.1710735142995,"isReversal":true,"velOverride":null,"isLocked":false},{"anchorPoint":{"x":1.42280179688882,"y":1.084577994438494},"prevControl":{"x":1.4101489101786275,"y":1.0756525247094149},"nextControl":{"x":1.904676854763725,"y":1.4244973615182641},"holonomicAngle":-143.54341099772375,"isReversal":false,"velOverride":null,"isLocked":false},{"anchorPoint":{"x":5.93667292812055,"y":2.4192844109739564},"prevControl":{"x":5.622202042264367,"y":1.8012937369084139},"nextControl":null,"holonomicAngle":-134.8221545235481,"isReversal":false,"velOverride":null,"isLocked":false}],"maxVelocity":15.0,"maxAcceleration":10.0,"isReversed":null}
{"waypoints":[{"anchorPoint":{"x":5.89,"y":2.68},"prevControl":null,"nextControl":{"x":6.145743670729333,"y":2.0795184682961447},"holonomicAngle":29.21087800281668,"isReversal":false,"velOverride":null,"isLocked":false},{"anchorPoint":{"x":1.7940795375261631,"y":1.632033643814123},"prevControl":{"x":1.8437193809377554,"y":1.6588272446774135},"nextControl":{"x":1.8437193809377554,"y":1.6588272446774135},"holonomicAngle":36.469234390052016,"isReversal":true,"velOverride":null,"isLocked":false},{"anchorPoint":{"x":1.312665757659544,"y":1.3072242184523433},"prevControl":{"x":1.4544600856338374,"y":1.3716369438441307},"nextControl":{"x":1.4544600856338374,"y":1.3716369438441307},"holonomicAngle":36.47,"isReversal":true,"velOverride":null,"isLocked":false},{"anchorPoint":{"x":1.4632870977205836,"y":1.1079234267843536},"prevControl":{"x":1.4506342110103911,"y":1.0989979570552746},"nextControl":{"x":1.9451621555954886,"y":1.4478427938641238},"holonomicAngle":36.47,"isReversal":false,"velOverride":null,"isLocked":false},{"anchorPoint":{"x":5.856801587020896,"y":2.6621825395549523},"prevControl":{"x":5.542330701164713,"y":2.04419186548941},"nextControl":null,"holonomicAngle":25.34617594194668,"isReversal":false,"velOverride":null,"isLocked":false}],"maxVelocity":15.0,"maxAcceleration":50000.0,"isReversed":null}
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"waypoints":[{"anchorPoint":{"x":5.16,"y":1.91},"prevControl":null,"nextControl":{"x":4.754426281315177,"y":1.8206878576896837},"holonomicAngle":-135.0,"isReversal":false,"velOverride":null,"isLocked":false},{"anchorPoint":{"x":2.0631502871909233,"y":1.4224797394961035},"prevControl":{"x":2.0536903236060184,"y":1.4170180269738348},"nextControl":{"x":2.072610250775828,"y":1.4279414520183722},"holonomicAngle":-150.0,"isReversal":false,"velOverride":10.0,"isLocked":false},{"anchorPoint":{"x":1.3728040676312965,"y":1.2555221546043713},"prevControl":{"x":1.9716738273825347,"y":1.375469491667014},"nextControl":{"x":1.9716738273825347,"y":1.375469491667014},"holonomicAngle":-150.0,"isReversal":true,"velOverride":null,"isLocked":false},{"anchorPoint":{"x":5.876175420084169,"y":2.3564585520284322},"prevControl":{"x":4.90809257449465,"y":2.0907309844404844},"nextControl":null,"holonomicAngle":-148.4971002478126,"isReversal":false,"velOverride":null,"isLocked":false}]}
{"waypoints":[{"anchorPoint":{"x":5.72,"y":2.77},"prevControl":null,"nextControl":{"x":5.314426281315177,"y":2.6806878576896835},"holonomicAngle":30.0,"isReversal":false,"velOverride":null,"isLocked":false},{"anchorPoint":{"x":1.7593554174450117,"y":1.655183057201558},"prevControl":{"x":1.7498954538601068,"y":1.6497213446792893},"nextControl":{"x":1.7688153810299165,"y":1.6606447697238267},"holonomicAngle":45.0,"isReversal":false,"velOverride":10.0,"isLocked":false},{"anchorPoint":{"x":1.3728040676312965,"y":1.2555221546043713},"prevControl":{"x":1.7014818839764259,"y":1.6204589371204061},"nextControl":{"x":1.7014818839764259,"y":1.6204589371204061},"holonomicAngle":45.0,"isReversal":true,"velOverride":null,"isLocked":false},{"anchorPoint":{"x":5.88,"y":2.3564585520284322},"prevControl":{"x":4.911917154410481,"y":2.0907309844404844},"nextControl":null,"holonomicAngle":47.66531841045756,"isReversal":false,"velOverride":null,"isLocked":false}]}
Loading

0 comments on commit 5363632

Please sign in to comment.