Skip to content

Commit a1c0e3d

Browse files
committed
fix javadocs
1 parent 2f92390 commit a1c0e3d

4 files changed

Lines changed: 12 additions & 9 deletions

File tree

.github/workflows/javadoc.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
name: Deploy Javadoc
22

3-
on:
4-
push:
5-
branches:
6-
- master
3+
on: [push]
74

85
jobs:
96
build-javadoc:
@@ -24,6 +21,7 @@ jobs:
2421
path: ./build/docs/javadoc
2522
deploy-javadoc:
2623
needs: build-javadoc
24+
if: github.ref == 'refs/heads/master'
2725
permissions:
2826
pages: write
2927
id-token: write

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ publishing {
9292
gpr(MavenPublication) {
9393
groupId = 'org.carlmontrobotics'
9494
artifactId = 'lib199'
95-
version = '3.2.0'
95+
version = '4.0.0'
9696

9797
from components.java
9898
}

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

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,13 @@ public PPRobotPath(List<PathPlannerTrajectory> trajectory, SwerveDriveInterface
6767
/**
6868
* Constructs a RobotPath Object
6969
*
70-
* @param initializeDrivetrainPosition
71-
* @param stopAtEnd
72-
* @return
70+
* @param pathName Name of the path
71+
* @param dt Drivetrain object
72+
* @param maxVel Maximum velocity of the robot
73+
* @param maxAccel Maximum acceleration of the robot
74+
* @param reversed Whether the path should be reversed
75+
* @param eventMap Map of event marker names to the commands that should run when reaching that marker.
76+
* This SHOULD NOT contain any commands requiring the same subsystems as this command, or it will be interrupted
7377
*/
7478
public PPRobotPath(String pathName, SwerveDriveInterface dt, double maxVel, double maxAccel, boolean reversed, HashMap<String, Command> eventMap) {
7579
this.trajectory = PathPlanner.loadPathGroup(pathName, maxVel, maxAccel, reversed);

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import static org.junit.Assert.assertEquals;
44

5+
import org.carlmontrobotics.MotorConfig;
56
import org.carlmontrobotics.lib199.testUtils.ErrStreamTest;
67
import org.carlmontrobotics.lib199.testUtils.SimDeviceTestRule;
78
import org.junit.ClassRule;
@@ -21,7 +22,7 @@ public void testCreateNoErrors() throws Exception {
2122
// Call close to free PWM ports
2223
((AutoCloseable)MotorControllerFactory.createTalon(0)).close();
2324
((AutoCloseable)MotorControllerFactory.createVictor(1)).close();
24-
MotorControllerFactory.createSparkMax(2, 40);
25+
MotorControllerFactory.createSparkMax(2, MotorConfig.NEO);
2526
assertEquals(0, errStream.toByteArray().length);
2627
}
2728

0 commit comments

Comments
 (0)