Compare commits

..

No commits in common. "c9316cebc30f37d2d79f0518c39106decfa85209" and "4386de4d4d5b62f1c949f4cc96ce348da2517262" have entirely different histories.

7 changed files with 13 additions and 15 deletions

View File

@ -16,12 +16,12 @@
}, },
{ {
"anchor": { "anchor": {
"x": 3.609900518622585, "x": 3.6442622950819668,
"y": 5.005924534374863 "y": 5.031967213114754
}, },
"prevControl": { "prevControl": {
"x": 3.2943611350609414, "x": 3.328722911520323,
"y": 5.531823506977602 "y": 5.557866185717494
}, },
"nextControl": null, "nextControl": null,
"isLocked": false, "isLocked": false,

View File

@ -3,13 +3,13 @@
"waypoints": [ "waypoints": [
{ {
"anchor": { "anchor": {
"x": 3.609900518622585, "x": 3.6442622950819668,
"y": 5.005924534374863 "y": 5.031967213114754
}, },
"prevControl": null, "prevControl": null,
"nextControl": { "nextControl": {
"x": 3.47740078362179, "x": 3.5117625600811717,
"y": 5.217924110376135 "y": 5.243966789116026
}, },
"isLocked": false, "isLocked": false,
"linkedName": "L" "linkedName": "L"

View File

@ -7,7 +7,7 @@ package frc.robot;
import org.littletonrobotics.junction.LoggedRobot; import org.littletonrobotics.junction.LoggedRobot;
import org.littletonrobotics.junction.LogFileUtil; import org.littletonrobotics.junction.LogFileUtil;
import org.littletonrobotics.junction.Logger; import org.littletonrobotics.junction.Logger;
import org.littletonrobotics.junction.networktables.NT4Publisher; //import org.littletonrobotics.junction.networktables.NT4Publisher;
import org.littletonrobotics.junction.wpilog.WPILOGReader; import org.littletonrobotics.junction.wpilog.WPILOGReader;
import org.littletonrobotics.junction.wpilog.WPILOGWriter; import org.littletonrobotics.junction.wpilog.WPILOGWriter;

View File

@ -113,7 +113,7 @@ public class RobotContainer {
drivetrain.drive( drivetrain.drive(
() -> driver.getLeftY() * Math.pow(Math.abs(driver.getLeftY()) + Math.abs(driver.getLeftX()), 3), () -> driver.getLeftY() * Math.pow(Math.abs(driver.getLeftY()) + Math.abs(driver.getLeftX()), 3),
() -> driver.getLeftX() * Math.pow(Math.abs(driver.getLeftY()) + Math.abs(driver.getLeftX()), 3), () -> driver.getLeftX() * Math.pow(Math.abs(driver.getLeftY()) + Math.abs(driver.getLeftX()), 3),
() -> driver.getRightX(), driver::getRightX, //Math.signum(driver.getRightX()) * Math.pow(driver.getRightX(), 3)
() -> true () -> true
) )
); );

View File

@ -16,8 +16,6 @@ public class AutoConstants {
public static final double kMaxAngularSpeedRadiansPerSecond = Math.PI; public static final double kMaxAngularSpeedRadiansPerSecond = Math.PI;
public static final double kMaxAngularSpeedRadiansPerSecondSquared = Math.PI; public static final double kMaxAngularSpeedRadiansPerSecondSquared = Math.PI;
public static final double kMaxSpeedMetersPerSecondAutoAlign = 2.5;
public static final double kPXYController = 3.5; public static final double kPXYController = 3.5;
public static final double kPThetaController = 5; public static final double kPThetaController = 5;

View File

@ -13,7 +13,7 @@ import edu.wpi.first.wpilibj2.command.sysid.SysIdRoutine.Config;
public class DrivetrainConstants { public class DrivetrainConstants {
// Driving Parameters - Note that these are not the maximum capable speeds of // Driving Parameters - Note that these are not the maximum capable speeds of
// the robot, rather the allowed maximum speeds // the robot, rather the allowed maximum speeds
public static final double kMaxSpeedMetersPerSecond = 5.5 * 0.75; public static final double kMaxSpeedMetersPerSecond = 5.5;
public static final double kMaxAngularSpeed = 2 * Math.PI; // radians per second public static final double kMaxAngularSpeed = 2 * Math.PI; // radians per second
// Chassis configuration // Chassis configuration

View File

@ -362,8 +362,8 @@ public class Drivetrain extends SubsystemBase {
); );
double speed = Math.hypot(controlEffort.vxMetersPerSecond, controlEffort.vyMetersPerSecond); double speed = Math.hypot(controlEffort.vxMetersPerSecond, controlEffort.vyMetersPerSecond);
if (speed > AutoConstants.kMaxSpeedMetersPerSecondAutoAlign) { if (speed > AutoConstants.kMaxSpeedMetersPerSecond) {
double mul = AutoConstants.kMaxSpeedMetersPerSecondAutoAlign / speed; double mul = AutoConstants.kMaxSpeedMetersPerSecond / speed;
controlEffort.vxMetersPerSecond *= mul; controlEffort.vxMetersPerSecond *= mul;
controlEffort.vyMetersPerSecond *= mul; controlEffort.vyMetersPerSecond *= mul;
} }