Many fixes

This commit is contained in:
Bertrand Songis
2019-03-22 12:00:01 +01:00
parent 307c8d7daf
commit ed1d312f20
6 changed files with 23 additions and 14 deletions
+3 -1
View File
@@ -192,7 +192,7 @@ inline bool isModuleDSM2(uint8_t idx)
#endif
// order is the same as in enum Protocols in myeeprom.h (none, ppm, pxx, pxx2, dsm, crossfire, multi, r9m, r9m2, sbus)
static const int8_t maxChannelsModules[] = { 0, 8, 8, 8, -2, 8, 4, 8, 8, 8}; // relative to 8!
static const int8_t maxChannelsModules[] = { 0, 8, 8, 16, -2, 8, 4, 8, 16, 8}; // relative to 8!
static const int8_t maxChannelsXJT[] = { 0, 8, 0, 4 }; // relative to 8!
constexpr int8_t MAX_TRAINER_CHANNELS_M8 = MAX_TRAINER_CHANNELS - 8;
@@ -216,6 +216,8 @@ inline int8_t defaultModuleChannels_M8(uint8_t idx)
return 0; // 8 channels
else if (isModuleMultimoduleDSM2(idx))
return -1; // 7 channels
else if (isModulePXX2(idx))
return 8; // 16 channels
else
return maxModuleChannels_M8(idx);
}
+2 -2
View File
@@ -191,9 +191,9 @@ void Pxx2Pulses::setupReceiverSettingsFrame(uint8_t module)
if (reusableBuffer.receiverSettings.pwmRate)
flag1 |= PXX2_RX_SETTINGS_FLAG1_FASTPWM;
Pxx2Transport::addByte(flag1);
uint8_t outputsCount = min<uint8_t>(16, reusableBuffer.receiverSettings.outputsCount);
uint8_t outputsCount = min<uint8_t>(24, reusableBuffer.receiverSettings.outputsCount);
for (int i = 0; i < outputsCount; i++) {
Pxx2Transport::addByte(reusableBuffer.receiverSettings.outputsMapping[i]);
Pxx2Transport::addByte(min<uint8_t>(23, reusableBuffer.receiverSettings.outputsMapping[i]));
}
}
reusableBuffer.receiverSettings.timeout = get_tmr10ms() + 200/*next try in 2s*/;