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,35 +20,23 @@
|
||||
*/
|
||||
|
||||
#include "opentx.h"
|
||||
#include "aux_serial_driver.h"
|
||||
|
||||
void processFrskyTelemetryData(uint8_t data)
|
||||
{
|
||||
if (pushFrskyTelemetryData(data)) {
|
||||
if (IS_FRSKY_SPORT_PROTOCOL()) {
|
||||
sportProcessTelemetryPacket(telemetryRxBuffer);
|
||||
}
|
||||
else {
|
||||
frskyDProcessPacket(telemetryRxBuffer);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
bool pushFrskyTelemetryData(uint8_t data)
|
||||
static inline bool pushFrskyTelemetryData(bool is_sport, uint8_t data,
|
||||
uint8_t* buffer, uint8_t& len)
|
||||
{
|
||||
static uint8_t dataState = STATE_DATA_IDLE;
|
||||
|
||||
switch (dataState) {
|
||||
case STATE_DATA_START:
|
||||
if (data == START_STOP) {
|
||||
if (IS_FRSKY_SPORT_PROTOCOL()) {
|
||||
if (is_sport) {
|
||||
dataState = STATE_DATA_IN_FRAME ;
|
||||
telemetryRxBufferCount = 0;
|
||||
len = 0;
|
||||
}
|
||||
}
|
||||
else {
|
||||
if (telemetryRxBufferCount < TELEMETRY_RX_PACKET_SIZE) {
|
||||
telemetryRxBuffer[telemetryRxBufferCount++] = data;
|
||||
if (len < TELEMETRY_RX_PACKET_SIZE) {
|
||||
buffer[len++] = data;
|
||||
}
|
||||
dataState = STATE_DATA_IN_FRAME;
|
||||
}
|
||||
@@ -59,39 +47,38 @@ bool pushFrskyTelemetryData(uint8_t data)
|
||||
dataState = STATE_DATA_XOR; // XOR next byte
|
||||
}
|
||||
else if (data == START_STOP) {
|
||||
if (IS_FRSKY_SPORT_PROTOCOL()) {
|
||||
if (is_sport) {
|
||||
dataState = STATE_DATA_IN_FRAME ;
|
||||
telemetryRxBufferCount = 0;
|
||||
}
|
||||
else {
|
||||
len = 0;
|
||||
} else {
|
||||
// end of frame detected
|
||||
dataState = STATE_DATA_IDLE;
|
||||
return true;
|
||||
}
|
||||
break;
|
||||
}
|
||||
else if (telemetryRxBufferCount < TELEMETRY_RX_PACKET_SIZE) {
|
||||
telemetryRxBuffer[telemetryRxBufferCount++] = data;
|
||||
else if (len < TELEMETRY_RX_PACKET_SIZE) {
|
||||
buffer[len++] = data;
|
||||
}
|
||||
break;
|
||||
|
||||
case STATE_DATA_XOR:
|
||||
if (telemetryRxBufferCount < TELEMETRY_RX_PACKET_SIZE) {
|
||||
telemetryRxBuffer[telemetryRxBufferCount++] = data ^ STUFF_MASK;
|
||||
if (len < TELEMETRY_RX_PACKET_SIZE) {
|
||||
buffer[len++] = data ^ STUFF_MASK;
|
||||
}
|
||||
dataState = STATE_DATA_IN_FRAME;
|
||||
break;
|
||||
|
||||
case STATE_DATA_IDLE:
|
||||
if (data == START_STOP) {
|
||||
telemetryRxBufferCount = 0;
|
||||
len = 0;
|
||||
dataState = STATE_DATA_START;
|
||||
}
|
||||
break;
|
||||
|
||||
} // switch
|
||||
|
||||
if (IS_FRSKY_SPORT_PROTOCOL() && telemetryRxBufferCount >= FRSKY_SPORT_PACKET_SIZE) {
|
||||
if (is_sport && len >= FRSKY_SPORT_PACKET_SIZE) {
|
||||
// end of frame detected
|
||||
dataState = STATE_DATA_IDLE;
|
||||
return true;
|
||||
@@ -100,4 +87,16 @@ bool pushFrskyTelemetryData(uint8_t data)
|
||||
return false;
|
||||
}
|
||||
|
||||
void processFrskyDTelemetryData(uint8_t module, uint8_t data, uint8_t* buffer, uint8_t& len)
|
||||
{
|
||||
if (pushFrskyTelemetryData(false, data, buffer, len)) {
|
||||
frskyDProcessPacket(module, buffer, len);
|
||||
}
|
||||
}
|
||||
|
||||
void processFrskySportTelemetryData(uint8_t module, uint8_t data, uint8_t* buffer, uint8_t& len)
|
||||
{
|
||||
if (pushFrskyTelemetryData(true, data, buffer, len)) {
|
||||
sportProcessTelemetryPacket(module, buffer, len);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user