Skip to content
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

Add elevator code #1

Merged
merged 506 commits into from
Jan 19, 2025
Merged

Add elevator code #1

merged 506 commits into from
Jan 19, 2025

Conversation

Noga18
Copy link
Contributor

@Noga18 Noga18 commented Dec 17, 2024

No description provided.

@Noga18 Noga18 requested review from rakrakon and Emma03L December 17, 2024 16:00
rakrakon
rakrakon requested changes Dec 25, 2024
View reviewed changes
src/main/kotlin/frc/robot/RobotContainer.kt Outdated Show resolved Hide resolved
src/main/kotlin/frc/robot/subsystems/elevator/Elevator.kt Outdated Show resolved Hide resolved
src/main/kotlin/frc/robot/subsystems/elevator/Elevator.kt Outdated Show resolved Hide resolved
src/main/kotlin/frc/robot/subsystems/elevator/Elevator.kt Outdated Show resolved Hide resolved
src/main/kotlin/frc/robot/subsystems/elevator/Elevator.kt Outdated Show resolved Hide resolved
src/main/kotlin/frc/robot/subsystems/elevator/ElevatorIOReal.kt Outdated Show resolved Hide resolved
src/main/kotlin/frc/robot/subsystems/elevator/ElevatorIOReal.kt Outdated Show resolved Hide resolved
src/main/kotlin/frc/robot/subsystems/elevator/ElevatorIOReal.kt Outdated Show resolved Hide resolved
src/main/kotlin/frc/robot/subsystems/elevator/ElevatorIOReal.kt Show resolved Hide resolved
@rakrakon rakrakon self-requested a review January 9, 2025 10:26
@katzuv katzuv changed the base branch from main to dev January 11, 2025 22:54
katzuv
katzuv requested changes Jan 13, 2025
View reviewed changes
src/main/kotlin/frc/robot/subsystems/elevator/Elevator.kt Outdated Show resolved Hide resolved
src/main/kotlin/frc/robot/subsystems/elevator/ElevatorConstants.kt Outdated Show resolved Hide resolved
src/main/kotlin/frc/robot/subsystems/elevator/ElevatorConstants.kt Outdated Show resolved Hide resolved
src/main/kotlin/frc/robot/subsystems/elevator/ElevatorConstants.kt Outdated Show resolved Hide resolved
src/main/kotlin/frc/robot/subsystems/elevator/ElevatorIOReal.kt Outdated Show resolved Hide resolved
src/main/kotlin/frc/robot/subsystems/elevator/ElevatorConstants.kt Show resolved Hide resolved
src/main/kotlin/frc/robot/subsystems/elevator/ElevatorConstants.kt Outdated Show resolved Hide resolved
src/main/kotlin/frc/robot/subsystems/elevator/ElevatorIO.kt Outdated Show resolved Hide resolved
src/main/kotlin/frc/robot/subsystems/elevator/ElevatorIO.kt Outdated Show resolved Hide resolved
src/main/kotlin/frc/robot/subsystems/elevator/ElevatorIO.kt Outdated Show resolved Hide resolved
This was linked to issues Jan 15, 2025
Elevator #38
Closed
Elevator subsystem #39
Closed
Elevator IO #40
Closed
@rakrakon rakrakon self-requested a review January 15, 2025 18:07
@katzuv
Copy link
Member

katzuv commented Jan 15, 2025

Something broke here

@vichik123
Copy link

I see there is a huge diff between the dev branch and this one. Try merging the dev branch into the elevator branch.

rakrakon and others added 25 commits January 19, 2025 20:29
@rakrakon
Refactor setPower & setPosition to be more concise
8a2cbe4
@rakrakon
Add apply to encoder config
389fadc
@rakrakon
Remove measure object creation in ElevatorPeriodic
2b2683b
@rakrakon
Spotless
6bd6c8f
@rakrakon
Change ElevatorIOReal to use MotionMagicTorqueCurrentFOC
4598b30
@rakrakon
Change position setpoint to be private
8ac8f8b
@rakrakon
Add mechanism2d
4205cd4
@rakrakon
Rename elevator mechanism to elevatorLigament
e25e751
@rakrakon
Delete CAD files
58846ae
@rakrakon
Add Second Elevator Motor
35bfcf6
@rakrakon
Spotless
d86ed3e
@Emma03L @rakrakon
Change setHeight parameter name to height
3bd95d8
@Emma03L @rakrakon
Change aux motor to not oppose the main motor
91c7bac
@Emma03L @rakrakon
Remove second control request
a529672
@rakrakon
Fix typo
66a8620
@rakrakon
Add logging to setpoint
f01ea9a
@rakrakon
Fix typo in ENCODER_OFFSET
81370c0
@rakrakon
Add motor.update() in ElevatorIOSim
9b0db1b
@rakrakon
Fix elevator simulation
de05cb1
@rakrakon
Spotless
9fcb589
@rakrakon
Change numMotors in simulation to 2
034ce4f
@rakrakon
Add command for each position
d646913
@rakrakon
Merge remote-tracking branch 'origin/feature/elevator' into feature/e…
d8fbf46 
…levator

# Conflicts:
#	.gitignore
#	src/main/kotlin/frc/robot/subsystems/elevator/Elevator.kt
@rakrakon
Spotless
e09fbb2
@rakrakon
Use extension functions
08a53db
Emma03L
Emma03L approved these changes Jan 19, 2025
View reviewed changes
Copy link
Contributor

@Emma03L Emma03L left a comment

Choose a reason for hiding this comment

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

Great job!🤩

@Emma03L Emma03L merged commit bebd2c8 into dev Jan 19, 2025
1 check passed
@Emma03L Emma03L deleted the feature/elevator branch January 19, 2025 18:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@vichik123 vichik123 vichik123 requested changes

@katzuv katzuv katzuv requested changes

@Emma03L Emma03L Emma03L approved these changes

@rakrakon rakrakon rakrakon approved these changes

Assignees
No one assigned
Labels
subsystem Pull request for a subsystem
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Elevator IO Elevator subsystem Elevator
6 participants
@Noga18 @katzuv @vichik123 @rakrakon @Emma03L @DavidMasin