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:
+86
-46
@@ -191,16 +191,16 @@ TEST(FrSkySPORT, FrSkyDCells)
|
||||
|
||||
uint8_t pkt1[] = { 0x7E, 0x98, 0x10, 0x06, 0x00, 0x07, 0xD0, 0x00, 0x00, 0x12 };
|
||||
EXPECT_EQ(checkSportPacket(pkt1+1), true);
|
||||
sportProcessTelemetryPacket(pkt1+1);
|
||||
sportProcessTelemetryPacket(0, pkt1+1, sizeof(pkt1) - 1);
|
||||
uint8_t pkt2[] = { 0x7E, 0x98, 0x10, 0x06, 0x00, 0x17, 0xD0, 0x00, 0x00, 0x02 };
|
||||
EXPECT_EQ(checkSportPacket(pkt2+1), true);
|
||||
sportProcessTelemetryPacket(pkt2+1);
|
||||
sportProcessTelemetryPacket(0, pkt2+1, sizeof(pkt2) - 1);
|
||||
uint8_t pkt3[] = { 0x7E, 0x98, 0x10, 0x06, 0x00, 0x27, 0xD0, 0x00, 0x00, 0xF1 };
|
||||
EXPECT_EQ(checkSportPacket(pkt3+1), true);
|
||||
sportProcessTelemetryPacket(pkt3+1);
|
||||
sportProcessTelemetryPacket(pkt1+1);
|
||||
sportProcessTelemetryPacket(pkt2+1);
|
||||
sportProcessTelemetryPacket(pkt3+1);
|
||||
sportProcessTelemetryPacket(0, pkt3+1, sizeof(pkt3) - 1);
|
||||
sportProcessTelemetryPacket(0, pkt1+1, sizeof(pkt1) - 1);
|
||||
sportProcessTelemetryPacket(0, pkt2+1, sizeof(pkt2) - 1);
|
||||
sportProcessTelemetryPacket(0, pkt3+1, sizeof(pkt3) - 1);
|
||||
EXPECT_EQ(telemetryItems[0].cells.count, 3);
|
||||
EXPECT_EQ(telemetryItems[0].value, 1200);
|
||||
for (int i=0; i<3; i++) {
|
||||
@@ -220,12 +220,16 @@ TEST(FrSkySPORT, frskySetCellVoltage)
|
||||
allowNewSensors = true;
|
||||
|
||||
// test that simulates 3 cell battery
|
||||
generateSportCellPacket(packet, 3, 0, 410, 420); sportProcessTelemetryPacket(packet);
|
||||
generateSportCellPacket(packet, 3, 0, 410, 420);
|
||||
sportProcessTelemetryPacket(0, packet, sizeof(packet));
|
||||
EXPECT_EQ(checkSportPacket(packet), true) << "Bad CRC generation in setSportPacketCrc()";
|
||||
generateSportCellPacket(packet, 3, 2, 430, 0); sportProcessTelemetryPacket(packet);
|
||||
generateSportCellPacket(packet, 3, 2, 430, 0);
|
||||
sportProcessTelemetryPacket(0, packet, sizeof(packet));
|
||||
|
||||
generateSportCellPacket(packet, 3, 0, 405, 300); sportProcessTelemetryPacket(packet);
|
||||
generateSportCellPacket(packet, 3, 2, 430, 0); sportProcessTelemetryPacket(packet);
|
||||
generateSportCellPacket(packet, 3, 0, 405, 300);
|
||||
sportProcessTelemetryPacket(0, packet, sizeof(packet));
|
||||
generateSportCellPacket(packet, 3, 2, 430, 0);
|
||||
sportProcessTelemetryPacket(0, packet, sizeof(packet));
|
||||
|
||||
EXPECT_EQ(telemetryItems[0].cells.count, 3);
|
||||
EXPECT_EQ(telemetryItems[0].cells.values[0].value, 405);
|
||||
@@ -236,11 +240,17 @@ TEST(FrSkySPORT, frskySetCellVoltage)
|
||||
EXPECT_EQ(telemetryItems[0].valueMin, 1135);
|
||||
EXPECT_EQ(telemetryItems[0].valueMax, 1260);
|
||||
|
||||
generateSportCellPacket(packet, 3, 0, 405, 250); sportProcessTelemetryPacket(packet);
|
||||
generateSportCellPacket(packet, 3, 2, 430, 0); sportProcessTelemetryPacket(packet);
|
||||
generateSportCellPacket(packet, 3, 0, 405, 250);
|
||||
sportProcessTelemetryPacket(0, packet, sizeof(packet));
|
||||
|
||||
generateSportCellPacket(packet, 3, 0, 410, 420); sportProcessTelemetryPacket(packet);
|
||||
generateSportCellPacket(packet, 3, 2, 430, 0); sportProcessTelemetryPacket(packet);
|
||||
generateSportCellPacket(packet, 3, 2, 430, 0);
|
||||
sportProcessTelemetryPacket(0, packet, sizeof(packet));
|
||||
|
||||
generateSportCellPacket(packet, 3, 0, 410, 420);
|
||||
sportProcessTelemetryPacket(0, packet, sizeof(packet));
|
||||
|
||||
generateSportCellPacket(packet, 3, 2, 430, 0);
|
||||
sportProcessTelemetryPacket(0, packet, sizeof(packet));
|
||||
|
||||
EXPECT_EQ(telemetryItems[0].cells.count, 3);
|
||||
EXPECT_EQ(telemetryItems[0].cells.values[0].value, 410);
|
||||
@@ -252,9 +262,12 @@ TEST(FrSkySPORT, frskySetCellVoltage)
|
||||
EXPECT_EQ(telemetryItems[0].valueMax, 1260);
|
||||
|
||||
//add another two cells - 5 cell battery
|
||||
generateSportCellPacket(packet, 5, 0, 418, 408); sportProcessTelemetryPacket(packet);
|
||||
generateSportCellPacket(packet, 5, 2, 415, 420); sportProcessTelemetryPacket(packet);
|
||||
generateSportCellPacket(packet, 5, 4, 410, 0); sportProcessTelemetryPacket(packet);
|
||||
generateSportCellPacket(packet, 5, 0, 418, 408);
|
||||
sportProcessTelemetryPacket(0, packet, sizeof(packet));
|
||||
generateSportCellPacket(packet, 5, 2, 415, 420);
|
||||
sportProcessTelemetryPacket(0, packet, sizeof(packet));
|
||||
generateSportCellPacket(packet, 5, 4, 410, 0);
|
||||
sportProcessTelemetryPacket(0, packet, sizeof(packet));
|
||||
|
||||
EXPECT_EQ(telemetryItems[0].cells.count, 5);
|
||||
EXPECT_EQ(telemetryItems[0].cells.values[0].value, 418);
|
||||
@@ -268,9 +281,12 @@ TEST(FrSkySPORT, frskySetCellVoltage)
|
||||
EXPECT_EQ(telemetryItems[0].valueMax, 2071);
|
||||
|
||||
//simulate very low voltage for cell 3
|
||||
generateSportCellPacket(packet, 5, 0, 418, 408); sportProcessTelemetryPacket(packet);
|
||||
generateSportCellPacket(packet, 5, 2, 100, 420); sportProcessTelemetryPacket(packet);
|
||||
generateSportCellPacket(packet, 5, 4, 410, 0); sportProcessTelemetryPacket(packet);
|
||||
generateSportCellPacket(packet, 5, 0, 418, 408);
|
||||
sportProcessTelemetryPacket(0, packet, sizeof(packet));
|
||||
generateSportCellPacket(packet, 5, 2, 100, 420);
|
||||
sportProcessTelemetryPacket(0, packet, sizeof(packet));
|
||||
generateSportCellPacket(packet, 5, 4, 410, 0);
|
||||
sportProcessTelemetryPacket(0, packet, sizeof(packet));
|
||||
|
||||
EXPECT_EQ(telemetryItems[0].cells.count, 5);
|
||||
EXPECT_EQ(telemetryItems[0].cells.values[0].value, 418);
|
||||
@@ -284,10 +300,14 @@ TEST(FrSkySPORT, frskySetCellVoltage)
|
||||
EXPECT_EQ(telemetryItems[0].valueMax, 2071);
|
||||
|
||||
//back to normal (but with reversed order of packets)
|
||||
generateSportCellPacket(packet, 5, 4, 410, 0); sportProcessTelemetryPacket(packet);
|
||||
generateSportCellPacket(packet, 5, 0, 418, 408); sportProcessTelemetryPacket(packet);
|
||||
generateSportCellPacket(packet, 5, 2, 412, 420); sportProcessTelemetryPacket(packet);
|
||||
generateSportCellPacket(packet, 5, 4, 410, 0); sportProcessTelemetryPacket(packet);
|
||||
generateSportCellPacket(packet, 5, 4, 410, 0);
|
||||
sportProcessTelemetryPacket(0, packet, sizeof(packet));
|
||||
generateSportCellPacket(packet, 5, 0, 418, 408);
|
||||
sportProcessTelemetryPacket(0, packet, sizeof(packet));
|
||||
generateSportCellPacket(packet, 5, 2, 412, 420);
|
||||
sportProcessTelemetryPacket(0, packet, sizeof(packet));
|
||||
generateSportCellPacket(packet, 5, 4, 410, 0);
|
||||
sportProcessTelemetryPacket(0, packet, sizeof(packet));
|
||||
|
||||
EXPECT_EQ(telemetryItems[0].cells.count, 5);
|
||||
EXPECT_EQ(telemetryItems[0].cells.values[0].value, 418);
|
||||
@@ -311,7 +331,7 @@ TEST(FrSkySPORT, StrangeCellsBug)
|
||||
|
||||
uint8_t pkt[] = { 0x7E, 0x48, 0x10, 0x00, 0x03, 0x30, 0x15, 0x50, 0x81, 0xD5 };
|
||||
EXPECT_EQ(checkSportPacket(pkt+1), true);
|
||||
sportProcessTelemetryPacket(pkt+1);
|
||||
sportProcessTelemetryPacket(0, pkt+1, sizeof(pkt) - 1);
|
||||
EXPECT_EQ(telemetryItems[0].cells.count, 3);
|
||||
EXPECT_EQ(telemetryItems[0].cells.values[0].value, 0); // now we ignore such low values
|
||||
EXPECT_EQ(telemetryItems[0].cells.values[1].value, 413);
|
||||
@@ -328,8 +348,10 @@ TEST(FrSkySPORT, frskySetCellVoltageTwoSensors)
|
||||
allowNewSensors = true;
|
||||
|
||||
//sensor 1: 3 cell battery
|
||||
generateSportCellPacket(packet, 3, 0, 418, 416); sportProcessTelemetryPacket(packet);
|
||||
generateSportCellPacket(packet, 3, 2, 415, 0); sportProcessTelemetryPacket(packet);
|
||||
generateSportCellPacket(packet, 3, 0, 418, 416);
|
||||
sportProcessTelemetryPacket(0, packet, sizeof(packet));
|
||||
generateSportCellPacket(packet, 3, 2, 415, 0);
|
||||
sportProcessTelemetryPacket(0, packet, sizeof(packet));
|
||||
|
||||
EXPECT_EQ(telemetryItems[0].cells.count, 3);
|
||||
EXPECT_EQ(telemetryItems[0].cells.values[0].value, 418);
|
||||
@@ -341,8 +363,10 @@ TEST(FrSkySPORT, frskySetCellVoltageTwoSensors)
|
||||
EXPECT_EQ(telemetryItems[0].valueMax, 1249);
|
||||
|
||||
//sensor 2: 4 cell battery
|
||||
generateSportCellPacket(packet, 4, 0, 410, 420, DATA_ID_FLVSS+1); sportProcessTelemetryPacket(packet);
|
||||
generateSportCellPacket(packet, 4, 2, 400, 405, DATA_ID_FLVSS+1); sportProcessTelemetryPacket(packet);
|
||||
generateSportCellPacket(packet, 4, 0, 410, 420, DATA_ID_FLVSS+1);
|
||||
sportProcessTelemetryPacket(0, packet, sizeof(packet));
|
||||
generateSportCellPacket(packet, 4, 2, 400, 405, DATA_ID_FLVSS+1);
|
||||
sportProcessTelemetryPacket(0, packet, sizeof(packet));
|
||||
|
||||
EXPECT_EQ(telemetryItems[1].cells.count, 4);
|
||||
EXPECT_EQ(telemetryItems[1].cells.values[0].value, 410);
|
||||
@@ -366,10 +390,14 @@ TEST(FrSkySPORT, frskySetCellVoltageTwoSensors)
|
||||
EXPECT_EQ(telemetryItems[2].valueMax, 287);
|
||||
|
||||
//now change some voltages
|
||||
generateSportCellPacket(packet, 3, 2, 415, 0); sportProcessTelemetryPacket(packet);
|
||||
generateSportCellPacket(packet, 4, 2, 390, 370, DATA_ID_FLVSS+1); sportProcessTelemetryPacket(packet);
|
||||
generateSportCellPacket(packet, 3, 0, 420, 410); sportProcessTelemetryPacket(packet);
|
||||
generateSportCellPacket(packet, 4, 0, 410, 420, DATA_ID_FLVSS+1); sportProcessTelemetryPacket(packet);
|
||||
generateSportCellPacket(packet, 3, 2, 415, 0);
|
||||
sportProcessTelemetryPacket(0, packet, sizeof(packet));
|
||||
generateSportCellPacket(packet, 4, 2, 390, 370, DATA_ID_FLVSS+1);
|
||||
sportProcessTelemetryPacket(0, packet, sizeof(packet));
|
||||
generateSportCellPacket(packet, 3, 0, 420, 410);
|
||||
sportProcessTelemetryPacket(0, packet, sizeof(packet));
|
||||
generateSportCellPacket(packet, 4, 0, 410, 420, DATA_ID_FLVSS+1);
|
||||
sportProcessTelemetryPacket(0, packet, sizeof(packet));
|
||||
|
||||
telemetryWakeup();
|
||||
|
||||
@@ -398,22 +426,26 @@ TEST(FrSkySPORT, frskyVfas)
|
||||
allowNewSensors = true;
|
||||
|
||||
// tests for Vfas
|
||||
generateSportFasVoltagePacket(packet, 5000); sportProcessTelemetryPacket(packet);
|
||||
generateSportFasVoltagePacket(packet, 5000);
|
||||
sportProcessTelemetryPacket(0, packet, sizeof(packet));
|
||||
EXPECT_EQ(telemetryItems[0].value, 5000);
|
||||
EXPECT_EQ(telemetryItems[0].valueMin, 5000);
|
||||
EXPECT_EQ(telemetryItems[0].valueMax, 5000);
|
||||
|
||||
generateSportFasVoltagePacket(packet, 6524); sportProcessTelemetryPacket(packet);
|
||||
generateSportFasVoltagePacket(packet, 6524);
|
||||
sportProcessTelemetryPacket(0, packet, sizeof(packet));
|
||||
EXPECT_EQ(telemetryItems[0].value, 6524);
|
||||
EXPECT_EQ(telemetryItems[0].valueMin, 6524); // the batt was changed (val > old max)
|
||||
EXPECT_EQ(telemetryItems[0].valueMax, 6524);
|
||||
|
||||
generateSportFasVoltagePacket(packet, 1248); sportProcessTelemetryPacket(packet);
|
||||
generateSportFasVoltagePacket(packet, 1248);
|
||||
sportProcessTelemetryPacket(0, packet, sizeof(packet));
|
||||
EXPECT_EQ(telemetryItems[0].value, 1248);
|
||||
EXPECT_EQ(telemetryItems[0].valueMin, 1248);
|
||||
EXPECT_EQ(telemetryItems[0].valueMax, 6524);
|
||||
|
||||
generateSportFasVoltagePacket(packet, 2248); sportProcessTelemetryPacket(packet);
|
||||
generateSportFasVoltagePacket(packet, 2248);
|
||||
sportProcessTelemetryPacket(0, packet, sizeof(packet));
|
||||
EXPECT_EQ(telemetryItems[0].value, 2248);
|
||||
EXPECT_EQ(telemetryItems[0].valueMin, 1248);
|
||||
EXPECT_EQ(telemetryItems[0].valueMax, 6524);
|
||||
@@ -440,30 +472,35 @@ TEST(FrSkySPORT, frskyCurrent)
|
||||
|
||||
// tests for Curr
|
||||
generateSportFasCurrentPacket(packet, 0);
|
||||
sportProcessTelemetryPacket(packet);
|
||||
sportProcessTelemetryPacket(0, packet, sizeof(packet));
|
||||
g_model.telemetrySensors[0].custom.offset = -5; /* unit: 1/10 amps */
|
||||
generateSportFasCurrentPacket(packet, 0); sportProcessTelemetryPacket(packet);
|
||||
generateSportFasCurrentPacket(packet, 0);
|
||||
sportProcessTelemetryPacket(0, packet, sizeof(packet));
|
||||
EXPECT_EQ(telemetryItems[0].value, 0);
|
||||
EXPECT_EQ(telemetryItems[0].valueMin, 0);
|
||||
EXPECT_EQ(telemetryItems[0].valueMax, 0);
|
||||
|
||||
// measured current less then offset - value should be zero
|
||||
generateSportFasCurrentPacket(packet, 4); sportProcessTelemetryPacket(packet);
|
||||
generateSportFasCurrentPacket(packet, 4);
|
||||
sportProcessTelemetryPacket(0, packet, sizeof(packet));
|
||||
EXPECT_EQ(telemetryItems[0].value, 0);
|
||||
EXPECT_EQ(telemetryItems[0].valueMin, 0);
|
||||
EXPECT_EQ(telemetryItems[0].valueMax, 0);
|
||||
|
||||
generateSportFasCurrentPacket(packet, 10); sportProcessTelemetryPacket(packet);
|
||||
generateSportFasCurrentPacket(packet, 10);
|
||||
sportProcessTelemetryPacket(0, packet, sizeof(packet));
|
||||
EXPECT_EQ(telemetryItems[0].value, 5);
|
||||
EXPECT_EQ(telemetryItems[0].valueMin, 0);
|
||||
EXPECT_EQ(telemetryItems[0].valueMax, 5);
|
||||
|
||||
generateSportFasCurrentPacket(packet, 500); sportProcessTelemetryPacket(packet);
|
||||
generateSportFasCurrentPacket(packet, 500);
|
||||
sportProcessTelemetryPacket(0, packet, sizeof(packet));
|
||||
EXPECT_EQ(telemetryItems[0].value, 495);
|
||||
EXPECT_EQ(telemetryItems[0].valueMin, 0);
|
||||
EXPECT_EQ(telemetryItems[0].valueMax, 495);
|
||||
|
||||
generateSportFasCurrentPacket(packet, 200); sportProcessTelemetryPacket(packet);
|
||||
generateSportFasCurrentPacket(packet, 200);
|
||||
sportProcessTelemetryPacket(0, packet, sizeof(packet));
|
||||
EXPECT_EQ(telemetryItems[0].value, 195);
|
||||
EXPECT_EQ(telemetryItems[0].valueMin, 0);
|
||||
EXPECT_EQ(telemetryItems[0].valueMax, 495);
|
||||
@@ -474,17 +511,20 @@ TEST(FrSkySPORT, frskyCurrent)
|
||||
telemetryData.telemetryValid = 0x07;
|
||||
g_model.telemetrySensors[0].custom.offset = +5; /* unit: 1/10 amps */
|
||||
|
||||
generateSportFasCurrentPacket(packet, 0); sportProcessTelemetryPacket(packet);
|
||||
generateSportFasCurrentPacket(packet, 0);
|
||||
sportProcessTelemetryPacket(0, packet, sizeof(packet));
|
||||
EXPECT_EQ(telemetryItems[0].value, 5);
|
||||
EXPECT_EQ(telemetryItems[0].valueMin, 5);
|
||||
EXPECT_EQ(telemetryItems[0].valueMax, 5);
|
||||
|
||||
generateSportFasCurrentPacket(packet, 500); sportProcessTelemetryPacket(packet);
|
||||
generateSportFasCurrentPacket(packet, 500);
|
||||
sportProcessTelemetryPacket(0, packet, sizeof(packet));
|
||||
EXPECT_EQ(telemetryItems[0].value, 505);
|
||||
EXPECT_EQ(telemetryItems[0].valueMin, 5);
|
||||
EXPECT_EQ(telemetryItems[0].valueMax, 505);
|
||||
|
||||
generateSportFasCurrentPacket(packet, 200); sportProcessTelemetryPacket(packet);
|
||||
generateSportFasCurrentPacket(packet, 200);
|
||||
sportProcessTelemetryPacket(0, packet, sizeof(packet));
|
||||
EXPECT_EQ(telemetryItems[0].value, 205);
|
||||
EXPECT_EQ(telemetryItems[0].valueMin, 5);
|
||||
EXPECT_EQ(telemetryItems[0].valueMax, 505);
|
||||
|
||||
Reference in New Issue
Block a user