Merge branch 'M17_AX25_FM' into I2C

M17RX.cpp

@@ -104,13 +104,9 @@ void CM17RX::samples(const q15_t* samples, uint16_t* rssi, uint8_t length)
 
     switch (m_state) {
     case M17RXS_LINK_SETUP:
-      processLinkSetup(sample);
-      break;
     case M17RXS_STREAM:
-      processStream(sample);
-      break;
     case M17RXS_PACKET:
-      processPacket(sample);
+      processData(sample);
       break;
     default:
       processNone(sample);
@@ -131,9 +127,9 @@ void CM17RX::processNone(q15_t sample)
 {
   bool ret1 = correlateSync(M17_LINK_SETUP_SYNC_SYMBOLS, M17_LINK_SETUP_SYNC_SYMBOLS_VALUES, M17_LINK_SETUP_SYNC_BYTES, MAX_SYNC_SYMBOL_START_ERRS, MAX_SYNC_BIT_START_ERRS);
   bool ret2 = correlateSync(M17_STREAM_SYNC_SYMBOLS,     M17_STREAM_SYNC_SYMBOLS_VALUES,     M17_STREAM_SYNC_BYTES,     MAX_SYNC_SYMBOL_START_ERRS, MAX_SYNC_BIT_START_ERRS);
-  bool ret3 = correlateSync(M17_PACKET_SYNC_SYMBOLS,     M17_PACKET_SYNC_SYMBOLS_VALUES,     M17_PACKET_SYNC_BYTES,     MAX_SYNC_SYMBOL_START_ERRS, MAX_SYNC_BIT_START_ERRS);
+  // bool ret3 = correlateSync(M17_PACKET_SYNC_SYMBOLS,     M17_PACKET_SYNC_SYMBOLS_VALUES,     M17_PACKET_SYNC_BYTES,     MAX_SYNC_SYMBOL_START_ERRS, MAX_SYNC_BIT_START_ERRS);
 
-  if (ret1 || ret2 || ret3) {
+  if (ret1 || ret2 /* || ret3 */ ) {
     // On the first sync, start the countdown to the state change
     if (m_countdown == 0U) {
       m_rssiAccum = 0U;
@@ -148,7 +144,7 @@ void CM17RX::processNone(q15_t sample)
       
       if (ret1) m_nextState = M17RXS_LINK_SETUP;
       if (ret2) m_nextState = M17RXS_STREAM;
-      if (ret3) m_nextState = M17RXS_PACKET;
+      // if (ret3) m_nextState = M17RXS_PACKET;
     }
   }
 
@@ -166,48 +162,32 @@ void CM17RX::processNone(q15_t sample)
 
     m_state     = m_nextState;
     m_countdown = 0U;
-  }
-}
-
-void CM17RX::processLinkSetup(q15_t sample)
-{
-  if (m_dataPtr == m_endPtr) {
-    m_minSyncPtr = m_syncPtr + M17_FRAME_LENGTH_SAMPLES - 1U;
-    if (m_minSyncPtr >= M17_FRAME_LENGTH_SAMPLES)
-      m_minSyncPtr -= M17_FRAME_LENGTH_SAMPLES;
-
-    m_maxSyncPtr = m_syncPtr + 1U;
-    if (m_maxSyncPtr >= M17_FRAME_LENGTH_SAMPLES)
-      m_maxSyncPtr -= M17_FRAME_LENGTH_SAMPLES;
-
-    calculateLevels(m_startPtr, M17_FRAME_LENGTH_SYMBOLS);
-
-    DEBUG4("M17RX: link setup sync found pos/centre/threshold", m_syncPtr, m_centreVal, m_thresholdVal);
-
-    uint8_t frame[M17_FRAME_LENGTH_BYTES + 3U];
-    samplesToBits(m_startPtr, M17_FRAME_LENGTH_SYMBOLS, frame, 8U, m_centreVal, m_thresholdVal);
-
-    m_lostCount--;
-    frame[0U] = 0x01U;
-    writeRSSIHeader(frame);
-
-    m_state      = M17RXS_NONE;
-    m_endPtr     = NOENDPTR;
-    m_averagePtr = NOAVEPTR;
-    m_countdown  = 0U;
     m_nextState = M17RXS_NONE;
-    m_maxCorr    = 0;
   }
 }
 
-void CM17RX::processStream(q15_t sample)
+void CM17RX::processData(q15_t sample)
 {
   if (m_minSyncPtr < m_maxSyncPtr) {
-    if (m_dataPtr >= m_minSyncPtr && m_dataPtr <= m_maxSyncPtr)
+    if (m_dataPtr >= m_minSyncPtr && m_dataPtr <= m_maxSyncPtr) {
-      correlateSync(M17_STREAM_SYNC_SYMBOLS, M17_STREAM_SYNC_SYMBOLS_VALUES, M17_STREAM_SYNC_BYTES, MAX_SYNC_SYMBOL_RUN_ERRS, MAX_SYNC_BIT_RUN_ERRS);
+      bool ret1 = correlateSync(M17_LINK_SETUP_SYNC_SYMBOLS, M17_LINK_SETUP_SYNC_SYMBOLS_VALUES, M17_LINK_SETUP_SYNC_BYTES, MAX_SYNC_SYMBOL_RUN_ERRS, MAX_SYNC_BIT_RUN_ERRS);
+      bool ret2 = correlateSync(M17_STREAM_SYNC_SYMBOLS,     M17_STREAM_SYNC_SYMBOLS_VALUES,     M17_STREAM_SYNC_BYTES,     MAX_SYNC_SYMBOL_RUN_ERRS, MAX_SYNC_BIT_RUN_ERRS);
+      // bool ret3 = correlateSync(M17_PACKET_SYNC_SYMBOLS,     M17_PACKET_SYNC_SYMBOLS_VALUES,     M17_PACKET_SYNC_BYTES,     MAX_SYNC_SYMBOL_RUN_ERRS, MAX_SYNC_BIT_RUN_ERRS);
+
+      if (ret1) m_state = M17RXS_LINK_SETUP;
+      if (ret2) m_state = M17RXS_STREAM;
+      // if (ret3) m_state = M17RXS_PACKET;
+    }
   } else {
-    if (m_dataPtr >= m_minSyncPtr || m_dataPtr <= m_maxSyncPtr)
+    if (m_dataPtr >= m_minSyncPtr || m_dataPtr <= m_maxSyncPtr) {
-      correlateSync(M17_STREAM_SYNC_SYMBOLS, M17_STREAM_SYNC_SYMBOLS_VALUES, M17_STREAM_SYNC_BYTES, MAX_SYNC_SYMBOL_RUN_ERRS, MAX_SYNC_BIT_RUN_ERRS);
+      bool ret1 = correlateSync(M17_LINK_SETUP_SYNC_SYMBOLS, M17_LINK_SETUP_SYNC_SYMBOLS_VALUES, M17_LINK_SETUP_SYNC_BYTES, MAX_SYNC_SYMBOL_RUN_ERRS, MAX_SYNC_BIT_RUN_ERRS);
+      bool ret2 = correlateSync(M17_STREAM_SYNC_SYMBOLS,     M17_STREAM_SYNC_SYMBOLS_VALUES,     M17_STREAM_SYNC_BYTES,     MAX_SYNC_SYMBOL_RUN_ERRS, MAX_SYNC_BIT_RUN_ERRS);
+      // bool ret3 = correlateSync(M17_PACKET_SYNC_SYMBOLS,     M17_PACKET_SYNC_SYMBOLS_VALUES,     M17_PACKET_SYNC_BYTES,     MAX_SYNC_SYMBOL_RUN_ERRS, MAX_SYNC_BIT_RUN_ERRS);
+
+      if (ret1) m_state = M17RXS_LINK_SETUP;
+      if (ret2) m_state = M17RXS_STREAM;
+      // if (ret3) m_state = M17RXS_PACKET;
+    }
   }
 
   if (m_dataPtr == m_endPtr) {
@@ -224,7 +204,17 @@ void CM17RX::processStream(q15_t sample)
 
     calculateLevels(m_startPtr, M17_FRAME_LENGTH_SYMBOLS);
 
+    switch (m_state) {
+      case M17RXS_LINK_SETUP:
+        DEBUG4("M17RX: link setup sync found pos/centre/threshold", m_syncPtr, m_centreVal, m_thresholdVal);
+        break;
+      case M17RXS_STREAM:
         DEBUG4("M17RX: stream sync found pos/centre/threshold", m_syncPtr, m_centreVal, m_thresholdVal);
+        break;
+      case M17RXS_PACKET:
+        DEBUG4("M17RX: packet sync found pos/centre/threshold", m_syncPtr, m_centreVal, m_thresholdVal);
+        break;
+    }
 
     uint8_t frame[M17_FRAME_LENGTH_BYTES + 3U];
     samplesToBits(m_startPtr, M17_FRAME_LENGTH_SYMBOLS, frame, 8U, m_centreVal, m_thresholdVal);
@@ -232,7 +222,7 @@ void CM17RX::processStream(q15_t sample)
     // We've not seen a stream sync for too long, signal RXLOST and change to RX_NONE
     m_lostCount--;
     if (m_lostCount == 0U) {
-      DEBUG1("M17RX: stream sync timed out, lost lock");
+      DEBUG1("M17RX: sync timed out, lost lock");
 
       io.setDecode(false);
       io.setADCDetection(false);
@@ -248,62 +238,21 @@ void CM17RX::processStream(q15_t sample)
     } else {
       frame[0U]  = 0x00U;
       frame[0U] |= m_lostCount == (MAX_SYNC_FRAMES - 1U) ? 0x01U : 0x00U;
-      writeRSSIData(frame);
+
+      switch (m_state) {
+        case M17RXS_LINK_SETUP:
+          writeRSSILinkSetup(frame);
+          break;
+        case M17RXS_STREAM:
+          writeRSSIStream(frame);
+          break;
+        case M17RXS_PACKET:
+          writeRSSIPacket(frame);
+          break;
+      }
+
       m_maxCorr   = 0;
-    }
-  }
-}
-
-void CM17RX::processPacket(q15_t sample)
-{
-  if (m_minSyncPtr < m_maxSyncPtr) {
-    if (m_dataPtr >= m_minSyncPtr && m_dataPtr <= m_maxSyncPtr)
-      correlateSync(M17_PACKET_SYNC_SYMBOLS, M17_PACKET_SYNC_SYMBOLS_VALUES, M17_PACKET_SYNC_BYTES, MAX_SYNC_SYMBOL_RUN_ERRS, MAX_SYNC_BIT_RUN_ERRS);
-  } else {
-    if (m_dataPtr >= m_minSyncPtr || m_dataPtr <= m_maxSyncPtr)
-      correlateSync(M17_PACKET_SYNC_SYMBOLS, M17_PACKET_SYNC_SYMBOLS_VALUES, M17_PACKET_SYNC_BYTES, MAX_SYNC_SYMBOL_RUN_ERRS, MAX_SYNC_BIT_RUN_ERRS);
-  }
-
-  if (m_dataPtr == m_endPtr) {
-    // Only update the centre and threshold if they are from a good sync
-    if (m_lostCount == MAX_SYNC_FRAMES) {
-      m_minSyncPtr = m_syncPtr + M17_FRAME_LENGTH_SAMPLES - 1U;
-      if (m_minSyncPtr >= M17_FRAME_LENGTH_SAMPLES)
-        m_minSyncPtr -= M17_FRAME_LENGTH_SAMPLES;
-
-      m_maxSyncPtr = m_syncPtr + 1U;
-      if (m_maxSyncPtr >= M17_FRAME_LENGTH_SAMPLES)
-        m_maxSyncPtr -= M17_FRAME_LENGTH_SAMPLES;
-    }
-
-    calculateLevels(m_startPtr, M17_FRAME_LENGTH_SYMBOLS);
-
-    DEBUG4("M17RX: packet sync found pos/centre/threshold", m_syncPtr, m_centreVal, m_thresholdVal);
-
-    uint8_t frame[M17_FRAME_LENGTH_BYTES + 3U];
-    samplesToBits(m_startPtr, M17_FRAME_LENGTH_SYMBOLS, frame, 8U, m_centreVal, m_thresholdVal);
-
-    // We've not seen a packet sync for too long, signal RXLOST and change to RX_NONE
-    m_lostCount--;
-    if (m_lostCount == 0U) {
-      DEBUG1("M17RX: packet sync timed out, lost lock");
-
-      io.setDecode(false);
-      io.setADCDetection(false);
-
-      serial.writeM17Lost();
-
-      m_state      = M17RXS_NONE;
-      m_endPtr     = NOENDPTR;
-      m_averagePtr = NOAVEPTR;
-      m_countdown  = 0U;
       m_nextState = M17RXS_NONE;
-      m_maxCorr    = 0;
-    } else {
-      frame[0U]  = 0x02U;
-      frame[0U] |= m_lostCount == (MAX_SYNC_FRAMES - 1U) ? 0x01U : 0x00U;
-      writeRSSIData(frame);
-      m_maxCorr = 0;
     }
   }
 }
@@ -482,7 +431,7 @@ void CM17RX::samplesToBits(uint16_t start, uint16_t count, uint8_t* buffer, uint
   }
 }
 
-void CM17RX::writeRSSIHeader(uint8_t* data)
+void CM17RX::writeRSSILinkSetup(uint8_t* data)
 {
 #if defined(SEND_RSSI_DATA)
   if (m_rssiCount > 0U) {
@@ -491,19 +440,19 @@ void CM17RX::writeRSSIHeader(uint8_t* data)
     data[121U] = (rssi >> 8) & 0xFFU;
     data[122U] = (rssi >> 0) & 0xFFU;
 
-    serial.writeM17Header(data, M17_FRAME_LENGTH_BYTES + 3U);
+    serial.writeM17LinkSetup(data, M17_FRAME_LENGTH_BYTES + 3U);
   } else {
-    serial.writeM17Header(data, M17_FRAME_LENGTH_BYTES + 1U);
+    serial.writeM17LinkSetup(data, M17_FRAME_LENGTH_BYTES + 1U);
   }
 #else
-  serial.writeM17Header(data, M17_FRAME_LENGTH_BYTES + 1U);
+  serial.writeM17LinkSetup(data, M17_FRAME_LENGTH_BYTES + 1U);
 #endif
 
   m_rssiAccum = 0U;
   m_rssiCount = 0U;
 }
 
-void CM17RX::writeRSSIData(uint8_t* data)
+void CM17RX::writeRSSIStream(uint8_t* data)
 {
 #if defined(SEND_RSSI_DATA)
   if (m_rssiCount > 0U) {
@@ -512,12 +461,33 @@ void CM17RX::writeRSSIData(uint8_t* data)
     data[121U] = (rssi >> 8) & 0xFFU;
     data[122U] = (rssi >> 0) & 0xFFU;
 
-    serial.writeM17Data(data, M17_FRAME_LENGTH_BYTES + 3U);
+    serial.writeM17Stream(data, M17_FRAME_LENGTH_BYTES + 3U);
   } else {
-    serial.writeM17Data(data, M17_FRAME_LENGTH_BYTES + 1U);
+    serial.writeM17Stream(data, M17_FRAME_LENGTH_BYTES + 1U);
   }
 #else
-  serial.writeM17Data(data, M17_FRAME_LENGTH_BYTES + 1U);
+  serial.writeM17Stream(data, M17_FRAME_LENGTH_BYTES + 1U);
+#endif
+
+  m_rssiAccum = 0U;
+  m_rssiCount = 0U;
+}
+
+void CM17RX::writeRSSIPacket(uint8_t* data)
+{
+#if defined(SEND_RSSI_DATA)
+  if (m_rssiCount > 0U) {
+    uint16_t rssi = m_rssiAccum / m_rssiCount;
+
+    data[121U] = (rssi >> 8) & 0xFFU;
+    data[122U] = (rssi >> 0) & 0xFFU;
+
+    serial.writeM17Packet(data, M17_FRAME_LENGTH_BYTES + 3U);
+  } else {
+    serial.writeM17Packet(data, M17_FRAME_LENGTH_BYTES + 1U);
+  }
+#else
+  serial.writeM17Packet(data, M17_FRAME_LENGTH_BYTES + 1U);
 #endif
 
   m_rssiAccum = 0U;

M17RX.h

@@ -64,14 +64,13 @@ private:
   uint16_t    m_rssiCount;
 
   void processNone(q15_t sample);
-  void processLinkSetup(q15_t sample);
+  void processData(q15_t sample);
-  void processStream(q15_t sample);
-  void processPacket(q15_t sample);
   bool correlateSync(uint8_t syncSymbols, const int8_t* syncSymbolValues, const uint8_t* syncBytes, uint8_t maxSymbolErrs, uint8_t maxBitErrs);
   void calculateLevels(uint16_t start, uint16_t count);
   void samplesToBits(uint16_t start, uint16_t count, uint8_t* buffer, uint16_t offset, q15_t centre, q15_t threshold);
-  void writeRSSIHeader(uint8_t* data);
+  void writeRSSILinkSetup(uint8_t* data);
-  void writeRSSIData(uint8_t* data);
+  void writeRSSIStream(uint8_t* data);
+  void writeRSSIPacket(uint8_t* data);
 };
 
 #endif

SerialPort.cpp

@@ -1,5 +1,5 @@
 /*
- *   Copyright (C) 2013,2015-2020 by Jonathan Naylor G4KLX
+ *   Copyright (C) 2013,2015-2021 by Jonathan Naylor G4KLX
  *   Copyright (C) 2016 by Colin Durbridge G4EML
  *
  *   This program is free software; you can redistribute it and/or modify
@@ -63,9 +63,10 @@ const uint8_t MMDVM_P25_LOST     = 0x32U;
 const uint8_t MMDVM_NXDN_DATA    = 0x40U;
 const uint8_t MMDVM_NXDN_LOST    = 0x41U;
 
-const uint8_t MMDVM_M17_HEADER   = 0x45U;
+const uint8_t MMDVM_M17_LINK_SETUP = 0x45U;
-const uint8_t MMDVM_M17_DATA     = 0x46U;
+const uint8_t MMDVM_M17_STREAM     = 0x46U;
-const uint8_t MMDVM_M17_LOST     = 0x47U;
+const uint8_t MMDVM_M17_PACKET     = 0x47U;
+const uint8_t MMDVM_M17_LOST       = 0x48U;
 
 const uint8_t MMDVM_POCSAG_DATA  = 0x50U;
 
@@ -1239,7 +1240,7 @@ void CSerialPort::processMessage(uint8_t type, const uint8_t* buffer, uint16_t l
 #endif
 
 #if defined(MODE_M17)
-    case MMDVM_M17_HEADER:
+    case MMDVM_M17_LINK_SETUP:
       if (m_m17Enable) {
         if (m_modemState == STATE_IDLE || m_modemState == STATE_M17)
           err = m17TX.writeData(buffer, length);
@@ -1248,12 +1249,12 @@ void CSerialPort::processMessage(uint8_t type, const uint8_t* buffer, uint16_t l
         if (m_modemState == STATE_IDLE)
           setMode(STATE_M17);
       } else {
-        DEBUG2("Received invalid M17 header", err);
+        DEBUG2("Received invalid M17 link setup data", err);
         sendNAK(err);
       }
       break;
 
-    case MMDVM_M17_DATA:
+    case MMDVM_M17_STREAM:
       if (m_m17Enable) {
         if (m_modemState == STATE_IDLE || m_modemState == STATE_M17)
           err = m17TX.writeData(buffer, length);
@@ -1262,7 +1263,21 @@ void CSerialPort::processMessage(uint8_t type, const uint8_t* buffer, uint16_t l
         if (m_modemState == STATE_IDLE)
           setMode(STATE_M17);
       } else {
-        DEBUG2("Received invalid M17 data", err);
+        DEBUG2("Received invalid M17 stream data", err);
+        sendNAK(err);
+      }
+      break;
+
+    case MMDVM_M17_PACKET:
+      if (m_m17Enable) {
+        if (m_modemState == STATE_IDLE || m_modemState == STATE_M17)
+          err = m17TX.writeData(buffer, length);
+      }
+      if (err == 0U) {
+        if (m_modemState == STATE_IDLE)
+          setMode(STATE_M17);
+      } else {
+        DEBUG2("Received invalid M17 packet data", err);
         sendNAK(err);
       }
       break;
@@ -1620,7 +1635,7 @@ void CSerialPort::writeNXDNLost()
 #endif
 
 #if defined(MODE_M17)
-void CSerialPort::writeM17Header(const uint8_t* data, uint8_t length)
+void CSerialPort::writeM17LinkSetup(const uint8_t* data, uint8_t length)
 {
   if (m_modemState != STATE_M17 && m_modemState != STATE_IDLE)
     return;
@@ -1632,7 +1647,7 @@ void CSerialPort::writeM17Header(const uint8_t* data, uint8_t length)
 
   reply[0U] = MMDVM_FRAME_START;
   reply[1U] = 0U;
-  reply[2U] = MMDVM_M17_HEADER;
+  reply[2U] = MMDVM_M17_LINK_SETUP;
 
   uint8_t count = 3U;
   for (uint8_t i = 0U; i < length; i++, count++)
@@ -1643,7 +1658,7 @@ void CSerialPort::writeM17Header(const uint8_t* data, uint8_t length)
   writeInt(1U, reply, count);
 }
 
-void CSerialPort::writeM17Data(const uint8_t* data, uint8_t length)
+void CSerialPort::writeM17Stream(const uint8_t* data, uint8_t length)
 {
   if (m_modemState != STATE_M17 && m_modemState != STATE_IDLE)
     return;
@@ -1655,7 +1670,30 @@ void CSerialPort::writeM17Data(const uint8_t* data, uint8_t length)
 
   reply[0U] = MMDVM_FRAME_START;
   reply[1U] = 0U;
-  reply[2U] = MMDVM_M17_DATA;
+  reply[2U] = MMDVM_M17_STREAM;
+
+  uint8_t count = 3U;
+  for (uint8_t i = 0U; i < length; i++, count++)
+    reply[count] = data[i];
+
+  reply[1U] = count;
+
+  writeInt(1U, reply, count);
+}
+
+void CSerialPort::writeM17Packet(const uint8_t* data, uint8_t length)
+{
+  if (m_modemState != STATE_M17 && m_modemState != STATE_IDLE)
+    return;
+
+  if (!m_m17Enable)
+    return;
+
+  uint8_t reply[130U];
+
+  reply[0U] = MMDVM_FRAME_START;
+  reply[1U] = 0U;
+  reply[2U] = MMDVM_M17_PACKET;
 
   uint8_t count = 3U;
   for (uint8_t i = 0U; i < length; i++, count++)

SerialPort.h

@@ -1,5 +1,5 @@
 /*
- *   Copyright (C) 2015,2016,2017,2018,2020 by Jonathan Naylor G4KLX
+ *   Copyright (C) 2015,2016,2017,2018,2020,2021 by Jonathan Naylor G4KLX
  *
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -65,8 +65,9 @@ public:
 #endif
 
 #if defined(MODE_M17)
-  void writeM17Header(const uint8_t* data, uint8_t length);
+  void writeM17LinkSetup(const uint8_t* data, uint8_t length);
-  void writeM17Data(const uint8_t* data, uint8_t length);
+  void writeM17Stream(const uint8_t* data, uint8_t length);
+  void writeM17Packet(const uint8_t* data, uint8_t length);
   void writeM17Lost();
 #endif
 

Version.h

@@ -19,6 +19,6 @@
 #if !defined(VERSION_H)
 #define  VERSION_H
 
-#define VERSION "20210307"
+#define VERSION "20210407"
 
 #endif