Skip to content

Commit 3fab6ca

Browse files
authored
Merge pull request #2 from StuyPulse/ian
Ready for testing
2 parents 8f50840 + 5cdad12 commit 3fab6ca

36 files changed

+2083
-545
lines changed

.Glass/glass.json

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,44 @@
11
{
2+
"NetworkTables": {
3+
"transitory": {
4+
"SmartDashboard": {
5+
"Odometry": {
6+
"open": true
7+
},
8+
"Vision": {
9+
"open": true
10+
},
11+
"open": true
12+
},
13+
"limelight": {
14+
"open": true
15+
}
16+
},
17+
"types": {
18+
"/FMSInfo": "FMSInfo",
19+
"/SmartDashboard/Alerts": "Alerts",
20+
"/SmartDashboard/Autonomous": "String Chooser",
21+
"/SmartDashboard/Field": "Field2d"
22+
},
23+
"windows": {
24+
"/SmartDashboard/Field": {
25+
"bottom": 1476,
26+
"height": 8.210550308227539,
27+
"left": 150,
28+
"right": 2961,
29+
"top": 79,
30+
"width": 16.541748046875,
31+
"window": {
32+
"visible": true
33+
}
34+
}
35+
}
36+
},
237
"NetworkTables Info": {
338
"visible": true
39+
},
40+
"NetworkTables Settings": {
41+
"mode": "Client (NT4)",
42+
"serverTeam": "694"
443
}
544
}

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
plugins {
22
id "java"
3-
id "edu.wpi.first.GradleRIO" version "2025.1.1"
3+
id "edu.wpi.first.GradleRIO" version "2025.2.1"
44
id "com.diffplug.spotless" version "6.22.0"
55
}
66

gradle/wrapper/gradle-wrapper.jar

-15.6 KB
Binary file not shown.
Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=permwrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip
4+
networkTimeout=10000
5+
validateDistributionUrl=true
46
zipStoreBase=GRADLE_USER_HOME
5-
zipStorePath=permwrapper/dists
7+
zipStorePath=permwrapper/dists

gradlew

Lines changed: 37 additions & 19 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gradlew.bat

Lines changed: 14 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

settings.gradle

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,3 +25,6 @@ pluginManagement {
2525
}
2626
}
2727
}
28+
29+
Properties props = System.getProperties();
30+
props.setProperty("org.gradle.internal.native.headers.unresolved.dependencies.ignore", "true");

simgui.json

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,13 @@
88
},
99
"windows": {
1010
"/SmartDashboard/Field": {
11-
"bottom": 1476,
12-
"height": 8.210550308227539,
13-
"left": 150,
14-
"right": 2961,
15-
"top": 79,
16-
"width": 16.541748046875,
11+
"bottom": 1638,
12+
"builtin": "2025 Reefscape",
13+
"height": 8.051901817321777,
14+
"left": 534,
15+
"right": 3466,
16+
"top": 291,
17+
"width": 17.54825210571289,
1718
"window": {
1819
"visible": true
1920
}

src/main/java/com/stuypulse/robot/Robot.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55

66
package com.stuypulse.robot;
77

8+
import com.stuypulse.robot.constants.Field;
9+
810
import edu.wpi.first.wpilibj.DriverStation;
911
import edu.wpi.first.wpilibj.TimedRobot;
1012
import edu.wpi.first.wpilibj2.command.Command;

src/main/java/com/stuypulse/robot/RobotContainer.java

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
package com.stuypulse.robot;
22

3-
import com.stuypulse.robot.commands.Test;
3+
import com.stuypulse.robot.commands.AutoPilot;
44
import com.stuypulse.robot.commands.auton.DoNothingAuton;
55
import com.stuypulse.robot.commands.dropper.DropperDrop;
6+
import com.stuypulse.robot.commands.dropper.DropperShootSequence;
67
import com.stuypulse.robot.commands.dropper.DropperStop;
78
import com.stuypulse.robot.commands.swerve.SwerveDriveDrive;
89
import com.stuypulse.robot.commands.swerve.SwervePIDToPose;
@@ -43,7 +44,7 @@ public class RobotContainer {
4344
// Robot container
4445

4546
public RobotContainer() {
46-
swerve.configureAutoBuilder();
47+
swerve.configureAutoBuilder();
4748
configureDefaultCommands();
4849
configureButtonBindings();
4950
configureAutons();
@@ -54,7 +55,6 @@ public RobotContainer() {
5455
/****************/
5556

5657
private void configureDefaultCommands() {
57-
// swerve.setDefaultCommand(new Test());
5858
swerve.setDefaultCommand(new SwerveDriveDrive(driver));
5959
}
6060

@@ -63,12 +63,19 @@ private void configureDefaultCommands() {
6363
/***************/
6464

6565
private void configureButtonBindings() {
66+
67+
// manual shoot
6668
driver.getRightTriggerButton()
6769
.onTrue(new DropperDrop())
6870
.onFalse(new DropperStop());
6971

72+
// align to closest coral and then shoot automatically
7073
driver.getRightButton()
71-
.whileTrue(new SwervePIDToPose(() -> Field.getTargetPoseForCoralBranch(Field.getClosestBranch())));
74+
.whileTrue(new SwervePIDToPose(() -> Field.getTargetPoseForCoralBranch(Field.getClosestBranch()))
75+
.andThen(new DropperShootSequence()));
76+
77+
driver.getTopButton()
78+
.whileTrue(new AutoPilot().repeatedly());
7279
}
7380

7481
/**************/

0 commit comments

Comments
 (0)