Robot shooter #39
Robot shooter #39
Conversation
src/main/java/frc/robot/subsystems/shooter_intake/ShooterIntakeSubsystem.java
Show resolved
Hide resolved
|
I'm having problems with solving the conflicting files can you help me? |
|
@avidraccoon what I do when I see merge conflicts is try to preserve the code that is in conflict with my code while still making sure my feature works. In this case it probably makes sense to "Accept Both" changes when doing the rebase and then refactor the code as needed to make things work. The rebase process can be found here: https://team401.github.io/Docs/Programming/Software-Workflow.html#keep-branch-updated If there's a specific problem I can help with just let me know! |
There was a problem hiding this comment.
Second pass, this looks pretty clean now. We just need to get the merge conflicts resolved and then it'll be ready to merge.
After we merge this, we need to get the hardware IO made so we can test on the robot. Can you create a ticket to do this if you haven't already?
| // Move to constants later | ||
| double intakeTargetRPM = -100.0; | ||
| double shootingTargetRPM = 300.0; | ||
| // |
There was a problem hiding this comment.
Let's move these to constants
We can store constants in src/main/java/frc/robot/constants and eventually JSONify everything
| public class ShooterIntakeIOSim implements ShooterIntakeIO { | ||
|
|
||
| FlywheelSim flywheelSim = new FlywheelSim(DCMotor.getCIM(2), 1.0, 1.0); | ||
| PIDController controller = new PIDController(0.75, 0.1, 0.0); |
There was a problem hiding this comment.
If these are going to be the control gains, we should move them to constants as well
|
I moved the constants and prepared for merge but now it can't build because it can find classes for import, how do I fix this? Edit: It can build but simulation will not run. Edit 2: Fixed it just needed to clear the build cache |
No description provided.