Merge pull request #8 from ss0g/main

added constant for test motor speed
Spartronics4915 · Jan 13, 2022 · 7cd16c4 · 7cd16c4
2 parents 1cced4a + 11fcec6
commit 7cd16c4
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 34 deletions.
diff --git a/.wpilib/wpilib_preferences.json b/.wpilib/wpilib_preferences.json
@@ -3,4 +3,4 @@
     "currentLanguage": "java",
     "projectYear": "2021",
     "teamNumber": 4915
-}
+}
diff --git 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
@@ -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(0.3);
+        mExampleSubsystem.startTestMotor(Constants.kTestMotorSpeed);
     }
 
     // Called every time the scheduler runs while the command is scheduled.

diff --git 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
@@ -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"
             ],