Skip to content

Commit

Permalink
Merge pull request #82 from IronRiders/main
Browse files Browse the repository at this point in the history
part 2 MERGE IN ORDER
  • Loading branch information
a-mishmash authored Mar 8, 2025
2 parents 6d72a97 + 849fdf7 commit d5a2517
Show file tree
Hide file tree
Showing 61 changed files with 1,160 additions and 295 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ name: CI
# events but only for the main branch.
on:
push:
branches: [ main ]
branches: [ main , competition-working ]
pull_request:
branches: [ main ]
branches: [ main , competition-working ]
# A workflow run is made up of one or more jobs that can run sequentially or in parallel
jobs:
# This workflow contains a single job called "build"
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.
42 changes: 21 additions & 21 deletions simgui-window.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,49 +6,49 @@
"GLOBAL": {
"font": "Proggy Dotted",
"fps": "120",
"height": "583",
"maximized": "0",
"height": "450",
"maximized": "1",
"style": "0",
"userScale": "2",
"width": "944",
"xpos": "974",
"ypos": "495"
"width": "959",
"xpos": "0",
"ypos": "575"
}
},
"Window": {
"###/FMSInfo": {
"Collapsed": "0",
"Pos": "89,544",
"Size": "181,167"
"Pos": "3,360",
"Size": "217,194"
},
"###Analog Inputs": {
"Collapsed": "0",
"Pos": "602,32",
"Size": "260,164"
"Size": "315,182"
},
"###FMS": {
"Collapsed": "0",
"Pos": "63,368",
"Size": "169,184"
"Pos": "2,431",
"Size": "202,214"
},
"###Joysticks": {
"Collapsed": "0",
"Pos": "250,148",
"Size": "796,222"
"Pos": "-1,431",
"Size": "976,179"
},
"###NetworkTables": {
"Collapsed": "0",
"Pos": "925,564",
"Pos": "940,417",
"Size": "750,401"
},
"###NetworkTables Info": {
"Collapsed": "0",
"Pos": "925,357",
"Pos": "940,2",
"Size": "750,416"
},
"###Other Devices": {
"Collapsed": "0",
"Pos": "925,20",
"Collapsed": "1",
"Pos": "914,23",
"Size": "250,695"
},
"###Plot <0>": {
Expand All @@ -58,13 +58,13 @@
},
"###System Joysticks": {
"Collapsed": "0",
"Pos": "409,560",
"Size": "204,218"
"Pos": "409,431",
"Size": "232,254"
},
"###Timing": {
"Collapsed": "0",
"Pos": "5,150",
"Size": "135,173"
"Pos": "3,164",
"Size": "162,194"
},
"Debug##Default": {
"Collapsed": "0",
Expand All @@ -74,7 +74,7 @@
"Robot State": {
"Collapsed": "0",
"Pos": "5,20",
"Size": "99,116"
"Size": "118,134"
}
}
}
1 change: 1 addition & 0 deletions simgui.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
"/SmartDashboard/IMU": "Alerts",
"/SmartDashboard/JSON": "Alerts",
"/SmartDashboard/Motors": "Alerts",
"/SmartDashboard/PathPlanner": "Alerts",
"/SmartDashboard/Pigeon 2 (v6) [9]": "Gyro",
"/SmartDashboard/Subsystems/AlgaeIntake/Algae Intake Eject": "Command",
"/SmartDashboard/Subsystems/AlgaeIntake/Algae Intake Grab": "Command",
Expand Down
2 changes: 1 addition & 1 deletion src/main/deploy/elastic-layout.json
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@
"height": 128.0,
"type": "Boolean Box",
"properties": {
"topic": "/SmartDashboard/Subsystems/CoralWrist/ForwardLimit",
"topic": "/SmartDashboard/Subsystems/AlgaeWrist/ForwardLimit",
"period": 0.06,
"data_type": "boolean",
"true_color": 4283215696,
Expand Down
38 changes: 38 additions & 0 deletions src/main/deploy/pathplanner/autos/Center Start.auto
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"version": "2025.0",
"command": {
"type": "sequential",
"data": {
"commands": [
{
"type": "parallel",
"data": {
"commands": [
{
"type": "path",
"data": {
"pathName": "Blue Start - Blue Front Reef"
}
},
{
"type": "named",
"data": {
"name": "Prepare to Score Coral L4"
}
}
]
}
},
{
"type": "named",
"data": {
"name": "Score Coral L4"
}
}
]
}
},
"resetOdom": true,
"folder": null,
"choreoAuto": false
}
19 changes: 19 additions & 0 deletions src/main/deploy/pathplanner/autos/Drive Station 1-Wall Leave.auto
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"version": "2025.0",
"command": {
"type": "sequential",
"data": {
"commands": [
{
"type": "path",
"data": {
"pathName": "Drive Station 1-Wall Leave"
}
}
]
}
},
"resetOdom": true,
"folder": null,
"choreoAuto": false
}
19 changes: 19 additions & 0 deletions src/main/deploy/pathplanner/autos/Drive Station 3-Wall Leave.auto
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"version": "2025.0",
"command": {
"type": "sequential",
"data": {
"commands": [
{
"type": "path",
"data": {
"pathName": "Drive Station 3-Wall Leave"
}
}
]
}
},
"resetOdom": true,
"folder": null,
"choreoAuto": false
}
19 changes: 19 additions & 0 deletions src/main/deploy/pathplanner/autos/leave start blue 1.auto
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"version": "2025.0",
"command": {
"type": "sequential",
"data": {
"commands": [
{
"type": "path",
"data": {
"pathName": "leave start blue 1"
}
}
]
}
},
"resetOdom": true,
"folder": "leave start blue",
"choreoAuto": false
}
19 changes: 19 additions & 0 deletions src/main/deploy/pathplanner/autos/leave start blue 2.auto
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"version": "2025.0",
"command": {
"type": "sequential",
"data": {
"commands": [
{
"type": "path",
"data": {
"pathName": " leave start blue 2"
}
}
]
}
},
"resetOdom": true,
"folder": "leave start blue",
"choreoAuto": false
}
19 changes: 19 additions & 0 deletions src/main/deploy/pathplanner/autos/leave start blue 3.auto
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"version": "2025.0",
"command": {
"type": "sequential",
"data": {
"commands": [
{
"type": "path",
"data": {
"pathName": "leave start blue 3"
}
}
]
}
},
"resetOdom": true,
"folder": "leave start blue",
"choreoAuto": false
}
19 changes: 19 additions & 0 deletions src/main/deploy/pathplanner/autos/leave start red 1.auto
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"version": "2025.0",
"command": {
"type": "sequential",
"data": {
"commands": [
{
"type": "path",
"data": {
"pathName": "leave start red 1"
}
}
]
}
},
"resetOdom": true,
"folder": "leave start red",
"choreoAuto": false
}
19 changes: 19 additions & 0 deletions src/main/deploy/pathplanner/autos/leave start red 2.auto
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"version": "2025.0",
"command": {
"type": "sequential",
"data": {
"commands": [
{
"type": "path",
"data": {
"pathName": "leave start red 2"
}
}
]
}
},
"resetOdom": true,
"folder": "leave start red",
"choreoAuto": false
}
19 changes: 19 additions & 0 deletions src/main/deploy/pathplanner/autos/leave start red 3.auto
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"version": "2025.0",
"command": {
"type": "sequential",
"data": {
"commands": [
{
"type": "path",
"data": {
"pathName": "leave start red 3"
}
}
]
}
},
"resetOdom": true,
"folder": "leave start red",
"choreoAuto": false
}
54 changes: 54 additions & 0 deletions src/main/deploy/pathplanner/paths/ leave start blue 2.path
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
{
"version": "2025.0",
"waypoints": [
{
"anchor": {
"x": 8.045797119140625,
"y": 6.154051513671875
},
"prevControl": null,
"nextControl": {
"x": 9.045797119140627,
"y": 6.154051513671875
},
"isLocked": false,
"linkedName": null
},
{
"anchor": {
"x": 6.225384521484375,
"y": 6.154051513671875
},
"prevControl": {
"x": 5.225384521484375,
"y": 6.154051513671875
},
"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": "leave start blue",
"idealStartingState": {
"velocity": 0,
"rotation": 0.0
},
"useDefaultConstraints": true
}
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
"rotation": -125.00000000000001
},
"reversed": false,
"folder": "Blue Left Human",
"folder": "other",
"idealStartingState": {
"velocity": 0,
"rotation": 59.99999999999999
Expand Down
Loading

0 comments on commit d5a2517

Please sign in to comment.