piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

RANGE CHECK now sent in CHANNELS Flag0

Browse Source
This commit is contained in:
Bertrand Songis
2019-03-11 08:49:20 +01:00
parent e9d54852b9
commit a44dad9bb2
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/pulses/pxx2.cpp
+7 -4
View File
@@ -26,9 +26,12 @@ uint8_t Pxx2Pulses::addFlag0(uint8_t module)
uint8_t flag0 = g_model.header.modelId[module] & 0x3F;
if (g_model.moduleData[module].failsafeMode != FAILSAFE_NOT_SET && g_model.moduleData[module].failsafeMode != FAILSAFE_RECEIVER) {
if (moduleSettings[module].counter == 0) {
flag0 |= PXX2_FLAG0_FAILSAFE;
flag0 |= PXX2_CHANNELS_FLAG0_FAILSAFE;
}
}
if (moduleSettings[module].mode == MODULE_MODE_RANGECHECK) {
flag0 |= PXX2_CHANNELS_FLAG0_RANGECHECK;
}
Pxx2Transport::addByte(flag0);
return flag0;
}
@@ -95,11 +98,11 @@ void Pxx2Pulses::setupChannelsFrame(uint8_t module)
// Channels
uint8_t channelsCount = sentModuleChannels(module);
addChannels(module, flag0 & PXX2_FLAG0_FAILSAFE, g_model.moduleData[module].channelsStart);
addChannels(module, flag0 & PXX2_CHANNELS_FLAG0_FAILSAFE, g_model.moduleData[module].channelsStart);
if (channelsCount > 8) {
addChannels(module, flag0 & PXX2_FLAG0_FAILSAFE, g_model.moduleData[module].channelsStart + 8);
addChannels(module, flag0 & PXX2_CHANNELS_FLAG0_FAILSAFE, g_model.moduleData[module].channelsStart + 8);
if (channelsCount > 16) {
addChannels(module, flag0 & PXX2_FLAG0_FAILSAFE, g_model.moduleData[module].channelsStart + 16);
addChannels(module, flag0 & PXX2_CHANNELS_FLAG0_FAILSAFE, g_model.moduleData[module].channelsStart + 16);
}
}
}
radio/src/pulses/pxx2.h
+2 -1
View File
@@ -40,7 +40,8 @@
#define PXX2_TYPE_C_OTA 0xFE
#define PXX2_FLAG0_FAILSAFE (1 << 6)
#define PXX2_CHANNELS_FLAG0_FAILSAFE (1 << 6)
#define PXX2_CHANNELS_FLAG0_RANGECHECK (1 << 7)
#define PXX2_RECV_OPTION_MASK_FASTPWM 0x10
#define PXX2_RECV_OPTION_MASK_TELEMETRY 0x00 // Todo : update when defined