Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history 
commit cac3586
Author: jopy-man <jophyw2008@gmail.com>
Date:   Sat Feb 22 16:35:05 2025 -0500

    auton one piece

commit 9a091e5
Author: Ian Shi <Ianshi1026@gmail.com>
Date:   Sat Feb 22 15:48:09 2025 -0500

    Yay cycles

commit 412dd5c
Author: Ian Shi <Ianshi1026@gmail.com>
Date:   Sat Feb 22 14:07:00 2025 -0500

    Automatically go back to acquiring coral when arm leaves hold algae state

commit 57ab037
Author: Ian Shi <Ianshi1026@gmail.com>
Date:   Sat Feb 22 14:02:06 2025 -0500

    Update climb logic and constants, add climb state for elevator and arm

commit bf16a62
Author: Ian Shi <Ianshi1026@gmail.com>
Date:   Sat Feb 22 13:05:35 2025 -0500

    Forgot to push climb idle

commit 0334fc3
Author: Ian Shi <Ianshi1026@gmail.com>
Date:   Sat Feb 22 13:05:20 2025 -0500

    Update climb subsystem

commit 1546dfe
Author: Ian Shi <Ianshi1026@gmail.com>
Date:   Sat Feb 22 13:04:57 2025 -0500

    Fix climb button

commit d748a0f
Merge: ded93ac 720f3da
Author: Ian Shi <Ianshi1026@gmail.com>
Date:   Sat Feb 22 13:04:24 2025 -0500

    Merge branch 'tuning' of https://github.com/StuyPulse/Aunt-Mary into tuning

commit ded93ac
Author: Ian Shi <Ianshi1026@gmail.com>
Date:   Sat Feb 22 13:04:03 2025 -0500

    Put climb in brake mode

commit f506a87
Author: Ian Shi <Ianshi1026@gmail.com>
Date:   Sat Feb 22 13:00:16 2025 -0500

    New offsets for swerve

commit 720f3da
Author: jopy-man <jophyw2008@gmail.com>
Date:   Sat Feb 22 11:44:19 2025 -0500

    push

commit a1c5256
Author: Ian Shi <Ianshi1026@gmail.com>
Date:   Fri Feb 21 23:59:18 2025 -0500

    PID to score position and PID to ready position

commit a7ac1b1
Author: Ian Shi <Ianshi1026@gmail.com>
Date:   Fri Feb 21 22:26:23 2025 -0500

    TranslationalMotionProfile to allow PIDToPose to account for initial velocity

commit 51f46ff
Author: Ian Shi <Ianshi1026@gmail.com>
Date:   Fri Feb 21 21:46:53 2025 -0500

    Add method to get field relative speeds

commit 780320b
Author: Ian Shi <Ianshi1026@gmail.com>
Date:   Fri Feb 21 20:48:18 2025 -0500

    Make LED color for alignment configureable

commit 831ed17
Author: Ian Shi <Ianshi1026@gmail.com>
Date:   Fri Feb 21 20:45:05 2025 -0500

    New logic for climbing that only uses bang bang control for closed position

commit 88ee9f2
Author: Kalimul Kaif <kalimul.kaif@stuypulse.com>
Date:   Fri Feb 21 19:13:40 2025 -0500

    Commit before leaving mcdonalds

commit 77ebf81
Author: Kalimul Kaif <kalimul.kaif@stuypulse.com>
Date:   Fri Feb 21 18:51:38 2025 -0500

    Get rid of elevatorArm feed forward, get rid of sysided alignment gains

commit ec28a67
Author: Kalimul Kaif <kalimul.kaif@stuypulse.com>
Date:   Fri Feb 21 18:42:52 2025 -0500

    Make triggers send arm and elevator to feed

commit a5b291b
Author: Kalimul Kaif <kalimul.kaif@stuypulse.com>
Date:   Fri Feb 21 18:42:39 2025 -0500

    Change arm gains based on state

commit 763891a
Author: jopy-man <jophyw2008@gmail.com>
Date:   Fri Feb 21 18:22:15 2025 -0500

    poop shooter

commit 07136b2
Author: jopy-man <jophyw2008@gmail.com>
Date:   Fri Feb 21 18:04:04 2025 -0500

    pull

commit dd13257
Author: jopy-man <jophyw2008@gmail.com>
Date:   Fri Feb 21 18:01:18 2025 -0500

    aaa

commit 9d8f3f4
Author: Ian Shi <Ianshi1026@gmail.com>
Date:   Fri Feb 21 17:53:16 2025 -0500

    Clean up code related to cancoders

commit 385522c
Author: jopy-man <jophyw2008@gmail.com>
Date:   Fri Feb 21 17:52:34 2025 -0500

    algae autons and testing

commit ea9afa7
Author: Ian Shi <Ianshi1026@gmail.com>
Date:   Fri Feb 21 17:51:47 2025 -0500

    Use abs encoder for arm

commit 17dc404
Author: Ian Shi <Ianshi1026@gmail.com>
Date:   Fri Feb 21 17:36:35 2025 -0500

    bruh jophy stop copy pasting code

commit c52f74d
Author: Ian Shi <Ianshi1026@gmail.com>
Date:   Fri Feb 21 15:32:33 2025 -0500

    Commit armimpl

commit 2cb5a7e
Author: SP-COMPuter <se@stuypulse.com>
Date:   Fri Feb 21 14:35:01 2025 -0500

    Add SwerveDriveNudgeForward and gain switching for kS, kV, kA on arm

commit 7f9c268
Author: jopy-man <jophyw2008@gmail.com>
Date:   Fri Feb 21 14:15:50 2025 -0500

    saaa

commit 6a341b1
Author: jopy-man <jophyw2008@gmail.com>
Date:   Fri Feb 21 14:09:07 2025 -0500

    aaa

commit ef615f3
Author: jopy-man <jophyw2008@gmail.com>
Date:   Fri Feb 21 13:57:42 2025 -0500

    skeebeediee

commit 2811b06
Merge: f18c559 ffa0426
Author: Ian Shi <Ianshi1026@gmail.com>
Date:   Fri Feb 21 13:54:24 2025 -0500

    Merge branch 'tuning' of https://github.com/StuyPulse/Aunt-Mary into tuning

commit f18c559
Author: Ian Shi <Ianshi1026@gmail.com>
Date:   Fri Feb 21 13:53:51 2025 -0500

    Fix limelight offsets and units for vision, tune modules

commit ffa0426
Author: SP-COMPuter <se@stuypulse.com>
Date:   Fri Feb 21 12:32:33 2025 -0500

    Add gain switching for arm based on holding coral, algae, or empty

commit 31da099
Author: Ian Shi <Ianshi1026@gmail.com>
Date:   Fri Feb 21 12:09:28 2025 -0500

    Update a few settings

commit 9c64792
Author: jopy-man <jophyw2008@gmail.com>
Date:   Fri Feb 21 10:00:41 2025 -0500

    oops

commit d6d9fe1
Author: jopy-man <jophyw2008@gmail.com>
Date:   Fri Feb 21 09:59:00 2025 -0500

    auton path stuff

commit ffbf59c
Author: Ian Shi <Ianshi1026@gmail.com>
Date:   Fri Feb 21 01:36:40 2025 -0500

    Fix issue with diff kGs for froggy pivot crashing sim

commit 4da28b3
Merge: e85ba56 7d04bb4
Author: Ian Shi <Ianshi1026@gmail.com>
Date:   Fri Feb 21 01:16:24 2025 -0500

    Merge branch 'tuning' of https://github.com/StuyPulse/Aunt-Mary into tuning

commit e85ba56
Author: Ian Shi <Ianshi1026@gmail.com>
Date:   Fri Feb 21 01:16:21 2025 -0500

    Add clearance distance from reef so arm doesnt hit it

commit 03cb7b4
Author: Ian Shi <Ianshi1026@gmail.com>
Date:   Fri Feb 21 00:47:11 2025 -0500

    Fix elevator to l3 back command

commit 7d04bb4
Author: Kalimul Kaif <kalimul.kaif@stuypulse.com>
Date:   Thu Feb 20 23:29:54 2025 -0500

    Add kG gain switching for froggy based on holding algae or not

commit 742625c
Author: jopy-man <jophyw2008@gmail.com>
Date:   Thu Feb 20 20:27:38 2025 -0500

    auton paths

commit 36345db
Author: Ian Shi <Ianshi1026@gmail.com>
Date:   Thu Feb 20 19:44:06 2025 -0500

    Add comments to controls in RobotContainer

commit 1529bc5
Author: Ian Shi <Ianshi1026@gmail.com>
Date:   Thu Feb 20 19:38:09 2025 -0500

    Add rotational deadband to swerve

commit d488717
Author: Ian Shi <Ianshi1026@gmail.com>
Date:   Thu Feb 20 19:23:59 2025 -0500

    Forgot to resolve these

commit b8c3576
Merge: 9e340f0 427f6aa
Author: Ian Shi <Ianshi1026@gmail.com>
Date:   Thu Feb 20 19:23:48 2025 -0500

    Merge branch 'tuning' of https://github.com/StuyPulse/Aunt-Mary into tuning

commit 9e340f0
Author: Ian Shi <Ianshi1026@gmail.com>
Date:   Thu Feb 20 19:07:59 2025 -0500

    Remove superstructure

commit 427f6aa
Author: jopy-man <jophyw2008@gmail.com>
Date:   Thu Feb 20 19:01:32 2025 -0500

    made arm come up while driving in auton

commit 4d98f45
Author: Ian Shi <Ianshi1026@gmail.com>
Date:   Thu Feb 20 18:33:35 2025 -0500

    Remove sysid routine for climb

commit 7230740
Author: Ian Shi <Ianshi1026@gmail.com>
Date:   Thu Feb 20 18:30:36 2025 -0500

    Better logging for froggy pivot

commit 030fd07
Author: Ian Shi <Ianshi1026@gmail.com>
Date:   Thu Feb 20 18:29:40 2025 -0500

    Get shooter offset and new offset and min/max angles for froggy

commit d7387f9
Author: Ian Shi <Ianshi1026@gmail.com>
Date:   Thu Feb 20 14:15:31 2025 -0500

    Camera offsets and names

commit 22bda0a
Author: Ian Shi <Ianshi1026@gmail.com>
Date:   Thu Feb 20 14:15:18 2025 -0500

    New arm gains, hold algae logic for shooter and froggy, no more vertical down or stow

commit 10ebde8
Author: Ian Shi <Ianshi1026@gmail.com>
Date:   Thu Feb 20 10:45:23 2025 -0500

    add cam offset and fix names

commit c1b60b3
Author: Ian Shi <Ianshi1026@gmail.com>
Date:   Thu Feb 20 09:31:53 2025 -0500

    FF for arm based on swerve accel and elevator accel

commit 3f4012f
Author: Ian Shi <Ianshi1026@gmail.com>
Date:   Thu Feb 20 02:09:47 2025 -0500

    Add method to get X accel from gyro, add logging for gyro

commit 1338b85
Author: Ian Shi <Ianshi1026@gmail.com>
Date:   Thu Feb 20 01:59:42 2025 -0500

    Improve logging for current

commit f2d677e
Author: Ian Shi <Ianshi1026@gmail.com>
Date:   Thu Feb 20 01:02:05 2025 -0500

    Organize Sysid routines and some logging

commit 2efc600
Author: Ian Shi <Ianshi1026@gmail.com>
Date:   Wed Feb 19 14:42:28 2025 -0500

    pushed before i gtg :(

commit 0d3d18a
Author: Ian Shi <Ianshi1026@gmail.com>
Date:   Wed Feb 19 14:37:51 2025 -0500

    L2-L4 front targets

commit 9df017e
Author: Ian Shi <Ianshi1026@gmail.com>
Date:   Wed Feb 19 14:34:44 2025 -0500

    update vertical down angle

commit f250756
Author: Ian Shi <Ianshi1026@gmail.com>
Date:   Wed Feb 19 14:26:51 2025 -0500

    Max speed for froggy roller intake

commit 708a24d
Author: Ian Shi <Ianshi1026@gmail.com>
Date:   Wed Feb 19 14:21:39 2025 -0500

    Arm tuning

commit 2be1001
Author: Ian Shi <Ianshi1026@gmail.com>
Date:   Wed Feb 19 13:14:59 2025 -0500

    Add offset for Funnel side cam

commit 3867658
Author: Ian Shi <Ianshi1026@gmail.com>
Date:   Wed Feb 19 12:33:42 2025 -0500

    Make min and max arm angle a setting

commit 47d0fab
Author: Ian Shi <Ianshi1026@gmail.com>
Date:   Wed Feb 19 12:30:49 2025 -0500

    Froggy sysid routine and stuff

commit 38135dd
Author: Ian Shi <Ianshi1026@gmail.com>
Date:   Wed Feb 19 11:16:31 2025 -0500

    arm tuning stuff

commit 42c302e
Author: Ian Shi <Ianshi1026@gmail.com>
Date:   Wed Feb 19 00:33:54 2025 -0500

    Add bang bang control for climb

commit e9a6fe8
Author: Ian Shi <Ianshi1026@gmail.com>
Date:   Wed Feb 19 00:20:00 2025 -0500

    Fix logic for enabled/disabled subsystems

commit 315edb1
Author: Ian Shi <Ianshi1026@gmail.com>
Date:   Wed Feb 19 00:07:40 2025 -0500

    Add logic for writing absencoder readings for the arm onto the motor

commit bb2a4ef
Author: Ian Shi <Ianshi1026@gmail.com>
Date:   Tue Feb 18 21:36:59 2025 -0500

    Fix arm/elevator sim when theyre disabled

commit b5acccf
Author: Ian Shi <Ianshi1026@gmail.com>
Date:   Tue Feb 18 21:33:12 2025 -0500

    w sim gui again

commit 055aba2
Author: Ian Shi <Ianshi1026@gmail.com>
Date:   Tue Feb 18 21:10:28 2025 -0500

    ResetPoseToStartOfPath command, and add to autons

commit 6eff677
Author: Ian Shi <Ianshi1026@gmail.com>
Date:   Tue Feb 18 21:01:26 2025 -0500

    Add method to reset pose to start of a pathplanner path

commit 5ea5258
Author: Ian Shi <Ianshi1026@gmail.com>
Date:   Tue Feb 18 20:38:14 2025 -0500

    Sysid for chassis translation
  • Loading branch information
@k4limul
k4limul committed Feb 23, 2025
1 parent 3c94cea commit 5c23406
Show file tree
Hide file tree
Showing 178 changed files with 4,819 additions and 1,619 deletions.
5 changes: 0 additions & 5 deletions simgui-ds.json
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
{
"Joysticks": {
"window": {
"visible": false
}
},
"keyboardJoysticks": [
{
"axisConfig": [
Expand Down
22 changes: 7 additions & 15 deletions simgui.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
"/SmartDashboard/Swerve/Module 2": "Mechanism2d",
"/SmartDashboard/Swerve/Module 3": "Mechanism2d",
"/SmartDashboard/Visualizers/Arm": "Mechanism2d",
"/SmartDashboard/Visualizers/Arm-Elevator": "Mechanism2d",
"/SmartDashboard/Visualizers/Elevator": "Mechanism2d",
"/SmartDashboard/Visualizers/Superstructure": "Mechanism2d"
},
Expand All @@ -47,7 +48,7 @@
"visible": true
}
},
"/SmartDashboard/Visualizers/Superstructure": {
"/SmartDashboard/Visualizers/Arm-Elevator": {
"window": {
"visible": true
}
Expand Down Expand Up @@ -95,13 +96,8 @@
"Server": {
"Publishers": {
"open": true
},
"open": true
},
"visible": true
},
"NetworkTables View": {
"visible": false
}
}
},
"Plot": {
"Plot <0>": {
Expand All @@ -113,8 +109,7 @@
0.0,
0.8500000238418579
],
"height": 0,
"height": 246,
"height": 9,
"series": [
{
"color": [
Expand Down Expand Up @@ -147,8 +142,7 @@
}
],
"window": {
"name": "Elevator Target Vs Current Height",
"visible": false
"name": "Elevator Target Vs Current Height"
}
},
"Plot <1>": {
Expand All @@ -161,7 +155,6 @@
0.8500000238418579
],
"height": 4,
"height": 252,
"series": [
{
"color": [
Expand Down Expand Up @@ -194,8 +187,7 @@
}
],
"window": {
"name": "Arm Target vs Current Angle",
"visible": false
"name": "Arm Target vs Current Angle"
}
}
}
Expand Down
31 changes: 31 additions & 0 deletions src/main/deploy/pathplanner/autos/Blue G + 1 Algae (1 + 1).auto
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
{
"version": "2025.0",
"command": {
"type": "sequential",
"data": {
"commands": [
{
"type": "path",
"data": {
"pathName": "Blue Mid Bottom to G"
}
},
{
"type": "path",
"data": {
"pathName": "Blue G to GH Algae"
}
},
{
"type": "path",
"data": {
"pathName": "Blue GH Algae to Barge 3"
}
}
]
}
},
"resetOdom": true,
"folder": "Blue Bottom Autons",
"choreoAuto": false
}
43 changes: 43 additions & 0 deletions src/main/deploy/pathplanner/autos/Blue G + 2 Algae (1 + 2).auto
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
{
"version": "2025.0",
"command": {
"type": "sequential",
"data": {
"commands": [
{
"type": "path",
"data": {
"pathName": "Blue Mid Bottom to G"
}
},
{
"type": "path",
"data": {
"pathName": "Blue G to GH Algae"
}
},
{
"type": "path",
"data": {
"pathName": "Blue GH Algae to Barge 3"
}
},
{
"type": "path",
"data": {
"pathName": "Blue Barge 3 to IJ Algae"
}
},
{
"type": "path",
"data": {
"pathName": "Blue IJ Algae to Barge 3"
}
}
]
}
},
"resetOdom": true,
"folder": "Blue Bottom Autons",
"choreoAuto": false
}
55 changes: 55 additions & 0 deletions src/main/deploy/pathplanner/autos/Blue G + 3 Algae (1 + 3).auto
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
{
"version": "2025.0",
"command": {
"type": "sequential",
"data": {
"commands": [
{
"type": "path",
"data": {
"pathName": "Blue Mid Bottom to G"
}
},
{
"type": "path",
"data": {
"pathName": "Blue G to GH Algae"
}
},
{
"type": "path",
"data": {
"pathName": "Blue GH Algae to Barge 3"
}
},
{
"type": "path",
"data": {
"pathName": "Blue Barge 3 to IJ Algae"
}
},
{
"type": "path",
"data": {
"pathName": "Blue IJ Algae to Barge 3"
}
},
{
"type": "path",
"data": {
"pathName": "Blue Barge 3 to EF Algae"
}
},
{
"type": "path",
"data": {
"pathName": "Blue EF Algae to Barge 3"
}
}
]
}
},
"resetOdom": true,
"folder": "Blue Bottom Autons",
"choreoAuto": false
}
31 changes: 31 additions & 0 deletions src/main/deploy/pathplanner/autos/Blue H + 1 Algae (1 + 1).auto
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
{
"version": "2025.0",
"command": {
"type": "sequential",
"data": {
"commands": [
{
"type": "path",
"data": {
"pathName": "Blue Mid Top to H"
}
},
{
"type": "path",
"data": {
"pathName": "Blue H to GH Algae"
}
},
{
"type": "path",
"data": {
"pathName": "Blue GH Algae to Barge 3"
}
}
]
}
},
"resetOdom": true,
"folder": "Blue Top Autons",
"choreoAuto": false
}
43 changes: 43 additions & 0 deletions src/main/deploy/pathplanner/autos/Blue H + 2 Algae (1 + 2).auto
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
{
"version": "2025.0",
"command": {
"type": "sequential",
"data": {
"commands": [
{
"type": "path",
"data": {
"pathName": "Blue Mid Top to H"
}
},
{
"type": "path",
"data": {
"pathName": "Blue H to GH Algae"
}
},
{
"type": "path",
"data": {
"pathName": "Blue GH Algae to Barge 3"
}
},
{
"type": "path",
"data": {
"pathName": "Blue Barge 3 to IJ Algae"
}
},
{
"type": "path",
"data": {
"pathName": "Blue IJ Algae to Barge 3"
}
}
]
}
},
"resetOdom": true,
"folder": "Blue Top Autons",
"choreoAuto": false
}
55 changes: 55 additions & 0 deletions src/main/deploy/pathplanner/autos/Blue H + 3 Algae (1 + 3).auto
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
{
"version": "2025.0",
"command": {
"type": "sequential",
"data": {
"commands": [
{
"type": "path",
"data": {
"pathName": "Blue Mid Top to H"
}
},
{
"type": "path",
"data": {
"pathName": "Blue H to GH Algae"
}
},
{
"type": "path",
"data": {
"pathName": "Blue GH Algae to Barge 3"
}
},
{
"type": "path",
"data": {
"pathName": "Blue Barge 3 to IJ Algae"
}
},
{
"type": "path",
"data": {
"pathName": "Blue IJ Algae to Barge 3"
}
},
{
"type": "path",
"data": {
"pathName": "Blue Barge 3 to EF Algae"
}
},
{
"type": "path",
"data": {
"pathName": "Blue EF Algae to Barge 3"
}
}
]
}
},
"resetOdom": true,
"folder": "Blue Top Autons",
"choreoAuto": false
}
25 changes: 25 additions & 0 deletions src/main/deploy/pathplanner/autos/New Auto.auto
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
"version": "2025.0",
"command": {
"type": "sequential",
"data": {
"commands": [
{
"type": "path",
"data": {
"pathName": "aaaa"
}
},
{
"type": "path",
"data": {
"pathName": "aaa"
}
}
]
}
},
"resetOdom": false,
"folder": null,
"choreoAuto": false
}
Loading

0 comments on commit 5c23406

Please sign in to comment.