Skip to content

13 turret initial code#20

Merged
ImSpxrsh merged 26 commits intodevelopfrom
13-turret-initial-code
Feb 28, 2026
Merged

13 turret initial code#20
ImSpxrsh merged 26 commits intodevelopfrom
13-turret-initial-code

Conversation

@PillageDev
Copy link
Member

Initial turret code with CRT controlling a table top turret. This is transferrable to the actual turret, just need to change a few variables for CRT.

Closes #13

NathanEdg and others added 11 commits January 28, 2026 16:26
…ebuilt into 13-turret-initial-code

# Conflicts:
#	src/main/java/frc/robot/subsystems/turret/Turret.java
#	src/main/java/frc/robot/subsystems/turret/TurretIOSensorInputs.java
# Conflicts:
#	src/main/java/frc/robot/CanID.java
#	src/main/java/frc/robot/RobotContainer.java
#	src/main/java/frc/robot/subsystems/vision/Vision.java
#	src/main/java/frc/robot/subsystems/vision/photon/Camera.java
@PillageDev PillageDev requested review from a team February 20, 2026 02:43
@PillageDev PillageDev linked an issue Feb 20, 2026 that may be closed by this pull request
Copy link
Contributor

@bjmcternan bjmcternan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some cleanup we can do. Might be best to discuss it in a huddle

@NathanEdg NathanEdg dismissed stale reviews from afranchuk and themself via 1abef26 February 24, 2026 18:19
NathanEdg and others added 7 commits February 24, 2026 13:21
This reverts commit 1abef26.
This reverts commit 07ba2b5.
* Add shooter subsystem with shot compensation logic and CAN ID updates

* Add shooter subsystem initialization in RobotContainer

* Refactor shooter and turret subsystems to use new Targeting subsystem and remove old pubsub system

* Integrate shooter and turret dependencies into indexer subsystem and enhance ball feeding logic
@PillageDev PillageDev linked an issue Feb 27, 2026 that may be closed by this pull request
Co-authored-by: Brennan <bjmcternan@users.noreply.github.com>
@bjmcternan
Copy link
Contributor

We just sat down and went over this code. I think this looks good now. There's some outstanding tasks that we need to address but this is a good start to get into develop.

bjmcternan
bjmcternan previously approved these changes Feb 28, 2026
Copy link
Contributor

@bjmcternan bjmcternan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good

@bjmcternan bjmcternan dismissed afranchuk’s stale review February 28, 2026 17:27

Stale, will address comments in another PR. Thanks

Copy link
Contributor

@bjmcternan bjmcternan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good

Copy link
Member

@ImSpxrsh ImSpxrsh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good

@ImSpxrsh ImSpxrsh merged commit 06ce13a into develop Feb 28, 2026
2 checks passed
@ImSpxrsh ImSpxrsh deleted the 13-turret-initial-code branch February 28, 2026 19:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Turret Initial Code Shooter subsystem

5 participants