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

Updated the HAL, wpilibj, and wpilibc for PCM and PDP

Browse Source 
Removed #if 0...#endif from PCM.cpp

Change-Id: I2d117c87a3fa10bddebf83706f79c2e767d22a0d

Update the HAL to the PCM/PDP changes

Change-Id: If554b650e263f174e90864f1e9ffba91daf20f7e

Update C++ to the PCM/PDP changes

Change-Id: Ia3114d4526be1dc5cc2f74fd8f7ab44f204d15f2

Updated PCM/PDP in Java

Change-Id: I8fe03afbcb1739d555e86abc0eaae1e12313d490
This commit is contained in:
thomasclark
2014-07-02 15:15:56 -04:00
parent 0ef5c3adfa
commit 255a3a5b12
17 changed files with 42 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
wpilibj/wpilibJavaIntegrationTests/src/main/java/edu/wpi/first/wpilibj/PCMTest.java
View File

@@ -54,8 +54,8 @@ public class PCMTest extends AbstractComsSetup {
fakePressureSwitch = new DigitalOutput(11);
fakeCompressor = new AnalogInput(1);
solenoid1 = new Solenoid(1);
solenoid2 = new Solenoid(2);
solenoid1 = new Solenoid(0);
solenoid2 = new Solenoid(1);
fakeSolenoid1 = new DigitalInput(12);
fakeSolenoid2 = new DigitalInput(13);

6
wpilibj/wpilibJavaIntegrationTests/src/main/java/edu/wpi/first/wpilibj/test/TestBench.java
View File

@@ -56,9 +56,9 @@ public final class TestBench {
/* PowerDistributionPanel channels */
public static final int kJaguarPDPChannel = 7;
public static final int kVictorPDPChannel = 11;
public static final int kTalonPDPChannel = 12;
public static final int kJaguarPDPChannel = 6;
public static final int kVictorPDPChannel = 10;
public static final int kTalonPDPChannel = 11;
/* CAN ASSOICATED CHANNELS */
public static final int kFakeJaguarPotentiometer = 1;