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

chore: New module/serial API (#3055)

Browse Source 
* 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:
Raphael Coeffic
2023-02-09 19:44:32 +10:00
committed by GitHub
parent d80adc6c4d
commit 72193eda82
189 changed files with 7960 additions and 8364 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/telemetry/multi.cpp
+15 -23
View File
@@ -19,7 +19,6 @@
* GNU General Public License for more details.
*/
#include "opentx.h"
#include "aux_serial_driver.h"
#include "telemetry.h"
#include "io/multi_protolist.h"
@@ -157,14 +156,7 @@ bool isMultiModeScanning(uint8_t module)
static MultiBufferState guessProtocol(uint8_t module)
{
uint32_t moduleIdx = EXTERNAL_MODULE;
#if defined(INTERNAL_MODULE_MULTI)
if (isModuleMultimodule(INTERNAL_MODULE)) {
moduleIdx = INTERNAL_MODULE;
}
#endif
if (g_model.moduleData[moduleIdx].multi.rfProtocol == MODULE_SUBTYPE_MULTI_DSM2)
if (g_model.moduleData[module].multi.rfProtocol == MODULE_SUBTYPE_MULTI_DSM2)
return SpektrumTelemetryFallback;
else if (g_model.moduleData[module].multi.rfProtocol == MODULE_SUBTYPE_MULTI_FS_AFHDS2A)
return FlyskyTelemetryFallback;
@@ -434,14 +426,14 @@ static void processMultiTelemetryPaket(const uint8_t * packet, uint8_t module)
case FrSkyHubTelemetry:
if (len >= 4)
frskyDProcessPacket(data);
frskyDProcessPacket(module, data, len);
else
TRACE("[MP] Received Frsky HUB telemetry len %d < 4", len);
break;
case FrSkySportTelemetry:
if (len >= 4) {
if (sportProcessTelemetryPacket(data) && len >= 8) {
if (sportProcessTelemetryPacket(module, data, len) && len >= 8) {
uint8_t primId = data[1];
uint16_t dataId = *((uint16_t *)(data+2));
if (primId == DATA_FRAME && dataId == RSSI_ID) {
@@ -470,10 +462,13 @@ static void processMultiTelemetryPaket(const uint8_t * packet, uint8_t module)
#if defined(LUA)
case FrskySportPolling:
if (len >= 1 && outputTelemetryBuffer.destination == TELEMETRY_ENDPOINT_SPORT && data[0] == outputTelemetryBuffer.sport.physicalId) {
TRACE("MP Sending sport data out.");
sportSendBuffer(outputTelemetryBuffer.data, outputTelemetryBuffer.size);
}
// TODO
// if (len >= 1 &&
// outputTelemetryBuffer.destination == TELEMETRY_ENDPOINT_SPORT &&
// data[0] == outputTelemetryBuffer.sport.physicalId) {
// TRACE("MP Sending sport data out.");
// sportSendBuffer(outputTelemetryBuffer.data, outputTelemetryBuffer.size);
// }
break;
#endif
case SpectrumScannerPacket:
@@ -604,12 +599,9 @@ void processMultiTelemetryData(uint8_t data, uint8_t module)
uint8_t &rxBufferCount = getTelemetryRxBufferCount(module);
uint16_t &lastRxTS = getMultiTelemetryLastRxTS(module);
uint16_t nowMs = (uint16_t)RTOS_GET_MS();
if (nowMs - lastRxTS > 15)
setMultiTelemetryBufferState(module, NoProtocolDetected);
lastRxTS = nowMs;
// debugPrintf("State: %d, byte received %02X, buflen: %d\r\n", getMultiTelemetryBufferState(module), data, rxBufferCount);
// debugPrintf("State: %d, byte received %02X, buflen: %d\r\n",
// getMultiTelemetryBufferState(module), data, rxBufferCount);
switch (getMultiTelemetryBufferState(module)) {
case NoProtocolDetected:
@@ -629,7 +621,7 @@ void processMultiTelemetryData(uint8_t data, uint8_t module)
case FrskyTelemetryFallback:
setMultiTelemetryBufferState(module, FrskyTelemetryFallbackFirstByte);
processFrskyTelemetryData(data);
processFrskySportTelemetryData(module, data, rxBuffer, rxBufferCount);
break;
case FrskyTelemetryFallbackFirstByte:
@@ -637,7 +629,7 @@ void processMultiTelemetryData(uint8_t data, uint8_t module)
setMultiTelemetryBufferState(module, MultiStatusOrFrskyData);
}
else {
processFrskyTelemetryData(data);
processFrskySportTelemetryData(module, data, rxBuffer, rxBufferCount);
if (data != 0x7e)
setMultiTelemetryBufferState(module, FrskyTelemetryFallbackNextBytes);
}
@@ -645,7 +637,7 @@ void processMultiTelemetryData(uint8_t data, uint8_t module)
break;
case FrskyTelemetryFallbackNextBytes:
processFrskyTelemetryData(data);
processFrskySportTelemetryData(module, data, rxBuffer, rxBufferCount);
if (data == 0x7e) {
// end of packet or start of new packet
setMultiTelemetryBufferState(module, FrskyTelemetryFallbackFirstByte);