Companion didn't compile

This commit is contained in:
bsongis
2014-12-08 21:39:56 +01:00
parent 4c2c85fe9f
commit 7ee2f911a8
7 changed files with 72 additions and 39 deletions
+7 -3
View File
@@ -48,7 +48,6 @@ uint8_t dsm2Stream[64]; // Likely more than we need
uint8_t *dsm2StreamPtr;
uint8_t dsm2SerialByte ;
uint8_t dsm2SerialBitCount;
uint8_t dsm2BindEnable = 0;
uint8_t dsm2BindTimer = DSM2_BIND_TIMEOUT;
#endif
@@ -170,14 +169,19 @@ void setupPulsesDSM2(unsigned int port)
else if (moduleFlag[port] == MODULE_RANGECHECK)
dsmDat[0] |= DSM2_SEND_RANGECHECK;
#else
dsm2BindEnable = 0;
if (dsm2BindTimer > 0) {
dsm2BindTimer--;
if (switchState(SW_DSM2_BIND)) {
dsm2BindEnable = DSM2_SEND_BIND;
moduleFlag[port] = MODULE_BIND;
dsmDat[0] |= DSM2_SEND_BIND;
}
}
else if (moduleFlag[port] == MODULE_RANGECHECK) {
dsmDat[0] |= DSM2_SEND_RANGECHECK;
}
else {
moduleFlag[port] = 0;
}
#endif
dsmDat[1] = g_model.header.modelId; // DSM2 Header second byte for model match