chore: New module/serial API (#3055)
* WiP: new module interface * WiP: softserial timer DMA * WiP: setup() and send() in one step and remove methods specific to internal or external module * fixes and extra port config * horus targets * module ports have moved * T8 support (only internal module) * fix nv14 * stupid GCC.... * disable BT * remove nv14 telem driver * remove old aux serial driver * Move module buffers out of pulses.h * Soft serial fixes and PXX1 support * Fixed PPM module output * Fixed CLI * compilation fixes * Ported bluetooth and flysky gimbal to new serial driver * Re-enable soft-serial RX * fixes and cleanup * nv14 fixes * Fix flysky gimbals * Ghost module * 16 bytes of RAM * Remove getByte from module API * Ghost cleanup * fix: _half_duplex_input() must be called after usart init * WiP * more cleanup * Remove board specific settings from PXX1 / PXX2 drivers * A bit of PXX2 header cleanup * Add support for OVER8 and ONEBIT * Add some support for inverters (NV14 / EL18) * Support NV14 power fixes in generic board * Fix polarity handling * Fix RX DMA * Fix mixer not running * Add soft-serial polarity control * Quick fix for telemetry polling while module port is changed * Fix bootloader DEBUG * Fix MPM telemetry * Fix pulse start * DSM2 soft-serial fallback * DSMP async module restart * Fix CRSF LUA upstream * Remove global variable telemetryProtocol * Use HAL/LL constants * Fix various issue with AFHDS3 and NV14/EL18 internal module * Fixed S.PORT unit tests * fix: update widx after writing at current index * fix: init error condition * Fix: possible infinite loop in _find_port() * Add support for bidir S.PORT init * Add support for "getLastByte" in HW serial driver * PXX1: Add support for S.PORT based on IDLE callback * Fix rebase error * Fix softserial _rx_fifo_push() * Add softserial support for waitForTxCompleted() * Fix MPM flashing (internal / external) * Fixed external MPM * Activate RX DMA on internal module Seems to work with serial passthrough without issues, at least on the L3R PRO. * Fix softserial DMA on stdlcd F4 targets * Add softserial support for 32bit timers (mostly TIM2) * More precise soft-serial * Fix MPM update using inverters & HW uart * Raise S.PORT DMA/USART IRQ prio to achieve faster switching to input * Remove useless delays * Fix flashing external ELRS module * Added a retry mechanism for FrSky S.PORT update * Remove useless enableRx() * External FrSky modules are all flashed via S.PORT * Remove power management unit update This was only used on the first batch of X-lite.
This commit is contained in:
@@ -20,10 +20,7 @@
|
||||
*/
|
||||
|
||||
#include "opentx.h"
|
||||
|
||||
#if defined(PXX2)
|
||||
#include "extmodule_serial_driver.h"
|
||||
#endif
|
||||
#include "hal/module_port.h"
|
||||
|
||||
#if defined(PCBFRSKY) || defined(PCBFLYSKY)
|
||||
uint8_t switchToMix(uint8_t source)
|
||||
@@ -726,12 +723,16 @@ bool isModuleUsingSport(uint8_t moduleBay, uint8_t moduleType)
|
||||
// External XJT has a physical switch to disable S.PORT
|
||||
case MODULE_TYPE_R9M_PXX1:
|
||||
// R9M telemetry is disabled by pulses (pxx1.cpp)
|
||||
#if defined(HARDWARE_EXTERNAL_MODULE)
|
||||
if (moduleBay == EXTERNAL_MODULE)
|
||||
return false;
|
||||
#endif
|
||||
|
||||
case MODULE_TYPE_CROSSFIRE:
|
||||
#if defined(HARDWARE_INTERNAL_MODULE)
|
||||
if (moduleBay == INTERNAL_MODULE)
|
||||
return false;
|
||||
#endif
|
||||
|
||||
default:
|
||||
return true;
|
||||
@@ -785,7 +786,7 @@ bool isInternalModuleAvailable(int moduleType)
|
||||
if (g_eeGeneral.internalModule != moduleType)
|
||||
return false;
|
||||
|
||||
#if defined(INTERNAL_MODULE_PXX1)
|
||||
#if defined(INTERNAL_MODULE_PXX1) && defined(HARDWARE_EXTERNAL_MODULE)
|
||||
if ((moduleType == MODULE_TYPE_XJT_PXX1) &&
|
||||
isModuleUsingSport(EXTERNAL_MODULE,
|
||||
g_model.moduleData[EXTERNAL_MODULE].type)) {
|
||||
@@ -793,7 +794,7 @@ bool isInternalModuleAvailable(int moduleType)
|
||||
}
|
||||
#endif
|
||||
|
||||
#if defined(INTERNAL_MODULE_PXX2)
|
||||
#if defined(INTERNAL_MODULE_PXX2) && defined(HARDWARE_EXTERNAL_MODULE)
|
||||
if ((moduleType == MODULE_TYPE_ISRM_PXX2) &&
|
||||
areModulesConflicting(moduleType,
|
||||
g_model.moduleData[EXTERNAL_MODULE].type)) {
|
||||
@@ -854,7 +855,8 @@ bool isExternalModuleAvailable(int moduleType)
|
||||
moduleType == MODULE_TYPE_R9M_LITE_PRO_PXX2) {
|
||||
|
||||
#if defined(PXX2)
|
||||
return extmoduleGetSerialPort() != nullptr;
|
||||
return modulePortFind(EXTERNAL_MODULE, ETX_MOD_TYPE_SERIAL,
|
||||
ETX_MOD_PORT_UART, ETX_Pol_Normal);
|
||||
#else
|
||||
return false;
|
||||
#endif
|
||||
@@ -916,22 +918,25 @@ bool isExternalModuleAvailable(int moduleType)
|
||||
|
||||
bool isRfProtocolAvailable(int protocol)
|
||||
{
|
||||
#if defined(CROSSFIRE)
|
||||
#if defined(CROSSFIRE) && defined(HARDWARE_EXTERNAL_MODULE)
|
||||
if (protocol != MODULE_SUBTYPE_PXX1_OFF && g_model.moduleData[EXTERNAL_MODULE].type == MODULE_TYPE_CROSSFIRE) {
|
||||
return false;
|
||||
}
|
||||
#endif
|
||||
#if defined(GHOST)
|
||||
|
||||
#if defined(GHOST) && defined(HARDWARE_EXTERNAL_MODULE)
|
||||
if (protocol != MODULE_SUBTYPE_PXX1_OFF && g_model.moduleData[EXTERNAL_MODULE].type == MODULE_TYPE_GHOST) {
|
||||
return false;
|
||||
}
|
||||
#endif
|
||||
|
||||
#if !defined(MODULE_PROTOCOL_D8)
|
||||
if (protocol == MODULE_SUBTYPE_PXX1_ACCST_D8) {
|
||||
return false;
|
||||
}
|
||||
#endif
|
||||
#if defined(PCBTARANIS) || defined(PCBHORUS)
|
||||
|
||||
#if (defined(PCBTARANIS) || defined(PCBHORUS)) && defined(HARDWARE_EXTERNAL_MODULE)
|
||||
if (protocol != MODULE_SUBTYPE_PXX1_OFF && g_model.moduleData[EXTERNAL_MODULE].type == MODULE_TYPE_R9M_PXX1) {
|
||||
return false;
|
||||
}
|
||||
@@ -1029,7 +1034,7 @@ bool isTrainerModeAvailable(int mode)
|
||||
return false;
|
||||
#endif
|
||||
|
||||
#if !defined(MULTIMODULE)
|
||||
#if !defined(MULTIMODULE) || !defined(HARDWARE_INTERNAL_MODULE) || !defined(HARDWARE_EXTERNAL_MODULE)
|
||||
if (mode == TRAINER_MODE_MULTI)
|
||||
return false;
|
||||
#else
|
||||
|
||||
Reference in New Issue
Block a user