fix: Internal PXX exclusive S.PORT (#3822)
This commit is contained in:
@@ -19,6 +19,7 @@
|
||||
* GNU General Public License for more details.
|
||||
*/
|
||||
|
||||
#include "dataconstants.h"
|
||||
#include "hal/module_port.h"
|
||||
#include "heartbeat_driver.h"
|
||||
#include "mixer_scheduler.h"
|
||||
@@ -69,14 +70,17 @@ void Pxx1Pulses<PxxTransport>::addExtraFlags(uint8_t module)
|
||||
extraFlags |= (g_model.moduleData[module].pxx.receiverTelemetryOff << 1);
|
||||
extraFlags |= (g_model.moduleData[module].pxx.receiverHigherChannels << 2);
|
||||
if (isModuleR9MNonAccess(module)) {
|
||||
extraFlags |= (min<uint8_t>(g_model.moduleData[module].pxx.power, isModuleR9M_FCC_VARIANT(module) ? (uint8_t)R9M_FCC_POWER_MAX : (uint8_t)R9M_LBT_POWER_MAX) << 3);
|
||||
if (isModuleR9M_EUPLUS(module))
|
||||
extraFlags |= (1 << 6);
|
||||
extraFlags |= (min<uint8_t>(g_model.moduleData[module].pxx.power,
|
||||
isModuleR9M_FCC_VARIANT(module)
|
||||
? (uint8_t)R9M_FCC_POWER_MAX
|
||||
: (uint8_t)R9M_LBT_POWER_MAX)
|
||||
<< 3);
|
||||
if (isModuleR9M_EUPLUS(module)) extraFlags |= (1 << 6);
|
||||
}
|
||||
|
||||
#if defined(HARDWARE_EXTERNAL_MODULE) && defined(HARDWARE_INTERNAL_MODULE)
|
||||
// Disable S.PORT if internal module is active
|
||||
if (module == EXTERNAL_MODULE && isSportLineUsedByInternalModule()) {
|
||||
// Disable S.PORT if port is not used (might be used by the internal module)
|
||||
if (module == EXTERNAL_MODULE && !modulePortIsPortUsedByModule(module, ETX_MOD_PORT_SPORT)) {
|
||||
extraFlags |= (1 << 5);
|
||||
}
|
||||
#endif
|
||||
@@ -284,6 +288,8 @@ static void* pxx1Init(uint8_t module)
|
||||
|
||||
if (module == INTERNAL_MODULE) {
|
||||
|
||||
if (!pxxClearSPort()) return nullptr;
|
||||
|
||||
txCfg.baudrate = _pxx1_internal_baudrate;
|
||||
mod_st = modulePortInitSerial(module, ETX_MOD_PORT_UART, &txCfg, false);
|
||||
|
||||
@@ -361,7 +367,12 @@ static void* pxx1Init(uint8_t module)
|
||||
static void pxx1DeInit(void* ctx)
|
||||
{
|
||||
auto mod_st = (etx_module_state_t*)ctx;
|
||||
auto module = modulePortGetModule(mod_st);
|
||||
modulePortDeInit(mod_st);
|
||||
|
||||
if (module == INTERNAL_MODULE) {
|
||||
pulsesRestartModuleUnsafe(EXTERNAL_MODULE);
|
||||
}
|
||||
}
|
||||
|
||||
static void pxx1SendPulses(void* ctx, uint8_t* buffer, int16_t* channels, uint8_t nChannels)
|
||||
|
||||
Reference in New Issue
Block a user