From 6ec4b799f70610338b557bf3215ee02fcf49d756 Mon Sep 17 00:00:00 2001 From: 242165-arch <239209852+242165-arch@users.noreply.github.com> Date: Mon, 16 Feb 2026 09:32:34 -0600 Subject: [PATCH 1/5] add gitqattributes file --- .gitattributes | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..84194ec --- /dev/null +++ b/.gitattributes @@ -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 From 1db66fe36da26bab1dfbcedd3a9baf27c6b9465b Mon Sep 17 00:00:00 2001 From: 242165-arch <239209852+242165-arch@users.noreply.github.com> Date: Mon, 16 Feb 2026 09:52:29 -0600 Subject: [PATCH 2/5] Add robotMass variable for future calibration Created a placeholder variable to be updated once the physical robot mass is confirmed. Co-authored-by: gameingame-eng --- .../org/firstinspires/ftc/teamcode/pedroPathing/Constants.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/pedroPathing/Constants.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/pedroPathing/Constants.java index b51a997..bf1d40d 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/pedroPathing/Constants.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/pedroPathing/Constants.java @@ -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") @@ -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") From 9f355959fa2ff05b9d7339dc75f025a883f86de6 Mon Sep 17 00:00:00 2001 From: 242165-arch <239209852+242165-arch@users.noreply.github.com> Date: Mon, 16 Feb 2026 10:01:55 -0600 Subject: [PATCH 3/5] change group to pedroauto --- .../main/java/org/firstinspires/ftc/teamcode/twelveball.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/twelveball.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/twelveball.java index 1852609..7b57a42 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/twelveball.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/twelveball.java @@ -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; From 6fa6433340c9bedd1910bd48dcd3255edadb80d3 Mon Sep 17 00:00:00 2001 From: 242165-arch <239209852+242165-arch@users.noreply.github.com> Date: Mon, 16 Feb 2026 13:42:43 -0600 Subject: [PATCH 4/5] prepare for logic debloated, fixed multiple bugs (wonky if elif block and lauch logic messup), and changed lauch button to X --- .../main/java/org/firstinspires/ftc/teamcode/teleop.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/teleop.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/teleop.java index 5689807..297a457 100644 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/teleop.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/teleop.java @@ -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; @@ -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, @@ -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 @@ -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(); From 83950038d5ade986854ffd0089afe7a124052d56 Mon Sep 17 00:00:00 2001 From: 242165-arch <239209852+242165-arch@users.noreply.github.com> Date: Mon, 16 Feb 2026 14:20:14 -0600 Subject: [PATCH 5/5] delete unneccessary github action --- .github/workflows/mistake-pr.yml | 67 -------------------------------- 1 file changed, 67 deletions(-) delete mode 100644 .github/workflows/mistake-pr.yml diff --git a/.github/workflows/mistake-pr.yml b/.github/workflows/mistake-pr.yml deleted file mode 100644 index b398dd7..0000000 --- a/.github/workflows/mistake-pr.yml +++ /dev/null @@ -1,67 +0,0 @@ -name: Auto-close mistake PRs - -on: - pull_request: - types: [opened, synchronize, reopened] - -permissions: - issues: write - pull-requests: write - -jobs: - detect: - runs-on: ubuntu-latest - steps: - - name: Detect mistake PR - uses: actions/github-script@v7 - with: - script: | - const pr = context.payload.pull_request; - const labels = pr.labels.map(l => l.name); - - // Skip if auto-reopen is disabled or already used - if (labels.includes('reopen-used') || labels.includes('reopen-locked')) { - return; - } - - // Get changed files - const files = await github.paginate( - github.rest.pulls.listFiles, - { - owner: context.repo.owner, - repo: context.repo.repo, - pull_number: pr.number, - } - ); - - // Detect newly added OR copied files - const hasNewFiles = files.some( - f => f.status === 'added' || f.status === 'copied' - ); - - if (!hasNewFiles) return; - - // Label as mistake PR - await github.rest.issues.addLabels({ - owner: context.repo.owner, - repo: context.repo.repo, - issue_number: pr.number, - labels: ['mistake-pr'] - }); - - // Explain and close - await github.rest.issues.createComment({ - owner: context.repo.owner, - repo: context.repo.repo, - issue_number: pr.number, - body: - "This PR was automatically closed because it adds new files.\n\n" + - "If this is intentional, comment `/not-a-mistake` **once** to reopen it." - }); - - await github.rest.pulls.update({ - owner: context.repo.owner, - repo: context.repo.repo, - pull_number: pr.number, - state: 'closed' - });