Skip to content

merge main into turret#12

Merged
Luddo183 merged 51 commits into
turretfrom
main-intermediate
Feb 28, 2026
Merged

merge main into turret#12
Luddo183 merged 51 commits into
turretfrom
main-intermediate

Conversation

@Luddo183
Copy link
Copy Markdown
Contributor

No description provided.

Luddo183 and others added 30 commits January 21, 2026 10:47
This code creates an intake-wheels branch. The file inside called intake.java controls the wheels on the intake via voltage control.
Indexer subsystem, it pushes all the balls in a straight line before going to the turret.
Added disconnected alerts to the intake wheels.
Added CAN IDs for the shooter wheel motor and shooter angle motor.
removing encoder, switching to double
renaming
adding to RobotContainer
Phoenix2342-Bot and others added 21 commits February 8, 2026 19:37
* Update at 'Sat Feb 21 09:42:47 EST 2026'

* Update at 'Sat Feb 21 09:44:24 EST 2026'

* Update at 'Sat Feb 21 09:46:17 EST 2026'

* Update at 'Sat Feb 21 09:50:48 EST 2026'

* Update at 'Sat Feb 21 10:00:22 EST 2026'

* Update at 'Sat Feb 21 10:13:24 EST 2026'

* Update at 'Sat Feb 21 11:58:59 EST 2026'

* Update at 'Sat Feb 21 11:59:59 EST 2026'

* Update at 'Sat Feb 21 14:39:06 EST 2026'

* Update at 'Sat Feb 21 14:40:35 EST 2026'

* Update at 'Sat Feb 21 15:37:31 EST 2026'
@Luddo183 Luddo183 merged commit 9f46356 into turret Feb 28, 2026
2 checks passed
@Luddo183 Luddo183 deleted the main-intermediate branch February 28, 2026 19:33
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.

7 participants