From 45b1c7e01239925da52704fc7442984f803f28d2 Mon Sep 17 00:00:00 2001 From: "Team 3128: Controls" <35188310+ControlsNarwhal@users.noreply.github.com> Date: Sun, 6 Oct 2024 22:31:27 -0700 Subject: [PATCH] Code O EOD changes This reverts commit 7f97490d91f56c61b2503d08bf76cf01b78612c7. --- build.gradle | 6 ------ settings.gradle | 2 -- src/main/java/frc/team3128/Main.java | 2 +- src/main/java/frc/team3128/Robot.java | 1 - .../java/frc/team3128/RobotContainer.java | 21 +++++++------------ 5 files changed, 8 insertions(+), 24 deletions(-) diff --git a/build.gradle b/build.gradle index ff14235..cefe5fb 100644 --- a/build.gradle +++ b/build.gradle @@ -74,12 +74,6 @@ dependencies { def akitJson = new groovy.json.JsonSlurper().parseText(new File(projectDir.getAbsolutePath() + "/vendordeps/AdvantageKit.json").text) annotationProcessor "org.littletonrobotics.akit.junction:junction-autolog:$akitJson.version" - annotationProcessor project(":annotation-processor") - implementation project(":annotation-processor") - - implementation 'com.squareup:javapoet:1.13.0' - - implementation 'org.reflections:reflections:0.9.12' } repositories { diff --git a/settings.gradle b/settings.gradle index 6d0a3b0..d94f73c 100644 --- a/settings.gradle +++ b/settings.gradle @@ -26,7 +26,5 @@ pluginManagement { } } -include ":annotation-processor" - Properties props = System.getProperties(); props.setProperty("org.gradle.internal.native.headers.unresolved.dependencies.ignore", "true"); diff --git a/src/main/java/frc/team3128/Main.java b/src/main/java/frc/team3128/Main.java index e72af8e..b56cd7c 100644 --- a/src/main/java/frc/team3128/Main.java +++ b/src/main/java/frc/team3128/Main.java @@ -21,7 +21,7 @@ private Main() {} *
If you change your main robot class, change the parameter type. */ public static void main(String... args) { - NAR_Robot.logWithAdvantageKit = false; + NAR_Robot.logWithAdvantageKit = true; RobotBase.startRobot(Robot::getInstance); } } diff --git a/src/main/java/frc/team3128/Robot.java b/src/main/java/frc/team3128/Robot.java index 86a72db..cd1d33b 100644 --- a/src/main/java/frc/team3128/Robot.java +++ b/src/main/java/frc/team3128/Robot.java @@ -63,7 +63,6 @@ public static synchronized Robot getInstance() { public void robotInit(){ timer.restart(); - autoPrograms = new AutoPrograms(); m_robotContainer.initDashboard(); diff --git a/src/main/java/frc/team3128/RobotContainer.java b/src/main/java/frc/team3128/RobotContainer.java index 9f4c55b..add299b 100644 --- a/src/main/java/frc/team3128/RobotContainer.java +++ b/src/main/java/frc/team3128/RobotContainer.java @@ -128,6 +128,11 @@ private void configureButtonBindings() { .onTrue(sequence( Shooter.getInstance().runKickMotor(.5), Hopper.getInstance().runManipulator(.8) + )) + .onFalse(sequence( + Shooter.getInstance().runKickMotor(0), + Hopper.getInstance().runManipulator(0), + Shooter.getInstance().stopMotors() )); new Trigger(()-> Shooter.getInstance().noteInRollers()).negate() @@ -191,25 +196,13 @@ public static void toggleSideCams(boolean enable) { } public void initDashboard() { - dashboard = NarwhalDashboard.getInstance(); + /*dashboard = NarwhalDashboard.getInstance(); dashboard.addUpdate("time", ()-> Timer.getMatchTime()); dashboard.addUpdate("voltage",()-> RobotController.getBatteryVoltage()); dashboard.addUpdate("robotX", ()-> swerve.getPose().getX()); dashboard.addUpdate("robotY", ()-> swerve.getPose().getY()); dashboard.addUpdate("robotYaw", ()-> swerve.getPose().getRotation().getDegrees()); - - if (NAR_TalonFX.getNumFailedConfigs() + NAR_CANSpark.getNumFailedConfigs() > 0 || !isConnected()) { - Log.recoverable("Colors", "Errors configuring: " + NAR_CANSpark.getNumFailedConfigs() + NAR_TalonFX.getNumFailedConfigs()); - Leds.getInstance().setLedColor(Colors.ERROR); - } - else if (!swerve.isConfigured()) { - Log.info("Colors", "Swerve Not Configured"); - Leds.getInstance().setLedColor(Colors.RED); - } - else { - Log.info("Colors", "No errors configuring"); - Leds.getInstance().setLedColor(Colors.CONFIGURED); - } + */ } public boolean isConnected() {