Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pull in auto controlls #61

Open
wants to merge 45 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
5ef4432
setup basic input
ChloroticLeaf Jan 23, 2025
f0d8f04
Update README.md
ChloroticLeaf Jan 23, 2025
7d54a63
kinda work
ChloroticLeaf Jan 29, 2025
a297b63
small chanmges
ChloroticLeaf Jan 29, 2025
6e452c8
f# Conflicts:
Saturncorgi Jan 7, 2025
42886e3
added like code
Saturncorgi Jan 7, 2025
34992c7
more code
Saturncorgi Jan 8, 2025
2d19df5
update backup
Saturncorgi Jan 8, 2025
04e057d
no warnings 😊
Saturncorgi Jan 8, 2025
dbc3f66
swerve updates + test code for motors
Saturncorgi Jan 15, 2025
191c7ff
got rid of swerve stuff while it does not work
Saturncorgi Jan 17, 2025
175fca9
read the drive stuff i commented out
Saturncorgi Jan 17, 2025
01e3a3d
made numbers come out + put ids to smartdashboard
Saturncorgi Jan 17, 2025
f5d44b7
not super sure acctually
Saturncorgi Jan 23, 2025
d90ce07
some *limited* commenting + added canAlignCoral smart dashboard value
Jan 23, 2025
6c4a13f
added pose estimation based on all 4 cameras possibly
Jan 23, 2025
0184e77
FYI that was all writen at 11:30 at night and probably won't work
Jan 23, 2025
4225bf7
cleaned up comments a bit
Saturncorgi Jan 23, 2025
7f97df9
re-add drive stuff + format vision stuff
Saturncorgi Jan 23, 2025
24b0d32
IDK stuff
Saturncorgi Jan 23, 2025
5855b60
Allow for an arbitrary number of cameras
Saturncorgi Jan 23, 2025
a79b52d
also stuff
Saturncorgi Jan 23, 2025
6abc222
a bit of input validation
Saturncorgi Jan 23, 2025
c9b5a10
stuff
Saturncorgi Jan 23, 2025
843d902
update all vendordeps
Saturncorgi Jan 23, 2025
70153f2
Created Coral Wrist Command, Subsystem and Constants file plus util f…
ryanelbert5125gmail Jan 20, 2025
2458538
Create gradle.yml
Saturncorgi Jan 23, 2025
dd5bb18
Update gradle.yml
Saturncorgi Jan 23, 2025
3e083db
Update gradle.yml
Saturncorgi Jan 23, 2025
b627614
Update gradle.yml
Saturncorgi Jan 23, 2025
75122bf
Update gradle.yml
Saturncorgi Jan 23, 2025
ae1f477
Add workflow status badge to readme
Saturncorgi Jan 23, 2025
d786b53
Updated drive
a-mishmash Jan 23, 2025
65a79fa
stuff again
Saturncorgi Jan 24, 2025
2b69c28
bingus
a-mishmash Jan 24, 2025
1da318a
no warnings
Saturncorgi Jan 24, 2025
37d1455
actually no warnings
Saturncorgi Jan 24, 2025
0226179
stuff
Saturncorgi Jan 24, 2025
d0e160b
Offset changes
a-mishmash Jan 24, 2025
7e238f4
update
Saturncorgi Jan 29, 2025
9643238
somewhat auto worke
ChloroticLeaf Jan 29, 2025
a3a420f
Worke!! up to date!
ChloroticLeaf Jan 29, 2025
a5323c4
auto setup
ChloroticLeaf Feb 26, 2025
6bcaa9e
Merge branch 'main' into 22-auto-general-controls
ChloroticLeaf Feb 27, 2025
5fd0bc2
add auto controls
ChloroticLeaf Feb 27, 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 .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
hs_err_pid*
replay_pid*
build/
build/
.gradle/
.vscode/
.idea/ # please do not use IntelliJ!
Expand Down
2 changes: 1 addition & 1 deletion .wpilib/wpilib_preferences.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"currentLanguage": "java",
"enableCppIntellisense": false,
"projectYear": "none",
"projectYear": 2025,
"teamNumber": 4180
}
3 changes: 1 addition & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,7 @@ deploy {
frcStaticFileDeploy(getArtifactTypeClass('FileTreeArtifact')) {
files = project.fileTree('src/main/deploy')
directory = '/home/lvuser/deploy'
deleteOldFiles = false // Change to true to delete files on roboRIO that no
// longer exist in deploy directory of this project
deleteOldFiles = true // helps with pathplaner but could cause issue maybe
}
}
}
Expand Down
Binary file modified ctre_sim/Talon FX vers. C - 01 - 0 - ext.dat
Binary file not shown.
Binary file modified ctre_sim/Talon FX vers. C - 03 - 0 - ext.dat
Binary file not shown.
Binary file modified ctre_sim/Talon FX vers. C - 05 - 0 - ext.dat
Binary file not shown.
Binary file modified ctre_sim/Talon FX vers. C - 07 - 0 - ext.dat
Binary file not shown.
1 change: 1 addition & 0 deletions networktables.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
[]
100 changes: 100 additions & 0 deletions simgui-ds.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
{
"keyboardJoysticks": [
{
"axisConfig": [
{
"decKey": 65,
"incKey": 68
},
{
"decKey": 87,
"incKey": 83
},
{
"decKey": 69,
"decayRate": 0.0,
"incKey": 82,
"keyRate": 0.009999999776482582
}
],
"axisCount": 3,
"buttonCount": 4,
"buttonKeys": [
90,
88,
67,
86
],
"povConfig": [
{
"key0": 328,
"key135": 323,
"key180": 322,
"key225": 321,
"key270": 324,
"key315": 327,
"key45": 329,
"key90": 326
}
],
"povCount": 1
},
{
"axisConfig": [
{
"decKey": 74,
"incKey": 76
},
{
"decKey": 73,
"incKey": 75
}
],
"axisCount": 2,
"buttonCount": 4,
"buttonKeys": [
77,
44,
46,
47
],
"povCount": 0
},
{
"axisConfig": [
{
"decKey": 263,
"incKey": 262
},
{
"decKey": 265,
"incKey": 264
}
],
"axisCount": 2,
"buttonCount": 6,
"buttonKeys": [
260,
268,
266,
261,
269,
267
],
"povCount": 0
},
{
"axisCount": 0,
"buttonCount": 0,
"povCount": 0
}
],
"robotJoysticks": [
{
"guid": "Keyboard1"
},
{
"guid": "Keyboard0"
}
]
}
70 changes: 70 additions & 0 deletions simgui-window.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
{
"Docking": {
"Data": []
},
"MainWindow": {
"GLOBAL": {
"font": "Fira Code Retina",
"fps": "120",
"height": "635",
"maximized": "0",
"style": "3",
"userScale": "2",
"width": "638",
"xpos": "1281",
"ypos": "387"
}
},
"Window": {
"###FMS": {
"Collapsed": "0",
"Pos": "619,616",
"Size": "172,198"
},
"###Joysticks": {
"Collapsed": "0",
"Pos": "155,183",
"Size": "632,169"
},
"###NetworkTables": {
"Collapsed": "0",
"Pos": "152,616",
"Size": "750,185"
},
"###NetworkTables Info": {
"Collapsed": "0",
"Pos": "619,544",
"Size": "750,145"
},
"###Other Devices": {
"Collapsed": "0",
"Pos": "619,25",
"Size": "250,695"
},
"###Plot <0>": {
"Collapsed": "0",
"Pos": "825,385",
"Size": "700,400"
},
"###System Joysticks": {
"Collapsed": "0",
"Pos": "5,350",
"Size": "231,236"
},
"###Timing": {
"Collapsed": "0",
"Pos": "194,44",
"Size": "139,171"
},
"Debug##Default": {
"Collapsed": "0",
"Pos": "60,60",
"Size": "400,400"
},
"Robot State": {
"Collapsed": "0",
"Pos": "5,20",
"Size": "108,122"
}
}
}
47 changes: 47 additions & 0 deletions simgui.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
{
"NTProvider": {
"types": {
"/FMSInfo": "FMSInfo",
"/SmartDashboard/Alerts": "Alerts",
"/SmartDashboard/Auto Select": "String Chooser",
"/SmartDashboard/Encoders": "Alerts",
"/SmartDashboard/Field": "Field2d",
"/SmartDashboard/IMU": "Alerts",
"/SmartDashboard/JSON": "Alerts",
"/SmartDashboard/Motors": "Alerts",
"/SmartDashboard/Pigeon 2 (v6) [11]": "Gyro",
"/SmartDashboard/Swerve Drive": "Alerts"
}
},
"NetworkTables Info": {
"visible": true
},
"Plot": {
"Plot <0>": {
"plots": [
{
"backgroundColor": [
0.10000000149011612,
0.10000000149011612,
0.10000000149011612,
1.0
],
"height": 154
},
{
"backgroundColor": [
0.10000000149011612,
0.10000000149011612,
0.10000000149011612,
1.0
],
"height": 154
}
],
"window": {
"name": "/SmartDashboard/Field",
"visible": false
}
}
}
}
1 change: 1 addition & 0 deletions src/deploy/pathplanner/navgrid.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"field_size":{"x":17.548,"y":8.052},"nodeSizeMeters":0.3,"grid":[[true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true],[true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true],[true,true,true,true,true,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,true,true,true,true,true],[true,true,true,true,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,true,true,true,true],[true,true,true,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,true,true,true],[true,true,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,true,true],[true,true,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,true,true],[true,true,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,true,true],[true,true,false,false,false,false,false,false,false,false,false,false,false,false,true,true,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,true,true,true,false,false,false,false,false,false,false,false,false,false,false,false,true,true],[true,true,false,false,false,false,false,false,false,false,false,false,true,true,true,true,true,true,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,true,true,true,true,true,false,false,false,false,false,false,false,false,false,false,false,true,true],[true,true,false,false,false,false,false,false,false,false,false,true,true,true,true,true,true,true,true,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,true,true,true,true,true,true,true,false,false,false,false,false,false,false,false,false,false,true,true],[true,true,false,false,false,false,false,false,false,false,true,true,true,true,true,true,true,true,true,true,false,false,false,false,false,false,false,false,true,true,true,false,false,false,false,false,false,false,false,true,true,true,true,true,true,true,true,true,false,false,false,false,false,false,false,false,false,true,true],[true,true,false,false,false,false,false,false,false,false,true,true,true,true,true,true,true,true,true,true,false,false,false,false,false,false,false,true,true,true,true,true,false,false,false,false,false,false,false,true,true,true,true,true,true,true,true,true,false,false,false,false,false,false,false,false,false,true,true],[true,true,false,false,false,false,false,false,false,false,true,true,true,true,true,true,true,true,true,true,false,false,false,false,false,false,false,true,true,true,true,true,false,false,false,false,false,false,false,true,true,true,true,true,true,true,true,true,false,false,false,false,false,false,false,false,false,true,true],[true,true,false,false,false,false,false,false,false,false,true,true,true,true,true,true,true,true,true,true,false,false,false,false,false,false,false,true,true,true,true,true,false,false,false,false,false,false,false,true,true,true,true,true,true,true,true,true,false,false,false,false,false,false,false,false,false,true,true],[true,true,false,false,false,false,false,false,false,false,true,true,true,true,true,true,true,true,true,true,false,false,false,false,false,false,false,false,true,true,true,false,false,false,false,false,false,false,false,true,true,true,true,true,true,true,true,true,false,false,false,false,false,false,false,false,false,true,true],[true,true,false,false,false,false,false,false,false,false,false,true,true,true,true,true,true,true,true,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,true,true,true,true,true,true,true,false,false,false,false,false,false,false,false,false,false,true,true],[true,true,false,false,false,false,false,false,false,false,false,false,true,true,true,true,true,true,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,true,true,true,true,true,false,false,false,false,false,false,false,false,false,false,false,true,true],[true,true,false,false,false,false,false,false,false,false,false,false,false,false,true,true,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,true,true,true,false,false,false,false,false,false,false,false,false,false,false,false,true,true],[true,true,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,true,true],[true,true,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,true,true],[true,true,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,true,true],[true,true,true,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,true,true,true],[true,true,true,true,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,true,true,true,true],[true,true,true,true,true,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,false,true,true,true,true,true],[true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true],[true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true]]}
54 changes: 54 additions & 0 deletions src/deploy/pathplanner/paths/NAMEME.path
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
{
"version": "2025.0",
"waypoints": [
{
"anchor": {
"x": 2.0,
"y": 7.0
},
"prevControl": null,
"nextControl": {
"x": 3.0,
"y": 7.0
},
"isLocked": false,
"linkedName": null
},
{
"anchor": {
"x": 4.0,
"y": 6.0
},
"prevControl": {
"x": 3.0,
"y": 6.0
},
"nextControl": null,
"isLocked": false,
"linkedName": null
}
],
"rotationTargets": [],
"constraintZones": [],
"pointTowardsZones": [],
"eventMarkers": [],
"globalConstraints": {
"maxVelocity": 3.0,
"maxAcceleration": 3.0,
"maxAngularVelocity": 540.0,
"maxAngularAcceleration": 720.0,
"nominalVoltage": 12.0,
"unlimited": false
},
"goalEndState": {
"velocity": 0,
"rotation": 0.0
},
"reversed": false,
"folder": null,
"idealStartingState": {
"velocity": 0,
"rotation": 0.0
},
"useDefaultConstraints": true
}
32 changes: 32 additions & 0 deletions src/deploy/pathplanner/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{
"robotWidth": 0.9,
"robotLength": 0.9,
"holonomicMode": true,
"pathFolders": [],
"autoFolders": [],
"defaultMaxVel": 3.0,
"defaultMaxAccel": 3.0,
"defaultMaxAngVel": 540.0,
"defaultMaxAngAccel": 720.0,
"defaultNominalVoltage": 12.0,
"robotMass": 74.088,
"robotMOI": 6.883,
"robotTrackwidth": 0.546,
"driveWheelRadius": 0.048,
"driveGearing": 5.143,
"maxDriveSpeed": 5.45,
"driveMotorType": "krakenX60",
"driveCurrentLimit": 60.0,
"wheelCOF": 1.2,
"flModuleX": 0.273,
"flModuleY": 0.273,
"frModuleX": 0.273,
"frModuleY": -0.273,
"blModuleX": -0.273,
"blModuleY": 0.273,
"brModuleX": -0.273,
"brModuleY": -0.273,
"bumperOffsetX": 0.0,
"bumperOffsetY": 0.0,
"robotFeatures": []
}
2 changes: 1 addition & 1 deletion src/main/deploy/swerve/modules/backleft.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"canbus": null
},
"inverted": {
"drive": true,
"drive": false,
"angle": true
},
"absoluteEncoderInverted": false
Expand Down
12 changes: 12 additions & 0 deletions src/main/java/org/ironriders/core/RobotContainer.java
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@
import org.ironriders.elevator.ElevatorCommands;
import org.ironriders.elevator.ElevatorSubsystem;
import org.ironriders.elevator.ElevatorConstants;
//import org.ironriders.manipulators.CoralWristCommands;
//import org.ironriders.manipulators.CoralWristSubsystem;

import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard;
import edu.wpi.first.wpilibj.GenericHID;
import edu.wpi.first.wpilibj.smartdashboard.SendableChooser;
Expand All @@ -33,11 +36,20 @@
import org.ironriders.vision.Vision;
import org.photonvision.PhotonCamera;

import edu.wpi.first.wpilibj2.command.button.CommandGenericHID;
import org.ironriders.vision.VisionCommands;
import org.ironriders.vision.VisionSubsystem;
import org.photonvision.PhotonCamera;

import edu.wpi.first.wpilibj2.command.Command;
import edu.wpi.first.wpilibj2.command.button.CommandGenericHID;
import edu.wpi.first.wpilibj2.command.button.CommandGenericHID;
import edu.wpi.first.wpilibj2.command.button.CommandXboxController;
import edu.wpi.first.wpilibj2.command.button.Trigger;
//import edu.wpi.*;
import com.pathplanner.lib.auto.AutoBuilder;
import com.pathplanner.lib.commands.PathPlannerAuto;
import com.pathplanner.lib.path.PathPlannerPath;

/**
* This class is where the bulk of the robot should be declared. Since
Expand Down
1 change: 1 addition & 0 deletions src/main/java/org/ironriders/core/Utils.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package org.ironriders.core;


public class Utils {

/**
Expand Down
Loading
Loading