Skip to content

Commit

Permalink
Fix AdvantageKit Logging, LoggedSendableChooser
Browse files Browse the repository at this point in the history
Fixed AdvantageKit logging by removing invalid log replay code.

Replaced standard sendableChooser with loggedSendableChooser
  • Loading branch information
rechsby committed Dec 12, 2024
1 parent f798c4e commit 4ae66ea
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 12 deletions.
3 changes: 0 additions & 3 deletions src/main/java/frc/robot/Robot.java
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,6 @@ public Robot() {
PowerDistribution distribution = new PowerDistribution(1, ModuleType.kRev); // Enables power distribution logging
} else {
setUseTiming(false); // Run as fast as possible
String logPath = LogFileUtil.findReplayLog(); // Pull the replay log from AdvantageScope (or prompt the user)
Logger.setReplaySource(new WPILOGReader(logPath)); // Read replay log
Logger.addDataReceiver(new WPILOGWriter(LogFileUtil.addPathSuffix(logPath, "_sim"))); // Save outputs to a new log
}

Logger.start(); // Start logging! No more data receivers, replay sources, or metadata values may be added.
Expand Down
17 changes: 8 additions & 9 deletions src/main/java/frc/robot/RobotContainer.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,14 @@

import static edu.wpi.first.units.Units.*;

import com.ctre.phoenix6.swerve.SwerveModule.DriveRequestType;
import org.littletonrobotics.junction.networktables.LoggedDashboardChooser;


import com.pathplanner.lib.auto.AutoBuilder;
import com.ctre.phoenix6.swerve.SwerveRequest;

import edu.wpi.first.math.geometry.Pose2d;
import edu.wpi.first.math.geometry.Rotation2d;
import edu.wpi.first.math.kinematics.ChassisSpeeds;
import edu.wpi.first.wpilibj.smartdashboard.SendableChooser;
import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard;
import edu.wpi.first.wpilibj2.command.Command;
import edu.wpi.first.wpilibj2.command.sysid.SysIdRoutine.Direction;
import frc.lib.controller.LogitechController;
Expand All @@ -39,7 +38,7 @@ public class RobotContainer {

public final CommandSwerveDrivetrain drivetrain = TunerConstants.createDrivetrain();

private SendableChooser<Command> autoChooser = new SendableChooser<Command>();
private final LoggedDashboardChooser<Command> autoChooser;

// Use open-loop control for drive motors
private final SwerveRequest.SwerveDriveBrake brake = new SwerveRequest.SwerveDriveBrake();
Expand All @@ -49,8 +48,8 @@ public RobotContainer() {
configureBindings();

drivetrain.setUpPathPlanner();
autoChooser = AutoBuilder.buildAutoChooser();
SmartDashboard.putData("Auto Chooser", autoChooser);
autoChooser = new LoggedDashboardChooser<>("Auto Routine", AutoBuilder.buildAutoChooser());

}

private void configureBindings() {
Expand All @@ -61,7 +60,7 @@ private void configureBindings() {
drivetrain.applyRequest(
() -> {
ChassisSpeeds driverDesiredSpeeds = new ChassisSpeeds(
sps(deadband(leftDriveController.getYAxis().get(), .1)) * GlobalConstants.MAX_TRANSLATIONAL_SPEED,
sps(deadband(leftDriveController.getYAxis().get(), 0.1)) * GlobalConstants.MAX_TRANSLATIONAL_SPEED,
-sps(deadband(leftDriveController.getXAxis().get(),0.1)) * GlobalConstants.MAX_TRANSLATIONAL_SPEED,
-sps(deadband(rightDriveController.getXAxis().get(),0.1)) * GlobalConstants.MAX_ROTATIONAL_SPEED
);
Expand Down Expand Up @@ -108,7 +107,7 @@ private double sps(double value) {

public Command getAutonomousCommand() {

return autoChooser.getSelected();
return autoChooser.get();

}
}

0 comments on commit 4ae66ea

Please sign in to comment.