From 8962d72e9bc5e801e96d633c127663ac71dbae2f Mon Sep 17 00:00:00 2001 From: Zoomer234 Date: Wed, 5 Jan 2022 19:32:25 -0800 Subject: [PATCH 1/3] Fixed issues with building. --- vendordeps/Phoenix.json | 26 -------------------------- vendordeps/REVRobotics.json | 6 ------ 2 files changed, 32 deletions(-) diff --git a/vendordeps/Phoenix.json b/vendordeps/Phoenix.json index 880c056..f50e2f5 100644 --- a/vendordeps/Phoenix.json +++ b/vendordeps/Phoenix.json @@ -20,16 +20,6 @@ } ], "jniDependencies": [ - { - "groupId": "com.ctre.phoenix", - "artifactId": "cci", - "version": "5.19.4", - "isJar": false, - "skipInvalidPlatforms": true, - "validPlatforms": [ - "linuxathena" - ] - }, { "groupId": "com.ctre.phoenix.sim", "artifactId": "cci-sim", @@ -77,7 +67,6 @@ "sharedLibrary": false, "skipInvalidPlatforms": true, "binaryPlatforms": [ - "linuxathena", "windowsx86-64", "linuxx86-64", "osxx86-64" @@ -92,24 +81,11 @@ "sharedLibrary": false, "skipInvalidPlatforms": true, "binaryPlatforms": [ - "linuxathena", "windowsx86-64", "linuxx86-64", "osxx86-64" ] }, - { - "groupId": "com.ctre.phoenix", - "artifactId": "cci", - "version": "5.19.4", - "libName": "CTRE_PhoenixCCI", - "headerClassifier": "headers", - "sharedLibrary": false, - "skipInvalidPlatforms": true, - "binaryPlatforms": [ - "linuxathena" - ] - }, { "groupId": "com.ctre.phoenix.sim", "artifactId": "cci-sim", @@ -133,7 +109,6 @@ "sharedLibrary": false, "skipInvalidPlatforms": true, "binaryPlatforms": [ - "linuxathena", "windowsx86-64", "linuxx86-64", "osxx86-64" @@ -176,7 +151,6 @@ "sharedLibrary": false, "skipInvalidPlatforms": true, "binaryPlatforms": [ - "linuxathena", "windowsx86-64", "linuxx86-64", "osxx86-64" diff --git a/vendordeps/REVRobotics.json b/vendordeps/REVRobotics.json index 9164b8e..4366e9b 100644 --- a/vendordeps/REVRobotics.json +++ b/vendordeps/REVRobotics.json @@ -4,10 +4,8 @@ "artifactId": "SparkMax-cpp", "binaryPlatforms": [ "windowsx86-64", - "windowsx86", "linuxaarch64bionic", "linuxx86-64", - "linuxathena", "linuxraspbian", "osxx86-64" ], @@ -21,11 +19,9 @@ { "artifactId": "SparkMax-driver", "binaryPlatforms": [ - "windowsx86-64", "windowsx86", "linuxaarch64bionic", "linuxx86-64", - "linuxathena", "linuxraspbian", "osxx86-64" ], @@ -52,11 +48,9 @@ "isJar": false, "skipInvalidPlatforms": true, "validPlatforms": [ - "windowsx86-64", "windowsx86", "linuxaarch64bionic", "linuxx86-64", - "linuxathena", "linuxraspbian", "osxx86-64" ], From d7f0f34e680e32164fa4da10ad6dd81754d87156 Mon Sep 17 00:00:00 2001 From: ss0g <55930267+ss0g@users.noreply.github.com> Date: Wed, 12 Jan 2022 17:56:59 -0800 Subject: [PATCH 2/3] Camden is so cool. --- .wpilib/wpilib_preferences.json | 2 +- .../java/com/spartronics4915/frc/commands/ExampleCommand.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.wpilib/wpilib_preferences.json b/.wpilib/wpilib_preferences.json index 2cfd6b0..0c0cdda 100644 --- a/.wpilib/wpilib_preferences.json +++ b/.wpilib/wpilib_preferences.json @@ -3,4 +3,4 @@ "currentLanguage": "java", "projectYear": "2021", "teamNumber": 4915 -} +} \ No newline at end of file diff --git a/src/main/java/com/spartronics4915/frc/commands/ExampleCommand.java b/src/main/java/com/spartronics4915/frc/commands/ExampleCommand.java index 6643627..4796a87 100644 --- a/src/main/java/com/spartronics4915/frc/commands/ExampleCommand.java +++ b/src/main/java/com/spartronics4915/frc/commands/ExampleCommand.java @@ -25,7 +25,7 @@ public ExampleCommand(ExampleSubsystem subsystem) // Called when the command is initially scheduled. @Override public void initialize() { - mExampleSubsystem.startTestMotor(0.3); + mExampleSubsystem.startTestMotor(1); } // Called every time the scheduler runs while the command is scheduled. From 11fcec6e1968478ba05237dcb597591c92f45a2c Mon Sep 17 00:00:00 2001 From: ss0g <55930267+ss0g@users.noreply.github.com> Date: Wed, 12 Jan 2022 18:00:26 -0800 Subject: [PATCH 3/3] add constant for motor speed --- src/main/java/com/spartronics4915/frc/Constants.java | 1 + .../java/com/spartronics4915/frc/commands/ExampleCommand.java | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/spartronics4915/frc/Constants.java b/src/main/java/com/spartronics4915/frc/Constants.java index 9e22c12..4d3c02d 100644 --- a/src/main/java/com/spartronics4915/frc/Constants.java +++ b/src/main/java/com/spartronics4915/frc/Constants.java @@ -12,4 +12,5 @@ public final class Constants { public static final int kTestMotorId = 1; + public static final double kTestMotorSpeed = 0.3; } diff --git a/src/main/java/com/spartronics4915/frc/commands/ExampleCommand.java b/src/main/java/com/spartronics4915/frc/commands/ExampleCommand.java index 4796a87..e82b193 100644 --- a/src/main/java/com/spartronics4915/frc/commands/ExampleCommand.java +++ b/src/main/java/com/spartronics4915/frc/commands/ExampleCommand.java @@ -1,5 +1,6 @@ package com.spartronics4915.frc.commands; +import com.spartronics4915.frc.Constants; import com.spartronics4915.frc.subsystems.ExampleSubsystem; import edu.wpi.first.wpilibj2.command.CommandBase; @@ -25,7 +26,7 @@ public ExampleCommand(ExampleSubsystem subsystem) // Called when the command is initially scheduled. @Override public void initialize() { - mExampleSubsystem.startTestMotor(1); + mExampleSubsystem.startTestMotor(Constants.kTestMotorSpeed); } // Called every time the scheduler runs while the command is scheduled.