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.

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

Robot configuration #24

Merged
merged 3 commits into from
Sep 20, 2023
Merged

Robot configuration #24

merged 3 commits into from
Sep 20, 2023

Conversation

minhnguyenbhs
Copy link
Contributor

No description provided.

@jkleiber
Copy link
Member

jkleiber commented Sep 18, 2023

Not 100% sure what they are, but the merge conflicts need to be fixed. Be careful to not delete code that we need. The following commands should help:

git checkout main
git pull
git checkout robot-configuration
git rebase main

And then go through the process from last week of using git status to view the conflicting files, resolve conflicts in vscode, and use git add . And git rebase --continue when you're done fixing a particular commit

Copy link
Member

@jkleiber jkleiber left a comment

Choose a reason for hiding this comment

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

Reviewing code on the plane, lmk if I'm totally off base


public RobotContainer() {
drive.setDefaultCommand(new TankDrive(drive,
drive.setDefaultCommand(new TankDrive(drive,
Copy link
Member

Choose a reason for hiding this comment

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

The default command should match the drive mode

@@ -25,9 +18,9 @@ public enum DriveMode {

public DriveSubsystem(ChassisMode chassisMode, DriveMode driveMode) {
if (chassisMode == ChassisMode.B_TEAM) {
driveHardware = new DriveSparkMAX(DriveConstants.frontLeftID, DriveConstants.frontRightID, DriveConstants.backLeftID, DriveConstants.backRightID);
driveHardware = new DriveSparkMAX(B_Configs.frontLeftID, B_Configs.frontRightID, B_Configs.backLeftID, B_Configs.backRightID);
Copy link
Member

Choose a reason for hiding this comment

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

Shouldn't all these configs be passed in via the robot configuration class rather than these constants

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Should the DriveSubsystem constructor have all of the motor controller ids then?

@minhnguyenbhs minhnguyenbhs merged commit 77bf956 into main Sep 20, 2023
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.

3 participants