Skip to content

Accidental PR #57

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Closed
Professor348 wants to merge 169 commits into from
Closed

Accidental PR #57

Professor348 wants to merge 169 commits into from

Conversation

@Professor348
Copy link

@Professor348 Professor348 commented Jan 17, 2026 •
edited
Loading

Sorry, didn't mean to PR to Pedropathing repo, I meant to PR to our Master branch.

BaronClaps and others added 30 commits August 28, 2025 23:11
@BaronClaps
2.0.0
f7f328c
@BaronClaps
2.0.0 - Template Constants
ddd5f7a
@BaronClaps
2.0.0 - Template Constants
50d8203
@BaronClaps
Add Circle to the selector
16059fb
@Professor348
Added Apriltag code
aaf40d0
@Professor348
Began writing constants file
1d5ad71
@Professor348
Removed old code
9c92c35
@Professor348
Added old code back as .txt files
5f2d8a4
@NotABitcoinScam
Added new Teleop that is current with PedroPathing v2.0
8d8e33b
@Professor348
Tuning work
50e5d4f
@Professor348
Fixed TeleopTest
1d15fa7
@Professor348
Fixed TeleopTest_V1.java (I hope)
c8e9084
@Professor348
Merge remote-tracking branch 'upstream/HEAD'
c4f87a0 
# Conflicts:
#	TeamCode/src/main/java/org/firstinspires/ftc/teamcode/pedroPathing/Constants.java
#	TeamCode/src/main/java/org/firstinspires/ftc/teamcode/pedroPathing/Tuning.java
#	build.dependencies.gradle
@Professor348
Updated to Pedro 2.0.1
088e43c
@Professor348
Tuned Pedropathing
821fe67
@Professor348
Merge remote-tracking branch 'origin/master'
20abe1a
@Professor348
Added program to chase an aprilTag and tried to modify it to use pedr…
587ceea 
…opathing controls
@Professor348
More AprilTag testing
d9bd24c
@Professor348
Merge remote-tracking branch 'upstream/master'
caca515 
# Conflicts:
#	TeamCode/src/main/java/org/firstinspires/ftc/teamcode/pedroPathing/Tuning.java
@Professor348
Update README.md
66dc057 
Updated the README to describe what the repo is for better.
@Professor348
Finalized transfer of aprilTag tracking from example code to Pedropat…
4fa6e40 
…hing, & made a field-centric heading-based tag tracker
@Professor348
Began Auto Development
155330c
@LOAD-Robotics
Merge branch 'Pedro-Pathing:master' into master
80686c8
@Professor348
Continue Auto Development
6dabceb
@Professor348
Worked on autotracking camera turret
35a0d0f
@Professor348
Worked on autotracking camera turret
0ef4582
@Professor348
Worked on autotracking camera turret
eb16005
@Professor348
Adjusted turret code to avoid NANs
0110d80
@Professor348
Updated to Pedropathing 2.0.3
4e22aa1
@Professor348
Worked on tuning turret tracking
794d2da
NotABitcoinScam and others added 27 commits January 2, 2026 14:23
@NotABitcoinScam
Temporarily disabled the turret rotation in Teleop_Main_.java
c793f2c
@Professor348
Optimized a few things in Teleop_Main_
f656350
@Professor348
Added a setHoodPos parameter for tuning
445823e
@Professor348
Created a more complex auto for testing
eaf58d8
@NotABitcoinScam
FIRST TEST COMMIT FROM MY NEW COMPUTER =D
e60a794 
(it's just a comment in Teleop_Main_.java)
@NotABitcoinScam
Added some comments
4d2357b
@NotABitcoinScam
Toyed with telemetry system but commeneted it out
da1ca94 
Added a flywheelpercentage to telemetry and panels telem

Added the prism library to the teamcode Build.gradle

added a getFlywheelMaxRPM function for telemetry math
@Professor348
Removed redundant function getMaxFlywheelSpeed in favor of pulling di…
77e99a1 
…rectly from the variable
@NotABitcoinScam
Set the zero power behavior of the flywheels to FLOAT
dc71a93
@NotABitcoinScam
Merge remote-tracking branch 'origin/development' into development
0980c37
@Professor348
Commented out the turret zeroing function in Teleop_Outreach_.java fo…
d59015a 
…r Deep Roots
@Professor348
Re-tuned turret PID for new sprocket, and did some work on auto testing
fdc0540
@Professor348
Retuned turret PID and did a bit of flywheel work
567d10d
@NotABitcoinScam
Added some TODOs
d8c9a0d
@Professor348
Autoaim, hood, & turret work
9e8549b
@NotABitcoinScam
Created InterpLUTPoint class
127174e
@NotABitcoinScam
Created InterpLUTPoint class
8d0edb0
@Professor348
Implemented auto speed change for shooting zones and started building…
fbf84c0 
… hood InterpLUT
@Professor348
Updated in-code controls diagrams and moved non-code diagrams to thei…
ee9c96c 
…r own folder for organization purposes
@Professor348
Made Diagrams folder into Obsidian Workspace
ccb5348 
This will just let us edit the .canvas files and update the diagrams easier
@Professor348
Fixed major bug in auto path mirror function, and did some auto work.
b644bc2
@Professor348
Merge remote-tracking branch 'origin/development' into development
5376387
@Professor348
Changed teleop code to use the ending position of auto as it's start …
3f57e05 
…position.
@Professor348
Merge remote-tracking branch 'origin/development' into development
0f13549 
# Conflicts:
#	TeamCode/src/main/java/org/firstinspires/ftc/teamcode/LOADCode/Main_/Teleop_/Teleop_Main_.java
@Professor348
Auto work
00dae44
@Professor348
Quick bugfix with one of the InterpLUT points for hood autoaim
bca8d0c
@Professor348
Auto & teleop work during scrimmage
007b91d
@Professor348 Professor348 marked this pull request as draft January 17, 2026 20:52
@Professor348 Professor348 changed the title Tower Hill Scrimmage Code Accidental PR Jan 17, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@Professor348 @NotABitcoinScam @BaronClaps @LOAD-Robotics