Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
a3d2b04
initial commit
527dj Nov 5, 2025
1bd30c5
added frame for shooter and intake subsystems
527dj Nov 5, 2025
4eb4bc0
Intake updates
527dj Nov 14, 2025
4225512
Added more code for intake
527dj Nov 14, 2025
0930f44
Updated Intake implementation
527dj Nov 14, 2025
bd6b38f
Got rid of auto generated solenoid usage
527dj Nov 14, 2025
3bd13a6
Completed basic intake implementation. Sim implementation will need t…
527dj Nov 16, 2025
8b40b84
cleaned up some stuff
527dj Nov 16, 2025
9e7576e
Renamed and deleted unecessary files in prep for shooter code
527dj Nov 16, 2025
7bcd3c3
Updated tuner constants
527dj Nov 21, 2025
99f21a6
Merge branch 'main' of https://github.com/Mubotics7157/MargieRecode
527dj Nov 21, 2025
19e41c1
Implement Mechanism2D for Intake simulations
527dj Nov 21, 2025
dad8f2c
Completed sim implementation with implementation in robotcontainer
527dj Nov 21, 2025
5ee0e1e
Updated simulation piece detection
527dj Nov 24, 2025
7a91d58
Updated current limits for intake rollers
527dj Nov 24, 2025
c1c6a98
Added Superstructure
527dj Nov 25, 2025
5cf677a
Changed tuner constants and format
527dj Nov 25, 2025
cdc269c
updated tunerconstants
527dj Nov 25, 2025
132419a
changed bindings
527dj Nov 25, 2025
b7cf192
removed useless function
527dj Nov 25, 2025
078f79a
Updated tuner constants
527dj Nov 26, 2025
fe8857f
Tuned arm deploy position and new arm function
527dj Nov 26, 2025
3a3367d
Removed either command
527dj Nov 26, 2025
0eb3cdc
Added indexer motor
527dj Nov 26, 2025
3ff3ebc
Updated advantage scope layouts
527dj Nov 26, 2025
0d5c4a7
Changed commands used
527dj Nov 26, 2025
772b0f1
Removed extra outtake and intake commands, replaced with startEnd com…
527dj Nov 26, 2025
f4c56ec
Removed piece detection
527dj Nov 26, 2025
b043c21
Partially added indexer logging
527dj Nov 26, 2025
efcf057
Cleaned up intaking logic, removed piece detection
527dj Nov 26, 2025
6745733
Removed IO layers of superstructure
527dj Nov 27, 2025
f51be29
Switched to Goals instead of enums, simplified statemachine and remov…
527dj Nov 27, 2025
716e180
Rephrased commmands to work with new superstructure code
527dj Nov 27, 2025
9984f7d
Added functions for goal setting, and goal checking
527dj Nov 27, 2025
da75931
Deactivated auto command for now
527dj Nov 27, 2025
dbad341
Reenabled auto command
527dj Nov 27, 2025
29801c4
Added IOs back for logging purposes
527dj Nov 27, 2025
d401190
Added Indexer logging
527dj Nov 27, 2025
742f790
Created test autopath
527dj Dec 2, 2025
3d6188c
updated controls
527dj Dec 2, 2025
18d22e6
Tuned arm deploy position
527dj Dec 2, 2025
c3e85ef
Renamed setRollerVoltage functions to setDutyCycle
527dj Dec 2, 2025
889c76d
Added elastic dashboard logging
527dj Dec 2, 2025
1ea4836
Added Elastic compatibility and logging
527dj Dec 3, 2025
5e754e0
Tuned drive constants
527dj Dec 3, 2025
2c1619e
Changed canbus
527dj Dec 3, 2025
c77b7f3
Completed intake elastic logging
527dj Dec 3, 2025
6a805cc
update mk5n constants
pmazumder3927 Dec 5, 2025
d18b7cf
use higher freq gyro updates
pmazumder3927 Dec 5, 2025
df7c4f0
user sensortomech ratio
pmazumder3927 Dec 5, 2025
ab59b74
coupling ratio position/vel compensation
pmazumder3927 Dec 5, 2025
dc8e7bb
swerve setpoint generator
pmazumder3927 Dec 5, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .SysId/sysid.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{}
4 changes: 3 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@
{
"name": "WPIlibUnitTests",
"workingDirectory": "${workspaceFolder}/build/jni/release",
"vmargs": ["-Djava.library.path=${workspaceFolder}/build/jni/release"],
"vmargs": [
"-Djava.library.path=${workspaceFolder}/build/jni/release"
],
"env": {
"LD_LIBRARY_PATH": "${workspaceFolder}/build/jni/release",
"DYLD_LIBRARY_PATH": "${workspaceFolder}/build/jni/release"
Expand Down
134 changes: 119 additions & 15 deletions AdvantageScope Swerve Calibration.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"hubs": [
{
"x": 139,
"y": 95,
"width": 1100,
"height": 650,
"x": -8,
"y": -8,
"width": 1936,
"height": 1048,
"state": {
"sidebar": {
"width": 300,
Expand All @@ -13,11 +13,19 @@
"/RealOutputs",
"/RealOutputs/SwerveStates",
"/RealOutputs/SwerveChassisSpeeds",
"/RealOutputs/Odometry"
"/RealOutputs/Odometry",
"/AdvantageKit/RealOutputs",
"/AdvantageKit/RealOutputs/Odometry/Robot",
"/AdvantageKit/RealOutputs/Vision/Camera1",
"/SmartDashboard",
"/AdvantageKit/RealOutputs/Superstructure",
"/AdvantageKit",
"/AdvantageKit/Intake",
"/AdvantageKit/Superstructure"
]
},
"tabs": {
"selected": 1,
"selected": 2,
"tabs": [
{
"type": 0,
Expand Down Expand Up @@ -76,6 +84,51 @@
"logType": "Rotation2d",
"visible": true,
"options": {}
},
{
"type": "states",
"logKey": "NT:/AdvantageKit/RealOutputs/SwerveStates/Measured",
"logType": "SwerveModuleState[]",
"visible": true,
"options": {
"color": "#0000ff",
"arrangement": "0,1,2,3"
}
},
{
"type": "states",
"logKey": "NT:/AdvantageKit/RealOutputs/SwerveStates/SetpointsOptimized",
"logType": "SwerveModuleState[]",
"visible": true,
"options": {
"color": "#00ff00",
"arrangement": "0,1,2,3"
}
},
{
"type": "chassisSpeeds",
"logKey": "NT:/AdvantageKit/RealOutputs/SwerveChassisSpeeds/Measured",
"logType": "ChassisSpeeds",
"visible": true,
"options": {
"color": "#ffff00"
}
},
{
"type": "chassisSpeeds",
"logKey": "NT:/AdvantageKit/RealOutputs/SwerveChassisSpeeds/Setpoints",
"logType": "ChassisSpeeds",
"visible": true,
"options": {
"color": "#ff8c00"
}
},
{
"type": "rotation",
"logKey": "NT:/AdvantageKit/RealOutputs/Odometry/Robot/rotation",
"logType": "Rotation2d",
"visible": true,
"options": {}
}
],
"maxSpeed": 5,
Expand Down Expand Up @@ -120,27 +173,78 @@
"model": "Crab Bot",
"color": "#ff8c00"
}
},
{
"type": "robot",
"logKey": "NT:/AdvantageKit/RealOutputs/Odometry/Robot",
"logType": "Pose2d",
"visible": true,
"options": {
"model": "2024 KitBot"
}
},
{
"type": "vision",
"logKey": "NT:/AdvantageKit/RealOutputs/Vision/Camera0/TagPoses",
"logType": "Pose3d[]",
"visible": true,
"options": {
"color": "#00ff00",
"size": "normal"
}
},
{
"type": "vision",
"logKey": "NT:/AdvantageKit/RealOutputs/Vision/Camera1/TagPoses",
"logType": "Pose3d[]",
"visible": true,
"options": {
"color": "#00ff00",
"size": "normal"
}
},
{
"type": "mechanism",
"logKey": "NT:/SmartDashboard/Intake/Mechanism",
"logType": "Mechanism2d",
"visible": true,
"options": {}
}
],
"game": "2025 Field",
"game": "2025 Field (Welded)",
"origin": "blue"
},
"controllerUUID": "psf0y633oclnjyocus23hcnq1d4tpyte",
"renderer": {
"cameraIndex": -1,
"orbitFov": 50,
"cameraPosition": [
1.4695761589768238e-15,
5.999999999999999,
-12
5.19113927039247,
5.88432583191309,
-3.632652004468072
],
"cameraTarget": [
0,
0.5,
0
5.830818917232525,
0.5503848177969854,
0.6221527170045741
]
},
"controlsHeight": 200
"controlsHeight": 100
},
{
"type": 8,
"title": "Joysticks",
"controller": [
"Xbox Controller (White)",
"None",
"None",
"None",
"None",
"None"
],
"controllerUUID": "txhox0ps7gozefkq4lb225n2hyhj2s3h",
"renderer": null,
"controlsHeight": 85
},
{
"type": 1,
Expand Down Expand Up @@ -459,5 +563,5 @@
}
],
"satellites": [],
"version": "4.0.0-beta-3"
"version": "4.1.5"
}
Loading