Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
64 commits
Select commit Hold shift + click to select a range
480eb86
i would try it if i had an xbox crontroller but for now it might work
themehdev Feb 17, 2026
efc7713
its being rlly wierd but ill fix it later
themehdev Feb 17, 2026
dd7cd94
kk I got it working just it needs some tuning on the hang time
themehdev Feb 18, 2026
4fa0eb4
updated max speed and fixed things from sim
themehdev Feb 18, 2026
cdc89d7
Merge branch 'main' into michael-shooting-while-moving
themehdev Feb 18, 2026
0cb7fed
commented tracking mode out
themehdev Feb 18, 2026
d002a06
added delay to shot so db can rotate correctly
themehdev Feb 18, 2026
2395d26
Commented stuff, got rid of base shoot command, updated hangtime cons…
themehdev Feb 19, 2026
8b00a78
saved some lines, added a bunch of comments (more things to think about)
themehdev Feb 19, 2026
4291534
fixed hood
themehdev Feb 19, 2026
e3468af
updated constants to be more correct
themehdev Feb 19, 2026
e6a4200
took out comments
themehdev Feb 21, 2026
8bc4fa7
moved things around, same functionality
themehdev Feb 23, 2026
ea6145b
moved more things around, pretty clean now :)
themehdev Feb 23, 2026
33f8f6b
Merge branch 'main' into michael-shooting-while-moving
themehdev Feb 24, 2026
d284e2e
fixed merge conflicts
themehdev Feb 24, 2026
8edc55b
removed unused imports
themehdev Feb 24, 2026
b17254b
Merge branch 'main' into michael-shooting-while-moving
themehdev Feb 26, 2026
d234bee
fixing bad merge
themehdev Feb 26, 2026
f44e3ec
made it so literally there is no added complexity when shooting not o…
themehdev Feb 26, 2026
07c6746
added ferrying (NEEDS TESTING)
themehdev Feb 26, 2026
4096400
removed unused imports
themehdev Feb 26, 2026
76d8d71
updated for more code reusability
themehdev Feb 27, 2026
956f4c2
Merge branch 'main' into michael-shooting-while-moving
themehdev Feb 27, 2026
8711ff8
kk it builds again
themehdev Feb 27, 2026
ad98cf7
remove unused imports
themehdev Feb 27, 2026
af0c70f
fixed things with merge
themehdev Feb 27, 2026
5e33948
GUYS IT TOTALLY WORKED
themehdev Feb 28, 2026
85089b6
Merge branch 'main' into michael-shooting-while-moving
themehdev Feb 28, 2026
ffd19fb
fixed merge crappiness
themehdev Feb 28, 2026
cb1ff39
Merge branch 'main' into michael-shooting-while-moving
themehdev Feb 28, 2026
7300c85
Merge branch 'main' into michael-shooting-while-moving
themehdev Mar 2, 2026
f4b97cf
fixing things from merge
themehdev Mar 2, 2026
076d73c
still need to test shooting, but db is working
themehdev Mar 2, 2026
a430873
changed back to comp
themehdev Mar 2, 2026
4681480
made max tuning constants dynamic
themehdev Mar 2, 2026
bdd5563
added comment ig
themehdev Mar 2, 2026
4296ff4
Revert "Fix Long Loop Cycle"
themehdev Mar 2, 2026
24bcfb5
Merge branch 'main' of https://github.com/errorcodexero/Rebuilt2026
themehdev Mar 2, 2026
96111e7
Merge branch 'main' into michael-shooting-while-moving
themehdev Mar 2, 2026
f94944e
fixed new merge conflicts, added better wait for drivebase
themehdev Mar 2, 2026
90a70dc
fixed duplicate things
themehdev Mar 2, 2026
edbe9de
Merge branch 'main' into michael-shooting-while-moving
themehdev Mar 3, 2026
9d57fbb
some cleanup
themehdev Mar 3, 2026
9f5f506
added support for hangtime tuning
themehdev Mar 3, 2026
4e0f191
Merge branch 'main' into michael-shooting-while-moving
themehdev Mar 4, 2026
0b553d2
added tuning for hangtime and its JSON support
themehdev Mar 4, 2026
404c100
add tag loaded back
themehdev Mar 4, 2026
9290275
added different max speed when ferrying
themehdev Mar 5, 2026
c6a329f
Merge branch 'main' into michael-shooting-while-moving
themehdev Mar 6, 2026
224a0a6
get rid of flat tuning
themehdev Mar 6, 2026
6cd2910
updated shoot command to stop shooting when angle isn't correct, and …
themehdev Mar 6, 2026
4d380ea
Merge branch 'main' into michael-shooting-while-moving
themehdev Mar 6, 2026
1ad4c1a
fixed idiot merge conflicts
themehdev Mar 6, 2026
844b354
Merge branch 'main' into michael-shooting-while-moving
themehdev Mar 8, 2026
4026b08
Merge branch 'main' into michael-shooting-while-moving
themehdev Mar 10, 2026
7c99df1
Merge branch 'main' into michael-shooting-while-moving
themehdev Mar 11, 2026
ecc0f83
Reorganize Shoot on the Move
blaze-developer Mar 11, 2026
3b8a109
Remove cmd
blaze-developer Mar 11, 2026
6852bb3
Revert
blaze-developer Mar 11, 2026
d1071cd
Clean
blaze-developer Mar 11, 2026
ddf6f14
CLeanup
blaze-developer Mar 11, 2026
8bc15f2
Add slow mode for shooting
blaze-developer Mar 11, 2026
70de08c
Shoot on the move
blaze-developer Mar 11, 2026
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
51 changes: 34 additions & 17 deletions src/main/deploy/tuning/arc.json
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,20 @@
{
// Shoot cmd
"distance" : 1.48,
"velocity" : 54.0
"velocity" : 54.0,
"hangtime" : 1.8
},
{
// Shoot cmd
"distance" : 1.60,
"velocity" : 56.0
"velocity" : 56.0,
"hangtime" : 1.8
},
{
// Shoot cmd
"distance" : 1.80,
"velocity" : 61.0
"velocity" : 61.0,
"hangtime" : 1.8
}
]
},
Expand All @@ -27,22 +30,26 @@
{
// Shoot cmd
"distance" : 2.0,
"velocity" : 54.0
"velocity" : 54.0,
"hangtime" : 1.8
},
{
// Shoot cmd
"distance" : 2.20,
"velocity" : 56.0
"velocity" : 56.0,
"hangtime" : 1.8
},
{
// Shoot mode
"distance" : 2.40,
"velocity" : 59.0
"velocity" : 59.0,
"hangtime" : 1.8
},
{
// Shoot mode
"distance" : 2.60,
"velocity" : 61.0
"velocity" : 61.0,
"hangtime" : 1.8
}
]
},
Expand All @@ -52,32 +59,38 @@
{
// Shoot cmd
"distance" : 2.8,
"velocity" : 56
"velocity" : 56,
"hangtime" : 1.8
},
{
// Shoot cmd
"distance" : 3.0,
"velocity" : 58
"velocity" : 58,
"hangtime" : 1.8
},
{
// Shoot cmd
"distance" : 3.2,
"velocity" : 59
"velocity" : 59,
"hangtime" : 1.8
},
{
// Shoot cmd
"distance" : 3.4,
"velocity" : 61
"velocity" : 61,
"hangtime" : 1.8
},
{
// Shoot cmd
"distance" : 3.60,
"velocity" : 63.0
"velocity" : 63.0,
"hangtime" : 1.8
},
{
// Shoot cmd
"distance" : 3.8,
"velocity" : 64.0
"velocity" : 64.0,
"hangtime" : 1.8
}
]
},
Expand All @@ -87,22 +100,26 @@
{
// Shoot cmd
"distance" : 4.00,
"velocity" : 60.0
"velocity" : 60.0,
"hangtime" : 1.8
},
{
// Shoot cmd
"distance" : 4.3,
"velocity" : 62.0
"velocity" : 62.0,
"hangtime" : 1.8
},
{
// Shoot cmd
"distance" : 4.6,
"velocity" : 64.0
"velocity" : 64.0,
"hangtime" : 1.8
},
{
// Shoot cmd
"distance" : 5.25,
"velocity" : 73.0
"velocity" : 73.0,
"hangtime" : 1.8
}
]
}
Expand Down
70 changes: 0 additions & 70 deletions src/main/flat.json

This file was deleted.

6 changes: 6 additions & 0 deletions src/main/java/frc/robot/Constants.java
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,16 @@ public final class Constants {
// Sets the currently running robot. Change to SIMBOT when running the
// desktop physics simulation so AdvantageKit runs in SIM mode instead of
// falling back to REPLAY.
//REMEMBER TO CHANGE BACK TO COMPETITION!
private static final RobotType robotType = RobotType.COMPETITION;

public static final boolean spawnLessFuelInSim = true;

public static final boolean shootOnMove = true;

public static final double speedMultiplierShooting = 0.2;
public static final double speedMultiplierFerrying = 0.8;

public static class DriveConstants {
public static final double slowModeJoystickMultiplier = 0.4;
}
Expand Down
22 changes: 12 additions & 10 deletions src/main/java/frc/robot/RobotContainer.java
Original file line number Diff line number Diff line change
Expand Up @@ -217,8 +217,8 @@ public RobotContainer() {
if (hopper_ == null) {
hopper_ = new Hopper(new HopperIO() {});
}

// Force Load Apriltag Layout
// Force Preload Static Apriltag Layout
for (var tag : FieldConstants.layout.getTags()) {
System.out.println("Tag Loaded: " + tag.ID);
}
Expand All @@ -230,7 +230,11 @@ public RobotContainer() {
() -> -gamepad_.getRightX()
);

RobotState.initialize(drivebase_::getPose);
RobotState.initialize(
drivebase_::getPose,
drivebase_::getFieldChassisSpeeds,
shooter_::getTuning
);

// Initialize the visualizers.
Mechanism3d.measured.zero();
Expand Down Expand Up @@ -285,19 +289,17 @@ private void configureBindings() {
// While the left trigger is held, we will run the intake. If the intake is stowed, it will also deploy it.
gamepad_.leftTrigger().or(operatorGamepad_.leftTrigger()).whileTrue(RobotCommands.intake(intake_, hopper_));

// While the right trigger is held, we will shoot into the hub or ferry. Binding A to the shaking of the shooter.
// While the right trigger is held, we will shoot into the hub or ferry.
gamepad_.rightTrigger().or(operatorGamepad_.rightTrigger())
.whileTrue(RobotCommands.shoot(shooter_, hopper_, intake_, drivebase_, gamepad_.a().or(operatorGamepad_.a())));

// When the shooter isnt shooting, get it ready to shoot.
shooter_.setDefaultCommand(shooter_.idleCommand());

//While the X button is held, the intake will run the eject sequence. If it the intake is stowed, it will also deploy it.

// While the X button is held, the intake will run the eject sequence. If it the intake is stowed, it will also deploy it.
operatorGamepad_.x().whileTrue(intake_.hopperEjectSequence().alongWith(hopper_.reverseFeed()));

operatorGamepad_.y().whileTrue(RobotCommands.ejectUp(shooter_, hopper_));

// When the shooter isnt shooting, stow it.
shooter_.setDefaultCommand(shooter_.idleCommand());

// Bind dashboard button to refreshing the tuning.
var refreshTuningButton = new LoggedNetworkBoolean("/Tuning/RefreshTuning", false);
new Trigger(refreshTuningButton::get)
Expand Down
Loading
Loading