Skip to content

Commit

Permalink
Formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
cherriae committed Jan 19, 2024
1 parent beaf117 commit e687349
Show file tree
Hide file tree
Showing 34 changed files with 101 additions and 102 deletions.
16 changes: 8 additions & 8 deletions .github/ISSUE_TEMPLATE/bug.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Bug Report
description: File a bug report
labels: ["bug"]

body:
body:
- type: input
attributes:
label: Summary
Expand All @@ -18,7 +18,7 @@ body:
description: What did you expect compared to reality?
validations:
required: true

- type: textarea
id: reproduction-steps
attributes:
Expand All @@ -41,21 +41,21 @@ body:
multiple: false
options:
- label: Windows 10/11
- label: MacOS
- label: MacOS
- label: Linux
default: 0
validations:
required: true

- type: textarea
id: sys-info
attributes:
attributes:
label: Add your project information
value: >
Control + Shift + P > WPILIB Open Project Information and paste it here
Control + Shift + P > WPILIB Open Project Information and paste it here
validations:
required: true

- type: checkboxes
id: checkboxes
attributes:
Expand All @@ -67,7 +67,7 @@ body:
required: true
- label: I have provided all information about this bug.
required: true

- type: textarea
id: additional-context
attributes:
Expand Down
2 changes: 1 addition & 1 deletion .pathplanner/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@
"defaultMaxAngVel": 540.0,
"defaultMaxAngAccel": 720.0,
"maxModuleSpeed": 2.88
}
}
2 changes: 1 addition & 1 deletion .wpilib/wpilib_preferences.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
"currentLanguage": "java",
"projectYear": "2024",
"teamNumber": 334
}
}
2 changes: 1 addition & 1 deletion networktables.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
[]
[]
2 changes: 1 addition & 1 deletion simgui-ds.json
Original file line number Diff line number Diff line change
Expand Up @@ -95,4 +95,4 @@
}
],
"useEnableDisableHotkeys": true
}
}
2 changes: 1 addition & 1 deletion simgui.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@
}
}
}
}
}
2 changes: 1 addition & 1 deletion src/main/deploy/example.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Files placed in this directory will be deployed to the RoboRIO into the
'deploy' directory in the home folder. Use the 'Filesystem.getDeployDirectory' wpilib function
to get a proper path relative to the deploy directory.
to get a proper path relative to the deploy directory.
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,4 @@
},
"folder": null,
"choreoAuto": false
}
}
2 changes: 1 addition & 1 deletion src/main/deploy/pathplanner/navgrid.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/main/deploy/pathplanner/paths/New New Path.path
Original file line number Diff line number Diff line change
Expand Up @@ -64,4 +64,4 @@
"folder": null,
"previewStartingState": null,
"useDefaultConstraints": false
}
}
2 changes: 1 addition & 1 deletion src/main/deploy/pathplanner/paths/New Path.path
Original file line number Diff line number Diff line change
Expand Up @@ -125,4 +125,4 @@
"folder": null,
"previewStartingState": null,
"useDefaultConstraints": false
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -52,4 +52,4 @@
"folder": null,
"previewStartingState": null,
"useDefaultConstraints": false
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -52,4 +52,4 @@
"folder": null,
"previewStartingState": null,
"useDefaultConstraints": false
}
}
2 changes: 1 addition & 1 deletion src/main/deploy/pathplanner/paths/Test1.path
Original file line number Diff line number Diff line change
Expand Up @@ -126,4 +126,4 @@
"folder": null,
"previewStartingState": null,
"useDefaultConstraints": false
}
}
15 changes: 7 additions & 8 deletions src/main/java/frc/robot/Constants.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
// Copyright (c) FIRST and other WPILib contributors.
// Open Source Software; you can modify and/or share it under the terms of
// the WPILib BSD license file in the root directory of this project.
/* Team 334 */
/* Copyright (c) 2024 Team 334. All Rights Reserved. */

package frc.robot;

Expand All @@ -19,7 +18,7 @@ public final class Constants {
public static class CAN {
public static final int DRIVE_FRONT_LEFT = 1;
public static final int ROT_FRONT_LEFT = 2;

public static final int DRIVE_FRONT_RIGHT = 3;
public static final int ROT_FRONT_RIGHT = 4;

Expand Down Expand Up @@ -49,8 +48,8 @@ public static class Physical {

public static final double SWERVE_DRIVE_BASE_RADIUS = 0.43;

public static final double SWERVE_DRIVE_GEAR_RATIO = 6.75;
public static final double SWERVE_DRIVE_WHEEL_RADIUS = 0.1;
public static final double SWERVE_DRIVE_GEAR_RATIO = 6.75;
public static final double SWERVE_DRIVE_WHEEL_RADIUS = 0.1;
public static final double SWERVE_DRIVE_WHEEL_CIRCUMFERENCE = 2 * Math.PI * SWERVE_DRIVE_WHEEL_RADIUS;


Expand All @@ -69,10 +68,10 @@ public static class Offsets {
public static final double ENCODER_FRONT_RIGHT = -58;
public static final double ENCODER_BACK_RIGHT = 10;
public static final double ENCODER_BACK_LEFT = 43;

}

public static class Ports {
public static final int DRIVER_CONTROLLER = 0;
}
}
}
5 changes: 2 additions & 3 deletions src/main/java/frc/robot/Main.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
// Copyright (c) FIRST and other WPILib contributors.
// Open Source Software; you can modify and/or share it under the terms of
// the WPILib BSD license file in the root directory of this project.
/* Team 334 */
/* Copyright (c) 2024 Team 334. All Rights Reserved. */

package frc.robot;

Expand Down
7 changes: 3 additions & 4 deletions src/main/java/frc/robot/Robot.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
// Copyright (c) FIRST and other WPILib contributors.
// Open Source Software; you can modify and/or share it under the terms of
// the WPILib BSD license file in the root directory of this project.
/* Team 334 */
/* Copyright (c) 2024 Team 334. All Rights Reserved. */

package frc.robot;

Expand Down Expand Up @@ -96,4 +95,4 @@ public void simulationInit() {}
/** This function is called periodically whilst in simulation. */
@Override
public void simulationPeriodic() {}
}
}
7 changes: 3 additions & 4 deletions src/main/java/frc/robot/RobotContainer.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
// Copyright (c) FIRST and other WPILib contributors.
// Open Source Software; you can modify and/or share it under the terms of
// the WPILib BSD license file in the root directory of this project.
/* Team 334 */
/* Copyright (c) 2024 Team 334. All Rights Reserved. */

package frc.robot;

Expand Down Expand Up @@ -88,4 +87,4 @@ public Command getAutonCommand() {

return autonChooser.getSelected();
}
}
}
5 changes: 2 additions & 3 deletions src/main/java/frc/robot/commands/shooter/Shooter.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
// Copyright (c) FIRST and other WPILib contributors.
// Open Source Software; you can modify and/or share it under the terms of
// the WPILib BSD license file in the root directory of this project.
/* Team 334 */
/* Copyright (c) 2024 Team 334. All Rights Reserved. */

package frc.robot.commands.shooter;

Expand Down
7 changes: 3 additions & 4 deletions src/main/java/frc/robot/commands/swerve/BrakeSwerve.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
// Copyright (c) FIRST and other WPILib contributors.
// Open Source Software; you can modify and/or share it under the terms of
// the WPILib BSD license file in the root directory of this project.
/* Team 334 */
/* Copyright (c) 2024 Team 334. All Rights Reserved. */

package frc.robot.commands.swerve;

Expand All @@ -11,7 +10,7 @@

/**
* Creates a natural brake on the swerve drive by facing the modules so they form an "X" shape.
*
*
* @author Peter Gutkovich
*/
public class BrakeSwerve extends Command {
Expand Down
7 changes: 3 additions & 4 deletions src/main/java/frc/robot/commands/swerve/ResetGyro.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
// Copyright (c) FIRST and other WPILib contributors.
// Open Source Software; you can modify and/or share it under the terms of
// the WPILib BSD license file in the root directory of this project.
/* Team 334 */
/* Copyright (c) 2024 Team 334. All Rights Reserved. */

package frc.robot.commands.swerve;

Expand All @@ -13,7 +12,7 @@
*/
public class ResetGyro extends Command {
private SwerveDriveSubsystem _swerveDrive;

/** Creates a new ResetGyro. */
public ResetGyro(SwerveDriveSubsystem swerveDrive) {
// Use addRequirements() here to declare subsystem dependencies.
Expand Down
9 changes: 4 additions & 5 deletions src/main/java/frc/robot/commands/swerve/ResetPose.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
// Copyright (c) FIRST and other WPILib contributors.
// Open Source Software; you can modify and/or share it under the terms of
// the WPILib BSD license file in the root directory of this project.
/* Team 334 */
/* Copyright (c) 2024 Team 334. All Rights Reserved. */

package frc.robot.commands.swerve;

Expand All @@ -13,12 +12,12 @@
*/
public class ResetPose extends Command {
private SwerveDriveSubsystem _swerveDrive;

/** Creates a new ResetPose. */
public ResetPose(SwerveDriveSubsystem swerveDrive) {
_swerveDrive = swerveDrive;
addRequirements(_swerveDrive);

// Use addRequirements() here to declare subsystem dependencies.
}

Expand Down
9 changes: 4 additions & 5 deletions src/main/java/frc/robot/commands/swerve/TeleopDrive.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
// Copyright (c) FIRST and other WPILib contributors.
// Open Source Software; you can modify and/or share it under the terms of
// the WPILib BSD license file in the root directory of this project.
/* Team 334 */
/* Copyright (c) 2024 Team 334. All Rights Reserved. */

package frc.robot.commands.swerve;

Expand All @@ -14,7 +13,7 @@

/**
* Drive the swerve chassis based on teleop joystick input
*
*
* @author Peter Gutkovich
* @author Elvis Osmanov
*/
Expand Down Expand Up @@ -69,4 +68,4 @@ public void end(boolean interrupted) {}
public boolean isFinished() {
return false;
}
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
// Copyright (c) FIRST and other WPILib contributors.
// Open Source Software; you can modify and/or share it under the terms of
// the WPILib BSD license file in the root directory of this project.
/* Team 334 */
/* Copyright (c) 2024 Team 334. All Rights Reserved. */

package frc.robot.commands.swerve;

Expand Down Expand Up @@ -40,4 +39,4 @@ public void end(boolean interrupted) {}
public boolean isFinished() {
return true;
}
}
}
13 changes: 6 additions & 7 deletions src/main/java/frc/robot/subsystems/ShooterSubsystem.java
Original file line number Diff line number Diff line change
@@ -1,22 +1,21 @@
// Copyright (c) FIRST and other WPILib contributors.
// Open Source Software; you can modify and/or share it under the terms of
// the WPILib BSD license file in the root directory of this project.
/* Team 334 */
/* Copyright (c) 2024 Team 334. All Rights Reserved. */

package frc.robot.subsystems;
package frc.robot.subsystems;

import edu.wpi.first.wpilibj2.command.SubsystemBase;
import com.revrobotics.CANSparkMax;
import com.revrobotics.CANSparkLowLevel.MotorType;

public class ShooterSubsystem extends SubsystemBase {
private CANSparkMax _leftMotor = new CANSparkMax(0, MotorType.kBrushless);
private CANSparkMax _rightMotor = new CANSparkMax(1, MotorType.kBrushless);
private CANSparkMax _leftMotor = new CANSparkMax(0, MotorType.kBrushless);
private CANSparkMax _rightMotor = new CANSparkMax(1, MotorType.kBrushless);

/** Creates a new ShooterSubsystem. */
public ShooterSubsystem() {
}



@Override
public void periodic() {
Expand Down
Loading

0 comments on commit e687349

Please sign in to comment.