Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-21 01:01:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Updated PDP port of Talon and disabled PDP tests for Victor and Jaguar since the Victor and Jaguar don't draw enough current for the PDP to read above 0. PDP tests for both java and cpp only test the Talon now."

Browse Source
This commit is contained in:
Brad Miller (WPI)
2016-02-06 08:45:44 -08:00
committed by Gerrit Code Review
parent 4a6f55b61d 6b356020f3
commit 94629bcb78
4 changed files with 4 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
wpilibjIntegrationTests/src/main/java/edu/wpi/first/wpilibj/PDPTest.java
View File

@@ -65,9 +65,7 @@ public class PDPTest extends AbstractComsSetup {
public static Collection<Object[]> generateData() {
// logger.fine("Loading the MotorList");
return Arrays.asList(new Object[][] {
{TestBench.getInstance().getTalonPair(), new Double(0.0)},
{TestBench.getInstance().getVictorPair(), new Double(0.0)},
{TestBench.getInstance().getJaguarPair(), new Double(0.0)}});
{TestBench.getInstance().getTalonPair(), new Double(0.0)}});
}
@After
@@ -97,7 +95,7 @@ public class PDPTest extends AbstractComsSetup {
/* Set the motor to full forward */
me.getMotor().set(1.0);
Timer.delay(0.25);
Timer.delay(2);
/* The current should now be greater than the low current */
assertThat("The driven current is not greater than the resting current.",

2
wpilibjIntegrationTests/src/main/java/edu/wpi/first/wpilibj/test/TestBench.java
View File

@@ -68,7 +68,7 @@ public final class TestBench {
/* PowerDistributionPanel channels */
public static final int kJaguarPDPChannel = 6;
public static final int kVictorPDPChannel = 8;
public static final int kTalonPDPChannel = 11;
public static final int kTalonPDPChannel = 10;
public static final int kCANJaguarPDPChannel = 5;
/* CAN ASSOICATED CHANNELS */