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

@@ -2,21 +2,20 @@
#include "ctre/PCM.h"
#include <iostream>
static const int NUM_PCMS = 2;
extern PCM *modules[NUM_PCMS];
extern void initializePCM();
static const int NUM_MODULE_NUMBERS = 63;
extern PCM *modules[NUM_MODULE_NUMBERS];
extern void initializePCM(int module);
void *initializeCompressor(uint8_t module) {
initializePCM();
initializePCM(module);
return modules[module - 1];
return modules[module];
}
bool checkCompressorModule(uint8_t module) {
return module > 0 and module <= NUM_PCMS;
return module < NUM_MODULE_NUMBERS;
}
bool getCompressor(void *pcm_pointer, int32_t *status) {
PCM *module = (PCM *)pcm_pointer;
bool value;