Skip to content

Commit

Permalink
Code O EOD changes
Browse files Browse the repository at this point in the history
This reverts commit 7f97490.
  • Loading branch information
ControlsNarwhal committed Oct 7, 2024
1 parent 7f97490 commit 45b1c7e
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 24 deletions.
6 changes: 0 additions & 6 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 0 additions & 2 deletions settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,5 @@ pluginManagement {
}
}

include ":annotation-processor"

Properties props = System.getProperties();
props.setProperty("org.gradle.internal.native.headers.unresolved.dependencies.ignore", "true");
2 changes: 1 addition & 1 deletion src/main/java/frc/team3128/Main.java
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ private Main() {}
* <p>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);
}
}
1 change: 0 additions & 1 deletion src/main/java/frc/team3128/Robot.java
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ public static synchronized Robot getInstance() {
public void robotInit(){
timer.restart();



autoPrograms = new AutoPrograms();
m_robotContainer.initDashboard();
Expand Down
21 changes: 7 additions & 14 deletions src/main/java/frc/team3128/RobotContainer.java
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down Expand Up @@ -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() {
Expand Down

0 comments on commit 45b1c7e

Please sign in to comment.