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

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

View File

@@ -51,7 +51,7 @@ JNIEXPORT jobject JNICALL Java_edu_wpi_first_wpilibj_hal_SolenoidJNI_getPortWith
(JNIEnv *env, jclass, jbyte module, jbyte channel)
{
VoidPointer *port_pointer = new VoidPointer;
*port_pointer = getPortWithModule(module + 1, channel);
*port_pointer = getPortWithModule(module, channel);
return env->NewDirectByteBuffer(port_pointer, 4);
}