Skip to content
This repository was archived by the owner on May 1, 2026. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
24 changes: 24 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# --- Set default behavior to automatically normalize line endings ---
# This ensures text files use LF in the repo, but correct endings on checkout
* text=auto

# --- Ensure specific file types are treated as text/binary correctly ---
*.java text
*.xml text
*.gradle text
*.properties text
*.md text
.gitignore text
.gitattributes text

# Treat image files and binary assets as binary to prevent corruption
*.png binary
*.jpg binary
*.jpeg binary
*.gif binary
*.ico binary
*.so binary

# Gradle wrapper scripts should keep their executable bit and line endings
gradlew text eol=lf
gradlew.bat text eol=crlf
67 changes: 0 additions & 67 deletions .github/workflows/mistake-pr.yml

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import com.qualcomm.robotcore.hardware.DcMotorSimple;

public class Constants {
double robotMass = 6.7
public static DriveEncoderConstants localizerConstants = new DriveEncoderConstants()
.rightFrontMotorName("rightFront")
.rightRearMotorName("rightRear")
Expand All @@ -21,7 +22,7 @@ public class Constants {
.rightFrontEncoderDirection(Encoder.FORWARD)
.rightRearEncoderDirection(Encoder.FORWARD);
public static FollowerConstants followerConstants = new FollowerConstants();
// .mass()
//.mass(robotMass);
public static MecanumConstants driveConstants = new MecanumConstants()
.maxPower(1)
.rightFrontMotorName("rightFront")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@ public class teleop extends OpMode {
// Declare OpMode members.
private DcMotor leftFrontDrive = null;
private boolean intakeOn = false;
private boolean StopIntakeY = false;
private boolean Outtake = false;
private boolean prevIntakeButtonX = false;
private boolean prevOutTakeButtonA = false;
Expand Down Expand Up @@ -143,6 +142,7 @@ public void init() {
leftFeeder = hardwareMap.get(CRServo.class, "left_feeder");
rightFeeder = hardwareMap.get(CRServo.class, "right_feeder");
intake = hardwareMap.get(DcMotor.class, "intake");
intakeFlywheel = hardwareMap.get(DcMotor.class, "wheelIntake")

/*
* To drive forward, most robots need the motor on one side to be reversed,
Expand Down Expand Up @@ -266,13 +266,13 @@ public void loop() {
} else if (gamepad1.b) { // stop flywheel
launcher.setVelocity(0);
}
if (gamepad1.left_stick_button) {
elif (gamepad1.left_stick_button) {
launcher.setVelocity(LAUNCHER_TARGET_VELOCITY);
}
/*
* Now we call our "Launch" function.
*/
launch(gamepad1.rightBumperWasPressed());
launch(gamepad1.x);

/*
* Show the state and motor powers
Expand Down Expand Up @@ -325,16 +325,19 @@ void launch(boolean shotRequested) {
switch (launchState) {
case IDLE:
if (shotRequested) {
shotsFired = 0
launchState = LaunchState.SPIN_UP;
}
break;
case SPIN_UP:
launcher.setVelocity(LAUNCHER_TARGET_VELOCITY);
if (launcher.getVelocity() > LAUNCHER_MIN_VELOCITY) {
feederTimer.reset()
launchState = LaunchState.LAUNCH;
}
break;
case LAUNCH:

if (shotsFired < 3) {
double elapsed = feederTimer.milliseconds();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
import org.firstinspires.ftc.teamcode.pedroPathing.Constants;
import org.firstinspires.ftc.teamcode.pedroPathing.Dash.DashboardDrawingHandler;

@Autonomous(name = "RedGoal12BallAuto", group = "Autonomous")
@Autonomous(name = "RedGoal12BallAuto", group = "PEDROAUTO")
public class twelveball extends LinearOpMode {

private Follower follower;
Expand Down