Merge branch 'apriltags' of https://github.com/DeepBlueRobotics/lib199

Author: CoolSpy3

.github/workflows/javadoc.yml

@@ -1,9 +1,6 @@
 name: Deploy Javadoc
 
-on:
-  push:
-    branches:
-      - master
+on: [push]
 
 jobs:
   build-javadoc:
@@ -24,6 +21,7 @@ jobs:
         path: ./build/docs/javadoc
   deploy-javadoc:
     needs: build-javadoc
+    if: github.ref == 'refs/heads/master'
     permissions:
       pages: write
       id-token: write

build.gradle

@@ -92,7 +92,7 @@ publishing {
         gpr(MavenPublication) {
             groupId = 'org.carlmontrobotics'
             artifactId = 'lib199'
-            version = '3.2.0'
+            version = '4.0.0'
 
             from components.java
         }

src/main/java/org/carlmontrobotics/lib199/path/PPRobotPath.java

@@ -67,9 +67,13 @@ public PPRobotPath(List<PathPlannerTrajectory> trajectory, SwerveDriveInterface
     /**
      * Constructs a RobotPath Object
      * 
-     * @param initializeDrivetrainPosition
-     * @param stopAtEnd
-     * @return
+     * @param pathName   Name of the path
+     * @param dt         Drivetrain object
+     * @param maxVel     Maximum velocity of the robot
+     * @param maxAccel   Maximum acceleration of the robot
+     * @param reversed   Whether the path should be reversed
+     * @param eventMap   Map of event marker names to the commands that should run when reaching that marker.
+     *                   This SHOULD NOT contain any commands requiring the same subsystems as this command, or it will be interrupted
      */
     public PPRobotPath(String pathName, SwerveDriveInterface dt, double maxVel, double maxAccel, boolean reversed, HashMap<String, Command> eventMap) {
         this.trajectory = PathPlanner.loadPathGroup(pathName, maxVel, maxAccel, reversed);

src/test/java/org/carlmontrobotics/lib199/MotorControllerFactoryTest.java

@@ -2,6 +2,7 @@
 
 import static org.junit.Assert.assertEquals;
 
+import org.carlmontrobotics.MotorConfig;
 import org.carlmontrobotics.lib199.testUtils.ErrStreamTest;
 import org.carlmontrobotics.lib199.testUtils.SimDeviceTestRule;
 import org.junit.ClassRule;
@@ -21,7 +22,7 @@ public void testCreateNoErrors() throws Exception {
         // Call close to free PWM ports
         ((AutoCloseable)MotorControllerFactory.createTalon(0)).close();
         ((AutoCloseable)MotorControllerFactory.createVictor(1)).close();
-        MotorControllerFactory.createSparkMax(2, 40);
+        MotorControllerFactory.createSparkMax(2, MotorConfig.NEO);
         assertEquals(0, errStream.toByteArray().length);
     }