S.PORT Push reworking

2019-03-28 18:43:07 +01:00
parent 0feceff635
commit 95fe5c59bb
12 changed files with 99 additions and 241 deletions
@@ -20,76 +20,6 @@

 #include "opentx.h"

-bool checkPXX2PacketCRC(const uint8_t * packet)
-{
-  // TODO ...
-
-  return true;
-  // TRACE("checkPXX2PacketCRC(): checksum error ");
-  // DUMP(packet, FRSKY_SPORT_PACKET_SIZE);
-}
-
-void createFrSkyPXX2Sensor(uint16_t type, uint8_t value){
-  uint8_t buffer[5] = {0x18, 0x10, 0, 0, 0};
-  buffer[2] = type & 0xF;
-  buffer[3] = type >> 8;
-  buffer[4] = value;
-  sportProcessTelemetryPacketWithoutCrc(buffer);
-}
-
-void processFrskyPXX2Data(uint8_t data)
-{
-  static uint8_t dataState = STATE_DATA_IDLE;
-
-  switch (dataState) {
-    case STATE_DATA_IDLE:
-      if (data == START_STOP) {
-        telemetryRxBufferCount = 0;
-        dataState = STATE_DATA_START;
-      }
-      break;
-
-    case STATE_DATA_START:
-      if (telemetryRxBufferCount == 0 && data > 0x0C) {
-        // wrong length
-        telemetryRxBufferCount = 0;
-        dataState = STATE_DATA_IDLE;
-      }
-      else if (telemetryRxBufferCount < TELEMETRY_RX_PACKET_SIZE) {
-        telemetryRxBuffer[telemetryRxBufferCount++] = data;
-        if (telemetryRxBuffer[0] + 3 /* 1 byte for length, 2 bytes for CRC */ == telemetryRxBufferCount) {
-          if (checkPXX2PacketCRC(telemetryRxBuffer)) {
-            R9ModuleStreaming = TELEMETRY_TIMEOUT10ms; // reset counter only if valid packets are being detected
-            uint8_t R9Region = (telemetryRxBuffer[3] & 0x30) >> 4;
-            if (R9Region != 0x04) {
-              g_model.moduleData[EXTERNAL_MODULE].r9m.region = R9Region;
-            }
-            if (telemetryRxBuffer[2] & 0x80) {
-              createFrSkyPXX2Sensor(RSSI_ID, telemetryRxBuffer[2] & 0x7f);
-            }
-            else {
-              createFrSkyPXX2Sensor(BATT_ID, telemetryRxBuffer[2] & 0x7f);
-            }
-            if((telemetryRxBuffer[3] & 0x04) == 0) {
-              createFrSkyPXX2Sensor(R9_PWR_ID, (telemetryRxBuffer[3] & 0x03));
-            }
-            if (telemetryRxBuffer[0] == 0x0C) {
-              sportProcessTelemetryPacketWithoutCrc(telemetryRxBuffer + 5 /* LEN, TYPE, RSSI/BAT, TP/SS/FW_T, FW_VER, Data ID */);
-            }
-          }
-          telemetryRxBufferCount = 0;
-          dataState = STATE_DATA_IDLE;
-        }
-      }
-      else {
-        // overflow guard
-        telemetryRxBufferCount = 0;
-        dataState = STATE_DATA_IDLE;
-      }
-      break;
-  }
-}
-
 void processFrskyTelemetryData(uint8_t data)
 {
 #if defined(PCBSKY9X) && defined(BLUETOOTH)