From d662258ba647c5ad20d5a7b9fd243882aa39607b Mon Sep 17 00:00:00 2001 From: Mz Date: Fri, 12 Jan 2024 20:15:52 -0600 Subject: [PATCH] sim test --- .gitignore | 7 ++++++- .vscode/launch.json | 7 +++++++ README.md | 4 ++-- build.gradle | 2 +- .../frc/robot/subsystems/flywheel/FlywheelIOSparkMax.java | 4 ++-- 5 files changed, 18 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 5a46b97..ee0d079 100644 --- a/.gitignore +++ b/.gitignore @@ -172,4 +172,9 @@ out/ simgui*.json # Version file -src/main/java/frc/robot/BuildConstants.java \ No newline at end of file +src/main/java/frc/robot/BuildConstants.java + +# AdvantageKit logs +logs +ctre_sim +networktables.json diff --git a/.vscode/launch.json b/.vscode/launch.json index b8c1920..432f981 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -1,6 +1,13 @@ { "version": "0.2.0", "configurations": [ + { + "type": "java", + "name": "Main", + "request": "launch", + "mainClass": "frc.robot.Main", + "projectName": "FRC-2024" + }, { "type": "wpilib", "name": "WPILib Desktop Debug", diff --git a/README.md b/README.md index 9d3fce4..ced53bc 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # FRC-2024 -The code for the 2024 FRC season robot for Awtybots 5829. +The code for the 2024 FRC season robot for Awtybots 5829. ## Credits -Thank you FRC 6328 and FRC 3015! \ No newline at end of file +Thank you FRC 6328 and FRC 3015! diff --git a/build.gradle b/build.gradle index 65e589a..560c702 100755 --- a/build.gradle +++ b/build.gradle @@ -185,4 +185,4 @@ spotless { // A grave sin, but necessary for other programmers to use this system lol afterEvaluate { tasks.getByName('spotlessCheck').dependsOn(tasks.getByName('spotlessApply')) -} \ No newline at end of file +} diff --git a/src/main/java/frc/robot/subsystems/flywheel/FlywheelIOSparkMax.java b/src/main/java/frc/robot/subsystems/flywheel/FlywheelIOSparkMax.java index 787f369..7e3b098 100644 --- a/src/main/java/frc/robot/subsystems/flywheel/FlywheelIOSparkMax.java +++ b/src/main/java/frc/robot/subsystems/flywheel/FlywheelIOSparkMax.java @@ -28,8 +28,8 @@ public class FlywheelIOSparkMax implements FlywheelIO { private static final double GEAR_RATIO = 1.5; - private final CANSparkMax leader = new CANSparkMax(0, MotorType.kBrushless); - private final CANSparkMax follower = new CANSparkMax(1, MotorType.kBrushless); + private final CANSparkMax leader = new CANSparkMax(9, MotorType.kBrushless); + private final CANSparkMax follower = new CANSparkMax(10, MotorType.kBrushless); private final RelativeEncoder encoder = leader.getEncoder(); private final SparkPIDController pid = leader.getPIDController();