Merge pull request #189 from lucamarche-iz1mlt/48kHz

Update 48khz

.gitignore

@@ -1,5 +0,0 @@
-*.o
-obj/
-bin/
-GitVersion.h
-build/

.gitmodules

@@ -1,6 +0,0 @@
-[submodule "STM32F4XX_Lib"]
-	path = STM32F4XX_Lib
-	url = https://github.com/juribeparada/STM32F4XX_Lib.git
-[submodule "STM32F7XX_Lib"]
-	path = STM32F7XX_Lib
-	url = https://github.com/juribeparada/STM32F7XX_Lib.git

AX25Defines.h

@@ -1,36 +0,0 @@
-/*
- *   Copyright (C) 2020 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
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#if !defined(AX25DEFINES_H)
-#define  AX25DEFINES_H
-
-const uint8_t AX25_RADIO_SYMBOL_LENGTH = 20U;      // At 24 kHz sample rate
-
-const uint8_t AX25_FRAME_START = 0x7EU;
-const uint8_t AX25_FRAME_END   = 0x7EU;
-const uint8_t AX25_FRAME_ABORT = 0xFEU;
-
-const uint8_t AX25_MAX_ONES    = 5U;
-
-const uint16_t AX25_MIN_FRAME_LENGTH = 17U;        // Callsign (7) + Callsign (7) + Control (1) + Checksum (2)
-
-const uint16_t AX25_MAX_FRAME_LENGTH = 330U;       // Callsign (7) + Callsign (7) + 8 Digipeaters (56) +
-                                                   // Control (1) + PID (1) + Data (256) + Checksum (2)
-
-#endif
-

AX25Demodulator.cpp

@@ -1,319 +0,0 @@
-/*
- *   Copyright (C) 2020 by Jonathan Naylor G4KLX
- *   Copyright 2015-2019 Mobilinkd LLC <[email protected]>
- *
- *   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
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include "Config.h"
-
-#if defined(MODE_AX25)
-
-#include "Globals.h"
-#include "AX25Demodulator.h"
-#include "AX25Defines.h"
-
-const float32_t SAMPLE_RATE = 24000.0F;
-const float32_t SYMBOL_RATE = 1200.0F;
-
-const uint16_t DELAY_LEN = 11U;
-
-const float32_t SAMPLES_PER_SYMBOL = SAMPLE_RATE / SYMBOL_RATE;
-const float32_t PLL_LIMIT          = SAMPLES_PER_SYMBOL / 2.0F;
-
-const uint32_t LPF_FILTER_LEN = 48U;
-
-q15_t LPF_FILTER_COEFFS[] = {
-    -2,   -8,  -17,  -28,  -40,  -47,  -47,  -34,
-    -5,   46,  122,  224,  354,  510,  689,  885,
-  1092, 1302, 1506, 1693, 1856, 1987, 2077, 2124,
-  2124, 2077, 1987, 1856, 1693, 1506, 1302, 1092,
-  885,  689,  510,  354,  224,  122,   46,    -5,
-  -34,  -47,  -47,  -40,  -28,  -17,   -8,    -2
-};
-
-// Lock low-pass filter taps (80Hz Bessel)
-// scipy.signal:
-//      b, a = bessel(4, [80.0/(1200/2)], 'lowpass')
-//
-const uint8_t PLL_IIR_SIZE = 5U;
-
-const float32_t PLL_LOCK_B[] = {
-    1.077063e-03,4.308253e-03,6.462379e-03,4.308253e-03,1.077063e-03};
-
-const float32_t PLL_LOCK_A[] = {
-    1.000000e+00,-2.774567e+00,2.962960e+00,-1.437990e+00,2.668296e-01};
-
-// 64 Hz loop filter.
-// scipy.signal:
-//      loop_coeffs = firwin(9, [64.0/(1200/2)], width = None,
-//          pass_zero = True, scale = True, window='hann')
-//
-const uint32_t PLL_FILTER_LEN = 7U;
-
-float32_t PLL_FILTER_COEFFS[] = {3.196252e-02F, 1.204223e-01F, 2.176819e-01F, 2.598666e-01F, 2.176819e-01F, 1.204223e-01F, 3.196252e-02F};
-
-CAX25Demodulator::CAX25Demodulator(int8_t n) :
-m_frame(),
-m_twist(n),
-m_lpfFilter(),
-m_lpfState(),
-m_delayLine(NULL),
-m_delayPos(0U),
-m_nrziState(false),
-m_pllFilter(),
-m_pllState(),
-m_pllLast(false),
-m_pllBits(1U),
-m_pllCount(0.0F),
-m_pllJitter(0.0F),
-m_pllDCD(false),
-m_iirHistory(),
-m_hdlcOnes(0U),
-m_hdlcFlag(false),
-m_hdlcBuffer(0U),
-m_hdlcBits(0U),
-m_hdlcState(AX25_IDLE)
-{
-  m_delayLine = new bool[DELAY_LEN];
-
-  m_lpfFilter.numTaps = LPF_FILTER_LEN;
-  m_lpfFilter.pState  = m_lpfState;
-  m_lpfFilter.pCoeffs = LPF_FILTER_COEFFS;
-
-  m_pllFilter.numTaps = PLL_FILTER_LEN;
-  m_pllFilter.pState  = m_pllState;
-  m_pllFilter.pCoeffs = PLL_FILTER_COEFFS;
-
-  for (uint8_t i = 0U; i < PLL_IIR_SIZE; i++)
-    m_iirHistory[i] = 0.0F;
-}
-
-bool CAX25Demodulator::process(q15_t* samples, uint8_t length, CAX25Frame& frame)
-{
-  bool result = false;
-
-  q15_t fa[RX_BLOCK_SIZE];
-  m_twist.process(samples, fa, RX_BLOCK_SIZE);
-
-  int16_t buffer[RX_BLOCK_SIZE];
-  for (uint8_t i = 0; i < length; i++) {
-      bool   level = (fa[i] >= 0);
-      bool delayed = delay(level);
-      buffer[i] = (int16_t(level ^ delayed) << 1) - 1;
-  }
-
-  q15_t fc[RX_BLOCK_SIZE];
-  ::arm_fir_fast_q15(&m_lpfFilter, buffer, fc, RX_BLOCK_SIZE);
-
-  for (uint8_t i = 0; i < length; i++) {
-    bool bit = fc[i] >= 0;
-    bool sample = PLL(bit);
-
-    if (sample) {
-      // We will only ever get one frame because there are
-      // not enough bits in a block for more than one.
-      if (result) {
-        HDLC(NRZI(bit));
-      } else {
-        result = HDLC(NRZI(bit));
-        if (result) {
-          // Copy the frame data.
-          ::memcpy(frame.m_data, m_frame.m_data, AX25_MAX_PACKET_LEN);
-          frame.m_length = m_frame.m_length;
-          frame.m_fcs    = m_frame.m_fcs;
-          m_frame.m_length = 0U;
-        }
-      }
-    }
-  }
-
-  return result;
-}
-
-bool CAX25Demodulator::delay(bool b)
-{
-  bool r = m_delayLine[m_delayPos];
-
-  m_delayLine[m_delayPos++] = b;
-
-  if (m_delayPos >= DELAY_LEN)
-    m_delayPos = 0U;
-
-  return r;
-}
-
-bool CAX25Demodulator::NRZI(bool b)
-{
-  bool result = (b == m_nrziState);
-
-  m_nrziState = b;
-
-  return result;
-}
-
-bool CAX25Demodulator::PLL(bool input)
-{
-  bool sample = false;
-		
-  if (input != m_pllLast || m_pllBits > 16U) {
-    // Record transition.
-    m_pllLast = input;
-
-    if (m_pllCount > PLL_LIMIT)
-      m_pllCount -= SAMPLES_PER_SYMBOL;
-
-    float32_t adjust = m_pllBits > 16U ? 5.0F : 0.0F;
-    float32_t offset = m_pllCount / float32_t(m_pllBits);
-    float32_t jitter;
-    ::arm_fir_f32(&m_pllFilter, &offset, &jitter, 1U);
-
-    float32_t absOffset = adjust;
-    if (offset < 0.0F)
-      absOffset -= offset;
-    else
-      absOffset += offset;
-    m_pllJitter = iir(absOffset);
-
-    m_pllCount -= jitter / 2.0F;
-    m_pllBits = 1U;
-  } else {
-    if (m_pllCount > PLL_LIMIT) {
-      sample = true;
-      m_pllCount -= SAMPLES_PER_SYMBOL;
-      m_pllBits++;
-    }
-  }
-
-  m_pllCount += 1.0F;
-
-  return sample;
-}
-
-bool CAX25Demodulator::HDLC(bool b)
-{
-  if (m_hdlcOnes == AX25_MAX_ONES) {
-    if (b) {
-      // flag byte
-      m_hdlcFlag = true;
-    } else {
-      // bit stuffing...
-      m_hdlcFlag = false;
-      m_hdlcOnes = 0U;
-      return false;
-    }
-  }
-
-  m_hdlcBuffer >>= 1;
-  m_hdlcBuffer |= b ? 128U : 0U;
-  m_hdlcBits++;                      // Free-running until Sync byte.
-
-  if (b)
-    m_hdlcOnes++;
-  else
-    m_hdlcOnes = 0U;
-
-  if (m_hdlcFlag) {
-    bool result = false;
-
-    switch (m_hdlcBuffer) {
-      case AX25_FRAME_END:
-        if (m_frame.m_length >= AX25_MIN_FRAME_LENGTH) {
-          result = m_frame.checkCRC();
-          if (!result)
-              m_frame.m_length = 0U;
-        } else {
-            m_frame.m_length = 0U;
-        }
-        m_hdlcState = AX25_SYNC;
-        m_hdlcFlag = false;
-        m_hdlcBits = 0U;
-        break;
-
-      case AX25_FRAME_ABORT:
-        // Frame aborted
-        m_frame.m_length = 0U;
-        m_hdlcState = AX25_IDLE;
-        m_hdlcFlag = false;
-        m_hdlcBits = 0U;
-        break;
-
-      default:
-        break;
-    }
-
-    return result;
-  }
-
-  switch (m_hdlcState) {
-    case AX25_IDLE:
-      break;
-
-    case AX25_SYNC:
-      if (m_hdlcBits == 8U) {    // 8th bit.
-        // Start of frame data.
-        m_hdlcState = AX25_RECEIVE;
-        m_frame.append(m_hdlcBuffer);
-        m_hdlcBits = 0U;
-      }
-      break;
-
-    case AX25_RECEIVE:
-      if (m_hdlcBits == 8U) {    // 8th bit.
-        m_frame.append(m_hdlcBuffer);
-        m_hdlcBits = 0U;
-      }
-      break;
-
-    default:
-      break;
-  }
-
-  return false;
-}
-
-void CAX25Demodulator::setTwist(int8_t n)
-{
-  m_twist.setTwist(n);
-}
-
-bool CAX25Demodulator::isDCD()
-{
-  if (m_pllJitter <= (SAMPLES_PER_SYMBOL * 0.03F))
-    m_pllDCD = true;
-  else if (m_pllJitter >= (SAMPLES_PER_SYMBOL * 0.15F))
-    m_pllDCD = false;
-
-  return m_pllDCD;
-}
-
-float32_t CAX25Demodulator::iir(float32_t input)
-{
-  for (int8_t i = int8_t(PLL_IIR_SIZE) - 1; i != 0; i--)
-    m_iirHistory[i] = m_iirHistory[i - 1];
-
-  m_iirHistory[0] = input;
-  for (uint8_t i = 1U; i < PLL_IIR_SIZE; i++)
-    m_iirHistory[0] -= PLL_LOCK_A[i] * m_iirHistory[i];
-
-  float32_t result = 0.0F;
-  for (uint8_t i = 0U; i < PLL_IIR_SIZE; i++)
-    result += PLL_LOCK_B[i] * m_iirHistory[i];
-
-  return result;
-}
-
-#endif
-

AX25Demodulator.h

@@ -1,77 +0,0 @@
-/*
- *   Copyright (C) 2020 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
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include "Config.h"
-
-#if defined(MODE_AX25)
-
-#if !defined(AX25Demodulator_H)
-#define  AX25Demodulator_H
-
-#include "AX25Frame.h"
-#include "AX25Twist.h"
-
-enum AX25_STATE {
-  AX25_IDLE,
-  AX25_SYNC,
-  AX25_RECEIVE
-};
-
-class CAX25Demodulator {
-public:
-  CAX25Demodulator(int8_t n);
-
-  bool process(q15_t* samples, uint8_t length, CAX25Frame& frame);
-
-  void setTwist(int8_t n);
-
-  bool isDCD();
-
-private:
-  CAX25Frame           m_frame;
-  CAX25Twist           m_twist;
-  arm_fir_instance_q15 m_lpfFilter;
-  q15_t                m_lpfState[70U];     // NoTaps + BlockSize - 1, 48 + 20 - 1 plus some spare
-  bool*                m_delayLine;
-  uint16_t             m_delayPos;
-  bool                 m_nrziState;
-  arm_fir_instance_f32 m_pllFilter;
-  float32_t            m_pllState[20U];     // NoTaps + BlockSize - 1, 7 + 1 - 1 plus some spare
-  bool                 m_pllLast;
-  uint8_t              m_pllBits;
-  float32_t            m_pllCount;
-  float32_t            m_pllJitter;
-  bool                 m_pllDCD;
-  float32_t            m_iirHistory[5U];
-  uint16_t             m_hdlcOnes;
-  bool                 m_hdlcFlag;
-  uint16_t             m_hdlcBuffer;
-  uint16_t             m_hdlcBits;
-  AX25_STATE           m_hdlcState;
-
-  bool delay(bool b);
-  bool NRZI(bool b);
-  bool PLL(bool b);
-  bool HDLC(bool b);
-  float32_t iir(float32_t input);
-};
-
-#endif
-
-#endif
-

AX25Frame.cpp

@@ -1,127 +0,0 @@
-/*
- *   Copyright (C) 2020 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
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include "Config.h"
-
-#if defined(MODE_AX25)
-
-#include "Globals.h"
-#include "AX25Frame.h"
-
-const uint16_t CCITT_TABLE[] = {
-	0x0000,0x1189,0x2312,0x329b,0x4624,0x57ad,0x6536,0x74bf,
-	0x8c48,0x9dc1,0xaf5a,0xbed3,0xca6c,0xdbe5,0xe97e,0xf8f7,
-	0x1081,0x0108,0x3393,0x221a,0x56a5,0x472c,0x75b7,0x643e,
-	0x9cc9,0x8d40,0xbfdb,0xae52,0xdaed,0xcb64,0xf9ff,0xe876,
-	0x2102,0x308b,0x0210,0x1399,0x6726,0x76af,0x4434,0x55bd,
-	0xad4a,0xbcc3,0x8e58,0x9fd1,0xeb6e,0xfae7,0xc87c,0xd9f5,
-	0x3183,0x200a,0x1291,0x0318,0x77a7,0x662e,0x54b5,0x453c,
-	0xbdcb,0xac42,0x9ed9,0x8f50,0xfbef,0xea66,0xd8fd,0xc974,
-	0x4204,0x538d,0x6116,0x709f,0x0420,0x15a9,0x2732,0x36bb,
-	0xce4c,0xdfc5,0xed5e,0xfcd7,0x8868,0x99e1,0xab7a,0xbaf3,
-	0x5285,0x430c,0x7197,0x601e,0x14a1,0x0528,0x37b3,0x263a,
-	0xdecd,0xcf44,0xfddf,0xec56,0x98e9,0x8960,0xbbfb,0xaa72,
-	0x6306,0x728f,0x4014,0x519d,0x2522,0x34ab,0x0630,0x17b9,
-	0xef4e,0xfec7,0xcc5c,0xddd5,0xa96a,0xb8e3,0x8a78,0x9bf1,
-	0x7387,0x620e,0x5095,0x411c,0x35a3,0x242a,0x16b1,0x0738,
-	0xffcf,0xee46,0xdcdd,0xcd54,0xb9eb,0xa862,0x9af9,0x8b70,
-	0x8408,0x9581,0xa71a,0xb693,0xc22c,0xd3a5,0xe13e,0xf0b7,
-	0x0840,0x19c9,0x2b52,0x3adb,0x4e64,0x5fed,0x6d76,0x7cff,
-	0x9489,0x8500,0xb79b,0xa612,0xd2ad,0xc324,0xf1bf,0xe036,
-	0x18c1,0x0948,0x3bd3,0x2a5a,0x5ee5,0x4f6c,0x7df7,0x6c7e,
-	0xa50a,0xb483,0x8618,0x9791,0xe32e,0xf2a7,0xc03c,0xd1b5,
-	0x2942,0x38cb,0x0a50,0x1bd9,0x6f66,0x7eef,0x4c74,0x5dfd,
-	0xb58b,0xa402,0x9699,0x8710,0xf3af,0xe226,0xd0bd,0xc134,
-	0x39c3,0x284a,0x1ad1,0x0b58,0x7fe7,0x6e6e,0x5cf5,0x4d7c,
-	0xc60c,0xd785,0xe51e,0xf497,0x8028,0x91a1,0xa33a,0xb2b3,
-	0x4a44,0x5bcd,0x6956,0x78df,0x0c60,0x1de9,0x2f72,0x3efb,
-	0xd68d,0xc704,0xf59f,0xe416,0x90a9,0x8120,0xb3bb,0xa232,
-	0x5ac5,0x4b4c,0x79d7,0x685e,0x1ce1,0x0d68,0x3ff3,0x2e7a,
-	0xe70e,0xf687,0xc41c,0xd595,0xa12a,0xb0a3,0x8238,0x93b1,
-	0x6b46,0x7acf,0x4854,0x59dd,0x2d62,0x3ceb,0x0e70,0x1ff9,
-	0xf78f,0xe606,0xd49d,0xc514,0xb1ab,0xa022,0x92b9,0x8330,
-	0x7bc7,0x6a4e,0x58d5,0x495c,0x3de3,0x2c6a,0x1ef1,0x0f78 };
-
-CAX25Frame::CAX25Frame(const uint8_t* data, uint16_t length) :
-m_data(),
-m_length(0U),
-m_fcs(0U)
-{
-  for (uint16_t i = 0U; i < length && i < (AX25_MAX_PACKET_LEN - 2U); i++)
-    m_data[m_length++] = data[i];
-}
-
-CAX25Frame::CAX25Frame() :
-m_data(),
-m_length(0U),
-m_fcs(0U)
-{
-}
-
-bool CAX25Frame::append(uint16_t c)
-{
-  if (m_length == AX25_MAX_PACKET_LEN)
-    return false;
-
-  m_data[m_length++] = uint8_t(c);
-
-  return true;
-}
-
-bool CAX25Frame::checkCRC()
-{
-  union {
-    uint16_t crc16;
-    uint8_t  crc8[2U];
-  };
-
-  crc16 = 0xFFFFU;
-  for (uint16_t i = 0U; i < (m_length - 2U); i++)
-    crc16 = uint16_t(crc8[1U]) ^ CCITT_TABLE[crc8[0U] ^ m_data[i]];
-
-  crc16 = ~crc16;
-
-  if (crc8[0U] == m_data[m_length - 2U] && crc8[1U] == m_data[m_length - 1U]) {
-    m_fcs = crc16;
-    return true;
-  } else {
-    return false;
-  }
-}
-
-void CAX25Frame::addCRC()
-{
-  union {
-    uint16_t crc16;
-    uint8_t  crc8[2U];
-  };
-
-  crc16 = 0xFFFFU;
-  for (uint16_t i = 0U; i < m_length; i++)
-    crc16 = uint16_t(crc8[1U]) ^ CCITT_TABLE[crc8[0U] ^ m_data[i]];
-
-  crc16 = ~crc16;
-
-  m_fcs = crc16;
-
-  m_data[m_length++] = crc8[0U];
-  m_data[m_length++] = crc8[1U];
-}
-
-#endif
-

AX25Frame.h

@@ -1,47 +0,0 @@
-/*
- *   Copyright (C) 2020 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
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include "Config.h"
-
-#if defined(MODE_AX25)
-
-#if !defined(AX25Frame_H)
-#define  AX25Frame_H
-
-const uint16_t AX25_MAX_PACKET_LEN = 300U;
-
-class CAX25Frame {
-public:
-  CAX25Frame(const uint8_t* data, uint16_t length);
-  CAX25Frame();
-
-  bool append(uint16_t c);
-
-  bool checkCRC();
-
-  void addCRC();
-
-  uint8_t  m_data[AX25_MAX_PACKET_LEN];
-  uint16_t m_length;
-  uint16_t m_fcs;
-};
-
-#endif
-
-#endif
-

AX25RX.cpp

@@ -1,211 +0,0 @@
-/*
- *   Copyright (C) 2020 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
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include "Config.h"
-
-#if defined(MODE_AX25)
-
-#include "Globals.h"
-#include "AX25RX.h"
-
-/*
- * Generated with Scipy Filter, 152 coefficients, 1100-2300Hz bandpass,
- * Hann window, starting and ending 0 value coefficients removed.
- *
- * np.array(
- *  firwin2(152,
- *      [
- *          0.0,
- *          1000.0/(sample_rate/2),
- *          1100.0/(sample_rate/2),
- *          2350.0/(sample_rate/2),
- *          2500.0/(sample_rate/2),
- *          1.0
- *      ],
- *      [0,0,1,1,0,0],
- *      antisymmetric = False,
- *      window='hann') * 32768,
- *  dtype=int)[10:-10]
- */
-
-const uint32_t FILTER_LEN = 130U;
-
-q15_t FILTER_COEFFS[] = {
-      5,    12,    18,    21,   19,   11,    -2,   -15,   -25,   -27,
-    -21,   -11,    -3,    -5,  -19,  -43,   -69,   -83,   -73,   -35,
-     27,    98,   155,   180,  163,  109,    39,   -20,   -45,   -26,
-     23,    74,    89,    39,  -81, -247,  -407,  -501,  -480,  -334,
-    -92,   175,   388,   479,  429,  275,    99,     5,    68,   298,
-    626,   913,   994,   740,  115, -791, -1770, -2544, -2847, -2509,
-  -1527,   -76,  1518,  2875, 3653, 3653,  2875,  1518,   -76, -1527,
-  -2509, -2847, -2544, -1770, -791,  115,   740,   994,   913,   626,
-    298,    68,     5,    99,  275,  429,   479,   388,   175,   -92,
-   -334,  -480,  -501,  -407, -247,  -81,    39,    89,    74,    23,
-    -26,   -45,   -20,    39,  109,  163,   180,   155,    98,    27,
-    -35,   -73,   -83,   -69,  -43,  -19,    -5,    -3,   -11,   -21,
-    -27,   -25,   -15,    -2,   11,   19,    21,    18,    12,     5
-};
-
-CAX25RX::CAX25RX() :
-m_filter(),
-m_state(),
-m_demod1(3),
-m_demod2(6),
-m_demod3(9),
-m_lastFCS(0U),
-m_count(0U),
-m_slotTime(30U),
-m_slotCount(0U),
-m_pPersist(128U),
-m_dcd(false),
-m_canTX(false),
-m_x(1U),
-m_a(0xB7U),
-m_b(0x73U),
-m_c(0xF6U)
-{
-  m_filter.numTaps = FILTER_LEN;
-  m_filter.pState  = m_state;
-  m_filter.pCoeffs = FILTER_COEFFS;
-
-  initRand();
-}
-
-void CAX25RX::samples(q15_t* samples, uint8_t length)
-{
-  q15_t output[RX_BLOCK_SIZE];
-  ::arm_fir_fast_q15(&m_filter, samples, output, RX_BLOCK_SIZE);
-
-  m_count++;
-
-  CAX25Frame frame;
-
-  bool ret = m_demod1.process(output, length, frame);
-  if (ret) {
-    if (frame.m_fcs != m_lastFCS || m_count > 2U) {
-      m_lastFCS = frame.m_fcs;
-      m_count   = 0U;
-      serial.writeAX25Data(frame.m_data, frame.m_length - 2U);
-    }
-    DEBUG1("Decoder 1 reported");
-  }
-
-  ret = m_demod2.process(output, length, frame);
-  if (ret) {
-    if (frame.m_fcs != m_lastFCS || m_count > 2U) {
-      m_lastFCS = frame.m_fcs;
-      m_count   = 0U;
-      serial.writeAX25Data(frame.m_data, frame.m_length - 2U);
-    }
-    DEBUG1("Decoder 2 reported");
-  }
-
-  ret = m_demod3.process(output, length, frame);
-  if (ret) {
-    if (frame.m_fcs != m_lastFCS || m_count > 2U) {
-      m_lastFCS = frame.m_fcs;
-      m_count   = 0U;
-      serial.writeAX25Data(frame.m_data, frame.m_length - 2U);
-    }
-    DEBUG1("Decoder 3 reported");
-  }
-
-  m_slotCount += RX_BLOCK_SIZE;
-  if (m_slotCount >= m_slotTime) {
-    m_slotCount = 0U;
-
-    bool dcd1 = m_demod1.isDCD();
-    bool dcd2 = m_demod2.isDCD();
-    bool dcd3 = m_demod3.isDCD();
-    
-    if (dcd1 || dcd2 || dcd3) {
-      if (!m_dcd) {
-        io.setDecode(true);
-        io.setADCDetection(true);
-        m_dcd = true;
-      }
-
-      m_canTX = false;
-    } else {
-      if (m_dcd) {
-        io.setDecode(false);
-        io.setADCDetection(false);
-        m_dcd = false;
-      }
-
-      m_canTX = m_pPersist >= rand();
-    }
-  }
-}
-
-bool CAX25RX::canTX() const
-{
-  return m_canTX;
-}
-
-void CAX25RX::setParams(int8_t twist, uint8_t slotTime, uint8_t pPersist)
-{
-  m_demod1.setTwist(twist - 3);
-  m_demod2.setTwist(twist);
-  m_demod3.setTwist(twist + 3);
-
-  m_slotTime = slotTime * 240U;    // Slot time in samples
-  m_pPersist = pPersist;
-}
-
-// Taken from https://www.electro-tech-online.com/threads/ultra-fast-pseudorandom-number-generator-for-8-bit.124249/
-//X ABC Algorithm Random Number Generator for 8-Bit Devices:
-//This is a small PRNG, experimentally verified to have at least a 50 million byte period
-//by generating 50 million bytes and observing that there were no overapping sequences and repeats.
-//This generator passes serial correlation, entropy , Monte Carlo Pi value, arithmetic mean,
-//And many other statistical tests. This generator may have a period of up to 2^32, but this has
-//not been verified.
-//
-// By XORing 3 bytes into the a,b, and c registers, you can add in entropy from 
-//an external source easily.
-//
-//This generator is free to use, but is not suitable for cryptography due to its short period(by //cryptographic standards) and simple construction. No attempt was made to make this generator 
-// suitable for cryptographic use.
-//
-//Due to the use of a constant counter, the generator should be resistant to latching up.
-//A significant performance gain is had in that the x variable is only ever incremented.
-//
-//Only 4 bytes of ram are needed for the internal state, and generating a byte requires 3 XORs , //2 ADDs, one bit shift right , and one increment. Difficult or slow operations like multiply, etc 
-//were avoided for maximum speed on ultra low power devices.
-
-
-void CAX25RX::initRand() //Can also be used to seed the rng with more entropy during use.
-{
-  m_a = (m_a ^ m_c ^ m_x);
-  m_b = (m_b + m_a);
-  m_c = (m_c + (m_b >> 1) ^ m_a);
-}
-
-uint8_t CAX25RX::rand()
-{
-  m_x++;                           //x is incremented every round and is not affected by any other variable
-
-  m_a = (m_a ^ m_c ^ m_x);         //note the mix of addition and XOR
-  m_b = (m_b + m_a);               //And the use of very few instructions
-  m_c = (m_c + (m_b >> 1) ^ m_a);  //the right shift is to ensure that high-order bits from b can affect  
-
-  return uint8_t(m_c);             //low order bits of other variables
-}
-
-#endif
-

AX25RX.h

@@ -1,63 +0,0 @@
-/*
- *   Copyright (C) 2020 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
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include "Config.h"
-
-#if defined(MODE_AX25)
-
-#if !defined(AX25RX_H)
-#define  AX25RX_H
-
-#include "AX25Demodulator.h"
-
-class CAX25RX {
-public:
-  CAX25RX();
-
-  void samples(q15_t* samples, uint8_t length);
-
-  void setParams(int8_t twist, uint8_t slotTime, uint8_t pPersist);
-
-  bool canTX() const;
-
-private:
-  arm_fir_instance_q15 m_filter;
-  q15_t                m_state[160U];    // NoTaps + BlockSize - 1, 130 + 20 - 1 plus some spare
-  CAX25Demodulator     m_demod1;
-  CAX25Demodulator     m_demod2;
-  CAX25Demodulator     m_demod3;
-  uint16_t             m_lastFCS;
-  uint32_t             m_count;
-  uint32_t             m_slotTime;
-  uint32_t             m_slotCount;
-  uint8_t              m_pPersist;
-  bool                 m_dcd;
-  bool                 m_canTX;
-  uint8_t              m_x;
-  uint8_t              m_a;
-  uint8_t              m_b;
-  uint8_t              m_c;
-  
-  void initRand();
-  uint8_t rand();
-};
-
-#endif
-
-#endif
-

AX25TX.cpp

@@ -1,191 +0,0 @@
-/*
- *   Copyright (C) 2020 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
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include "Config.h"
-
-#if defined(MODE_AX25)
-
-#include "Globals.h"
-#include "AX25TX.h"
-
-#include "AX25Defines.h"
-#include "AX25Frame.h"
-
-
-const uint8_t START_FLAG[] = { AX25_FRAME_START };
-const uint8_t END_FLAG[]   = { AX25_FRAME_END };
-
-const uint8_t BIT_MASK_TABLE1[] = { 0x80U, 0x40U, 0x20U, 0x10U, 0x08U, 0x04U, 0x02U, 0x01U };
-
-#define WRITE_BIT1(p,i,b) p[(i)>>3] = (b) ? (p[(i)>>3] | BIT_MASK_TABLE1[(i)&7]) : (p[(i)>>3] & ~BIT_MASK_TABLE1[(i)&7])
-#define READ_BIT1(p,i)    (p[(i)>>3] & BIT_MASK_TABLE1[(i)&7])
-
-const uint8_t BIT_MASK_TABLE2[] = { 0x01U, 0x02U, 0x04U, 0x08U, 0x10U, 0x20U, 0x40U, 0x80U };
-
-#define WRITE_BIT2(p,i,b) p[(i)>>3] = (b) ? (p[(i)>>3] | BIT_MASK_TABLE2[(i)&7]) : (p[(i)>>3] & ~BIT_MASK_TABLE2[(i)&7])
-#define READ_BIT2(p,i)    (p[(i)>>3] & BIT_MASK_TABLE2[(i)&7])
-
-const uint16_t AUDIO_TABLE_LEN = 120U;
-
-const q15_t AUDIO_TABLE_DATA[] = {
-  0, 214, 428, 641, 851, 1060, 1265, 1468, 1666, 1859, 2048, 2230, 2407, 2577, 2740, 2896, 3043, 3182, 3313, 3434, 3546, 3649,
-  3741, 3823, 3895, 3955, 4006, 4045, 4073, 4089, 4095, 4089, 4073, 4045, 4006, 3955, 3895, 3823, 3741, 3649, 3546, 3434, 3313,
-  3182, 3043, 2896, 2740, 2577, 2407, 2230, 2048, 1859, 1666, 1468, 1265, 1060, 851, 641, 428, 214, 0, -214, -428, -641, -851,
-  -1060, -1265, -1468, -1666, -1859, -2047, -2230, -2407, -2577, -2740, -2896, -3043, -3182, -3313, -3434, -3546, -3649, -3741,
-  -3823, -3895, -3955, -4006, -4045, -4073, -4089, -4095, -4089, -4073, -4045, -4006, -3955, -3895, -3823, -3741, -3649, -3546,
-  -3434, -3313, -3182, -3043, -2896, -2740, -2577, -2407, -2230, -2047, -1859, -1666, -1468, -1265, -1060, -851, -641, -428, -214
-};
-
-CAX25TX::CAX25TX() :
-m_poBuffer(),
-m_poLen(0U),
-m_poPtr(0U),
-m_txDelay(360U),
-m_tablePtr(0U),
-m_nrzi(false)
-{
-}
-
-void CAX25TX::process()
-{
-  if (m_poLen == 0U)
-    return;
-
-  if (!m_duplex) {
-    if (m_poPtr == 0U) {
-      bool tx = ax25RX.canTX();
-      if (!tx)
-        return;
-    }
-  }
-
-  uint16_t space = io.getSpace();
-
-  while (space > AX25_RADIO_SYMBOL_LENGTH) {
-    bool b = READ_BIT1(m_poBuffer, m_poPtr) != 0U;
-    m_poPtr++;
-
-    writeBit(b);
-
-    space -= AX25_RADIO_SYMBOL_LENGTH;
-
-    if (m_poPtr >= m_poLen) {
-      m_poPtr = 0U;
-      m_poLen = 0U;
-      return;
-    }
-  }
-}
-
-uint8_t CAX25TX::writeData(const uint8_t* data, uint16_t length)
-{
-  CAX25Frame frame(data, length);
-  frame.addCRC();
-
-  m_poLen    = 0U;
-  m_poPtr    = 0U;
-  m_nrzi     = false;
-  m_tablePtr = 0U;
-
-  // Add TX delay
-  for (uint16_t i = 0U; i < m_txDelay; i++, m_poLen++) {
-    bool preamble = NRZI(false);
-    WRITE_BIT1(m_poBuffer, m_poLen, preamble);
-  }
-
-  // Add the Start Flag
-  for (uint16_t i = 0U; i < 8U; i++, m_poLen++) {
-    bool b1 = READ_BIT1(START_FLAG, i) != 0U;
-    bool b2 = NRZI(b1);
-    WRITE_BIT1(m_poBuffer, m_poLen, b2);
-  }
-
-  uint8_t ones = 0U;
-  for (uint16_t i = 0U; i < (frame.m_length * 8U); i++) {
-    bool b1 = READ_BIT2(frame.m_data, i) != 0U;
-    bool b2 = NRZI(b1);
-    WRITE_BIT1(m_poBuffer, m_poLen, b2);
-    m_poLen++;
-
-    if (b1) {
-      ones++;
-      if (ones == AX25_MAX_ONES) {
-        // Bit stuffing
-        bool b = NRZI(false);
-        WRITE_BIT1(m_poBuffer, m_poLen, b);
-        m_poLen++;
-        ones = 0U;
-      }
-    } else {
-      ones = 0U;
-    }
-  }
-
-  // Add the End Flag
-  for (uint16_t i = 0U; i < 8U; i++, m_poLen++) {
-    bool b1 = READ_BIT1(END_FLAG, i) != 0U;
-    bool b2 = NRZI(b1);
-    WRITE_BIT1(m_poBuffer, m_poLen, b2);
-  }
-
-  return 0U;
-}
-
-void CAX25TX::writeBit(bool b)
-{
-  q15_t buffer[AX25_RADIO_SYMBOL_LENGTH];
-  for (uint8_t i = 0U; i < AX25_RADIO_SYMBOL_LENGTH; i++) {
-    q15_t value = AUDIO_TABLE_DATA[m_tablePtr];
-
-    if (b) {
-      // De-emphasise the lower frequency by 6dB
-      value >>= 2;
-      m_tablePtr += 6U;
-    } else {
-      m_tablePtr += 11U;
-    }
-
-    buffer[i] = value >> 1;
-
-    if (m_tablePtr >= AUDIO_TABLE_LEN)
-      m_tablePtr -= AUDIO_TABLE_LEN;
-  }
-
-  io.write(STATE_AX25, buffer, AX25_RADIO_SYMBOL_LENGTH);
-}
-
-void CAX25TX::setTXDelay(uint8_t delay)
-{
-  m_txDelay = delay * 12U;
-}
-
-uint8_t CAX25TX::getSpace() const
-{
-  return m_poLen == 0U ? 255U : 0U;
-}
-
-bool CAX25TX::NRZI(bool b)
-{
-    if (!b)
-      m_nrzi = !m_nrzi;
-
-    return m_nrzi;
-}
-
-#endif
-

AX25TX.h

@@ -1,53 +0,0 @@
-/*
- *   Copyright (C) 2020 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
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include "Config.h"
-
-#if defined(MODE_AX25)
-
-#if !defined(AX25TX_H)
-#define  AX25TX_H
-
-class CAX25TX {
-public:
-  CAX25TX();
-
-  uint8_t writeData(const uint8_t* data, uint16_t length);
-
-  void process();
-
-  void setTXDelay(uint8_t delay);
-
-  uint8_t getSpace() const;
-
-private:
-  uint8_t    m_poBuffer[600U];
-  uint16_t   m_poLen;
-  uint16_t   m_poPtr;
-  uint16_t   m_txDelay;
-  uint16_t   m_tablePtr;
-  bool       m_nrzi;
-
-  void writeBit(bool b);
-  bool NRZI(bool b);
-};
-
-#endif
-
-#endif
-

AX25Twist.cpp

@@ -1,316 +0,0 @@
-/*
- *   Copyright (C) 2020 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
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include "Config.h"
-
-#if defined(MODE_AX25)
-
-#include "Globals.h"
-#include "AX25Twist.h"
-
-// 1200Hz = -12dB, 2200Hz = 0dB; 3381Hz cutoff; cosine.
-q15_t dB12[] = {
-  176,
-  -812,
-  -3916,
-  -7586,
-  23536,
-  -7586,
-  -3916,
-  -812,
-  176
-};
-
-// 1200Hz = -11dB, 2200Hz = 0dB; 3258Hz cutoff; cosine.
-q15_t dB11[] = {
-  121,
-  -957,
-  -3959,
-  -7383,
-  23871,
-  -7383,
-  -3959,
-  -957,
-  121
-};
-
-// 1200Hz = -10dB, 2200Hz = 0dB; 3118Hz cutoff; cosine.
-q15_t dB10[] = {
-  56,
-  -1110,
-  -3987,
-  -7141,
-  24254,
-  -7141,
-  -3987,
-  -1110,
-  56
-};
-
-// 1200Hz = -9dB, 2200Hz = 0dB; 2959Hz cutoff; cosine.
-q15_t dB9[] = {
-  -19,
-  -1268,
-  -3994,
-  -6856,
-  24688,
-  -6856,
-  -3994,
-  -1268,
-  -19
-};
-
-// 1200Hz = -8dB, 2200Hz = 0dB; 2778Hz cutoff; cosine.
-q15_t dB8[] = {
-  -104,
-  -1424,
-  -3968,
-  -6516,
-  25182,
-  -6516,
-  -3968,
-  -1424,
-  -104
-};
-
-// 1200Hz = -7dB, 2200Hz = 0dB; 2573Hz cutoff; cosine.
-q15_t dB7[] = {
-  -196,
-  -1565,
-  -3896,
-  -6114,
-  25742,
-  -6114,
-  -3896,
-  -1565,
-  -196
-};
-
-// 1200Hz = -6dB, 2200Hz = 0dB; 2343Hz cutoff; cosine.
-q15_t dB6[] = {
-  -288,
-  -1676,
-  -3761,
-  -5642,
-  26370,
-  -5642,
-  -3761,
-  -1676,
-  -288
-};
-
-// 1200Hz = -5dB, 2200Hz = 0dB; 2085Hz cutoff; cosine.
-q15_t dB5[] = {
-  -370,
-  -1735,
-  -3545,
-  -5088,
-  27075,
-  -5088,
-  -3545,
-  -1735,
-  -370
-};
-
-// 1200Hz = -4dB, 2200Hz = 0dB; 1790Hz cutoff; cosine.
-q15_t dB4[] = {
-  -432,
-  -1715,
-  -3220,
-  -4427,
-  27880,
-  -4427,
-  -3220,
-  -1715,
-  -432
-};
-
-// 1200Hz = -3dB, 2200Hz = 0dB; 1456Hz cutoff; cosine.
-q15_t dB3[] = {
-  -452,
-  -1582,
-  -2759,
-  -3646,
-  28792,
-  -3646,
-  -2759,
-  -1582,
-  -452
-};
-
-// 1200Hz = -2dB, 2200Hz = 0dB; 1070Hz cutoff; cosine.
-q15_t dB2[] = {
-  -408,
-  -1295,
-  -2123,
-  -2710,
-  29846,
-  -2710,
-  -2123,
-  -1295,
-  -408
-};
-
-// 1200Hz = -1dB, 2200Hz = 0dB; 605Hz cutoff; cosine.
-q15_t dB1[] = {
-  -268,
-  -795,
-  -1244,
-  -1546,
-  31116,
-  -1546,
-  -1244,
-  -795,
-  -268
-};
-
-q15_t dB0[] = {
-  0,
-  0,
-  0,
-  0,
-  32767,
-  0,
-  0,
-  0,
-  0,
-};
-
-// 1200Hz = 0dB, 2200Hz = -1dB; 4130Hz cutoff; cosine.
-q15_t dB_1[] = {
-  -419,
-  -177,
-  3316,
-  8650,
-  11278,
-  8650,
-  3316,
-  -177,
-  -419
-};
-
-// 1200Hz = 0dB, 2200Hz = -2dB; 3190Hz cutoff; cosine.
-q15_t dB_2[] = {
-  -90,
-  1033,
-  3975,
-  7267,
-  8711,
-  7267,
-  3975,
-  1033,
-  -90
-};
-
-// 1200Hz = 0dB, 2200Hz = -3dB; 2330Hz cutoff; cosine.
-q15_t dB_3[] = {
-  292,
-  1680,
-  3752,
-  5615,
-  6362,
-  5615,
-  3752,
-  1680,
-  292
-};
-
-// 1200Hz = 0dB, 2200Hz = -4dB; 2657Hz cutoff; boxcar.
-q15_t dB_4[] = {
-  917,
-  3024,
-  5131,
-  6684,
-  7255,
-  6684,
-  5131,
-  3024,
-  917
-};
-
-// 1200Hz = 0dB, 2200Hz = -5dB; 2360Hz cutoff; boxcar.
-q15_t dB_5[] = {
-  1620,
-  3339,
-  4925,
-  6042,
-  6444,
-  6042,
-  4925,
-  3339,
-  1620
-};
-
-// 1200Hz = 0dB, 2200Hz = -6dB; 2067Hz cutoff; boxcar.
-q15_t dB_6[] = {
-  2161,
-  3472,
-  4605,
-  5373,
-  5644,
-  5373,
-  4605,
-  3472,
-  2161
-};
-
-q15_t* coeffs[] = {
-  dB12,
-  dB11,
-  dB10,
-  dB9,
-  dB8,
-  dB7,
-  dB6,
-  dB5,
-  dB4,
-  dB3,
-  dB2,
-  dB1,
-  dB0,
-  dB_1,
-  dB_2,
-  dB_3,
-  dB_4,
-  dB_5,
-  dB_6
-};
-
-CAX25Twist::CAX25Twist(int8_t n) :
-m_filter(),
-m_state()
-{
-  setTwist(n);
-}
-
-void CAX25Twist::process(q15_t* in, q15_t* out, uint8_t length)
-{
-  ::arm_fir_fast_q15(&m_filter, in, out, length);
-}
-
-void CAX25Twist::setTwist(int8_t n)
-{
-  uint8_t twist = uint8_t(n + 6);
-
-  m_filter.numTaps = 9;
-  m_filter.pState  = m_state;
-  m_filter.pCoeffs = coeffs[twist];
-}
-
-#endif
-

AX25Twist.h

@@ -1,42 +0,0 @@
-/*
- *   Copyright (C) 2020 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
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include "Config.h"
-
-#if defined(MODE_AX25)
-
-#if !defined(AX25Twist_H)
-#define  AX25Twist_H
-
-class CAX25Twist {
-public:
-  CAX25Twist(int8_t n);
-
-  void process(q15_t* in, q15_t* out, uint8_t length);
-
-  void setTwist(int8_t n);
-
-private:
-  arm_fir_instance_q15 m_filter;
-  q15_t                m_state[40U];   // NoTaps + BlockSize - 1, 9 + 20 - 1 plus some spare
-};
-
-#endif
-
-#endif
-

CWIdTX.cpp

@@ -1,5 +1,5 @@
 /*
- *   Copyright (C) 2009-2017,2020 by Jonathan Naylor G4KLX
+ *   Copyright (C) 2009-2017 by Jonathan Naylor G4KLX
  *   Copyright (C) 2016 by Colin Durbridge G4EML
  *
  *   This program is free software; you can redistribute it and/or modify
@@ -22,12 +22,12 @@
 #include "CWIdTX.h"
 
 q15_t TONE[] = {
-    0, 518, 1000, 1414, 1732, 1932, 2000, 1932, 1732, 1414, 1000, 518, 0, -518, -1000, -1414, -1732, -1932, -2000, -1932, -1732, -1414, -1000, -518};
-
+    0, 261, 518, 765, 1000, 1218, 1414, 1587, 1732, 1848, 1932, 1983, 2000, 1983, 1932, 1848, 1732, 1587, 1414, 1218, 1000, 765, 518, 261, 0, -261, -518, -765, -1000, -1218, -1414,
+    -1587, -1732, -1848, -1932, -1983, -2000, -1983, -1932, -1848, -1732, -1587, -1414, -1218, -1000, -765, -518, -261};
 q15_t SILENCE[] = {
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
 
-const uint8_t CYCLE_LENGTH = 24U;
+const uint8_t CYCLE_LENGTH = 48U;
 
 const uint8_t DOT_LENGTH = 50U;
 
@@ -77,7 +77,6 @@ const struct {
   {',', 0xEEAEE000U, 22U},
   {'-', 0xEAAE0000U, 18U},
   {'=', 0xEAB80000U, 16U},
-  {'.', 0xBAEB8000U, 20U},
   {' ', 0x00000000U, 4U},
   {0U,  0x00000000U, 0U}
 };
@@ -125,7 +124,7 @@ void CCWIdTX::process()
   }
 }
 
-uint8_t CCWIdTX::write(const uint8_t* data, uint16_t length)
+uint8_t CCWIdTX::write(const uint8_t* data, uint8_t length)
 {
   ::memset(m_poBuffer, 0x00U, 1000U * sizeof(uint8_t));
 
@@ -171,3 +170,4 @@ void CCWIdTX::reset()
   m_poPtr = 0U;
   m_n     = 0U;
 }
+

CWIdTX.h

@@ -1,6 +1,6 @@
 /*
  *   Copyright (C) 2009-2015 by Jonathan Naylor G4KLX
- *   Copyright (C) 2016,2020 by Colin Durbridge G4EML
+ *   Copyright (C) 2016 by Colin Durbridge G4EML
  *
  *   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
@@ -28,7 +28,7 @@ public:
 
   void process();
 
-  uint8_t write(const uint8_t* data, uint16_t length);
+  uint8_t write(const uint8_t* data, uint8_t length);
 
   void reset();
 

CalDMR.cpp

@@ -1,5 +1,5 @@
 /*
- *   Copyright (C) 2009-2015,2020 by Jonathan Naylor G4KLX
+ *   Copyright (C) 2009-2015 by Jonathan Naylor G4KLX
  *   Copyright (C) 2016 by Colin Durbridge G4EML
  *
  *   This program is free software; you can redistribute it and/or modify
@@ -18,9 +18,6 @@
  */
 
 #include "Config.h"
-
-#if defined(MODE_DMR)
-
 #include "Globals.h"
 #include "CalDMR.h"
 
@@ -211,7 +208,7 @@ void CCalDMR::dmrdmo1k()
   }
 }
 
-uint8_t CCalDMR::write(const uint8_t* data, uint16_t length)
+uint8_t CCalDMR::write(const uint8_t* data, uint8_t length)
 {
   if (length != 1U)
     return 4U;
@@ -224,5 +221,3 @@ uint8_t CCalDMR::write(const uint8_t* data, uint16_t length)
   return 0U;
 }
 
-#endif
-

CalDMR.h

@@ -1,5 +1,5 @@
 /*
- *   Copyright (C) 2009-2015,2020 by Jonathan Naylor G4KLX
+ *   Copyright (C) 2009-2015 by Jonathan Naylor G4KLX
  *   Copyright (C) 2016 by Colin Durbridge G4EML
  *
  *   This program is free software; you can redistribute it and/or modify
@@ -17,13 +17,10 @@
  *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include "Config.h"
-
-#if defined(MODE_DMR)
-
 #if !defined(CALDMR_H)
 #define  CALDMR_H
 
+#include "Config.h"
 #include "DMRDefines.h"
 
 enum DMRCAL1K {
@@ -44,7 +41,7 @@ public:
   void createData1k(uint8_t n);
   void createDataDMO1k(uint8_t n);
 
-  uint8_t write(const uint8_t* data, uint16_t length);
+  uint8_t write(const uint8_t* data, uint8_t length);
 
 private:
   bool      m_transmit;
@@ -56,5 +53,3 @@ private:
 
 #endif
 
-#endif
-

CalDStarRX.cpp

@@ -1,5 +1,5 @@
 /*
- *   Copyright (C) 2009-2016,2020 by Jonathan Naylor G4KLX
+ *   Copyright (C) 2009-2016 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
@@ -17,9 +17,6 @@
  */
 
 #include "Config.h"
-
-#if defined(MODE_DSTAR)
-
 #include "Globals.h"
 #include "CalDStarRX.h"
 #include "Utils.h"
@@ -129,5 +126,3 @@ void CCalDStarRX::process(q15_t value)
   }
 }
 
-#endif
-

CalDStarRX.h

@@ -1,5 +1,5 @@
 /*
- *   Copyright (C) 2015,2016,2020 by Jonathan Naylor G4KLX
+ *   Copyright (C) 2015,2016 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
@@ -16,13 +16,10 @@
  *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include "Config.h"
-
-#if defined(MODE_DSTAR)
-
 #if !defined(CALDSTARRX_H)
 #define  CALDSTARRX_H
 
+#include "Config.h"
 #include "DStarDefines.h"
 
 class CCalDStarRX {
@@ -43,5 +40,3 @@ private:
 
 #endif
 
-#endif
-

CalDStarTX.cpp

@@ -1,5 +1,5 @@
 /*
- *   Copyright (C) 2009-2016,2020 by Jonathan Naylor G4KLX
+ *   Copyright (C) 2009-2016 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
@@ -17,9 +17,6 @@
  */
 
 #include "Config.h"
-
-#if defined(MODE_DSTAR)
-
 #include "Globals.h"
 #include "CalDStarTX.h"
 
@@ -165,7 +162,7 @@ void CCalDStarTX::process()
   m_count = (m_count + 1U) % (30U * 21U);
 }
 
-uint8_t CCalDStarTX::write(const uint8_t* data, uint16_t length)
+uint8_t CCalDStarTX::write(const uint8_t* data, uint8_t length)
 {
   if (length != 1U)
     return 4U;
@@ -184,5 +181,3 @@ uint8_t CCalDStarTX::write(const uint8_t* data, uint16_t length)
   return 0U;
 }
 
-#endif
-

CalDStarTX.h

@@ -1,5 +1,5 @@
 /*
- *   Copyright (C) 2015,2016,2020 by Jonathan Naylor G4KLX
+ *   Copyright (C) 2015,2016 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
@@ -16,20 +16,17 @@
  *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include "Config.h"
-
-#if defined(MODE_DSTAR)
-
 #if !defined(CALDSTARTX_H)
 #define  CALDSTARTX_H
 
+#include "Config.h"
 #include "DStarDefines.h"
 
 class CCalDStarTX {
 public:
   CCalDStarTX();
 
-  uint8_t write(const uint8_t* data, uint16_t length);
+  uint8_t write(const uint8_t* data, uint8_t length);
 
   void process();
 
@@ -40,5 +37,3 @@ private:
 
 #endif
 
-#endif
-

CalFM.cpp

@@ -1,133 +0,0 @@
-/*
- *   Copyright (C) 2009-2015,2020 by Jonathan Naylor G4KLX
- *   Copyright (C) 2016 by Colin Durbridge G4EML
- *   Copyright (C) 2020 by Phil Taylor M0VSE
- *
- *   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
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include "Config.h"
-
-#if defined(MODE_FM)
-
-#include "Globals.h"
-#include "CalFM.h"
-
-
-const struct TONE_TABLE {
-  uint16_t  frequency;
-  uint16_t length;
-  q31_t    increment;
-} TONE_TABLE_DATA[] = {
-  {2495U, 10U, 223248821},
-  {2079U, 12U, 186025772},
-  {1633U, 15U, 146118367},
-  {1247U, 19U, 111579672},
-  {1039U, 23U, 93012886},
-  {956U,  25U, 85541432}};
-
-const uint8_t TONE_TABLE_DATA_LEN = 6U;
-
-CCalFM::CCalFM() :
-m_frequency(0),
-m_length(0),
-m_tone(NULL),
-m_level(128 * 12),
-m_transmit(false),
-m_audioSeq(0),
-m_lastState(STATE_IDLE)
-{
-}
-
-void CCalFM::process()
-{
-  const TONE_TABLE* entry = NULL;
-
-  if (m_modemState != m_lastState)
-  {
-    switch (m_modemState) {
-        case STATE_FMCAL10K:
-          m_frequency = 956U;
-          break;
-        case STATE_FMCAL12K:
-          m_frequency = 1039U;
-          break;
-        case STATE_FMCAL15K:
-          m_frequency = 1247U;
-          break;
-        case STATE_FMCAL20K:
-          m_frequency = 1633U;
-          break;
-        case STATE_FMCAL25K:
-          m_frequency = 2079U;
-          break;
-        case STATE_FMCAL30K:
-          m_frequency = 2495U;
-          break;
-        default:
-          m_frequency = 0U;
-          break;
-    }
-
-    for (uint8_t i = 0U; i < TONE_TABLE_DATA_LEN; i++) {
-      if (TONE_TABLE_DATA[i].frequency == m_frequency) {
-        entry = TONE_TABLE_DATA + i;
-        break;
-      }
-    }
-
-    if (entry == NULL)
-      return;
-
-    m_length = entry->length;
-
-    delete[] m_tone;
-    m_tone = new q15_t[m_length];
-
-    q31_t arg = 0;
-    for (uint16_t i = 0U; i < m_length; i++) {
-      q63_t value = ::arm_sin_q31(arg) * q63_t(m_level);
-      m_tone[i] = q15_t(__SSAT((value >> 31), 16));
-
-      arg += entry->increment;
-    }
-
-    m_lastState=m_modemState;
-  }
-
-  if (m_transmit)
-  {
-    uint16_t space = io.getSpace();
-    while (space > m_length)
-    {
-      io.write(m_modemState,m_tone,m_length);
-      space -= m_length;
-    }
-  }
-}
-
-
-uint8_t CCalFM::write(const uint8_t* data, uint16_t length)
-{
-  if (length != 1U)
-    return 4U;
-
-  m_transmit = data[0U] == 1U;
-
-  return 0U;
-}
-
-#endif
-

CalFM.h

@@ -1,55 +0,0 @@
-/*
- *   Copyright (C) 2009-2015,2020 by Jonathan Naylor G4KLX
- *   Copyright (C) 2016 by Colin Durbridge G4EML
- *   Copyright (C) 2020 by Phil Taylor M0VSE
- *
- *   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
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include "Config.h"
-
-#if defined(MODE_FM)
-
-#if !defined(CALFM_H)
-#define  CALFM_H
-
-class CCalFM {
-public:
-  CCalFM();
-
-  void process();
-  void fm10kcal();
-  void fm12k5cal();
-  void fm15kcal();
-  void fm20kcal();
-  void fm25kcal();
-  void fm30kcal();
-
-  uint8_t write(const uint8_t* data, uint16_t length);
-
-private:
-  uint16_t  m_frequency;
-  uint16_t  m_length;
-  q15_t*    m_tone;
-  q15_t     m_level;
-  bool      m_transmit;
-  uint8_t   m_audioSeq;
-  uint8_t   m_lastState;
-};
-
-#endif
-
-#endif
-

CalM17.cpp

@@ -1,66 +0,0 @@
-/*
- *   Copyright (C) 2009-2015,2020,2021 by Jonathan Naylor G4KLX
- *   Copyright (C) 2016 by Colin Durbridge G4EML
- *
- *   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
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include "Config.h"
-
-#if defined(MODE_M17)
-
-#include "Globals.h"
-#include "CalM17.h"
-#include "M17Defines.h"
-
-const uint8_t PREAMBLE[] = {0x00U,
-	0x77U, 0x77U, 0x77U, 0x77U, 0x77U, 0x77U, 0x77U, 0x77U,
-	0x77U, 0x77U, 0x77U, 0x77U, 0x77U, 0x77U, 0x77U, 0x77U,
-	0x77U, 0x77U, 0x77U, 0x77U, 0x77U, 0x77U, 0x77U, 0x77U,
-	0x77U, 0x77U, 0x77U, 0x77U, 0x77U, 0x77U, 0x77U, 0x77U,
-	0x77U, 0x77U, 0x77U, 0x77U, 0x77U, 0x77U, 0x77U, 0x77U,
-	0x77U, 0x77U, 0x77U, 0x77U, 0x77U, 0x77U, 0x77U, 0x77U};
-
-CCalM17::CCalM17() :
-m_transmit(false)
-{
-}
-
-void CCalM17::process()
-{
-  m17TX.process();
-
-  if (!m_transmit)
-    return;
-
-  uint16_t space = m17TX.getSpace();
-  if (space < 2U)
-    return;
-
-  m17TX.writeData(PREAMBLE, M17_FRAME_LENGTH_BYTES + 1U);
-}
-
-uint8_t CCalM17::write(const uint8_t* data, uint16_t length)
-{
-  if (length != 1U)
-    return 4U;
-
-  m_transmit = data[0U] == 1U;
-
-  return 0U;
-}
-
-#endif
-

CalM17.h

@@ -1,43 +0,0 @@
-/*
- *   Copyright (C) 2009-2015,2020,2021 by Jonathan Naylor G4KLX
- *   Copyright (C) 2016 by Colin Durbridge G4EML
- *
- *   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
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include "Config.h"
-
-#if defined(MODE_M17)
-
-#if !defined(CALM17_H)
-#define  CALM17_H
-
-
-class CCalM17 {
-public:
-  CCalM17();
-
-  void process();
-
-  uint8_t write(const uint8_t* data, uint16_t length);
-
-private:
-  bool m_transmit;
-};
-
-#endif
-
-#endif
-

CalNXDN.cpp

@@ -1,6 +1,5 @@
 /*
  *   Copyright (C) 2018 by Andy Uribe CA6JAU
- *   Copyright (C) 2020 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
@@ -18,9 +17,6 @@
  */
 
 #include "Config.h"
-
-#if defined(MODE_NXDN)
-
 #include "Globals.h"
 #include "CalNXDN.h"
 
@@ -83,7 +79,7 @@ void CCalNXDN::process()
   }
 }
 
-uint8_t CCalNXDN::write(const uint8_t* data, uint16_t length)
+uint8_t CCalNXDN::write(const uint8_t* data, uint8_t length)
 {
   if (length != 1U)
     return 4U;
@@ -96,5 +92,3 @@ uint8_t CCalNXDN::write(const uint8_t* data, uint16_t length)
   return 0U;
 }
 
-#endif
-

CalNXDN.h

@@ -1,6 +1,5 @@
 /*
  *   Copyright (C) 2018 by Andy Uribe CA6JAU
- *   Copyright (C) 2020 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
@@ -17,13 +16,11 @@
  *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include "Config.h"
-
-#if defined(MODE_NXDN)
-
 #if !defined(CALNXDN_H)
 #define  CALNXDN_H
 
+#include "Config.h"
+
 enum NXDNCAL1K {
   NXDNCAL1K_IDLE,
   NXDNCAL1K_TX
@@ -35,7 +32,7 @@ public:
 
   void process();
 
-  uint8_t write(const uint8_t* data, uint16_t length);
+  uint8_t write(const uint8_t* data, uint8_t length);
 
 private:
   bool      m_transmit;
@@ -45,5 +42,3 @@ private:
 
 #endif
 
-#endif
-

CalP25.cpp

@@ -1,6 +1,5 @@
 /*
  *   Copyright (C) 2018 by Andy Uribe CA6JAU
- *   Copyright (C) 2020 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
@@ -18,9 +17,6 @@
  */
 
 #include "Config.h"
-
-#if defined(MODE_P25)
-
 #include "Globals.h"
 #include "CalP25.h"
 
@@ -86,7 +82,7 @@ void CCalP25::process()
   }
 }
 
-uint8_t CCalP25::write(const uint8_t* data, uint16_t length)
+uint8_t CCalP25::write(const uint8_t* data, uint8_t length)
 {
   if (length != 1U)
     return 4U;
@@ -99,5 +95,3 @@ uint8_t CCalP25::write(const uint8_t* data, uint16_t length)
   return 0U;
 }
 
-#endif
-

CalP25.h

@@ -1,6 +1,5 @@
 /*
  *   Copyright (C) 2018 by Andy Uribe CA6JAU
- *   Copyright (C) 2020 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
@@ -17,13 +16,10 @@
  *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include "Config.h"
-
-#if defined(MODE_P25)
-
 #if !defined(CALP25_H)
 #define  CALP25_H
 
+#include "Config.h"
 #include "P25Defines.h"
 
 enum P25CAL1K {
@@ -38,7 +34,7 @@ public:
 
   void process();
 
-  uint8_t write(const uint8_t* data, uint16_t length);
+  uint8_t write(const uint8_t* data, uint8_t length);
 
 private:
   bool      m_transmit;
@@ -47,5 +43,3 @@ private:
 
 #endif
 
-#endif
-

CalPOCSAG.cpp

@@ -1,55 +0,0 @@
-/*
- *   Copyright (C) 2019 by Florian Wolters DF2ET
- *   Copyright (C) 2020 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
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include "Config.h"
-
-#if defined(MODE_POCSAG)
-
-#include "Globals.h"
-#include "CalPOCSAG.h"
-
-CCalPOCSAG::CCalPOCSAG() :
-m_state(POCSAGCAL_IDLE)
-{
-}
-
-void CCalPOCSAG::process()
-{
-  if (m_state == POCSAGCAL_IDLE)
-    return;
-
-  uint16_t space = io.getSpace();
-  if (space <= 165U)
-    return;
-
-  pocsagTX.writeByte(0xAAU);
-}
-
-uint8_t CCalPOCSAG::write(const uint8_t* data, uint16_t length)
-{
-  if (length != 1U)
-    return 4U;
-
-  m_state = data[0U] == 1U ? POCSAGCAL_TX : POCSAGCAL_IDLE;
-
-  return 0U;
-}
-
-#endif
-

CalPOCSAG.h

@@ -1,47 +0,0 @@
-/*
- *   Copyright (C) 2019 by Florian Wolters DF2ET
- *   Copyright (C) 2020 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
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include "Config.h"
-
-#if defined(MODE_POCSAG)
-
-#if !defined(CALPOCSAG_H)
-#define  CALPOCSAG_H
-
-enum POCSAGCAL {
-  POCSAGCAL_IDLE,
-  POCSAGCAL_TX
-};
-
-class CCalPOCSAG {
-public:
-  CCalPOCSAG();
-
-  void process();
-
-  uint8_t write(const uint8_t* data, uint16_t length);
-
-private:
-  POCSAGCAL m_state;
-};
-
-#endif
-
-#endif
-

Config.h

@@ -1,5 +1,5 @@
 /*
- *   Copyright (C) 2015,2016,2017,2018,2020,2024 by Jonathan Naylor G4KLX
+ *   Copyright (C) 2015,2016,2017,2018 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
@@ -19,40 +19,6 @@
 #if !defined(CONFIG_H)
 #define  CONFIG_H
 
-// Allow for the selection of which modes to compile into the firmware. This is particularly useful for processors
-// which have limited code space and processing power.
-
-// Enable D-Star support.
-#define MODE_DSTAR
-
-// Enable DMR support.
-#define MODE_DMR
-
-// Enable System Fusion support.
-#define MODE_YSF
-
-// Enable P25 phase 1 support.
-#define MODE_P25
-
-// Enable NXDN support, the boxcar filter sometimes improves the performance of NXDN receive on some systems.
-#define MODE_NXDN
-#define USE_NXDN_BOXCAR
-
-// Enable dPMR support.
-#define	MODE_DPMR
-
-// Enable M17 support.
-#define MODE_M17
-
-// Enable POCSAG support.
-#define MODE_POCSAG
-
-// Enable FM support.
-#define MODE_FM
-
-// Enable AX.25 support, this is only enabled if FM is also enabled.
-#define MODE_AX25
-
 // Allow for the use of high quality external clock oscillators
 // The number is the frequency of the oscillator in Hertz.
 //
@@ -69,14 +35,11 @@
 // For 19.2 MHz
 // #define EXTERNAL_OSC 19200000
 
-// Select a baud rate for host communication. The faster speeds are needed for external FM to work.
-// #define SERIAL_SPEED 115200 // Suitable for most older boards (Arduino Due, etc). External FM will NOT work with this!
-// #define SERIAL_SPEED 230400 // Only works on newer boards like fast M4, M7, Teensy 3.x. External FM might work with this
-#define SERIAL_SPEED 460800	// Only works on newer boards like fast M4, M7, Teensy 3.x. External FM should work with this
-//#define SERIAL_SPEED 500000  // Used with newer boards and Armbian on AllWinner SOCs (H2, H3) that do not support 460800
+// Allow the use of the COS line to lockout the modem
+// #define USE_COS_AS_LOCKOUT
 
 // Use pins to output the current mode via LEDs
-#define MODE_LEDS
+// #define MODE_LEDS
 
 // For the original Arduino Due pin layout
 // #define ARDUINO_DUE_PAPA
@@ -84,12 +47,15 @@
 // For the ZUM V1.0 and V1.0.1 boards pin layout
 // #define ARDUINO_DUE_ZUM_V10
 
+// For the SQ6POG board
+// #define STM32F1_POG
+
 // For the SP8NTH board
 // #define ARDUINO_DUE_NTH
 
 // For ST Nucleo-64 STM32F446RE board
 // #define STM32F4_NUCLEO_MORPHO_HEADER
-// #define STM32F4_NUCLEO_ARDUINO_HEADER
+#define STM32F4_NUCLEO_ARDUINO_HEADER
 
 // Use separate mode pins to switch external channel/filters/bandwidth for example
 // #define MODE_PINS
@@ -101,16 +67,10 @@
 #define SEND_RSSI_DATA
 
 // Use the modem as a serial repeater for Nextion displays
-#define SERIAL_REPEATER
-
-// Set the baud rate of the modem serial repeater for Nextion displays
-#define SERIAL_REPEATER_BAUD_RATE 9600
-
-// Use the modem as an I2C repeater for OLED displays
-// #define I2C_REPEATER
+// #define SERIAL_REPEATER
 
 // To reduce CPU load, you can remove the DC blocker by commenting out the next line
-#define USE_DCBLOCKER
+// #define USE_DCBLOCKER
 
 // Constant Service LED once repeater is running 
 // Do not use if employing an external hardware watchdog 
@@ -119,17 +79,10 @@
 // Use the YSF and P25 LEDs for NXDN
 // #define USE_ALTERNATE_NXDN_LEDS
 
-// Use the D-Star and P25 LEDs for M17
-#define USE_ALTERNATE_M17_LEDS
-
 // Use the D-Star and DMR LEDs for POCSAG
-#define USE_ALTERNATE_POCSAG_LEDS
+// #define USE_ALTERNATE_POCSAG_LEDS
 
-// Use the D-Star and YSF LEDs for FM
-#define USE_ALTERNATE_FM_LEDS
-
-// Use the DMR and YSF LEDs for dPMR
-#define USE_ALTERNATE_DPMR_LEDS
+// Select BOXCAR Filter into D-Star
+// #define DSTARBOXCAR
 
 #endif
-

DMRDMORX.cpp

@@ -1,5 +1,5 @@
 /*
- *   Copyright (C) 2009-2017,2020 by Jonathan Naylor G4KLX
+ *   Copyright (C) 2009-2017 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
@@ -17,9 +17,6 @@
  */
 
 #include "Config.h"
-
-#if defined(MODE_DMR)
-
 #include "Globals.h"
 #include "DMRDMORX.h"
 #include "DMRSlotType.h"
@@ -426,6 +423,3 @@ void CDMRDMORX::writeRSSIData(uint8_t* frame)
   serial.writeDMRData(true, frame, DMR_FRAME_LENGTH_BYTES + 1U);
 #endif
 }
-
-#endif
-

DMRDMORX.h

@@ -1,5 +1,5 @@
 /*
- *   Copyright (C) 2015,2016,2017,2020 by Jonathan Naylor G4KLX
+ *   Copyright (C) 2015,2016,2017 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
@@ -16,16 +16,13 @@
  *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include "Config.h"
-
-#if defined(MODE_DMR)
-
 #if !defined(DMRDMORX_H)
 #define  DMRDMORX_H
 
+#include "Config.h"
 #include "DMRDefines.h"
 
-const uint16_t DMO_BUFFER_LENGTH_SAMPLES = 1440U;   // 60ms at 24 kHz
+const uint16_t DMO_BUFFER_LENGTH_SAMPLES = 2880U;   // 60ms at 48 kHz
 
 enum DMORX_STATE {
   DMORXS_NONE,
@@ -70,6 +67,3 @@ private:
 };
 
 #endif
-
-#endif
-

DMRDMOTX.cpp

@@ -1,5 +1,5 @@
 /*
- *   Copyright (C) 2009-2017,2020 by Jonathan Naylor G4KLX
+ *   Copyright (C) 2009-2017 by Jonathan Naylor G4KLX
  *   Copyright (C) 2016 by Colin Durbridge G4EML
  *   Copyright (C) 2017 by Andy Uribe CA6JAU
  *
@@ -19,16 +19,19 @@
  */
 
 #include "Config.h"
-
-#if defined(MODE_DMR)
-
 #include "Globals.h"
 #include "DMRSlotType.h"
 
-// Generated using rcosdesign(0.2, 8, 5, 'sqrt') in MATLAB
-static q15_t RRC_0_2_FILTER[] = {0, 0, 0, 0, 850, 219, -720, -1548, -1795, -1172, 237, 1927, 3120, 3073, 1447, -1431, -4544, -6442,
-                                 -5735, -1633, 5651, 14822, 23810, 30367, 32767, 30367, 23810, 14822, 5651, -1633, -5735, -6442,
-                                 -4544, -1431, 1447, 3073, 3120, 1927, 237, -1172, -1795, -1548, -720, 219, 850}; // numTaps = 45, L = 5
+// Generated using rcosdesign(0.2, 8, 10, 'sqrt') in MATLAB
+static q15_t RRC_0_2_FILTER[] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 850, 592, 219, -234, -720, -1179,
+                                -1548, -1769, -1795, -1597, -1172, -544, 237, 1092, 1927, 2637,
+                                3120, 3286, 3073, 2454, 1447, 116, -1431, -3043, -4544, -5739,
+                                -6442, -6483, -5735, -4121, -1633, 1669, 5651, 10118, 14822,
+                                19484, 23810, 27520, 30367, 32156, 32767, 32156, 30367, 27520,
+                                23810, 19484, 14822, 10118, 5651, 1669, -1633, -4121, -5735,
+                                -6483, -6442, -5739, -4544, -3043, -1431, 116, 1447, 2454,
+                                3073, 3286, 3120, 2637, 1927, 1092, 237, -544, -1172, -1597,
+                                -1795, -1769, -1548, -1179, -720, -234, 219, 592, 850}; // numTaps = 90, L = 10
 const uint16_t RRC_0_2_FILTER_PHASE_LEN = 9U; // phaseLength = numTaps/L
 
 const q15_t DMR_LEVELA =  1362;
@@ -77,7 +80,7 @@ void CDMRDMOTX::process()
       m_poLen = m_txDelay;
     } else {
       for (unsigned int i = 0U; i < DMR_FRAME_LENGTH_BYTES; i++)
-        m_fifo.get(m_poBuffer[i]);
+        m_poBuffer[i] = m_fifo.get();
 
       for (unsigned int i = 0U; i < 39U; i++)
         m_poBuffer[i + DMR_FRAME_LENGTH_BYTES] = PR_FILL[i];
@@ -107,7 +110,7 @@ void CDMRDMOTX::process()
   }
 }
 
-uint8_t CDMRDMOTX::writeData(const uint8_t* data, uint16_t length)
+uint8_t CDMRDMOTX::writeData(const uint8_t* data, uint8_t length)
 {
   if (length != (DMR_FRAME_LENGTH_BYTES + 1U))
     return 4U;
@@ -163,6 +166,3 @@ void CDMRDMOTX::setTXDelay(uint8_t delay)
   if (m_txDelay > 1200U)
     m_txDelay = 1200U;
 }
-
-#endif
-

DMRDMOTX.h

@@ -1,5 +1,5 @@
 /*
- *   Copyright (C) 2015,2016,2017,2020 by Jonathan Naylor G4KLX
+ *   Copyright (C) 2015,2016,2017 by Jonathan Naylor G4KLX
  *   Copyright (C) 2016 by Colin Durbridge G4EML
  *
  *   This program is free software; you can redistribute it and/or modify
@@ -17,22 +17,19 @@
  *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include "Config.h"
-
-#if defined(MODE_DMR)
-
 #if !defined(DMRDMOTX_H)
 #define  DMRDMOTX_H
 
+#include "Config.h"
 #include "DMRDefines.h"
 
-#include "RingBuffer.h"
+#include "SerialRB.h"
 
 class CDMRDMOTX {
 public:
   CDMRDMOTX();
 
-  uint8_t writeData(const uint8_t* data, uint16_t length);
+  uint8_t writeData(const uint8_t* data, uint8_t length);
 
   void process();
 
@@ -41,7 +38,7 @@ public:
   uint8_t getSpace() const;
 
 private:
-  CRingBuffer<uint8_t>                        m_fifo;
+  CSerialRB                        m_fifo;
   arm_fir_interpolate_instance_q15 m_modFilter;
   q15_t                            m_modState[16U];    // blockSize + phaseLength - 1, 4 + 9 - 1 plus some spare
   uint8_t                          m_poBuffer[1200U];
@@ -54,5 +51,3 @@ private:
 
 #endif
 
-#endif
-

DMRDefines.h

@@ -1,5 +1,5 @@
 /*
- *   Copyright (C) 2009-2016 by Jonathan Naylor G4KLX
+ *   Copyright (C) 2009-2017 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
@@ -19,7 +19,7 @@
 #if !defined(DMRDEFINES_H)
 #define  DMRDEFINES_H
 
-const unsigned int DMR_RADIO_SYMBOL_LENGTH = 5U;      // At 24 kHz sample rate
+const unsigned int DMR_RADIO_SYMBOL_LENGTH = 10U;      // At 48 kHz sample rate
 
 const unsigned int DMR_FRAME_LENGTH_BYTES   = 33U;
 const unsigned int DMR_FRAME_LENGTH_BITS    = DMR_FRAME_LENGTH_BYTES * 8U;

DMRIdleRX.cpp

@@ -1,5 +1,5 @@
 /*
- *   Copyright (C) 2009-2017,2020 by Jonathan Naylor G4KLX
+ *   Copyright (C) 2009-2017 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
@@ -17,9 +17,6 @@
  */
 
 #include "Config.h"
-
-#if defined(MODE_DMR)
-
 #include "Globals.h"
 #include "DMRIdleRX.h"
 #include "DMRSlotType.h"
@@ -27,8 +24,8 @@
 
 const q15_t SCALING_FACTOR = 19505;      // Q15(0.60)
 
-const uint8_t MAX_SYNC_SYMBOLS_ERRS = 2U;
-const uint8_t MAX_SYNC_BYTES_ERRS   = 3U;
+const uint8_t MAX_SYNC_SYMBOLS_ERRS = 4U;
+const uint8_t MAX_SYNC_BYTES_ERRS   = 6U;
 
 const uint8_t BIT_MASK_TABLE[] = {0x80U, 0x40U, 0x20U, 0x10U, 0x08U, 0x04U, 0x02U, 0x01U};
 
@@ -212,6 +209,3 @@ void CDMRIdleRX::setColorCode(uint8_t colorCode)
 {
   m_colorCode = colorCode;
 }
-
-#endif
-

DMRIdleRX.h

@@ -1,5 +1,5 @@
 /*
- *   Copyright (C) 2015,2020 by Jonathan Naylor G4KLX
+ *   Copyright (C) 2015 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
@@ -16,13 +16,10 @@
  *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include "Config.h"
-
-#if defined(MODE_DMR)
-
 #if !defined(DMRIDLERX_H)
 #define  DMRIDLERX_H
 
+#include "Config.h"
 #include "DMRDefines.h"
 
 class CDMRIdleRX {
@@ -52,5 +49,3 @@ private:
 
 #endif
 
-#endif
-

DMRRX.cpp

@@ -1,5 +1,5 @@
 /*
- *   Copyright (C) 2015,2016,2020 by Jonathan Naylor G4KLX
+ *   Copyright (C) 2015,2016 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
@@ -17,9 +17,6 @@
  */
 
 #include "Config.h"
-
-#if defined(MODE_DMR)
-
 #include "Globals.h"
 #include "DMRRX.h"
 
@@ -71,5 +68,3 @@ void CDMRRX::reset()
   m_slot2RX.reset();
 }
 
-#endif
-

DMRRX.h

@@ -1,5 +1,5 @@
 /*
- *   Copyright (C) 2015,2016,2020 by Jonathan Naylor G4KLX
+ *   Copyright (C) 2015,2016 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
@@ -16,13 +16,10 @@
  *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include "Config.h"
-
-#if defined(MODE_DMR)
-
 #if !defined(DMRRX_H)
 #define  DMRRX_H
 
+#include "Config.h"
 #include "DMRSlotRX.h"
 
 class CDMRRX {
@@ -43,5 +40,3 @@ private:
 
 #endif
 
-#endif
-

DMRSlotRX.cpp

@@ -1,5 +1,5 @@
 /*
- *   Copyright (C) 2009-2017,2020 by Jonathan Naylor G4KLX
+ *   Copyright (C) 2009-2017 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
@@ -17,23 +17,20 @@
  */
 
 #include "Config.h"
-
-#if defined(MODE_DMR)
-
 #include "Globals.h"
 #include "DMRSlotRX.h"
 #include "DMRSlotType.h"
 #include "Utils.h"
 
-const uint16_t SCAN_START = 400U;
-const uint16_t SCAN_END   = 490U;
+const uint16_t SCAN_START = 790U;
+const uint16_t SCAN_END   = 920U;
 
 const q15_t SCALING_FACTOR = 19505;      // Q15(0.60)
 
-const uint8_t MAX_SYNC_SYMBOLS_ERRS = 2U;
-const uint8_t MAX_SYNC_BYTES_ERRS   = 3U;
+const uint8_t MAX_SYNC_SYMBOLS_ERRS = 4U;
+const uint8_t MAX_SYNC_BYTES_ERRS   = 6U;
 
-const uint8_t MAX_SYNC_LOST_FRAMES  = 13U;
+const uint8_t MAX_SYNC_LOST_FRAMES  = 26U;
 
 const uint8_t BIT_MASK_TABLE[] = {0x80U, 0x40U, 0x20U, 0x10U, 0x08U, 0x04U, 0x02U, 0x01U};
 
@@ -100,7 +97,7 @@ bool CDMRSlotRX::processSample(q15_t sample, uint16_t rssi)
     return m_state != DMRRXS_NONE;
 
   // Ensure that the buffer doesn't overflow
-  if (m_dataPtr > m_endPtr || m_dataPtr >= 900U)
+  if (m_dataPtr > m_endPtr || m_dataPtr >= 1900U)
     return m_state != DMRRXS_NONE;
 
   m_buffer[m_dataPtr] = sample;
@@ -403,6 +400,3 @@ void CDMRSlotRX::writeRSSIData(uint8_t* frame)
   serial.writeDMRData(m_slot, frame, DMR_FRAME_LENGTH_BYTES + 1U);
 #endif
 }
-
-#endif
-

DMRSlotRX.h

@@ -1,5 +1,5 @@
 /*
- *   Copyright (C) 2015,2016,2017,2020 by Jonathan Naylor G4KLX
+ *   Copyright (C) 2015,2016,2017 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
@@ -16,13 +16,10 @@
  *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include "Config.h"
-
-#if defined(MODE_DMR)
-
 #if !defined(DMRSLOTRX_H)
 #define  DMRSLOTRX_H
 
+#include "Config.h"
 #include "DMRDefines.h"
 
 enum DMRRX_STATE {
@@ -47,7 +44,7 @@ public:
 private:
   bool        m_slot;
   uint32_t    m_bitBuffer[DMR_RADIO_SYMBOL_LENGTH];
-  q15_t       m_buffer[900U];
+  q15_t       m_buffer[1900U];
   uint16_t    m_bitPtr;
   uint16_t    m_dataPtr;
   uint16_t    m_syncPtr;
@@ -65,7 +62,7 @@ private:
   DMRRX_STATE m_state;
   uint8_t     m_n;
   uint8_t     m_type;
-  uint16_t    m_rssi[900U];
+  uint16_t    m_rssi[1900U];
 
   void correlateSync(bool first);
   void samplesToBits(uint16_t start, uint8_t count, uint8_t* buffer, uint16_t offset, q15_t centre, q15_t threshold);
@@ -73,6 +70,3 @@ private:
 };
 
 #endif
-
-#endif
-

DMRSlotType.cpp

@@ -1,5 +1,5 @@
 /*
- *   Copyright (C) 2015,2020 by Jonathan Naylor G4KLX
+ *   Copyright (C) 2015 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
@@ -17,9 +17,6 @@
  */
 
 #include "Config.h"
-
-#if defined(MODE_DMR)
-
 #include "Globals.h"
 #include "DMRSlotType.h"
 
@@ -288,5 +285,3 @@ void CDMRSlotType::encode(uint8_t colorCode, uint8_t dataType, uint8_t* frame) c
   frame[20U] = (frame[20U] & 0x03U) | ((slotType[1U] << 6) & 0xC0U) | ((slotType[2U] >> 2) & 0x3CU);
 }
 
-#endif
-

DMRSlotType.h

@@ -1,5 +1,5 @@
 /*
- *   Copyright (C) 2015,2020 by Jonathan Naylor G4KLX
+ *   Copyright (C) 2015 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
@@ -16,10 +16,6 @@
  *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include "Config.h"
-
-#if defined(MODE_DMR)
-
 #if !defined(DMRSLOTTYPE_H)
 #define  DMRSLOTTYPE_H
 
@@ -39,5 +35,3 @@ private:
 
 #endif
 
-#endif
-

DMRTX.cpp

@@ -1,5 +1,5 @@
 /*
- *   Copyright (C) 2009-2017,2020 by Jonathan Naylor G4KLX
+ *   Copyright (C) 2009-2017 by Jonathan Naylor G4KLX
  *   Copyright (C) 2016 by Colin Durbridge G4EML
  *   Copyright (C) 2017 by Andy Uribe CA6JAU
  *
@@ -19,16 +19,19 @@
  */
 
 #include "Config.h"
-
-#if defined(MODE_DMR)
-
 #include "Globals.h"
 #include "DMRSlotType.h"
 
-// Generated using rcosdesign(0.2, 8, 5, 'sqrt') in MATLAB
-static q15_t RRC_0_2_FILTER[] = {0, 0, 0, 0, 850, 219, -720, -1548, -1795, -1172, 237, 1927, 3120, 3073, 1447, -1431, -4544, -6442,
-                                 -5735, -1633, 5651, 14822, 23810, 30367, 32767, 30367, 23810, 14822, 5651, -1633, -5735, -6442,
-                                 -4544, -1431, 1447, 3073, 3120, 1927, 237, -1172, -1795, -1548, -720, 219, 850}; // numTaps = 45, L = 5
+// Generated using rcosdesign(0.2, 8, 10, 'sqrt') in MATLAB
+static q15_t RRC_0_2_FILTER[] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 850, 592, 219, -234, -720, -1179,
+                                -1548, -1769, -1795, -1597, -1172, -544, 237, 1092, 1927, 2637,
+                                3120, 3286, 3073, 2454, 1447, 116, -1431, -3043, -4544, -5739,
+                                -6442, -6483, -5735, -4121, -1633, 1669, 5651, 10118, 14822,
+                                19484, 23810, 27520, 30367, 32156, 32767, 32156, 30367, 27520,
+                                23810, 19484, 14822, 10118, 5651, 1669, -1633, -4121, -5735,
+                                -6483, -6442, -5739, -4544, -3043, -1431, 116, 1447, 2454,
+                                3073, 3286, 3120, 2637, 1927, 1092, 237, -544, -1172, -1597,
+                                -1795, -1769, -1548, -1179, -720, -234, 219, 592, 850}; // numTaps = 90, L = 10
 const uint16_t RRC_0_2_FILTER_PHASE_LEN = 9U; // phaseLength = numTaps/L
 
 const q15_t DMR_LEVELA =  1362;
@@ -147,7 +150,7 @@ void CDMRTX::process()
   }
 }
 
-uint8_t CDMRTX::writeData1(const uint8_t* data, uint16_t length)
+uint8_t CDMRTX::writeData1(const uint8_t* data, uint8_t length)
 {
   if (length != (DMR_FRAME_LENGTH_BYTES + 1U))
     return 4U;
@@ -171,7 +174,7 @@ uint8_t CDMRTX::writeData1(const uint8_t* data, uint16_t length)
   return 0U;
 }
 
-uint8_t CDMRTX::writeData2(const uint8_t* data, uint16_t length)
+uint8_t CDMRTX::writeData2(const uint8_t* data, uint8_t length)
 {
   if (length != (DMR_FRAME_LENGTH_BYTES + 1U))
     return 4U;
@@ -195,7 +198,7 @@ uint8_t CDMRTX::writeData2(const uint8_t* data, uint16_t length)
   return 0U;
 }
 
-uint8_t CDMRTX::writeShortLC(const uint8_t* data, uint16_t length)
+uint8_t CDMRTX::writeShortLC(const uint8_t* data, uint8_t length)
 {
   if (length != 9U)
     return 4U;
@@ -211,7 +214,7 @@ uint8_t CDMRTX::writeShortLC(const uint8_t* data, uint16_t length)
   return 0U;
 }
 
-uint8_t CDMRTX::writeAbort(const uint8_t* data, uint16_t length)
+uint8_t CDMRTX::writeAbort(const uint8_t* data, uint8_t length)
 {
   if (length != 1U)
     return 4U;
@@ -296,7 +299,7 @@ void CDMRTX::createData(uint8_t slotIndex)
 {
   if (m_fifo[slotIndex].getData() >= DMR_FRAME_LENGTH_BYTES && m_frameCount >= STARTUP_COUNT && m_abortCount[slotIndex] >= ABORT_COUNT) {
     for (unsigned int i = 0U; i < DMR_FRAME_LENGTH_BYTES; i++) {
-      m_fifo[slotIndex].get(m_poBuffer[i]);
+      m_poBuffer[i]   = m_fifo[slotIndex].get();
       m_markBuffer[i] = MARK_NONE;
     }
   } else {
@@ -417,6 +420,3 @@ uint32_t CDMRTX::getFrameCount()
 {
   return m_frameCount;
 }
-
-#endif
-

DMRTX.h

@@ -1,5 +1,5 @@
 /*
- *   Copyright (C) 2015,2016,2017,2020 by Jonathan Naylor G4KLX
+ *   Copyright (C) 2015,2016,2017 by Jonathan Naylor G4KLX
  *   Copyright (C) 2016 by Colin Durbridge G4EML
  *
  *   This program is free software; you can redistribute it and/or modify
@@ -17,16 +17,13 @@
  *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include "Config.h"
-
-#if defined(MODE_DMR)
-
 #if !defined(DMRTX_H)
 #define  DMRTX_H
 
+#include "Config.h"
 #include "DMRDefines.h"
 
-#include "RingBuffer.h"
+#include "SerialRB.h"
 
 enum DMRTXSTATE {
   DMRTXSTATE_IDLE,
@@ -41,11 +38,11 @@ class CDMRTX {
 public:
   CDMRTX();
 
-  uint8_t writeData1(const uint8_t* data, uint16_t length);
-  uint8_t writeData2(const uint8_t* data, uint16_t length);
+  uint8_t writeData1(const uint8_t* data, uint8_t length);
+  uint8_t writeData2(const uint8_t* data, uint8_t length);
 
-  uint8_t writeShortLC(const uint8_t* data, uint16_t length);
-  uint8_t writeAbort(const uint8_t* data, uint16_t length);
+  uint8_t writeShortLC(const uint8_t* data, uint8_t length);
+  uint8_t writeAbort(const uint8_t* data, uint8_t length);
 
   void setStart(bool start);
   void setCal(bool start);
@@ -62,7 +59,7 @@ public:
   void setColorCode(uint8_t colorCode);
 
 private:
-  CRingBuffer<uint8_t>                        m_fifo[2U];
+  CSerialRB                        m_fifo[2U];
   arm_fir_interpolate_instance_q15 m_modFilter;
   q15_t                            m_modState[16U];    // blockSize + phaseLength - 1, 4 + 9 - 1 plus some spare
   DMRTXSTATE                       m_state;
@@ -86,5 +83,3 @@ private:
 
 #endif
 
-#endif
-

DPMRDefines.h

@@ -1,120 +0,0 @@
-/*
- *   Copyright (C) 2016,2017,2018,2024 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
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#if !defined(DPMRDEFINES_H)
-#define  DPMRDEFINES_H
-
-const unsigned int DPMR_RADIO_SYMBOL_LENGTH = 10U;      // At 24 kHz sample rate
-
-const unsigned int DPMR_HEADER_FRAME_LENGTH_BITS    = 312U;
-const unsigned int DPMR_HEADER_FRAME_LENGTH_BYTES   = DPMR_HEADER_FRAME_LENGTH_BITS / 8U;
-const unsigned int DPMR_HEADER_FRAME_LENGTH_SYMBOLS = DPMR_HEADER_FRAME_LENGTH_BITS / 2U;
-const unsigned int DPMR_HEADER_FRAME_LENGTH_SAMPLES = DPMR_HEADER_FRAME_LENGTH_SYMBOLS * DPMR_RADIO_SYMBOL_LENGTH;
-
-const unsigned int DPMR_DATA_FRAME_LENGTH_BITS    = 384U;
-const unsigned int DPMR_DATA_FRAME_LENGTH_BYTES   = DPMR_DATA_FRAME_LENGTH_BITS / 8U;
-const unsigned int DPMR_DATA_FRAME_LENGTH_SYMBOLS = DPMR_DATA_FRAME_LENGTH_BITS / 2U;
-const unsigned int DPMR_DATA_FRAME_LENGTH_SAMPLES = DPMR_DATA_FRAME_LENGTH_SYMBOLS * DPMR_RADIO_SYMBOL_LENGTH;
-
-const unsigned int DPMR_END_FRAME_LENGTH_BITS    = 96U;
-const unsigned int DPMR_END_FRAME_LENGTH_BYTES   = DPMR_END_FRAME_LENGTH_BITS / 8U;
-const unsigned int DPMR_END_FRAME_LENGTH_SYMBOLS = DPMR_END_FRAME_LENGTH_BITS / 2U;
-const unsigned int DPMR_END_FRAME_LENGTH_SAMPLES = DPMR_END_FRAME_LENGTH_SYMBOLS * DPMR_RADIO_SYMBOL_LENGTH;
-
-const unsigned int DPMR_FS1_LENGTH_BITS    = 48U;
-const unsigned int DPMR_FS1_LENGTH_SYMBOLS = DPMR_FS1_LENGTH_BITS / 2U;
-const unsigned int DPMR_FS1_LENGTH_SAMPLES = DPMR_FS1_LENGTH_SYMBOLS * DPMR_RADIO_SYMBOL_LENGTH;
-
-const unsigned int DPMR_FS2_LENGTH_BITS    = 24U;
-const unsigned int DPMR_FS2_LENGTH_SYMBOLS = DPMR_FS2_LENGTH_BITS / 2U;
-const unsigned int DPMR_FS2_LENGTH_SAMPLES = DPMR_FS2_LENGTH_SYMBOLS * DPMR_RADIO_SYMBOL_LENGTH;
-
-const unsigned int DPMR_FS3_LENGTH_BITS    = 24U;
-const unsigned int DPMR_FS3_LENGTH_SYMBOLS = DPMR_FS3_LENGTH_BITS / 2U;
-const unsigned int DPMR_FS3_LENGTH_SAMPLES = DPMR_FS3_LENGTH_SYMBOLS * DPMR_RADIO_SYMBOL_LENGTH;
-
-const unsigned int DPMR_FS4_LENGTH_BITS    = 48U;
-const unsigned int DPMR_FS4_LENGTH_SYMBOLS = DPMR_FS4_LENGTH_BITS / 2U;
-const unsigned int DPMR_FS4_LENGTH_SAMPLES = DPMR_FS4_LENGTH_SYMBOLS * DPMR_RADIO_SYMBOL_LENGTH;
-
-const uint8_t DPMR_FS1_BYTES[]      = {0x57U, 0xFFU, 0x5FU, 0x75U, 0xD5U, 0x77U};
-const uint8_t DPMR_FS1_BYTES_LENGTH = 6U;
-
-const uint8_t DPMR_FS2_BYTES[]      = {0x5FU, 0xF7U, 0x7DU};
-const uint8_t DPMR_FS2_BYTES_LENGTH = 3U;
-
-const uint8_t DPMR_FS3_BYTES[]      = {0x7DU, 0xDFU, 0xF5U};
-const uint8_t DPMR_FS3_BYTES_LENGTH = 3U;
-
-const uint8_t DPMR_FS4_BYTES[]      = {0xFDU, 0x55U, 0xF5U, 0xDFU, 0x7FU, 0xDDU};
-const uint8_t DPMR_FS4_BYTES_LENGTH = 6U;
-
-const uint64_t DPMR_FS1_BITS      = 0x000057FF5F75D577U;
-const uint64_t DPMR_FS1_BITS_MASK = 0x0000FFFFFFFFFFFFU;
-
-const uint64_t DPMR_FS2_BITS      = 0x00000000005FF77DU;
-const uint64_t DPMR_FS2_BITS_MASK = 0x0000000000FFFFFFU;
-
-const uint64_t DPMR_FS3_BITS      = 0x00000000007DDFF5U;
-const uint64_t DPMR_FS3_BITS_MASK = 0x0000000000FFFFFFU;
-
-const uint64_t DPMR_FS4_BITS      = 0x0000FD55F5DF7FDDU;
-const uint64_t DPMR_FS4_BITS_MASK = 0x0000FFFFFFFFFFFFU;
-
-// FS1
-// 5     5      F     F      5     F      7     5      D     5      7     7
-// 01 01 01 11  11 11 11 11  01 01 11 11  01 11 01 01  11 01 01 01  01 11 01 11
-// +3 +3 +3 -3  -3 -3 -3 -3  +3 +3 -3 -3  +3 -3 +3 +3  -3 +3 +3 +3  +3 -3 +3 -3
-
-const int8_t DPMR_FS1_SYMBOLS_VALUES[] = {+3, +3, +3, -3, -3, -3, -3, -3, +3, +3, -3, -3, +3, -3, +3, +3, -3, +3, +3, +3, +3, -3, +3, -3};
-
-const uint32_t DPMR_FS1_SYMBOLS      = 0x00E0CB7AU;
-const uint32_t DPMR_FS1_SYMBOLS_MASK = 0x00FFFFFFU;
-
-// FS2
-// 5     F      F     7      7     D
-// 01 01 11 11  11 11 01 11  01 11 11 01
-// +3 +3 -3 -3  -3 -3 +3 -3  +3 -3 -3 +3
-
-const int8_t DPMR_FS2_SYMBOLS_VALUES[] = {+3, +3, -3, -3, -3, -3, +3, -3, +3, -3, -3, +3};
-
-const uint32_t DPMR_FS2_SYMBOLS      = 0x00000C29U;
-const uint32_t DPMR_FS2_SYMBOLS_MASK = 0x00000FFFU;
-
-// FS3
-// 7     D      D     F      F     5
-// 01 11 11 01  11 01 11 11  11 11 01 01
-// +3 -3 -3 +3  -3 +3 -3 -3  -3 -3 +3 +3
-
-const int8_t DPMR_FS3_SYMBOLS_VALUES[] = {+3, -3, -3, +3, -3, +3, -3, -3, -3, -3, +3, +3};
-
-const uint32_t DPMR_FS3_SYMBOLS      = 0x00000943U;
-const uint32_t DPMR_FS3_SYMBOLS_MASK = 0x00000FFFU;
-
-// FS4
-// F     D      5     5      F     5      D     F      7     F      D     D
-// 11 11 11 01  01 01 01 01  11 11 01 01  11 01 11 11  01 11 11 11  11 01 11 01
-// -3 -3 -3 +3  +3 +3 +3 +3  -3 -3 +3 +3  -3 +3 -3 -3  +3 -3 -3 -3  -3 +3 -3 +3
-
-const int8_t DPMR_FS4_SYMBOLS_VALUES[] = {-3, -3, -3, +3, +3, +3, +3, +3, -3, -3, +3, +3, -3, +3, -3, -3, +3, -3, -3, -3, -3, +3, -3, +3};
-
-const uint32_t DPMR_FS4_SYMBOLS      = 0x001F3485U;
-const uint32_t DPMR_FS4_SYMBOLS_MASK = 0x00FFFFFFU;
-
-#endif
-

DPMRRX.cpp

@@ -1,687 +0,0 @@
-/*
- *   Copyright (C) 2009-2018,2020,2024 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
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include "Config.h"
-
-#if defined(MODE_DPMR)
-
-#include "Globals.h"
-#include "DPMRRX.h"
-#include "Utils.h"
-
-const q15_t SCALING_FACTOR = 18750;      // Q15(0.55)
-
-const uint8_t MAX_FS_BIT_START_ERRS = 1U;
-const uint8_t MAX_FS_BIT_RUN_ERRS   = 3U;
-
-const uint8_t MAX_FS_SYMBOLS_ERRS = 2U;
-
-const uint8_t BIT_MASK_TABLE[] = {0x80U, 0x40U, 0x20U, 0x10U, 0x08U, 0x04U, 0x02U, 0x01U};
-
-#define WRITE_BIT1(p,i,b) p[(i)>>3] = (b) ? (p[(i)>>3] | BIT_MASK_TABLE[(i)&7]) : (p[(i)>>3] & ~BIT_MASK_TABLE[(i)&7])
-
-const uint8_t NOAVEPTR = 99U;
-
-const uint16_t NOENDPTR = 9999U;
-
-const unsigned int MAX_FS_FRAMES = 5U + 1U;
-
-CDPMRRX::CDPMRRX() :
-m_state(DPMRRXS_NONE),
-m_bitBuffer(),
-m_buffer(),
-m_bitPtr(0U),
-m_dataPtr(0U),
-m_startPtr(NOENDPTR),
-m_endPtr(NOENDPTR),
-m_fsPtr(NOENDPTR),
-m_minFSPtr(NOENDPTR),
-m_maxFSPtr(NOENDPTR),
-m_maxCorr(0),
-m_lostCount(0U),
-m_countdown(0U),
-m_centre(),
-m_centreVal(0),
-m_threshold(),
-m_thresholdVal(0),
-m_averagePtr(NOAVEPTR),
-m_rssiAccum(0U),
-m_rssiCount(0U)
-{
-}
-
-void CDPMRRX::reset()
-{
-  m_state        = DPMRRXS_NONE;
-  m_dataPtr      = 0U;
-  m_bitPtr       = 0U;
-  m_maxCorr      = 0;
-  m_averagePtr   = NOAVEPTR;
-  m_startPtr     = NOENDPTR;
-  m_endPtr       = NOENDPTR;
-  m_fsPtr        = NOENDPTR;
-  m_minFSPtr     = NOENDPTR;
-  m_maxFSPtr     = NOENDPTR;
-  m_centreVal    = 0;
-  m_thresholdVal = 0;
-  m_lostCount    = 0U;
-  m_countdown    = 0U;
-  m_rssiAccum    = 0U;
-  m_rssiCount    = 0U;
-}
-
-void CDPMRRX::samples(const q15_t* samples, uint16_t* rssi, uint8_t length)
-{
-  for (uint8_t i = 0U; i < length; i++) {
-    q15_t sample = samples[i];
-
-    m_rssiAccum += rssi[i];
-    m_rssiCount++;
-
-    m_bitBuffer[m_bitPtr] <<= 1;
-    if (sample < 0)
-      m_bitBuffer[m_bitPtr] |= 0x01U;
-
-    m_buffer[m_dataPtr] = sample;
-
-    switch (m_state) {
-    case DPMRRXS_HEADER:
-      processHeader(sample);
-      break;
-    case DPMRRXS_DATA:
-      processData(sample);
-      break;
-    case DPMRRXS_EOT:
-      processEOT(sample);
-      break;
-    default:
-      processNone(sample);
-      break;
-    }
-
-    m_dataPtr++;
-    if (m_dataPtr >= DPMR_DATA_FRAME_LENGTH_SAMPLES)
-      m_dataPtr = 0U;
-
-    m_bitPtr++;
-    if (m_bitPtr >= DPMR_RADIO_SYMBOL_LENGTH)
-      m_bitPtr = 0U;
-  }
-}
-
-void CDPMRRX::processNone(q15_t sample)
-{
-  // Process the FS1/Header sync
-  bool ret = correlateFS1();
-  if (ret) {
-    // On the first sync, start the countdown to the state change
-    if (m_countdown == 0U) {
-      m_rssiAccum = 0U;
-      m_rssiCount = 0U;
-
-      io.setDecode(true);
-      io.setADCDetection(true);
-
-      m_averagePtr = NOAVEPTR;
-
-      m_countdown = 5U;
-    }
-  }
-
-  if (m_countdown > 0U)
-    m_countdown--;
-
-  if (m_countdown == 1U) {
-    m_minFSPtr = m_fsPtr + DPMR_HEADER_FRAME_LENGTH_SAMPLES - 1U;
-    if (m_minFSPtr >= DPMR_DATA_FRAME_LENGTH_SAMPLES)
-      m_minFSPtr -= DPMR_DATA_FRAME_LENGTH_SAMPLES;
-
-    m_maxFSPtr = m_fsPtr + 1U;
-    if (m_maxFSPtr >= DPMR_DATA_FRAME_LENGTH_SAMPLES)
-      m_maxFSPtr -= DPMR_DATA_FRAME_LENGTH_SAMPLES;
-
-    m_state     = DPMRRXS_HEADER;
-    m_countdown = 0U;
-  }
-
-  // Process the FS2/Data sync
-  ret = correlateFS2();
-  if (ret) {
-    // On the first sync, start the countdown to the state change
-    if (m_countdown == 0U) {
-      m_rssiAccum = 0U;
-      m_rssiCount = 0U;
-
-      io.setDecode(true);
-      io.setADCDetection(true);
-
-      m_averagePtr = NOAVEPTR;
-
-      m_countdown = 5U;
-    }
-  }
-
-  if (m_countdown > 0U)
-    m_countdown--;
-
-  if (m_countdown == 1U) {
-    m_minFSPtr = m_fsPtr + DPMR_DATA_FRAME_LENGTH_SAMPLES - 1U;
-    if (m_minFSPtr >= DPMR_DATA_FRAME_LENGTH_SAMPLES)
-      m_minFSPtr -= DPMR_DATA_FRAME_LENGTH_SAMPLES;
-
-    m_maxFSPtr = m_fsPtr + 1U;
-    if (m_maxFSPtr >= DPMR_DATA_FRAME_LENGTH_SAMPLES)
-      m_maxFSPtr -= DPMR_DATA_FRAME_LENGTH_SAMPLES;
-
-    m_state     = DPMRRXS_DATA;
-    m_countdown = 0U;
-  }
-
-  // Don't process FS3/End sync here
-}
-
-void CDPMRRX::processHeader(q15_t sample)
-{
-  if (m_dataPtr == m_endPtr) {
-    m_minFSPtr = m_fsPtr + DPMR_HEADER_FRAME_LENGTH_SAMPLES - 1U;
-    if (m_minFSPtr >= DPMR_DATA_FRAME_LENGTH_SAMPLES)
-      m_minFSPtr -= DPMR_DATA_FRAME_LENGTH_SAMPLES;
-
-    m_maxFSPtr = m_fsPtr + 1U;
-    if (m_maxFSPtr >= DPMR_DATA_FRAME_LENGTH_SAMPLES)
-      m_maxFSPtr -= DPMR_DATA_FRAME_LENGTH_SAMPLES;
-
-    calculateLevels(m_startPtr, DPMR_HEADER_FRAME_LENGTH_SYMBOLS);
-
-    DEBUG4("DPMRRX: FS1 sync found pos/centre/threshold", m_fsPtr, m_centreVal, m_thresholdVal);
-
-    uint8_t frame[DPMR_HEADER_FRAME_LENGTH_BYTES + 3U];
-    samplesToBits(m_startPtr, DPMR_HEADER_FRAME_LENGTH_SYMBOLS, frame, 8U, m_centreVal, m_thresholdVal);
-
-    frame[0U] = 0x01U;
-
-    writeRSSIHeader(frame);
-
-    m_state   = DPMRRXS_DATA;
-    m_maxCorr = 0;
-  }
-}
-
-void CDPMRRX::processData(q15_t sample)
-{
-  if (m_minFSPtr < m_maxFSPtr) {
-    if (m_dataPtr >= m_minFSPtr && m_dataPtr <= m_maxFSPtr) {
-      correlateFS2();
-      bool ret = correlateFS3();
-      if (ret)
-        m_state = DPMRRXS_EOT;
-    }
-  } else {
-    if (m_dataPtr >= m_minFSPtr || m_dataPtr <= m_maxFSPtr) {
-      correlateFS2();
-      bool ret = correlateFS3();
-      if (ret)
-        m_state = DPMRRXS_EOT;
-    }
-  }
-
-  if (m_dataPtr == m_endPtr) {
-    // Only update the centre and threshold if they are from a good sync
-    if (m_lostCount == MAX_FS2_FRAMES) {
-      m_minFSPtr = m_fsPtr + DPMR_DATA_FRAME_LENGTH_SAMPLES - 1U;
-      if (m_minFSPtr >= DPMR_DATA_FRAME_LENGTH_SAMPLES)
-        m_minFSPtr -= DPMR_DATA_FRAME_LENGTH_SAMPLES;
-
-      m_maxFSPtr = m_fsPtr + 1U;
-      if (m_maxFSPtr >= DPMR_DATA_FRAME_LENGTH_SAMPLES)
-        m_maxFSPtr -= DPMR_DATA_FRAME_LENGTH_SAMPLES;
-    }
-
-    calculateLevels(m_startPtr, DPMR_DATA_FRAME_LENGTH_SYMBOLS);
-
-    DEBUG4("DPMRRX: FS2 sync found pos/centre/threshold", m_fsPtr, m_centreVal, m_thresholdVal);
-
-    uint8_t frame[DPMR_DATA_FRAME_LENGTH_BYTES + 3U];
-    samplesToBits(m_startPtr, DPMR_DATA_FRAME_LENGTH_SYMBOLS, frame, 8U, m_centreVal, m_thresholdVal);
-
-    // We've not seen a data sync for too long, signal RXLOST and change to RX_NONE
-    m_lostCount--;
-    if (m_lostCount == 0U) {
-      DEBUG1("DPMRRX: FS2 sync timed out, lost lock");
-
-      io.setDecode(false);
-      io.setADCDetection(false);
-
-      serial.writeDPMRLost();
-
-      m_state      = DPMRRXS_NONE;
-      m_endPtr     = NOENDPTR;
-      m_averagePtr = NOAVEPTR;
-      m_countdown  = 0U;
-      m_maxCorr    = 0;
-    } else {
-      frame[0U] = m_lostCount == (MAX_FS2_FRAMES - 1U) ? 0x01U : 0x00U;
-      writeRSSIData(frame);
-      m_maxCorr = 0;
-    }
-  }
-}
-
-void CDPMRRX::processEnd(q15_t sample)
-{
-  if (m_dataPtr == m_endPtr) {
-    calculateLevels(m_startPtr, DPMR_END_FRAME_LENGTH_SYMBOLS);
-
-    DEBUG4("DPMRRX: FS3 sync found pos/centre/threshold", m_fsPtr, m_centreVal, m_thresholdVal);
-
-    uint8_t frame[DPMR_END_FRAME_LENGTH_BYTES + 3U];
-    samplesToBits(m_startPtr, DPMR_END_FRAME_LENGTH_SYMBOLS, frame, 8U, m_centreVal, m_thresholdVal);
-
-    frame[0U] = 0x01U;
-
-    io.setDecode(false);
-    io.setADCDetection(false);
-
-    writeRSSIEnd(frame);
-
-    m_state      = DPMRRXS_NONE;
-    m_endPtr     = NOENDPTR;
-    m_averagePtr = NOAVEPTR;
-    m_countdown  = 0U;
-    m_maxCorr    = 0;
-  }
-}
-
-bool CDPMRRX::correlateFS1()
-{
-  if (countBits32(m_bitBuffer[m_bitPtr] ^ DPMR_FS1_SYMBOLS) <= MAX_FS1_SYMBOLS_ERRS) {
-    uint16_t ptr = m_dataPtr + DPMR_HEADER_FRAME_LENGTH_SAMPLES - DPMR_FS1_LENGTH_SAMPLES + DPMR_RADIO_SYMBOL_LENGTH;
-    if (ptr >= DPMR_DATA_FRAME_LENGTH_SAMPLES)
-      ptr -= DPMR_DATA_FRAME_LENGTH_SAMPLES;
-
-    q31_t corr = 0;
-    q15_t min =  16000;
-    q15_t max = -16000;
-
-    for (uint8_t i = 0U; i < DPMR_FS1_LENGTH_SYMBOLS; i++) {
-      q15_t val = m_buffer[ptr];
-
-      if (val > max)
-        max = val;
-      if (val < min)
-        min = val;
-
-      switch (DPMR_FS1_SYMBOLS_VALUES[i]) {
-      case +3:
-        corr -= (val + val + val);
-        break;
-      case +1:
-        corr -= val;
-        break;
-      case -1:
-        corr += val;
-        break;
-      default:  // -3
-        corr += (val + val + val);
-        break;
-      }
-
-      ptr += DPMR_RADIO_SYMBOL_LENGTH;
-      if (ptr >= DPMR_DATA_FRAME_LENGTH_SAMPLES)
-        ptr -= DPMR_DATA_FRAME_LENGTH_SAMPLES;
-    }
-
-    if (corr > m_maxCorr) {
-      if (m_averagePtr == NOAVEPTR) {
-        m_centreVal = (max + min) >> 1;
-
-        q31_t v1 = (max - m_centreVal) * SCALING_FACTOR;
-        m_thresholdVal = q15_t(v1 >> 15);
-      }
-
-      uint16_t startPtr = m_dataPtr + DPMR_HEADER_FRAME_LENGTH_SAMPLES - DPMR_FS1_LENGTH_SAMPLES + DPMR_RADIO_SYMBOL_LENGTH;
-      if (startPtr >= DPMR_DATA_FRAME_LENGTH_SAMPLES)
-        startPtr -= DPMR_DATA_FRAME_LENGTH_SAMPLES;
-
-      uint8_t sync[DPMR_FS1_BYTES_LENGTH];
-      samplesToBits(startPtr, DPMR_FS1_LENGTH_SYMBOLS, sync, 0U, m_centreVal, m_thresholdVal);
-
-     uint8_t errs = 0U;
-      for (uint8_t i = 0U; i < DPMR_FS1_BYTES_LENGTH; i++)
-        errs += countBits8(sync[i] ^ DPMR_FS1_BYTES[i]);
-
-      if (errs <= MAX_FS1_BIT_START_ERRS) {
-        m_maxCorr   = corr;
-        m_lostCount = MAX_FS1_FRAMES;
-        m_fsPtr     = m_dataPtr;
-
-        m_startPtr = startPtr;
-
-        m_endPtr = m_dataPtr + DPMR_HEADER_FRAME_LENGTH_SAMPLES - DPMR_FS1_LENGTH_SAMPLES - 1U;
-        if (m_endPtr >= DPMR_DATA_FRAME_LENGTH_SAMPLES)
-          m_endPtr -= DPMR_DATA_FRAME_LENGTH_SAMPLES;
-
-        return true;
-      }
-    }
-  }
-
-  return false;
-}
-
-bool CDPMRRX::correlateFS2()
-{
-  if (countBits32(m_bitBuffer[m_bitPtr] ^ DPMR_FS2_SYMBOLS) <= MAX_FS2_SYMBOLS_ERRS) {
-    uint16_t ptr = m_dataPtr + DPMR_DATA_FRAME_LENGTH_SAMPLES - DPMR_FS2_LENGTH_SAMPLES + DPMR_RADIO_SYMBOL_LENGTH;
-    if (ptr >= DPMR_DATA_FRAME_LENGTH_SAMPLES)
-      ptr -= DPMR_DATA_FRAME_LENGTH_SAMPLES;
-
-    q31_t corr = 0;
-    q15_t min =  16000;
-    q15_t max = -16000;
-
-    for (uint8_t i = 0U; i < DPMR_FS2_LENGTH_SYMBOLS; i++) {
-      q15_t val = m_buffer[ptr];
-
-      if (val > max)
-        max = val;
-      if (val < min)
-        min = val;
-
-      switch (DPMR_FS2_SYMBOLS_VALUES[i]) {
-      case +3:
-        corr -= (val + val + val);
-        break;
-      case +1:
-        corr -= val;
-        break;
-      case -1:
-        corr += val;
-        break;
-      default:  // -3
-        corr += (val + val + val);
-        break;
-      }
-
-      ptr += DPMR_RADIO_SYMBOL_LENGTH;
-      if (ptr >= DPMR_DATA_FRAME_LENGTH_SAMPLES)
-        ptr -= DPMR_DATA_FRAME_LENGTH_SAMPLES;
-    }
-
-    if (corr > m_maxCorr) {
-      if (m_averagePtr == NOAVEPTR) {
-        m_centreVal = (max + min) >> 1;
-
-        q31_t v1 = (max - m_centreVal) * SCALING_FACTOR;
-        m_thresholdVal = q15_t(v1 >> 15);
-      }
-
-      uint16_t startPtr = m_dataPtr + DPMR_DATA_FRAME_LENGTH_SAMPLES - DPMR_FS2_LENGTH_SAMPLES + DPMR_RADIO_SYMBOL_LENGTH;
-      if (startPtr >= DPMR_DATA_FRAME_LENGTH_SAMPLES)
-        startPtr -= DPMR_DATA_FRAME_LENGTH_SAMPLES;
-
-      uint8_t sync[DPMR_FS2_BYTES_LENGTH];
-      samplesToBits(startPtr, DPMR_FS2_LENGTH_SYMBOLS, sync, 0U, m_centreVal, m_thresholdVal);
-
-      uint8_t maxErrs;
-      if (m_state == DPMRRXS_NONE)
-        maxErrs = MAX_FS2_BIT_START_ERRS;
-      else
-        maxErrs = MAX_FS2_BIT_RUN_ERRS;
-
-     uint8_t errs = 0U;
-      for (uint8_t i = 0U; i < DPMR_FS2_BYTES_LENGTH; i++)
-        errs += countBits8(sync[i] ^ DPMR_FS2_BYTES[i]);
-
-      if (errs <= maxErrs) {
-        m_maxCorr   = corr;
-        m_lostCount = MAX_FS2_FRAMES;
-        m_fsPtr     = m_dataPtr;
-
-        m_startPtr = startPtr;
-
-        m_endPtr = m_dataPtr + DPMR_DATA_FRAME_LENGTH_SAMPLES - DPMR_FS2_LENGTH_SAMPLES - 1U;
-        if (m_endPtr >= DPMR_DATA_FRAME_LENGTH_SAMPLES)
-          m_endPtr -= DPMR_DATA_FRAME_LENGTH_SAMPLES;
-
-        return true;
-      }
-    }
-  }
-
-  return false;
-}
-
-bool CDPMRRX::correlateFS3()
-{
-  if (countBits32(m_bitBuffer[m_bitPtr] ^ DPMR_FS3_SYMBOLS) <= MAX_FS3_SYMBOLS_ERRS) {
-    uint16_t ptr = m_dataPtr + DPMR_END_FRAME_LENGTH_SAMPLES - DPMR_FS3_LENGTH_SAMPLES + DPMR_RADIO_SYMBOL_LENGTH;
-    if (ptr >= DPMR_DATA_FRAME_LENGTH_SAMPLES)
-      ptr -= DPMR_DATA_FRAME_LENGTH_SAMPLES;
-
-    q31_t corr = 0;
-    q15_t min =  16000;
-    q15_t max = -16000;
-
-    for (uint8_t i = 0U; i < DPMR_FS3_LENGTH_SYMBOLS; i++) {
-      q15_t val = m_buffer[ptr];
-
-      if (val > max)
-        max = val;
-      if (val < min)
-        min = val;
-
-      switch (DPMR_FS3_SYMBOLS_VALUES[i]) {
-      case +3:
-        corr -= (val + val + val);
-        break;
-      case +1:
-        corr -= val;
-        break;
-      case -1:
-        corr += val;
-        break;
-      default:  // -3
-        corr += (val + val + val);
-        break;
-      }
-
-      ptr += DPMR_RADIO_SYMBOL_LENGTH;
-      if (ptr >= DPMR_DATA_FRAME_LENGTH_SAMPLES)
-        ptr -= DPMR_DATA_FRAME_LENGTH_SAMPLES;
-    }
-
-    if (corr > m_maxCorr) {
-      if (m_averagePtr == NOAVEPTR) {
-        m_centreVal = (max + min) >> 1;
-
-        q31_t v1 = (max - m_centreVal) * SCALING_FACTOR;
-        m_thresholdVal = q15_t(v1 >> 15);
-      }
-
-      uint16_t startPtr = m_dataPtr + DPMR_END_FRAME_LENGTH_SAMPLES - DPMR_FS3_LENGTH_SAMPLES + DPMR_RADIO_SYMBOL_LENGTH;
-      if (startPtr >= DPMR_DATA_FRAME_LENGTH_SAMPLES)
-        startPtr -= DPMR_DATA_FRAME_LENGTH_SAMPLES;
-
-      uint8_t sync[DPMR_FS1_BYTES_LENGTH];
-      samplesToBits(startPtr, DPMR_FS3_LENGTH_SYMBOLS, sync, 0U, m_centreVal, m_thresholdVal);
-
-      uint8_t errs = 0U;
-      for (uint8_t i = 0U; i < DPMR_FS3_BYTES_LENGTH; i++)
-        errs += countBits8(sync[i] ^ DPMR_FS3_BYTES[i]);
-
-      if (errs <= MAX_FS3_BIT_RUN_ERRS) {
-        m_maxCorr   = corr;
-        m_lostCount = MAX_FS3_FRAMES;
-        m_fsPtr     = m_dataPtr;
-
-        m_startPtr = startPtr;
-
-        m_endPtr = m_dataPtr + DPMR_END_FRAME_LENGTH_SAMPLES - DPMR_FS3_LENGTH_SAMPLES - 1U;
-        if (m_endPtr >= DPMR_DATA_FRAME_LENGTH_SAMPLES)
-          m_endPtr -= DPMR_DATA_FRAME_LENGTH_SAMPLES;
-
-        return true;
-      }
-    }
-  }
-
-  return false;
-}
-
-void CDPMRRX::calculateLevels(uint16_t start, uint16_t count)
-{
-  q15_t maxPos = -16000;
-  q15_t minPos =  16000;
-  q15_t maxNeg =  16000;
-  q15_t minNeg = -16000;
-
-  for (uint16_t i = 0U; i < count; i++) {
-    q15_t sample = m_buffer[start];
-
-    if (sample > 0) {
-      if (sample > maxPos)
-        maxPos = sample;
-      if (sample < minPos)
-        minPos = sample;
-    } else {
-      if (sample < maxNeg)
-        maxNeg = sample;
-      if (sample > minNeg)
-        minNeg = sample;
-    }
-
-    start += DPMR_RADIO_SYMBOL_LENGTH;
-    if (start >= DPMR_FRAME_LENGTH_SAMPLES)
-      start -= DPMR_FRAME_LENGTH_SAMPLES;
-  }
-
-  q15_t posThresh = (maxPos + minPos) >> 1;
-  q15_t negThresh = (maxNeg + minNeg) >> 1;
-
-  q15_t centre = (posThresh + negThresh) >> 1;
-
-  q15_t threshold = posThresh - centre;
-
-  DEBUG5("DPMRRX: pos/neg/centre/threshold", posThresh, negThresh, centre, threshold);
-
-  if (m_averagePtr == NOAVEPTR) {
-    for (uint8_t i = 0U; i < 16U; i++) {
-      m_centre[i] = centre;
-      m_threshold[i] = threshold;
-    }
-
-    m_averagePtr = 0U;
-  } else {
-    m_centre[m_averagePtr] = centre;
-    m_threshold[m_averagePtr] = threshold;
-
-    m_averagePtr++;
-    if (m_averagePtr >= 16U)
-      m_averagePtr = 0U;
-  }
-
-  m_centreVal = 0;
-  m_thresholdVal = 0;
-
-  for (uint8_t i = 0U; i < 16U; i++) {
-    m_centreVal += m_centre[i];
-    m_thresholdVal += m_threshold[i];
-  }
-
-  m_centreVal >>= 4;
-  m_thresholdVal >>= 4;
-}
-
-void CDPMRRX::samplesToBits(uint16_t start, uint16_t count, uint8_t* buffer, uint16_t offset, q15_t centre, q15_t threshold)
-{
-  for (uint16_t i = 0U; i < count; i++) {
-    q15_t sample = m_buffer[start] - centre;
-
-    if (sample < -threshold) {
-      WRITE_BIT1(buffer, offset, false);
-      offset++;
-      WRITE_BIT1(buffer, offset, true);
-      offset++;
-    } else if (sample < 0) {
-      WRITE_BIT1(buffer, offset, false);
-      offset++;
-      WRITE_BIT1(buffer, offset, false);
-      offset++;
-    } else if (sample < threshold) {
-      WRITE_BIT1(buffer, offset, true);
-      offset++;
-      WRITE_BIT1(buffer, offset, false);
-      offset++;
-    } else {
-      WRITE_BIT1(buffer, offset, true);
-      offset++;
-      WRITE_BIT1(buffer, offset, true);
-      offset++;
-    }
-
-    start += DPMR_RADIO_SYMBOL_LENGTH;
-    if (start >= DPMR_FRAME_LENGTH_SAMPLES)
-      start -= DPMR_FRAME_LENGTH_SAMPLES;
-  }
-}
-
-void CDPMRRX::writeRSSIHeader(uint8_t* data)
-{
-#if defined(SEND_RSSI_DATA)
-  if (m_rssiCount > 0U) {
-    uint16_t rssi = m_rssiAccum / m_rssiCount;
-
-    data[49U] = (rssi >> 8) & 0xFFU;
-    data[50U] = (rssi >> 0) & 0xFFU;
-
-    serial.writeDPMRHeader(data, DPMR_HEADER_FRAME_LENGTH_BYTES + 3U);
-  } else {
-    serial.writeDPMRHeader(data, DPMR_HEADER_FRAME_LENGTH_BYTES + 1U);
-  }
-#else
-  serial.writeDPMRHeader(data, DPMR_HEADER_FRAME_LENGTH_BYTES + 1U);
-#endif
-
-  m_rssiAccum = 0U;
-  m_rssiCount = 0U;
-}
-
-void CDPMRRX::writeRSSIData(uint8_t* data)
-{
-#if defined(SEND_RSSI_DATA)
-  if (m_rssiCount > 0U) {
-    uint16_t rssi = m_rssiAccum / m_rssiCount;
-
-    data[49U] = (rssi >> 8) & 0xFFU;
-    data[50U] = (rssi >> 0) & 0xFFU;
-
-    serial.writeDPMRData(data, DPMR_DATA_FRAME_LENGTH_BYTES + 3U);
-  } else {
-    serial.writeDPMRData(data, DPMR_DATA_FRAME_LENGTH_BYTES + 1U);
-  }
-#else
-  serial.writeDPMRData(data, DPMR_DATA_FRAME_LENGTH_BYTES + 1U);
-#endif
-
-  m_rssiAccum = 0U;
-  m_rssiCount = 0U;
-}
-
-#endif
-

DPMRRX.h

@@ -1,82 +0,0 @@
-/*
- *   Copyright (C) 2015,2016,2017,2018,2020,2024 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
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include "Config.h"
-
-#if defined(MODE_DPMR)
-
-#if !defined(DPMRRX_H)
-#define  DPMRRX_H
-
-#include "DPMRDefines.h"
-
-enum DPMRRX_STATE {
-  DPMRRXS_NONE,
-  DPMRRXS_HEADER,
-  DPMRRXS_DATA,
-  DPMRRXS_END
-};
-
-class CDPMRRX {
-public:
-  CDPMRRX();
-
-  void samples(const q15_t* samples, uint16_t* rssi, uint8_t length);
-
-  void reset();
-
-private:
-  DPMRRX_STATE m_state;
-  uint32_t     m_bitBuffer[DPMR_RADIO_SYMBOL_LENGTH];
-  q15_t        m_buffer[DPMR_DATA_FRAME_LENGTH_SAMPLES];
-  uint16_t     m_bitPtr;
-  uint16_t     m_dataPtr;
-  uint16_t     m_startPtr;
-  uint16_t     m_endPtr;
-  uint16_t     m_fsPtr;
-  uint16_t     m_minFSPtr;
-  uint16_t     m_maxFSPtr;
-  q31_t        m_maxCorr;
-  uint16_t     m_lostCount;
-  uint8_t      m_countdown;
-  q15_t        m_centre[16U];
-  q15_t        m_centreVal;
-  q15_t        m_threshold[16U];
-  q15_t        m_thresholdVal;
-  uint8_t      m_averagePtr;
-  uint32_t     m_rssiAccum;
-  uint16_t     m_rssiCount;
-
-  void processNone(q15_t sample);
-  void processHeader(q15_t sample);
-  void processData(q15_t sample);
-  void processEnd(q15_t sample);
-  bool correlateFS1();
-  bool correlateFS2();
-  bool correlateFS3();
-  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 writeRSSIData(uint8_t* data);
-  void writeRSSIEnd(uint8_t* data);
-};
-
-#endif
-
-#endif
-

DPMRTX.cpp

@@ -1,238 +0,0 @@
-/*
- *   Copyright (C) 2009-2018,2020,2024 by Jonathan Naylor G4KLX
- *   Copyright (C) 2017 by Andy Uribe CA6JAU
- *
- *   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
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include "Config.h"
-
-#if defined(MODE_DPMR)
-
-#include "Globals.h"
-#include "DPMRTX.h"
-
-#include "DPMRDefines.h"
-
-// Generated using rcosdesign(0.2, 8, 10, 'sqrt') in MATLAB
-static q15_t RRC_0_2_FILTER[] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 850, 592, 219, -234, -720, -1179, -1548, -1769, -1795, -1597, -1172,
-                                 -544, 237, 1092, 1927, 2637, 3120, 3286, 3073, 2454, 1447, 116, -1431, -3043, -4544, -5739, -6442,
-                                 -6483, -5735, -4121, -1633, 1669, 5651, 10118, 14822, 19484, 23810, 27520, 30367, 32156, 32767,
-                                 32156, 30367, 27520, 23810, 19484, 14822, 10118, 5651, 1669, -1633, -4121, -5735, -6483, -6442,
-                                 -5739, -4544, -3043, -1431, 116, 1447, 2454, 3073, 3286, 3120, 2637, 1927, 1092, 237, -544, -1172,
-                                 -1597, -1795, -1769, -1548, -1179, -720, -234, 219, 592, 850}; // numTaps = 90, L = 10
-const uint16_t RRC_0_2_FILTER_PHASE_LEN = 9U; // phaseLength = numTaps/L
-
-static q15_t DPMR_SINC_FILTER[] = {572, -1003, -253, 254, 740, 1290, 1902, 2527, 3090, 3517, 3747, 3747, 3517, 3090, 2527, 1902,
-                                   1290, 740, 254, -253, -1003, 572};
-const uint16_t DPMR_SINC_FILTER_LEN = 22U;
-
-const q15_t DPMR_LEVELA =  735;
-const q15_t DPMR_LEVELB =  245;
-const q15_t DPMR_LEVELC = -245;
-const q15_t DPMR_LEVELD = -735;
-
-const uint8_t DPMR_PREAMBLE[] = {0x57U, 0x75U, 0xFDU};
-const uint8_t DPMR_SYNC = 0x5FU;
-
-CDPMRTX::CDPMRTX() :
-m_buffer(TX_BUFFER_LEN),
-m_modFilter(),
-m_sincFilter(),
-m_modState(),
-m_sincState(),
-m_poBuffer(),
-m_poLen(0U),
-m_poPtr(0U),
-m_txDelay(240U),     // 200ms
-m_txHang(3000U),     // 5s
-m_txCount(0U)
-{
-  ::memset(m_modState, 0x00U, 16U * sizeof(q15_t));
-  ::memset(m_sincState, 0x00U, 70U * sizeof(q15_t));
-
-  m_modFilter.L           = DPMR_RADIO_SYMBOL_LENGTH;
-  m_modFilter.phaseLength = RRC_0_2_FILTER_PHASE_LEN;
-  m_modFilter.pCoeffs     = RRC_0_2_FILTER;
-  m_modFilter.pState      = m_modState;
-
-  m_sincFilter.numTaps = DPMR_SINC_FILTER_LEN;
-  m_sincFilter.pState  = m_sincState;
-  m_sincFilter.pCoeffs = DPMR_SINC_FILTER;
-}
-
-void CDPMRTX::process()
-{
-  if (m_poLen == 0U && m_buffer.getData() > 0U) {
-    if (!m_tx) {
-      for (uint16_t i = 0U; i < m_txDelay; i++)
-        m_poBuffer[m_poLen++] = DPMR_SYNC;
-      m_poBuffer[m_poLen++] = DPMR_PREAMBLE[0U];
-      m_poBuffer[m_poLen++] = DPMR_PREAMBLE[1U];
-      m_poBuffer[m_poLen++] = DPMR_PREAMBLE[2U];
-    } else {
-      for (uint8_t i = 0U; i < DPMR_FRAME_LENGTH_BYTES; i++) {
-        uint8_t c = 0U;
-        m_buffer.get(c);
-        m_poBuffer[m_poLen++] = c;
-      }
-    }
-
-    m_poPtr = 0U;
-  }
-
-  if (m_poLen > 0U) {
-    uint16_t space = io.getSpace();
-    
-    while (space > (4U * DPMR_RADIO_SYMBOL_LENGTH)) {
-      uint8_t c = m_poBuffer[m_poPtr++];
-      writeByte(c);
-
-      space -= 4U * DPMR_RADIO_SYMBOL_LENGTH;
-      if (m_duplex)
-        m_txCount = m_txHang;
-      
-      if (m_poPtr >= m_poLen) {
-        m_poPtr = 0U;
-        m_poLen = 0U;
-        return;
-      }
-    }
-  } else if (m_txCount > 0U) {
-    // Transmit silence until the hang timer has expired.
-    uint16_t space = io.getSpace();
-
-    while (space > (4U * DPMR_RADIO_SYMBOL_LENGTH)) {
-      writeSilence();
-
-      space -= 4U * DPMR_RADIO_SYMBOL_LENGTH;
-      m_txCount--;
-
-      if (m_txCount == 0U)
-        return;
-    }
-  }
-}
-
-uint8_t CDPMRTX::writeHeader(const uint8_t* data, uint16_t length)
-{
-  if (length != (DPMR_HEADER_FRAME_LENGTH_BYTES + 1U))
-    return 4U;
-
-  uint16_t space = m_buffer.getSpace();
-  if (space < DPMR_HEADER_FRAME_LENGTH_BYTES)
-    return 5U;
-
-  for (uint8_t i = 0U; i < DPMR_HEADER_FRAME_LENGTH_BYTES; i++)
-    m_buffer.put(data[i + 1U]);
-
-  return 0U;
-}
-
-uint8_t CDPMRTX::writeData(const uint8_t* data, uint16_t length)
-{
-  if (length != (DPMR_DATA_FRAME_LENGTH_BYTES + 1U))
-    return 4U;
-
-  uint16_t space = m_buffer.getSpace();
-  if (space < DPMR_DATA_FRAME_LENGTH_BYTES)
-    return 5U;
-
-  for (uint8_t i = 0U; i < DPMR_DATA_FRAME_LENGTH_BYTES; i++)
-    m_buffer.put(data[i + 1U]);
-
-  return 0U;
-}
-
-uint8_t CDPMRTX::writeEOT(const uint8_t* data, uint16_t length)
-{
-  if (length != (DPMR_END_FRAME_LENGTH_BYTES + 1U))
-    return 4U;
-
-  uint16_t space = m_buffer.getSpace();
-  if (space < DPMR_END_FRAME_LENGTH_BYTES)
-    return 5U;
-
-  for (uint8_t i = 0U; i < DPMR_END_FRAME_LENGTH_BYTES; i++)
-    m_buffer.put(data[i + 1U]);
-
-  return 0U;
-}
-
-void CDPMRTX::writeByte(uint8_t c)
-{
-  q15_t inBuffer[4U];
-  q15_t intBuffer[DPMR_RADIO_SYMBOL_LENGTH * 4U];
-  q15_t outBuffer[DPMR_RADIO_SYMBOL_LENGTH * 4U];
-
-  const uint8_t MASK = 0xC0U;
-
-  for (uint8_t i = 0U; i < 4U; i++, c <<= 2) {
-    switch (c & MASK) {
-      case 0xC0U:
-        inBuffer[i] = DPMR_LEVELA;
-        break;
-      case 0x80U:
-        inBuffer[i] = DPMR_LEVELB;
-        break;
-      case 0x00U:
-        inBuffer[i] = DPMR_LEVELC;
-        break;
-      default:
-        inBuffer[i] = DPMR_LEVELD;
-        break;
-    }
-  }
-
-  ::arm_fir_interpolate_q15(&m_modFilter, inBuffer, intBuffer, 4U);
-
-  ::arm_fir_fast_q15(&m_sincFilter, intBuffer, outBuffer, DPMR_RADIO_SYMBOL_LENGTH * 4U);
-
-  io.write(STATE_DPMR, outBuffer, DPMR_RADIO_SYMBOL_LENGTH * 4U);
-}
-
-void CDPMRTX::writeSilence()
-{
-  q15_t inBuffer[4U] = {0x00U, 0x00U, 0x00U, 0x00U};
-  q15_t intBuffer[DPMR_RADIO_SYMBOL_LENGTH * 4U];
-  q15_t outBuffer[DPMR_RADIO_SYMBOL_LENGTH * 4U];
-
-  ::arm_fir_interpolate_q15(&m_modFilter, inBuffer, intBuffer, 4U);
-
-  ::arm_fir_fast_q15(&m_sincFilter, intBuffer, outBuffer, DPMR_RADIO_SYMBOL_LENGTH * 4U);
-
-  io.write(STATE_DPMR, outBuffer, DPMR_RADIO_SYMBOL_LENGTH * 4U);
-}
-
-void CDPMRTX::setTXDelay(uint8_t delay)
-{
-  m_txDelay = 300U + uint16_t(delay) * 6U;        // 500ms + tx delay
-
-  if (m_txDelay > 1200U)
-    m_txDelay = 1200U;
-}
-
-uint8_t CDPMRTX::getSpace() const
-{
-  return m_buffer.getSpace() / DPMR_FRAME_LENGTH_BYTES;
-}
-
-void CDPMRTX::setParams(uint8_t txHang)
-{
-  m_txHang = txHang * 600U;
-}
-
-#endif
-

DPMRTX.h

@@ -1,64 +0,0 @@
-/*
- *   Copyright (C) 2015,2016,2017,2018,2020,2024 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
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include "Config.h"
-
-#if defined(MODE_DPMR)
-
-#if !defined(DPMRTX_H)
-#define  DPMRTX_H
-
-#include "RingBuffer.h"
-
-class CDPMRTX {
-public:
-  CDPMRTX();
-
-  uint8_t writeHeader(const uint8_t* data, uint16_t length);
-  uint8_t writeData(const uint8_t* data, uint16_t length);
-  uint8_t writeEOT(const uint8_t* data, uint16_t length);
-
-  void process();
-
-  void setTXDelay(uint8_t delay);
-
-  uint8_t getSpace() const;
-
-  void setParams(uint8_t txHang);
-
-private:
-  CRingBuffer<uint8_t>             m_buffer;
-  arm_fir_interpolate_instance_q15 m_modFilter;
-  arm_fir_instance_q15             m_sincFilter;
-  q15_t                            m_modState[16U];    // blockSize + phaseLength - 1, 4 + 9 - 1 plus some spare
-  q15_t                            m_sincState[70U];   // NoTaps + BlockSize - 1, 22 + 40 - 1 plus some spare
-  uint8_t                          m_poBuffer[1200U];
-  uint16_t                         m_poLen;
-  uint16_t                         m_poPtr;
-  uint16_t                         m_txDelay;
-  uint32_t                         m_txHang;
-  uint32_t                         m_txCount;
-
-  void writeByte(uint8_t c);
-  void writeSilence();
-};
-
-#endif
-
-#endif
-

DStarDefines.h

@@ -1,5 +1,5 @@
 /*
- *   Copyright (C) 2009-2015,2017,2020 by Jonathan Naylor G4KLX
+ *   Copyright (C) 2009-2015,2017 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
@@ -19,7 +19,7 @@
 #if !defined(DSTARDEFINES_H)
 #define  DSTARDEFINES_H
 
-const unsigned int DSTAR_RADIO_SYMBOL_LENGTH = 5U;      // At 24 kHz sample rate
+const unsigned int DSTAR_RADIO_SYMBOL_LENGTH = 10U;      // At 48 kHz sample rate
 
 const unsigned int DSTAR_HEADER_LENGTH_BYTES   = 41U;
 

DStarRX.cpp

@@ -1,5 +1,6 @@
+
 /*
- *   Copyright (C) 2009-2017,2020 by Jonathan Naylor G4KLX
+ *   Copyright (C) 2009-2017 by Jonathan Naylor G4KLX
  *   Copyright (C) 2017 by Andy Uribe CA6JAU
  *
  *   This program is free software; you can redistribute it and/or modify
@@ -18,9 +19,6 @@
  */
 
 #include "Config.h"
-
-#if defined(MODE_DSTAR)
-
 #include "Globals.h"
 #include "DStarRX.h"
 #include "Utils.h"
@@ -28,18 +26,18 @@
 const unsigned int MAX_FRAMES = 150U;
 
 // D-Star bit order version of 0x55 0x55 0x6E 0x0A
-const uint64_t FRAME_SYNC_DATA = 0x0000000000557650U;
-const uint64_t FRAME_SYNC_MASK = 0x0000000000FFFFFFU;
-const uint8_t  FRAME_SYNC_ERRS = 2U;
+const uint32_t FRAME_SYNC_DATA = 0x00557650U;
+const uint32_t FRAME_SYNC_MASK = 0x00FFFFFFU;
+const uint8_t  FRAME_SYNC_ERRS = 1U;
 
 // D-Star bit order version of 0x55 0x2D 0x16
-const uint64_t DATA_SYNC_DATA = 0x0000000000AAB468U;
-const uint64_t DATA_SYNC_MASK = 0x0000000000FFFFFFU;
+const uint32_t DATA_SYNC_DATA = 0x00AAB468U;
+const uint32_t DATA_SYNC_MASK = 0x00FFFFFFU;
 const uint8_t  DATA_SYNC_ERRS = 2U;
 
 // D-Star bit order version of 0x55 0x55 0xC8 0x7A
-const uint64_t END_SYNC_DATA = 0x0000AAAAAAAA135EU;
-const uint64_t END_SYNC_MASK = 0x0000FFFFFFFFFFFFU;
+const uint32_t END_SYNC_DATA = 0xAAAA135EU;
+const uint32_t END_SYNC_MASK = 0xFFFFFFFFU;
 const uint8_t  END_SYNC_ERRS = 1U;
 
 const uint8_t BIT_MASK_TABLE0[] = {0x7FU, 0xBFU, 0xDFU, 0xEFU, 0xF7U, 0xFBU, 0xFDU, 0xFEU};
@@ -324,7 +322,7 @@ void CDStarRX::processNone(q15_t sample)
   bool ret = correlateFrameSync();
   if (ret) {
     m_countdown = 5U;
-
+	
     m_headerBuffer[m_headerPtr] = sample;
     m_headerPtr++;
 
@@ -384,10 +382,10 @@ void CDStarRX::processHeader(q15_t sample)
     m_frameCount = 0U;
     m_dataPtr    = 0U;
 
-    m_startPtr   = 476U;
-    m_syncPtr    = 471U;
-    m_maxSyncPtr = 472U;
-    m_minSyncPtr = 470U;
+    m_startPtr   = 952U;
+    m_syncPtr    = 942U;
+    m_maxSyncPtr = 944U;
+    m_minSyncPtr = 940U;
 
     DEBUG5("DStarRX: calc start/sync/max/min", m_startPtr, m_syncPtr, m_maxSyncPtr, m_minSyncPtr);
 
@@ -398,7 +396,7 @@ void CDStarRX::processHeader(q15_t sample)
 void CDStarRX::processData()
 {
   // Fuzzy matching of the end frame sequences
-  if (countBits64((m_bitBuffer[m_bitPtr] & DSTAR_END_SYNC_MASK) ^ DSTAR_END_SYNC_DATA) <= END_SYNC_ERRS) {
+  if (countBits32((m_bitBuffer[m_bitPtr] & DSTAR_END_SYNC_MASK) ^ DSTAR_END_SYNC_DATA) <= END_SYNC_ERRS) {
     DEBUG1("DStarRX: Found end sync in Data");
 
     io.setDecode(false);
@@ -507,7 +505,7 @@ void CDStarRX::writeRSSIData(unsigned char* data)
 
 bool CDStarRX::correlateFrameSync()
 {
-  if (countBits64((m_bitBuffer[m_bitPtr] & DSTAR_FRAME_SYNC_MASK) ^ DSTAR_FRAME_SYNC_DATA) <= FRAME_SYNC_ERRS) {
+  if (countBits32((m_bitBuffer[m_bitPtr] & DSTAR_FRAME_SYNC_MASK) ^ DSTAR_FRAME_SYNC_DATA) <= FRAME_SYNC_ERRS) {
     uint16_t ptr = m_dataPtr + DSTAR_DATA_LENGTH_SAMPLES - DSTAR_FRAME_SYNC_LENGTH_SAMPLES + DSTAR_RADIO_SYMBOL_LENGTH;
     if (ptr >= DSTAR_DATA_LENGTH_SAMPLES)
       ptr -= DSTAR_DATA_LENGTH_SAMPLES;
@@ -543,7 +541,7 @@ bool CDStarRX::correlateDataSync()
   if (m_rxState == DSRXS_DATA)
     maxErrs = DATA_SYNC_ERRS;
 
-  if (countBits64((m_bitBuffer[m_bitPtr] & DSTAR_DATA_SYNC_MASK) ^ DSTAR_DATA_SYNC_DATA) <= maxErrs) {
+  if (countBits32((m_bitBuffer[m_bitPtr] & DSTAR_DATA_SYNC_MASK) ^ DSTAR_DATA_SYNC_DATA) <= maxErrs) {
     uint16_t ptr = m_dataPtr + DSTAR_DATA_LENGTH_SAMPLES - DSTAR_DATA_SYNC_LENGTH_SAMPLES + DSTAR_RADIO_SYMBOL_LENGTH;
     if (ptr >= DSTAR_DATA_LENGTH_SAMPLES)
       ptr -= DSTAR_DATA_LENGTH_SAMPLES;
@@ -819,6 +817,3 @@ bool CDStarRX::checksum(const uint8_t* header) const
 
   return crc8[0U] == header[DSTAR_HEADER_LENGTH_BYTES - 2U] && crc8[1U] == header[DSTAR_HEADER_LENGTH_BYTES - 1U];
 }
-
-#endif
-

DStarRX.h

@@ -1,5 +1,5 @@
 /*
- *   Copyright (C) 2015,2016,2017,2020 by Jonathan Naylor G4KLX
+ *   Copyright (C) 2015,2016,2017 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
@@ -16,13 +16,10 @@
  *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include "Config.h"
-
-#if defined(MODE_DSTAR)
-
 #if !defined(DSTARRX_H)
 #define  DSTARRX_H
 
+#include "Config.h"
 #include "DStarDefines.h"
 
 enum DSRX_STATE {
@@ -41,7 +38,7 @@ public:
 
 private:
   DSRX_STATE   m_rxState;
-  uint64_t     m_bitBuffer[DSTAR_RADIO_SYMBOL_LENGTH];
+  uint32_t     m_bitBuffer[DSTAR_RADIO_SYMBOL_LENGTH];
   q15_t        m_headerBuffer[DSTAR_FEC_SECTION_LENGTH_SAMPLES + 2U * DSTAR_RADIO_SYMBOL_LENGTH];
   q15_t        m_dataBuffer[DSTAR_DATA_LENGTH_SAMPLES];
   uint16_t     m_bitPtr;
@@ -82,5 +79,3 @@ private:
 
 #endif
 
-#endif
-

DStarTX.cpp

@@ -1,5 +1,5 @@
 /*
- *   Copyright (C) 2009-2017,2020 by Jonathan Naylor G4KLX
+ *   Copyright (C) 2009-2017 by Jonathan Naylor G4KLX
  *   Copyright (C) 2017 by Andy Uribe CA6JAU
  *
  *   This program is free software; you can redistribute it and/or modify
@@ -18,9 +18,6 @@
  */
 
 #include "Config.h"
-
-#if defined(MODE_DSTAR)
-
 #include "Globals.h"
 #include "DStarTX.h"
 
@@ -30,8 +27,10 @@ const uint8_t BIT_SYNC = 0xAAU;
 
 const uint8_t FRAME_SYNC[] = {0xEAU, 0xA6U, 0x00U};
 
-// Generated using gaussfir(0.35, 1, 5) in MATLAB
-static q15_t GAUSSIAN_0_35_FILTER[] = {0, 0, 0, 0, 1001, 3514, 9333, 18751, 28499, 32767, 28499, 18751, 9333, 3514, 1001}; // numTaps = 15, L = 5
+// Generated using gaussfir(0.35, 1, 10) in MATLAB
+static q15_t GAUSSIAN_0_35_FILTER[] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1001, 1942, 3514, 5930,
+                                      9333, 13699, 18751, 23938, 28499, 31644, 32767, 31644,
+                                      28499, 23938, 18751, 13699, 9333, 5930, 3514, 1942, 1001}; // numTaps = 30, L = 10
 const uint16_t GAUSSIAN_0_35_FILTER_PHASE_LEN = 3U; // phaseLength = numTaps/L
 
 const q15_t DSTAR_LEVEL0 = -841;
@@ -199,7 +198,7 @@ m_poLen(0U),
 m_poPtr(0U),
 m_txDelay(60U)       // 100ms
 {
-  ::memset(m_modState, 0x00U, 20U * sizeof(q15_t));
+  ::memset(m_modState, 0x00U, 15U * sizeof(q15_t));
 
   m_modFilter.L           = DSTAR_RADIO_SYMBOL_LENGTH;
   m_modFilter.phaseLength = GAUSSIAN_0_35_FILTER_PHASE_LEN;
@@ -220,12 +219,11 @@ void CDStarTX::process()
         m_poBuffer[m_poLen++] = BIT_SYNC;
     } else {
       // Pop the type byte off
-      uint8_t dummy;
-      m_buffer.get(dummy);
+      m_buffer.get();
 
       uint8_t header[DSTAR_HEADER_LENGTH_BYTES];
       for (uint8_t i = 0U; i < DSTAR_HEADER_LENGTH_BYTES; i++)
-        m_buffer.get(header[i]);
+        header[i] = m_buffer.get();
 
       uint8_t buffer[86U];
       txHeader(header, buffer + 2U);
@@ -243,19 +241,17 @@ void CDStarTX::process()
  
   if (type == DSTAR_DATA && m_poLen == 0U) {
     // Pop the type byte off
-    uint8_t dummy;
-    m_buffer.get(dummy);
+    m_buffer.get();
 
     for (uint8_t i = 0U; i < DSTAR_DATA_LENGTH_BYTES; i++)
-      m_buffer.get(m_poBuffer[m_poLen++]);
+      m_poBuffer[m_poLen++] = m_buffer.get();
 
     m_poPtr = 0U;
   }
 
   if (type == DSTAR_EOT && m_poLen == 0U) {
     // Pop the type byte off
-    uint8_t dummy;
-    m_buffer.get(dummy);
+    m_buffer.get();
 
     for (uint8_t j = 0U; j < 3U; j++) {
       for (uint8_t i = 0U; i < DSTAR_END_SYNC_LENGTH_BYTES; i++)
@@ -283,7 +279,7 @@ void CDStarTX::process()
   }
 }
 
-uint8_t CDStarTX::writeHeader(const uint8_t* header, uint16_t length)
+uint8_t CDStarTX::writeHeader(const uint8_t* header, uint8_t length)
 {
   if (length != DSTAR_HEADER_LENGTH_BYTES)
     return 4U;
@@ -302,7 +298,7 @@ uint8_t CDStarTX::writeHeader(const uint8_t* header, uint16_t length)
   return 0U;
 }
 
-uint8_t CDStarTX::writeData(const uint8_t* data, uint16_t length)
+uint8_t CDStarTX::writeData(const uint8_t* data, uint8_t length)
 {
   if (length != DSTAR_DATA_LENGTH_BYTES)
     return 4U;
@@ -394,7 +390,7 @@ void CDStarTX::txHeader(const uint8_t* in, uint8_t* out) const
     if (i < 660U) {
       if (d & 0x08U)
         out[INTERLEAVE_TABLE_TX[i * 2U]] |= (0x01U << INTERLEAVE_TABLE_TX[i * 2U + 1U]);
-      i++;
+        i++;
 
       if (d & 0x04U)
         out[INTERLEAVE_TABLE_TX[i * 2U]] |= (0x01U << INTERLEAVE_TABLE_TX[i * 2U + 1U]);
@@ -449,5 +445,3 @@ uint8_t CDStarTX::getSpace() const
   return m_buffer.getSpace() / (DSTAR_DATA_LENGTH_BYTES + 1U);
 }
 
-#endif
-

DStarTX.h

@@ -1,5 +1,5 @@
 /*
- *   Copyright (C) 2015,2016,2017,2020 by Jonathan Naylor G4KLX
+ *   Copyright (C) 2015,2016,2017 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
@@ -16,21 +16,19 @@
  *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include "Config.h"
-
-#if defined(MODE_DSTAR)
-
 #if !defined(DSTARTX_H)
 #define  DSTARTX_H
 
-#include "RingBuffer.h"
+#include "Config.h"
+
+#include "SerialRB.h"
 
 class CDStarTX {
 public:
   CDStarTX();
 
-  uint8_t writeHeader(const uint8_t* header, uint16_t length);
-  uint8_t writeData(const uint8_t* data, uint16_t length);
+  uint8_t writeHeader(const uint8_t* header, uint8_t length);
+  uint8_t writeData(const uint8_t* data, uint8_t length);
   uint8_t writeEOT();
 
   void process();
@@ -40,9 +38,9 @@ public:
   uint8_t getSpace() const;
 
 private:
-  CRingBuffer<uint8_t>             m_buffer;
+  CSerialRB                        m_buffer;
   arm_fir_interpolate_instance_q15 m_modFilter;
-  q15_t                            m_modState[20U];    // blockSize + phaseLength - 1, 8 + 9 - 1 plus some spare
+  q15_t                            m_modState[15U];    // blockSize + phaseLength - 1, 8 + 3 - 1 plus some spare
   uint8_t                          m_poBuffer[600U];
   uint16_t                         m_poLen;
   uint16_t                         m_poPtr;
@@ -54,5 +52,3 @@ private:
 
 #endif
 
-#endif
-

Debug.h

@@ -1,5 +1,5 @@
 /*
- *   Copyright (C) 2015,2016,2017,2021 by Jonathan Naylor G4KLX
+ *   Copyright (C) 2015,2016,2017 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
@@ -27,7 +27,6 @@
 #define  DEBUG3(a,b,c)      serial.writeDebug((a),(b),(c))
 #define  DEBUG4(a,b,c,d)    serial.writeDebug((a),(b),(c),(d))
 #define  DEBUG5(a,b,c,d,e)  serial.writeDebug((a),(b),(c),(d),(e))
-#define  DEBUG_DUMP(a,b)    serial.writeDebugDump((a),(b))
 
 #endif
 

FM.h

@@ -1,158 +0,0 @@
-/*
- *   Copyright (C) 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
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include "Config.h"
-
-#if defined(MODE_FM)
-
-#if !defined(FM_H)
-#define  FM_H
-
-#include "FMBlanking.h"
-#include "FMCTCSSRX.h"
-#include "FMCTCSSTX.h"
-#include "FMTimeout.h"
-#include "FMKeyer.h"
-#include "FMTimer.h"
-#include "RingBuffer.h"
-#include "FMDirectForm1.h"
-#include "FMDownSampler.h"
-#include "FMUpSampler.h"
-#include "FMNoiseSquelch.h"
-
-enum FM_STATE {
-  FS_LISTENING,
-  FS_KERCHUNK_RF,
-  FS_RELAYING_RF,
-  FS_RELAYING_WAIT_RF,
-  FS_TIMEOUT_RF,
-  FS_TIMEOUT_WAIT_RF,
-  FS_KERCHUNK_EXT,
-  FS_RELAYING_EXT,
-  FS_RELAYING_WAIT_EXT,
-  FS_TIMEOUT_EXT,
-  FS_TIMEOUT_WAIT_EXT,
-  FS_HANG
-};
-
-
-class CFM {
-public:
-  CFM();
-
-  void samples(bool cos, q15_t* samples, uint8_t length);
-
-  void process();
-
-  void reset();
-
-  uint8_t setCallsign(const char* callsign, uint8_t speed, uint16_t frequency, uint8_t time, uint8_t holdoff, uint8_t highLevel, uint8_t lowLevel, bool callsignAtStart, bool callsignAtEnd, bool callsignAtLatch);
-  uint8_t setAck(const char* rfAck, uint8_t speed, uint16_t frequency, uint8_t minTime, uint16_t delay, uint8_t level);
-  uint8_t setMisc(uint16_t timeout, uint8_t timeoutLevel, uint8_t ctcssFrequency, uint8_t ctcssHighThreshold, uint8_t ctcssLowThreshold, uint8_t ctcssLevel, uint8_t kerchunkTime, uint8_t hangTime, uint8_t accessMode, bool linkMode, bool cosInvert, bool noiseSquelch, uint8_t squelchHighThreshold, uint8_t squelchLowThreshold, uint8_t rfAudioBoost, uint8_t maxDev, uint8_t rxLevel);
-  uint8_t setExt(const char* ack, uint8_t audioBoost, uint8_t speed, uint16_t frequency, uint8_t level);
-
-  uint8_t getSpace() const;
-
-  uint8_t writeData(const uint8_t* data, uint8_t length);
-
-private:
-  CFMKeyer             m_callsign;
-  CFMKeyer             m_rfAck;
-  CFMKeyer             m_extAck;
-  CFMCTCSSRX           m_ctcssRX;
-  CFMCTCSSTX           m_ctcssTX;
-  CFMNoiseSquelch      m_squelch;
-  CFMTimeout           m_timeoutTone;
-  FM_STATE             m_state;
-  bool                 m_callsignAtStart;
-  bool                 m_callsignAtEnd;
-  bool                 m_callsignAtLatch;
-  CFMTimer             m_callsignTimer;
-  CFMTimer             m_timeoutTimer;
-  CFMTimer             m_holdoffTimer;
-  CFMTimer             m_kerchunkTimer;
-  CFMTimer             m_ackMinTimer;
-  CFMTimer             m_ackDelayTimer;
-  CFMTimer             m_hangTimer;
-  CFMTimer             m_statusTimer;
-  CFMTimer             m_reverseTimer;
-  bool                 m_needReverse;
-  CFMDirectFormI       m_filterStage1;
-  CFMDirectFormI       m_filterStage2;
-  CFMDirectFormI       m_filterStage3;
-  CFMBlanking          m_blanking;
-  uint8_t              m_accessMode;
-  bool                 m_linkMode;
-  bool                 m_cosInvert;
-  bool                 m_noiseSquelch;
-  q15_t                m_rfAudioBoost;
-  q15_t                m_extAudioBoost;
-  CFMDownSampler       m_downSampler;
-  bool                 m_extEnabled;
-  q15_t                m_rxLevel;
-  CRingBuffer<q15_t>   m_inputRFRB;
-  CRingBuffer<q15_t>   m_outputRFRB;
-  CFMUpSampler         m_inputExtRB;
-  bool                 m_rfSignal;
-  bool                 m_extSignal;
-
-  void stateMachine(bool validRFSignal, bool validExtSignal);
-
-  void repeaterSamples(bool cos, q15_t* samples, uint8_t length);
-  void linkSamples(bool cos, q15_t* samples, uint8_t length);
-
-  void duplexStateMachine(bool validRFSignal, bool validExtSignal);
-  void listeningStateDuplex(bool validRFSignal, bool validExtSignal);
-  void kerchunkRFStateDuplex(bool validSignal);
-  void relayingRFStateDuplex(bool validSignal);
-  void relayingRFWaitStateDuplex(bool validSignal);
-  void timeoutRFStateDuplex(bool validSignal);
-  void timeoutRFWaitStateDuplex(bool validSignal);
-  void kerchunkExtStateDuplex(bool validSignal);
-  void relayingExtStateDuplex(bool validSignal);
-  void relayingExtWaitStateDuplex(bool validSignal);
-  void timeoutExtStateDuplex(bool validSignal);
-  void timeoutExtWaitStateDuplex(bool validSignal);
-  void hangStateDuplex(bool validRFSignal, bool validExtSignal);
-
-  void simplexStateMachine(bool validRFSignal, bool validExtSignal);
-  void listeningStateSimplex(bool validRFSignal, bool validExtSignal);
-  void relayingRFStateSimplex(bool validSignal);
-  void relayingRFWaitStateSimplex(bool validSignal);
-  void timeoutRFStateSimplex(bool validSignal);
-  void timeoutRFWaitStateSimplex(bool validSignal);
-  void relayingExtStateSimplex(bool validSignal);
-  void relayingExtWaitStateSimplex(bool validSignal);
-  void timeoutExtStateSimplex(bool validSignal);
-  void timeoutExtWaitStateSimplex(bool validSignal);
-
-  void linkStateMachine(bool validRFSignal, bool validExtSignal);
-
-  void clock(uint8_t length);
-
-  void sendCallsign();
-  void beginRelaying();
-
-  void insertDelay(uint16_t ms);
-  void insertSilence(uint16_t ms);
-};
-
-#endif
-
-#endif
-

FMBlanking.cpp

@@ -1,88 +0,0 @@
-/*
- *   Copyright (C) 2020 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
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include "Config.h"
-
-#if defined(MODE_FM)
-
-#include "Globals.h"
-#include "FMBlanking.h"
-
-// 2000 Hz sine wave at 24000 Hz sample rate
-const q31_t TONE[] = {0, 16384, 28378, 32767, 28378, 16384, 0, -16383, -28377, -32767, -28377, -16383};
-
-const uint8_t TONE_LEN = 12U;
-
-const uint32_t BLEEP_LEN = 2400U;   // 100ms
-
-CFMBlanking::CFMBlanking() :
-m_posValue(0),
-m_negValue(0),
-m_level(128 * 128),
-m_running(false),
-m_pos(0U),
-m_n(0U)
-{
-}
-
-void CFMBlanking::setParams(uint8_t value, uint8_t level)
-{
-  m_posValue = q15_t(value * 128);
-  m_negValue = -m_posValue;
-
-  m_level = q15_t(level * 128);
-}
-
-q15_t CFMBlanking::process(q15_t sample)
-{
-  if (m_posValue == 0)
-    return sample;
-
-  if (!m_running) {
-    if (sample >= m_posValue) {
-      m_running = true;
-      m_pos = 0U;
-      m_n   = 0U;
-    } else if (sample <= m_negValue) {
-      m_running = true;
-      m_pos = 0U;
-      m_n   = 0U;
-    }
-  }
-
-  if (!m_running)
-    return sample;
-
-  if (m_pos <= BLEEP_LEN) {
-    q31_t value = TONE[m_n++] * m_level;
-    sample = q15_t(__SSAT((value >> 15), 16));
-    if (m_n >= TONE_LEN)
-      m_n = 0U;
-  } else {
-    sample = 0;
-  }
-
-  m_pos++;
-  if (m_pos >= 12000U)
-    m_running = false;
-
-  return sample;
-}
-
-#endif
-

FMBlanking.h

@@ -1,46 +0,0 @@
-/*
- *   Copyright (C) 2020 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
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include "Config.h"
-
-#if defined(MODE_FM)
-
-#if !defined(FMBlanking_H)
-#define  FMBlanking_H
-
-class CFMBlanking {
-public:
-  CFMBlanking();
-
-  void setParams(uint8_t value, uint8_t level);
-
-  q15_t process(q15_t sample);
-
-private:
-  q15_t    m_posValue;
-  q15_t    m_negValue;
-  q15_t    m_level;
-  bool     m_running;
-  uint32_t m_pos;
-  uint8_t  m_n;
-};
-
-#endif
-
-#endif
-

FMCTCSSRX.cpp

@@ -1,181 +0,0 @@
-/*
- *   Copyright (C) 2020 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
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include "Config.h"
-
-#if defined(MODE_FM)
-
-#include "Globals.h"
-#include "FMCTCSSRX.h"
-
-const struct RX_CTCSS_TABLE {
-  uint8_t frequency;
-  q63_t   coeffDivTwo;
-} RX_CTCSS_TABLE_DATA[] = {
-  { 67U, 2147153298},
-  { 69U, 2147130228},
-  { 71U, 2147103212},
-  { 74U, 2147076297},
-  { 77U, 2147047330},
-  { 79U, 2147016195},
-  { 82U, 2146982775},
-  { 85U, 2146946945},
-  { 88U, 2146907275},
-  { 91U, 2146867538},
-  { 94U, 2146822298},
-  { 97U, 2146785526},
-  {100U, 2146747759},
-  {103U, 2146695349},
-  {107U, 2146637984},
-  {110U, 2146578604},
-  {114U, 2146513835},
-  {118U, 2146445080},
-  {123U, 2146370355},
-  {127U, 2146291161},
-  {131U, 2146205372},
-  {136U, 2146112589},
-  {141U, 2146014479},
-  {146U, 2145910829},
-  {151U, 2145796971},
-  {156U, 2145676831},
-  {159U, 2145604646},
-  {162U, 2145547790},
-  {165U, 2145468230},
-  {167U, 2145409363},
-  {171U, 2145324517},
-  {173U, 2145261046},
-  {177U, 2145170643},
-  {179U, 2145102321},
-  {183U, 2145006080},
-  {186U, 2144932648},
-  {189U, 2144830280},
-  {192U, 2144748638},
-  {196U, 2144639788},
-  {199U, 2144555290},
-  {203U, 2144436713},
-  {206U, 2144346237},
-  {210U, 2144217348},
-  {218U, 2143983951},
-  {225U, 2143735870},
-  {229U, 2143622139},
-  {233U, 2143469001},
-  {241U, 2143182299},
-  {250U, 2142874683},
-  {254U, 2142733729}};
-
-const uint8_t CTCSS_TABLE_DATA_LEN = 50U;
-
-// 4Hz bandwidth
-const uint16_t N = 24000U / 4U;
-
-CFMCTCSSRX::CFMCTCSSRX() :
-m_coeffDivTwo(0),
-m_highThreshold(0),
-m_lowThreshold(0),
-m_count(0U),
-m_q0(0),
-m_q1(0),
-m_state(false)
-{
-}
-
-uint8_t CFMCTCSSRX::setParams(uint8_t frequency, uint8_t highThreshold, uint8_t lowThreshold)
-{
-  m_coeffDivTwo = 0;
-
-  for (uint8_t i = 0U; i < CTCSS_TABLE_DATA_LEN; i++) {
-    if (RX_CTCSS_TABLE_DATA[i].frequency == frequency) {
-      m_coeffDivTwo = RX_CTCSS_TABLE_DATA[i].coeffDivTwo;
-      break;
-    }
-  }
-
-  if (m_coeffDivTwo == 0)
-    return 4U;
-
-  m_highThreshold = q31_t(highThreshold);
-  m_lowThreshold  = q31_t(lowThreshold);
-
-  return 0U;
-}
-
-bool CFMCTCSSRX::process(q15_t sample)
-{
-  //get more dynamic into the decoder by multiplying the sample by 1.5
-  q31_t sample31 = q31_t(sample) +  (q31_t(sample) >> 1);
-
-  q31_t q2 = m_q1;
-  m_q1 = m_q0;
-
-  // Q31 multiplication, t3 = m_coeffDivTwo * 2 * m_q1
-  q63_t t1 = m_coeffDivTwo * m_q1;
-  q31_t t2 = __SSAT((t1 >> 31), 31);
-  q31_t t3 = t2 * 2;
-
-  // m_q0 = m_coeffDivTwo * m_q1 * 2 - q2 + sample
-  m_q0 = t3 - q2 + sample31;
-
-  m_count++;
-  if (m_count == N) {
-    // Q31 multiplication, t2 = m_q0 * m_q0
-    q63_t t1 = q63_t(m_q0) * q63_t(m_q0);
-    q31_t t2 = __SSAT((t1 >> 31), 31);
-
-    // Q31 multiplication, t4 = m_q0 * m_q0
-    q63_t t3 = q63_t(m_q1) * q63_t(m_q1);
-    q31_t t4 = __SSAT((t3 >> 31), 31);
-
-    // Q31 multiplication, t9 = m_q0 * m_q1 * m_coeffDivTwo * 2
-    q63_t t5 = q63_t(m_q0) * q63_t(m_q1);
-    q31_t t6 = __SSAT((t5 >> 31), 31);
-    q63_t t7 = t6 * m_coeffDivTwo;
-    q31_t t8 = __SSAT((t7 >> 31), 31);
-    q31_t t9  = t8 * 2;
-
-    // value = m_q0 * m_q0 + m_q1 * m_q1 - m_q0 * m_q1 * m_coeffDivTwo * 2
-    q31_t value = t2 + t4 - t9;
-
-    bool previousState = m_state;
-
-    q31_t threshold = m_highThreshold;
-    if (previousState)
-      threshold = m_lowThreshold;
-
-    m_state = value >= threshold;
-
-    if (previousState != m_state)
-      DEBUG4("CTCSS Value / Threshold / Valid", value, threshold, m_state);
-
-    m_count = 0U;
-    m_q0 = 0;
-    m_q1 = 0;
-  }
-
-  return m_state;
-}
-
-void CFMCTCSSRX::reset()
-{
-  m_q0 = 0;
-  m_q1 = 0;
-  m_state = false;
-  m_count = 0U;
-}
-
-#endif
-

FMCTCSSRX.h

@@ -1,49 +0,0 @@
-/*
- *   Copyright (C) 2020 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
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include "Config.h"
-
-#if defined(MODE_FM)
-
-#if !defined(FMCTCSSRX_H)
-#define  FMCTCSSRX_H
-
-class CFMCTCSSRX {
-public:
-  CFMCTCSSRX();
-
-  uint8_t setParams(uint8_t frequency, uint8_t highThreshold, uint8_t lowThreshold);
-  
-  bool process(q15_t sample);
-
-  void reset();
-
-private:
-  q63_t    m_coeffDivTwo;
-  q31_t    m_highThreshold;
-  q31_t    m_lowThreshold;
-  uint16_t m_count;
-  q31_t    m_q0;
-  q31_t    m_q1;
-  bool     m_state;
-};
-
-#endif
-
-#endif
-

FMCTCSSTX.cpp

@@ -1,134 +0,0 @@
-/*
- *   Copyright (C) 2020 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
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include "Config.h"
-
-#if defined(MODE_FM)
-
-#include "Globals.h"
-#include "FMCTCSSTX.h"
-
-const struct TX_CTCSS_TABLE {
-  uint8_t  frequency;
-  uint16_t length;
-  q31_t    increment;
-} TX_CTCSS_TABLE_DATA[] = {
-  { 67U, 358U, 5995059},
-  { 69U, 346U, 6200860},
-  { 71U, 334U, 6433504},
-  { 74U, 323U, 6657200},
-  { 77U, 312U, 6889844},
-  { 79U, 301U, 7131436},
-  { 82U, 291U, 7381976},
-  { 85U, 281U, 7641463},
-  { 88U, 271U, 7918846},
-  { 91U, 262U, 8187282},
-  { 94U, 253U, 8482561},
-  { 97U, 246U, 8715205},
-  {100U, 240U, 8947849},
-  {103U, 232U, 9261024},
-  {107U, 224U, 9592094},
-  {110U, 216U, 9923165},
-  {114U, 209U, 10272131},
-  {118U, 202U, 10630045},
-  {123U, 195U, 11005854},
-  {127U, 189U, 11390612},
-  {131U, 182U, 11793265},
-  {136U, 176U, 12213814},
-  {141U, 170U, 12643310},
-  {146U, 164U, 13081755},
-  {151U, 159U, 13547043},
-  {156U, 153U, 14021279},
-  {159U, 150U, 14298662},
-  {162U, 148U, 14513411},
-  {165U, 145U, 14808690},
-  {167U, 143U, 15023438},
-  {171U, 140U, 15327665},
-  {173U, 138U, 15551361},
-  {177U, 135U, 15864536},
-  {179U, 133U, 16097180},
-  {183U, 131U, 16419303},
-  {186U, 129U, 16660894},
-  {189U, 126U, 16991965},
-  {192U, 124U, 17251452},
-  {196U, 122U, 17591471},
-  {199U, 120U, 17850958},
-  {203U, 118U, 18208872},
-  {206U, 116U, 18477308},
-  {210U, 114U, 18853117},
-  {218U, 110U, 19515258},
-  {225U, 106U, 20195295},
-  {229U, 105U, 20499521},
-  {233U, 103U, 20902175},
-  {241U,  99U, 21635898},
-  {250U,  96U, 22396465},
-  {254U,  94U, 22736484}};
-
-const uint8_t CTCSS_TABLE_DATA_LEN = 50U;
-
-CFMCTCSSTX::CFMCTCSSTX() :
-m_values(NULL),
-m_length(0U),
-m_n(0U)
-{
-}
-
-uint8_t CFMCTCSSTX::setParams(uint8_t frequency, uint8_t level)
-{
-  const TX_CTCSS_TABLE* entry = NULL;
-
-  for (uint8_t i = 0U; i < CTCSS_TABLE_DATA_LEN; i++) {
-    if (TX_CTCSS_TABLE_DATA[i].frequency == frequency) {
-      entry = TX_CTCSS_TABLE_DATA + i;
-      break;
-    }
-  }
-
-  if (entry == NULL)
-    return 4U;
-
-  m_length = entry->length;
-
-  delete[] m_values;
-  m_values = new q15_t[m_length];
-
-  q31_t arg = 0;
-  for (uint16_t i = 0U; i < m_length; i++) {
-    q63_t value = ::arm_sin_q31(arg) * q63_t(level * 13);
-    m_values[i] = q15_t(__SSAT((value >> 31), 16));
-
-    arg += entry->increment;
-  }
-
-  return 0U;
-}
-
-q15_t CFMCTCSSTX::getAudio(bool reverse)
-{
-  q15_t sample = m_values[m_n++];
-  if (m_n >= m_length)
-    m_n = 0U;
-  
-  if (reverse)
-    return -sample;
-  else
-    return sample;
-}
-
-#endif
-

FMCTCSSTX.h

@@ -1,43 +0,0 @@
-/*
- *   Copyright (C) 2020 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
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include "Config.h"
-
-#if defined(MODE_FM)
-
-#if !defined(FMCTCSSTX_H)
-#define  FMCTCSSTX_H
-
-class CFMCTCSSTX {
-public:
-  CFMCTCSSTX();
-
-  uint8_t setParams(uint8_t frequency, uint8_t level);
-
-  q15_t getAudio(bool reverse);
-
-private:
-  q15_t*   m_values;
-  uint16_t m_length;
-  uint16_t m_n;
-};
-
-#endif
-
-#endif
-

FMDirectForm1.h

@@ -1,113 +0,0 @@
-
-/*******************************************************************************
-This header file has been taken from:
-"A Collection of Useful C++ Classes for Digital Signal Processing"
-By Vinnie Falco 
-Bernd Porr adapted it for Linux and turned it into a filter using
-fixed point arithmetic.
---------------------------------------------------------------------------------
-License: MIT License (http://www.opensource.org/licenses/mit-license.php)
-Copyright (c) 2009 by Vinnie Falco
-Copyright (C) 2013-2017, Bernd Porr, [email protected]
-Copyright (C) 2020 , Mario Molitor , [email protected]
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-*******************************************************************************/
-
-// based on https://raw.githubusercontent.com/berndporr/iir_fixed_point/master/DirectFormI.h
-
-#include "Config.h"
-
-#if defined(MODE_FM)
-
-#include <cstdint>
-
-#ifndef DIRECTFORMI_H_
-#define DIRECTFORMI_H_
-class CFMDirectFormI
-{
-public:
-
-	// convenience function which takes the a0 argument but ignores it!
-	CFMDirectFormI(const q31_t b0, const q31_t b1, const q31_t b2, const q31_t, const q31_t a1, const q31_t a2)
-	{
-		// FIR coefficients
-		c_b0 = b0;
-		c_b1 = b1;
-		c_b2 = b2;
-		// IIR coefficients
-		c_a1 = a1;
-		c_a2 = a2;
-		reset();
-	}
-
-	CFMDirectFormI(const CFMDirectFormI &my)
-	{
-		// delay line
-		m_x2 = my.m_x2; // x[n-2]
-		m_y2 = my.m_y2; // y[n-2]
-		m_x1 = my.m_x1; // x[n-1]
-		m_y1 = my.m_y1; // y[n-1]
-
-		// coefficients
-		c_b0 = my.c_b0;
-		c_b1 = my.c_b1;
-		c_b2 = my.c_b2; // FIR
-		c_a1 = my.c_a1;
-		c_a2 = my.c_a2; // IIR
-	}
-
-	void reset()
-	{
-		m_x1 = 0;
-		m_x2 = 0;
-		m_y1 = 0;
-		m_y2 = 0;
-	}
-
-	// filtering operation: one sample in and one out
-	inline q15_t filter(const q15_t in)
-	{
-		// calculate the output
-		q31_t out_upscaled = c_b0 * in + c_b1 * m_x1 + c_b2 * m_x2 - c_a1 * m_y1 - c_a2 * m_y2;
-
-		q15_t out = __SSAT(out_upscaled >> 15, 15);
-
-		// update the delay lines
-		m_x2 = m_x1;
-		m_y2 = m_y1;
-		m_x1 = in;
-		m_y1 = out;
-
-		return out;
-	}
-
-private:
-	// delay line
-	q31_t m_x2; // x[n-2]
-	q31_t m_y2; // y[n-2]
-	q31_t m_x1; // x[n-1]
-	q31_t m_y1; // y[n-1]
-
-	// coefficients
-	q31_t c_b0,c_b1,c_b2; // FIR
-	q31_t c_a1,c_a2; // IIR
-};
-
-#endif /* DIRECTFORMI_H */
-
-#endif
-

FMDownSampler.cpp

@@ -1,80 +0,0 @@
-/*
- *   Copyright (C) 2020 by Jonathan Naylor G4KLX
- *   Copyright (C) 2020 by Geoffrey Merck F4FXL - KC3FRA
- *
- *   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
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include "Config.h"
-
-#if defined(MODE_FM)
-
-#include "FMDownSampler.h"
-
-CFMDownSampler::CFMDownSampler(uint16_t length) :
-m_ringBuffer(length),
-m_samplePack(0U),
-m_samplePackPointer(NULL),
-m_sampleIndex(0U)
-{
-  m_samplePackPointer = (uint8_t*)&m_samplePack;
-}
-
-void CFMDownSampler::addSample(q15_t sample)
-{
-  uint32_t usample = uint32_t(int32_t(sample) + 2048);
-  //only take one of three samples
-  switch(m_sampleIndex){
-    case 0:
-      m_samplePack = usample << 12;
-    break;
-    case 3:{
-      m_samplePack |= usample;
-      
-      //we did not use MSB; skip it
-      TSamplePairPack pair{m_samplePackPointer[0U], m_samplePackPointer[1U], m_samplePackPointer[2U]}; 
-
-      m_ringBuffer.put(pair);
-
-      m_samplePack = 0U;//reset the sample pack
-    }
-    break;
-    default:
-        //Just skip this sample
-    break;
-  }
-
-  m_sampleIndex++;
-  if (m_sampleIndex >= 6U)//did we pack two samples ?
-      m_sampleIndex = 0U;  
-}
-
-bool CFMDownSampler::getPackedData(TSamplePairPack& data)
-{
-  return m_ringBuffer.get(data);
-}
-
-uint16_t CFMDownSampler::getData()
-{
-  return m_ringBuffer.getData();
-}
-
-void CFMDownSampler::reset()
-{
-  m_sampleIndex = 0U;
-}
-
-#endif
-

FMDownSampler.h

@@ -1,52 +0,0 @@
-/*
- *   Copyright (C) 2020 by Jonathan Naylor G4KLX
- *   Copyright (C) 2020 by Geoffrey Merck F4FXL - KC3FRA
- *
- *   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
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include "Config.h"
-
-#if defined(MODE_FM)
-
-#if !defined(FMDOWNSAMPLER_H)
-#define FMDOWNSAMPLER_H
-
-#include "RingBuffer.h"
-#include "FMSamplePairPack.h"
-
-class CFMDownSampler {
-public:
-  CFMDownSampler(uint16_t length);
-
-  void addSample(q15_t sample);
-
-  bool getPackedData(TSamplePairPack& data);
-
-  uint16_t getData();
-
-  void reset();
-
-private:
-  CRingBuffer<TSamplePairPack> m_ringBuffer;
-  uint32_t                     m_samplePack;
-  uint8_t*                     m_samplePackPointer;
-  uint8_t                      m_sampleIndex;
-};
-
-#endif
-
-#endif
-

FMKeyer.cpp

@@ -1,222 +0,0 @@
-/*
- *   Copyright (C) 2020 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
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include "Config.h"
-
-#if defined(MODE_FM)
-
-#include "Globals.h"
-#include "FMKeyer.h"
-
-const struct {
-  char     c;
-  uint32_t pattern;
-  uint8_t  length;
-} SYMBOL_LIST[] = {
-  {'A', 0xB8000000U, 8U},
-  {'B', 0xEA800000U, 12U},
-  {'C', 0xEBA00000U, 14U},
-  {'D', 0xEA000000U, 10U},
-  {'E', 0x80000000U, 4U},
-  {'F', 0xAE800000U, 12U},
-  {'G', 0xEE800000U, 12U},
-  {'H', 0xAA000000U, 10U},
-  {'I', 0xA0000000U, 6U},
-  {'J', 0xBBB80000U, 16U},
-  {'K', 0xEB800000U, 12U},
-  {'L', 0xBA800000U, 12U},
-  {'M', 0xEE000000U, 10U},
-  {'N', 0xE8000000U, 8U},
-  {'O', 0xEEE00000U, 14U},
-  {'P', 0xBBA00000U, 14U},
-  {'Q', 0xEEB80000U, 16U},
-  {'R', 0xBA000000U, 10U},
-  {'S', 0xA8000000U, 8U},
-  {'T', 0xE0000000U, 6U},
-  {'U', 0xAE000000U, 10U},
-  {'V', 0xAB800000U, 12U},
-  {'W', 0xBB800000U, 12U},
-  {'X', 0xEAE00000U, 14U},
-  {'Y', 0xEBB80000U, 16U},
-  {'Z', 0xEEA00000U, 14U},
-  {'1', 0xBBBB8000U, 20U},
-  {'2', 0xAEEE0000U, 18U},
-  {'3', 0xABB80000U, 16U},
-  {'4', 0xAAE00000U, 14U},
-  {'5', 0xAA800000U, 12U},
-  {'6', 0xEAA00000U, 14U},
-  {'7', 0xEEA80000U, 16U},
-  {'8', 0xEEEA0000U, 18U},
-  {'9', 0xEEEE8000U, 20U},
-  {'0', 0xEEEEE000U, 22U},
-  {'/', 0xEAE80000U, 16U},
-  {'?', 0xAEEA0000U, 18U},
-  {',', 0xEEAEE000U, 22U},
-  {'-', 0xEAAE0000U, 18U},
-  {'=', 0xEAB80000U, 16U},
-  {'.', 0xBAEB8000U, 20U},
-  {' ', 0x00000000U, 4U},
-  {0U,  0x00000000U, 0U}
-};
-
-const uint8_t BIT_MASK_TABLE[] = {0x80U, 0x40U, 0x20U, 0x10U, 0x08U, 0x04U, 0x02U, 0x01U};
-
-#define WRITE_BIT_FM(p,i,b) p[(i)>>3] = (b) ? (p[(i)>>3] | BIT_MASK_TABLE[(i)&7]) : (p[(i)>>3] & ~BIT_MASK_TABLE[(i)&7])
-#define READ_BIT_FM(p,i)    (p[(i)>>3] & BIT_MASK_TABLE[(i)&7])
-
-CFMKeyer::CFMKeyer() :
-m_wanted(false),
-m_poBuffer(),
-m_poLen(0U),
-m_poPos(0U),
-m_dotLen(0U),
-m_dotPos(0U),
-m_audio(NULL),
-m_audioLen(0U),
-m_audioPos(0U),
-m_highLevel(0U),
-m_lowLevel(0)
-{
-}
-
-uint8_t CFMKeyer::setParams(const char* text, uint8_t speed, uint16_t frequency, uint8_t highLevel, uint8_t lowLevel)
-{
-  m_poLen = 0U;
-
-  for (uint8_t i = 0U; text[i] != '\0'; i++) {
-    for (uint8_t j = 0U; SYMBOL_LIST[j].c != 0U; j++) {
-      if (SYMBOL_LIST[j].c == text[i]) {
-        uint32_t MASK = 0x80000000U;
-        for (uint8_t k = 0U; k < SYMBOL_LIST[j].length; k++, m_poLen++, MASK >>= 1) {
-          bool b = (SYMBOL_LIST[j].pattern & MASK) == MASK;
-          WRITE_BIT_FM(m_poBuffer, m_poLen, b);
-
-          if (m_poLen >= 995U) {
-            m_poLen = 0U;
-            return 4U;
-          }
-        }
-
-        break;
-      }
-    }
-  }
-
-  m_highLevel = q15_t(highLevel);
-  m_lowLevel  = q15_t(lowLevel);
-
-  m_dotLen = 24000U / speed;   // In samples
-
-  m_audioLen = 24000U / frequency; // In samples
-
-  delete[] m_audio;
-  m_audio = new bool[m_audioLen];
-
-  for (uint16_t i = 0U; i < m_audioLen; i++) {
-    if (i < (m_audioLen / 2U))
-      m_audio[i] = true;
-    else
-      m_audio[i] = false;
-  }
-
-  return 0U;
-}
-
-q15_t CFMKeyer::getHighAudio()
-{
-  q15_t output = 0U;
-  if (!m_wanted)
-    return 0U;
-
-  bool b = READ_BIT_FM(m_poBuffer, m_poPos);
-  if (b)
-    output = m_audio[m_audioPos] ? m_highLevel : -m_highLevel;
-
-  m_audioPos++;
-  if (m_audioPos >= m_audioLen)
-    m_audioPos = 0U;
-  m_dotPos++;
-  if (m_dotPos >= m_dotLen) {
-    m_dotPos = 0U;
-    m_poPos++;
-    if (m_poPos >= m_poLen) {
-      stop();
-      return output;
-    }
-  }
-
-  return output;
-}
-
-q15_t CFMKeyer::getLowAudio()
-{
-  q15_t output = 0U;
-  if (!m_wanted)
-    return 0U;
-
-  bool b = READ_BIT_FM(m_poBuffer, m_poPos);
-  if (b)
-    output = m_audio[m_audioPos] ? m_lowLevel : -m_lowLevel;
-
-  m_audioPos++;
-  if (m_audioPos >= m_audioLen)
-    m_audioPos = 0U;
-  m_dotPos++;
-  if (m_dotPos >= m_dotLen) {
-    m_dotPos = 0U;
-    m_poPos++;
-    if (m_poPos >= m_poLen) {
-      stop();
-      return output;
-    }
-  }
-
-  return output;
-}
-
-void CFMKeyer::start()
-{
-  if (isRunning())
-    return;
-
-  m_wanted   = true;
-  m_poPos    = 0U;
-  m_dotPos   = 0U;
-  m_audioPos = 0U;
-}
-
-void CFMKeyer::stop()
-{
-  m_wanted   = false;
-  m_poPos    = 0U;
-  m_dotPos   = 0U;
-  m_audioPos = 0U;
-}
-
-bool CFMKeyer::isWanted() const
-{
-  return m_wanted;
-}
-
-bool CFMKeyer::isRunning() const
-{
-  return m_poPos > 0U || m_dotPos > 0U || m_audioPos > 0U;
-}
-
-#endif
-

FMKeyer.h

@@ -1,59 +0,0 @@
-/*
- *   Copyright (C) 2020 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
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include "Config.h"
-
-#if defined(MODE_FM)
-
-#if !defined(FMKeyer_H)
-#define  FMKeyer_H
-
-class CFMKeyer {
-public:
-  CFMKeyer();
-
-  uint8_t setParams(const char* text, uint8_t speed, uint16_t frequency, uint8_t highLevel, uint8_t lowLevel);
-
-  q15_t getHighAudio();
-  q15_t getLowAudio();
-
-  void start();
-  void stop();
-
-  bool isRunning() const;
-
-  bool isWanted() const;
-
-private:
-  bool     m_wanted;
-  uint8_t  m_poBuffer[1000U];
-  uint16_t m_poLen;
-  uint16_t m_poPos;
-  uint16_t m_dotLen;
-  uint16_t m_dotPos;
-  bool*    m_audio;
-  uint16_t m_audioLen;
-  uint16_t m_audioPos;
-  q15_t    m_highLevel;
-  q15_t    m_lowLevel;
-};
-
-#endif
-
-#endif
-

FMNoiseSquelch.cpp

@@ -1,133 +0,0 @@
-/*
- *   Copyright (C) 2020 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
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include "Config.h"
-
-#if defined(MODE_FM)
-
-#include "Globals.h"
-#include "FMNoiseSquelch.h"
-
-// 4500Hz centre frequency
-const q31_t COEFF_DIV_TWO = 821806413;
-
-// 400Hz bandwidth
-const uint16_t N = 24000U / 400U;
-
-CFMNoiseSquelch::CFMNoiseSquelch() :
-m_highThreshold(0),
-m_lowThreshold(0),
-m_count(0U),
-m_q0(0),
-m_q1(0),
-m_state(false),
-m_validCount(0U)
-{
-
-}
-
-void CFMNoiseSquelch::setParams(uint8_t highThreshold, uint8_t lowThreshold)
-{
-  m_highThreshold = q31_t(highThreshold);
-  m_lowThreshold  = q31_t(lowThreshold);
-}
-
-bool CFMNoiseSquelch::process(q15_t sample)
-{
-  //get more dynamic into the decoder by multiplying the sample by 64
-  q31_t sample31 = q31_t(sample) << 6; //+  (q31_t(sample) >> 1);
-
-  q31_t q2 = m_q1;
-  m_q1 = m_q0;
-
-  // Q31 multiplication, t3 = m_coeffDivTwo * 2 * m_q1
-  q63_t t1 = COEFF_DIV_TWO * m_q1;
-  q31_t t2 = __SSAT((t1 >> 31), 31);
-  q31_t t3 = t2 * 2;
-
-  // m_q0 = m_coeffDivTwo * m_q1 * 2 - q2 + sample
-  m_q0 = t3 - q2 + sample31;
-
-  m_count++;
-  if (m_count == N) {
-    // Q31 multiplication, t2 = m_q0 * m_q0
-    q63_t t1 = q63_t(m_q0) * q63_t(m_q0);
-    q31_t t2 = __SSAT((t1 >> 31), 31);
-
-    // Q31 multiplication, t4 = m_q0 * m_q0
-    q63_t t3 = q63_t(m_q1) * q63_t(m_q1);
-    q31_t t4 = __SSAT((t3 >> 31), 31);
-
-    // Q31 multiplication, t9 = m_q0 * m_q1 * m_coeffDivTwo * 2
-    q63_t t5 = q63_t(m_q0) * q63_t(m_q1);
-    q31_t t6 = __SSAT((t5 >> 31), 31);
-    q63_t t7 = t6 * COEFF_DIV_TWO;
-    q31_t t8 = __SSAT((t7 >> 31), 31);
-    q31_t t9  = t8 * 2;
-
-    // value = m_q0 * m_q0 + m_q1 * m_q1 - m_q0 * m_q1 * m_coeffDivTwo * 2
-    q31_t value = t2 + t4 - t9;
-
-    bool previousState = m_state;
-
-    q31_t threshold = m_highThreshold;
-    if (previousState)
-      threshold = m_lowThreshold;
-
-    if (!m_state) {
-      if (value < threshold)
-        m_validCount++;
-      else
-        m_validCount = 0U;
-    }
-
-    if (m_state) {
-      if (value >= threshold)
-        m_invalidCount++;
-      else
-        m_invalidCount = 0U;
-    }
-
-    m_state = m_validCount >= 10U && m_invalidCount < 10U;
-
-    if(previousState && !m_state)
-      m_invalidCount = 0U;
-
-    if (previousState != m_state) {
-      DEBUG4("Noise Squelch Value / Threshold / Valid", value, threshold, m_state);
-      DEBUG3("Valid Count / Invalid Count", m_validCount, m_invalidCount);
-    }
-
-    m_count = 0U;
-    m_q0 = 0;
-    m_q1 = 0;
-  }
-
-  return m_state;
-}
-
-void CFMNoiseSquelch::reset()
-{
-  m_q0 = 0;
-  m_q1 = 0;
-  m_state = false;
-  m_count = 0U;
-}
-
-#endif
-

FMNoiseSquelch.h

@@ -1,50 +0,0 @@
-/*
- *   Copyright (C) 2020 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
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include "Config.h"
-
-#if defined(MODE_FM)
-
-#if !defined(FMNOISESQUELCH_H)
-#define  FMNOISESQUELCH_H
-
-class CFMNoiseSquelch {
-public:
-  CFMNoiseSquelch();
-
-  void setParams(uint8_t highThreshold, uint8_t lowThreshold);
-  
-  bool process(q15_t sample);
-
-  void reset();
-
-private:
-  q31_t    m_highThreshold;
-  q31_t    m_lowThreshold;
-  uint16_t m_count;
-  q31_t    m_q0;
-  q31_t    m_q1;
-  bool     m_state;
-  uint8_t  m_validCount;
-  uint8_t  m_invalidCount;
-};
-
-#endif
-
-#endif
-

FMSamplePairPack.h

@@ -1,36 +0,0 @@
-/*
- *   Copyright (C) 2020 by Jonathan Naylor G4KLX
- *   Copyright (C) 2020 by Geoffrey Merck F4FXL - KC3FRA
- *
- *   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
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include "Config.h"
-
-#if defined(MODE_FM)
-
-#if !defined(TSAMPLEPACK_H)
-#define TSAMPLEPACK_H
-
-struct TSamplePairPack {
-  uint8_t byte0;
-  uint8_t byte1;
-  uint8_t byte2;
-};
-
-#endif
-
-#endif
-

FMTimeout.cpp

@@ -1,80 +0,0 @@
-/*
- *   Copyright (C) 2020 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
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include "Config.h"
-
-#if defined(MODE_FM)
-
-#include "Globals.h"
-#include "FMTimeout.h"
-
-// 400 Hz sine wave at 24000 Hz sample rate
-const q15_t BUSY_AUDIO[] = {0, 3426, 6813, 10126, 13328, 16384, 19261, 21926, 24351, 26510, 28378, 29935, 31164, 32052, 32588, 32767, 32588, 32052, 31164, 29935, 28378, 26510, 24351,
-                            21926, 19261, 16384, 13328, 10126, 6813, 3425, 0, -3425, -6813, -10126, -13328, -16384, -19261, -21926, -24351, -26510, -28378, -29935, -31164, -32052,
-                            -32588, -32768, -32588, -32052, -31164, -29935, -28378, -26510, -24351, -21926, -19261, -16384, -13328, -10126, -6813, -3425};
-const uint8_t BUSY_AUDIO_LEN = 60U;
-
-CFMTimeout::CFMTimeout() :
-m_level(128 * 128),
-m_running(false),
-m_pos(0U),
-m_n(0U)
-{
-}
-
-void CFMTimeout::setParams(uint8_t level)
-{
-  m_level = q15_t(level * 5);
-}
-
-q15_t CFMTimeout::getAudio()
-{
-  q15_t sample = 0;
-  if (!m_running)
-    return sample;
-
-  if (m_pos >= 12000U) {
-    q31_t sample31 = BUSY_AUDIO[m_n] * m_level;
-    sample = q15_t(__SSAT((sample31 >> 15), 16));
-
-    m_n++;
-    if (m_n >= BUSY_AUDIO_LEN)
-      m_n = 0U;
-  }
-
-  m_pos++;
-  if (m_pos >= 24000U)
-    m_pos = 0U;
-
-  return sample;
-}
-
-void CFMTimeout::start()
-{
-  m_running = true;
-  m_pos = 0U;
-  m_n   = 0U;
-}
-
-void CFMTimeout::stop()
-{
-  m_running = false;
-}
-
-#endif
-

FMTimeout.h

@@ -1,47 +0,0 @@
-/*
- *   Copyright (C) 2020 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
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include "Config.h"
-
-#if defined(MODE_FM)
-
-#if !defined(FMTimeout_H)
-#define  FMTimeout_H
-
-class CFMTimeout {
-public:
-  CFMTimeout();
-
-  void setParams(uint8_t level);
-
-  void start();
-  void stop();
-
-  q15_t getAudio();
-
-private:
-  q15_t    m_level;
-  bool     m_running;
-  uint32_t m_pos;
-  uint8_t  m_n;
-};
-
-#endif
-
-#endif
-

FMTimer.cpp

@@ -1,76 +0,0 @@
-/*
- *   Copyright (C) 2009,2010,2015,2020 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
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include "Config.h"
-
-#if defined(MODE_FM)
-
-#include "Globals.h"
-#include "FMTimer.h"
-
-CFMTimer::CFMTimer() :
-m_timeout(0U),
-m_timer(0U)
-{
-}
-
-void CFMTimer::setTimeout(uint16_t secs, uint32_t msecs)
-{
-  m_timeout = (secs * 24000U) + (msecs * 24U);
-}
-
-uint32_t CFMTimer::getTimeout() const
-{
-  return m_timeout / 24U;
-}
-
-void CFMTimer::start()
-{
-  if (m_timeout > 0U)
-    m_timer = 1U;
-}
-
-void CFMTimer::stop()
-{
-  m_timer = 0U;
-}
-
-void CFMTimer::clock(uint8_t length)
-{
-  if (m_timer > 0U && m_timeout > 0U)
-    m_timer += length;
-}
-
-bool CFMTimer::isRunning() const
-{
-  return m_timer > 0U;
-}
-
-bool CFMTimer::hasExpired() const
-{
-  if (m_timeout == 0U || m_timer == 0U)
-    return false;
-
-  if (m_timer > m_timeout)
-    return true;
-
-  return false;
-}
-
-#endif
-

FMTimer.h

@@ -1,52 +0,0 @@
-/*
- *   Copyright (C) 2009,2010,2015,2020 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
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include "Config.h"
-
-#if defined(MODE_FM)
-
-#if !defined(FMTimer_H)
-#define  FMTimer_H
-
-class CFMTimer {
-public:
-  CFMTimer();
-
-  void setTimeout(uint16_t secs, uint32_t msecs);
-
-  uint32_t getTimeout() const;
-
-  void start();
-  
-  void stop();
-
-  void clock(uint8_t length);
-
-  bool isRunning() const;
-  
-  bool hasExpired() const;
-
-private:
-  uint32_t m_timeout;
-  uint32_t m_timer;
-};
-
-#endif
-
-#endif
-

FMUpSampler.cpp

@@ -1,104 +0,0 @@
-/*
- *   Copyright (C) 2020 by Jonathan Naylor G4KLX
- *   Copyright (C) 2020 by Geoffrey Merck F4FXL - KC3FRA
- *
- *   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
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include "Config.h"
-
-#if defined(MODE_FM)
-
-#include "FMUpSampler.h"
-
-const uint32_t FM_UPSAMPLE_MASK = 0x00000FFFU;
-
-CFMUpSampler::CFMUpSampler() :
-m_upSampleIndex(0),
-m_pack(0U),
-m_packPointer(NULL),
-m_samples(3600U), //300ms of 12 bit 8kHz audio
-m_running(false)
-{
-  m_packPointer = (uint8_t*)&m_pack;
-}
-
-void CFMUpSampler::reset()
-{
-    m_upSampleIndex = 0U;
-    m_pack = 0U;
-    m_samples.reset();
-    m_running = false;
-}
-
-void CFMUpSampler::addData(const uint8_t* data, uint16_t length)
-{
-  TSamplePairPack* packPointer = (TSamplePairPack*)data;
-  TSamplePairPack* packPointerEnd = packPointer + (length / 3U);
-  while(packPointer != packPointerEnd) {
-    m_samples.put(*packPointer);
-    packPointer++;
-  }
-  if(!m_running)
-    m_running = m_samples.getData() > 300U;//75ms of audio
-}
-
-bool CFMUpSampler::getSample(q15_t& sample)
-{
-  if(!m_running)
-    return false;
-
-  switch (m_upSampleIndex)
-  {
-  case 0: {
-    TSamplePairPack pairPack;
-    if(!m_samples.get(pairPack)) {
-      m_running = false;
-      return false;
-    }
-      
-    m_pack = 0U;
-    m_packPointer = (uint8_t*)&m_pack;
-
-    m_packPointer[0U] = pairPack.byte0;
-    m_packPointer[1U] = pairPack.byte1;
-    m_packPointer[2U] = pairPack.byte2;
-
-    sample = q15_t(m_pack >> 12) - 2048;
-    break;
-  }
-  case 3:
-    sample = q15_t(m_pack & FM_UPSAMPLE_MASK) - 2048;
-  break;
-  default:
-    sample = 0;
-  break;
-  }
-
-  m_upSampleIndex++;
-  if(m_upSampleIndex >= 6U)
-    m_upSampleIndex = 0U;
-
-  return true;
-}
-
-uint16_t CFMUpSampler::getSpace() const
-{
-  //return available space in bytes
-  return m_samples.getSpace() * sizeof(TSamplePairPack);
-}
-
-#endif
-

FMUpSampler.h

@@ -1,54 +0,0 @@
-/*
- *   Copyright (C) 2020 by Jonathan Naylor G4KLX
- *   Copyright (C) 2020 by Geoffrey Merck F4FXL - KC3FRA
- *
- *   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
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-
-#include "Config.h"
-
-#if defined(MODE_FM)
-
-#if !defined(FMUPSAMPLER_H)
-#define FMUPSAMPLER_H
-
-#include "RingBuffer.h"
-#include "FMSamplePairPack.h"
-
-class CFMUpSampler {
-public:
-  CFMUpSampler();
-
-  void reset();
-
-  void addData(const uint8_t* data, uint16_t length);
-
-  bool getSample(q15_t& sample);
-
-  uint16_t getSpace() const;
-
-private:
-  uint8_t m_upSampleIndex;
-  uint32_t m_pack;
-  uint8_t * m_packPointer;
-  CRingBuffer<TSamplePairPack> m_samples;
-  bool m_running;
-};
-
-#endif
-
-#endif
-

GitVersion.h

@@ -0,0 +1 @@
+#define GITVERSION "0000000"

Globals.h

@@ -1,5 +1,5 @@
 /*
- *   Copyright (C) 2015,2016,2017,2018,2020,2021,2024 by Jonathan Naylor G4KLX
+ *   Copyright (C) 2015,2016,2017,2018 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
@@ -23,12 +23,14 @@
 #include "stm32f4xx.h"
 #elif defined(STM32F7XX)
 #include "stm32f7xx.h"
+#elif defined(STM32F105xC)
+#include "stm32f1xx.h"
+#include "STM32Utils.h"
 #else
 #include <Arduino.h>
-#undef PI //Undefine PI to get rid of annoying warning as it is also defined in arm_math.h.
 #endif
 
-#if defined(__SAM3X8E__)
+#if defined(__SAM3X8E__) || defined(STM32F105xC)
 #define  ARM_MATH_CM3
 #elif defined(STM32F7XX)
 #define  ARM_MATH_CM7
@@ -48,10 +50,6 @@ enum MMDVM_STATE {
   STATE_P25       = 4,
   STATE_NXDN      = 5,
   STATE_POCSAG    = 6,
-  STATE_M17       = 7,
-  STATE_DPMR      = 8,
-  STATE_FM        = 10,
-  STATE_AX25      = 11,
 
   // Dummy states start at 90
   STATE_NXDNCAL1K = 91,
@@ -62,16 +60,7 @@ enum MMDVM_STATE {
   STATE_RSSICAL   = 96,
   STATE_CWID      = 97,
   STATE_DMRCAL    = 98,
-  STATE_DSTARCAL  = 99,
-  STATE_INTCAL    = 100,
-  STATE_POCSAGCAL = 101,
-  STATE_FMCAL10K  = 102,
-  STATE_FMCAL12K  = 103,
-  STATE_FMCAL15K  = 104,
-  STATE_FMCAL20K  = 105,
-  STATE_FMCAL25K  = 106,
-  STATE_FMCAL30K  = 107,
-  STATE_M17CAL    = 108
+  STATE_DSTARCAL  = 99
 };
 
 #include "SerialPort.h"
@@ -80,34 +69,24 @@ enum MMDVM_STATE {
 #include "DMRDMOTX.h"
 #include "DStarRX.h"
 #include "DStarTX.h"
-#include "DPMRRX.h"
-#include "DPMRTX.h"
 #include "DMRRX.h"
 #include "DMRTX.h"
 #include "YSFRX.h"
 #include "YSFTX.h"
 #include "P25RX.h"
 #include "P25TX.h"
-#include "M17RX.h"
-#include "M17TX.h"
 #include "NXDNRX.h"
 #include "NXDNTX.h"
 #include "POCSAGTX.h"
 #include "CalDStarRX.h"
 #include "CalDStarTX.h"
-#include "CalFM.h"
 #include "CalDMR.h"
 #include "CalP25.h"
 #include "CalNXDN.h"
-#include "CalPOCSAG.h"
 #include "CalRSSI.h"
 #include "CWIdTX.h"
-#include "AX25RX.h"
-#include "AX25TX.h"
-#include "CalM17.h"
 #include "Debug.h"
 #include "IO.h"
-#include "FM.h"
 
 const uint8_t  MARK_SLOT1 = 0x08U;
 const uint8_t  MARK_SLOT2 = 0x04U;
@@ -115,10 +94,10 @@ const uint8_t  MARK_NONE  = 0x00U;
 
 const uint16_t RX_BLOCK_SIZE = 2U;
 
-const uint16_t TX_RINGBUFFER_SIZE = 500U;
-const uint16_t RX_RINGBUFFER_SIZE = 600U;
+const uint16_t TX_RINGBUFFER_SIZE = 1000U;
+const uint16_t RX_RINGBUFFER_SIZE = 1200U;
 
-#if defined(__MK20DX256__)
+#if defined(STM32F105xC) || defined(__MK20DX256__)
 const uint16_t TX_BUFFER_LEN = 2000U;
 #else
 const uint16_t TX_BUFFER_LEN = 4000U;
@@ -132,10 +111,6 @@ extern bool m_ysfEnable;
 extern bool m_p25Enable;
 extern bool m_nxdnEnable;
 extern bool m_pocsagEnable;
-extern bool m_m17Enable;
-extern bool m_dpmrEnable;
-extern bool m_fmEnable;
-extern bool m_ax25Enable;
 
 extern bool m_duplex;
 
@@ -145,15 +120,9 @@ extern bool m_dcd;
 extern CSerialPort serial;
 extern CIO io;
 
-#if defined(MODE_DSTAR)
 extern CDStarRX dstarRX;
 extern CDStarTX dstarTX;
 
-extern CCalDStarRX calDStarRX;
-extern CCalDStarTX calDStarTX;
-#endif
-
-#if defined(MODE_DMR)
 extern CDMRIdleRX dmrIdleRX;
 extern CDMRRX dmrRX;
 extern CDMRTX dmrTX;
@@ -161,58 +130,23 @@ extern CDMRTX dmrTX;
 extern CDMRDMORX dmrDMORX;
 extern CDMRDMOTX dmrDMOTX;
 
-extern CCalDMR calDMR;
-#endif
-
-#if defined(MODE_YSF)
 extern CYSFRX ysfRX;
 extern CYSFTX ysfTX;
-#endif
 
-#if defined(MODE_P25)
 extern CP25RX p25RX;
 extern CP25TX p25TX;
 
-extern CCalP25 calP25;
-#endif
-
-#if defined(MODE_NXDN)
 extern CNXDNRX nxdnRX;
 extern CNXDNTX nxdnTX;
 
-extern CCalNXDN calNXDN;
-#endif
+extern CPOCSAGTX pocsagTX;
 
-#if defined(MODE_POCSAG)
-extern CPOCSAGTX  pocsagTX;
-extern CCalPOCSAG calPOCSAG;
-#endif
-
-#if defined(MODE_M17)
-extern CM17RX m17RX;
-extern CM17TX m17TX;
-
-extern CCalM17 calM17;
-#endif
-
-#if defined(MODE_DPMR)
-extern CDPMRRX dpmrRX;
-extern CDPMRTX dpmrTX;
-
-extern CCalNXDN calNXDN;
-#endif
-
-#if defined(MODE_FM)
-extern CFM    fm;
-extern CCalFM calFM;
-#endif
-
-#if defined(MODE_AX25)
-extern CAX25RX ax25RX;
-extern CAX25TX ax25TX;
-#endif
-
-extern CCalRSSI calRSSI;
+extern CCalDStarRX calDStarRX;
+extern CCalDStarTX calDStarTX;
+extern CCalDMR     calDMR;
+extern CCalP25     calP25;
+extern CCalNXDN    calNXDN;
+extern CCalRSSI    calRSSI;
 
 extern CCWIdTX cwIdTX;
 

I2CTeensy.cpp

@@ -1,6 +1,4 @@
 /*
- *   Copyright (C) 2017 by Chris Huitema
- *
  *   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
  *   the Free Software Foundation; either version 2 of the License, or
@@ -184,7 +182,7 @@ void CSerialPort::beginInt(uint8_t n, int speed)
   }
 }
 
-int CSerialPort::availableForReadInt(uint8_t n)
+int CSerialPort::availableInt(uint8_t n)
 {
   switch (n) {
     case 1U:

IO.cpp

@@ -1,5 +1,5 @@
 /*
- *   Copyright (C) 2015,2016,2017,2018,2020,2021,2024 by Jonathan Naylor G4KLX
+ *   Copyright (C) 2015,2016,2017,2018 by Jonathan Naylor G4KLX
  *   Copyright (C) 2015 by Jim Mclaughlin KI6ZUM
  *   Copyright (C) 2016 by Colin Durbridge G4EML
  *
@@ -22,59 +22,41 @@
 #include "Globals.h"
 #include "IO.h"
 
-#if defined(USE_DCBLOCKER)
-// Generated using [b, a] = butter(1, 0.001) in MATLAB
-static q31_t   DC_FILTER[] = {3367972, 0, 3367972, 0, 2140747704, 0}; // {b0, 0, b1, b2, -a1, -a2}
+// Generated using [b, a] = butter(1, 0.0005) in MATLAB
+static q31_t   DC_FILTER[] = {1685306, 0, 1685306, 0, 2144113034, 0}; // {b0, 0, b1, b2, -a1, -a2}
 const uint32_t DC_FILTER_STAGES = 1U; // One Biquad stage
-#endif
 
-#if defined(MODE_DMR) || defined(MODE_YSF)
-// Generated using rcosdesign(0.2, 8, 5, 'sqrt') in MATLAB
-static q15_t RRC_0_2_FILTER[] = {401, 104, -340, -731, -847, -553, 112, 909, 1472, 1450, 683, -675, -2144, -3040, -2706, -770, 2667, 6995,
-                                 11237, 14331, 15464, 14331, 11237, 6995, 2667, -770, -2706, -3040, -2144, -675, 683, 1450, 1472, 909, 112,
-                                 -553, -847, -731, -340, 104, 401, 0};
-const uint16_t RRC_0_2_FILTER_LEN = 42U;
-#endif
-
-#if defined(MODE_M17)
-// Generated using rcosdesign(0.5, 8, 5, 'sqrt') in MATLAB
-static q15_t RRC_0_5_FILTER[] = {-147, -88, 72, 220, 223, 46, -197, -285, -79, 334, 623, 390, -498, -1691, -2363, -1556, 1284, 5872, 11033,
-				  15109, 16656, 15109, 11033, 5872, 1284, -1556, -2363, -1691, -498, 390, 623, 334, -79, -285, -197, 46, 223,
-				  220, 72, -88, -147, 0};
-const uint16_t RRC_0_5_FILTER_LEN = 42U;
-#endif
-
-#if defined(MODE_NXDN) && defined(USE_NXDN_BOXCAR)
-// One symbol boxcar filter
-static q15_t   BOXCAR10_FILTER[] = {6000, 6000, 6000, 6000, 6000, 6000, 6000, 6000, 6000, 6000};
-const uint16_t BOXCAR10_FILTER_LEN = 10U;
-#endif
-
-#if defined(MODE_DPMR) || (defined(MODE_NXDN) && !defined(USE_NXDN_BOXCAR))
 // Generated using rcosdesign(0.2, 8, 10, 'sqrt') in MATLAB
-static q15_t NXDN_0_2_FILTER[] = {284, 198, 73, -78, -240, -393, -517, -590, -599, -533, -391, -181, 79, 364, 643, 880, 1041, 1097, 1026, 819,
+static q15_t RRC_0_2_FILTER[] = {284, 198, 73, -78, -240, -393, -517, -590, -599, -533, -391, -181, 79, 364, 643, 880, 1041, 1097, 1026, 819,
                                   483, 39, -477, -1016, -1516, -1915, -2150, -2164, -1914, -1375, -545, 557, 1886, 3376, 4946, 6502, 7946, 9184,
                                   10134, 10731, 10935, 10731, 10134, 9184, 7946, 6502, 4946, 3376, 1886, 557, -545, -1375, -1914, -2164, -2150,
                                   -1915, -1516, -1016, -477, 39, 483, 819, 1026, 1097, 1041, 880, 643, 364, 79, -181, -391, -533, -599, -590,
                                   -517, -393, -240, -78, 73, 198, 284, 0};
-const uint16_t NXDN_0_2_FILTER_LEN = 82U;
+const uint16_t RRC_0_2_FILTER_LEN = 82U;
 
-static q15_t NXDN_ISINC_FILTER[] = {790, -1085, -1073, -553, 747, 2341, 3156, 2152, -893, -4915, -7834, -7536, -3102, 4441, 12354, 17394, 17394,
-                                   12354, 4441, -3102, -7536, -7834, -4915, -893, 2152, 3156, 2341, 747, -553, -1073, -1085, 790};
+// Generated using rcosdesign(0.2, 8, 20, 'sqrt') in MATLAB
+static q15_t NXDN_0_2_FILTER[] = {201, 174, 140, 99, 52, 0, -55, -112, -170, -226, -278, -325, -365, -397, -417, -427, -424, -407, -377, -333, -277, -208,
+								  -128, -40, 56, 156, 258, 358, 455, 544, 622, 687, 736, 766, 775, 762, 725, 664, 579, 471, 342, 193, 27, -151, -338, -528,
+								  -718, -901, -1072, -1225, -1354, -1454, -1520, -1547, -1530, -1466, -1353, -1189, -972, -704, -385, -18, 394, 846, 1333,
+								  1850, 2388, 2940, 3498, 4053, 4598, 5122, 5619, 6079, 6494, 6859, 7166, 7410, 7588, 7696, 7732, 7696, 7588, 7410, 7166,
+								  6859, 6494, 6079, 5619, 5122, 4598, 4053, 3498, 2940, 2388, 1850, 1333, 846, 394, -18, -385, -704, -972, -1189, -1353,
+								  -1466, -1530, -1547, -1520, -1454, -1354, -1225, -1072, -901, -718, -528, -338, -151, 27, 193, 342, 471, 579, 664, 725,
+								  762, 775, 766, 736, 687, 622, 544, 455, 358, 258, 156, 56, -40, -128, -208, -277, -333, -377, -407, -424, -427, -417, -397,
+								  -365, -325, -278, -226, -170, -112, -55, 0, 52, 99, 140, 174, 201, 0};
+const uint16_t NXDN_0_2_FILTER_LEN = 162U;
+
+static q15_t NXDN_ISINC_FILTER[] = {7616, -1333, -1856, -2611, -3399, -4006, -4230, -3918, -2988, -1458, 561, 2867, 5200, 7276, 8832, 9665,
+                                    9665, 8832, 7276, 5200, 2867, 561, -1458, -2988, -3918, -4230, -4006, -3399, -2611, -1856, -1333, 7616};
 const uint16_t NXDN_ISINC_FILTER_LEN = 32U;
-#endif
 
-#if defined(MODE_DSTAR)
-// Generated using gaussfir(0.5, 4, 5) in MATLAB
-static q15_t   GAUSSIAN_0_5_FILTER[] = {8, 104, 760, 3158, 7421, 9866, 7421, 3158, 760, 104, 8, 0};
-const uint16_t GAUSSIAN_0_5_FILTER_LEN = 12U;
+#if !defined (DSTARBOXCAR)
+// Generated using gaussfir(0.5, 4, 10) in MATLAB
+static q15_t   GAUSSIAN_0_5_FILTER[] = {1, 4, 15, 52, 151, 380, 832, 1579, 2599, 3710, 4594, 4933, 4594, 3710, 2599, 1579, 832, 380, 151, 52, 15, 4, 1, 0};
+const uint16_t GAUSSIAN_0_5_FILTER_LEN = 24U;
 #endif
-
-#if defined(MODE_P25)
 // One symbol boxcar filter
-static q15_t   BOXCAR5_FILTER[] = {12000, 12000, 12000, 12000, 12000, 0};
-const uint16_t BOXCAR5_FILTER_LEN = 6U;
-#endif
+static q15_t   BOXCAR_FILTER[] = {6000, 6000, 6000, 6000, 6000, 6000, 6000, 6000, 6000, 6000, 0, 0};
+const uint16_t BOXCAR_FILTER_LEN = 12U;
 
 const uint16_t DC_OFFSET = 2048U;
 
@@ -83,40 +65,22 @@ m_started(false),
 m_rxBuffer(RX_RINGBUFFER_SIZE),
 m_txBuffer(TX_RINGBUFFER_SIZE),
 m_rssiBuffer(RX_RINGBUFFER_SIZE),
-#if defined(USE_DCBLOCKER)
 m_dcFilter(),
 m_dcState(),
-#endif
-#if defined(MODE_DSTAR)
+m_rrcFilter(),
+#if !defined (DSTARBOXCAR)
 m_gaussianFilter(),
-m_gaussianState(),
 #endif
-#if defined(MODE_DMR)
-m_rrc02Filter1(),
-m_rrc02State1(),
-#endif
-#if defined(MODE_YSF)
-m_rrc02Filter2(),
-m_rrc02State2(),
-#endif
-#if defined(MODE_P25)
-m_boxcar5Filter(),
-m_boxcar5State(),
-#endif
-#if defined(MODE_NXDN) && defined(USE_NXDN_BOXCAR)
-m_boxcar10Filter(),
-m_boxcar10State(),
-#endif
-#if defined(MODE_DPMR) || (defined(MODE_NXDN) && !defined(USE_NXDN_BOXCAR))
+m_boxcarFilter(),
 m_nxdnFilter(),
 m_nxdnISincFilter(),
+m_rrcState(),
+#if !defined (DSTARBOXCAR)
+m_gaussianState(),
+#endif
+m_boxcarState(),
 m_nxdnState(),
 m_nxdnISincState(),
-#endif
-#if defined(MODE_M17)
-m_rrc05Filter(),
-m_rrc05State(),
-#endif
 m_pttInvert(false),
 m_rxLevel(128 * 128),
 m_cwIdTXLevel(128 * 128),
@@ -125,14 +89,9 @@ m_dmrTXLevel(128 * 128),
 m_ysfTXLevel(128 * 128),
 m_p25TXLevel(128 * 128),
 m_nxdnTXLevel(128 * 128),
-m_m17TXLevel(128 * 128),
-m_dpmrTXLevel(128 * 128),
 m_pocsagTXLevel(128 * 128),
-m_fmTXLevel(128 * 128),
-m_ax25TXLevel(128 * 128),
 m_rxDCOffset(DC_OFFSET),
 m_txDCOffset(DC_OFFSET),
-m_useCOSAsLockout(false),
 m_ledCount(0U),
 m_ledValue(true),
 m_detect(false),
@@ -141,53 +100,32 @@ m_dacOverflow(0U),
 m_watchdog(0U),
 m_lockout(false)
 {
-#if defined(USE_DCBLOCKER)
-  ::memset(m_dcState, 0x00U, 4U * sizeof(q31_t));
+  ::memset(m_rrcState,      	0x00U,  140U * sizeof(q15_t));
+#if !defined (DSTARBOXCAR)
+  ::memset(m_gaussianState, 	0x00U,   80U * sizeof(q15_t));
+#endif
+  ::memset(m_boxcarState,   	0x00U,   60U * sizeof(q15_t));
+  ::memset(m_nxdnState,     	0x00U, 	220U * sizeof(q15_t));
+  ::memset(m_nxdnISincState, 	0x00U, 	 60U * sizeof(q15_t));
+  ::memset(m_dcState,       	0x00U,    4U * sizeof(q31_t));
+
   m_dcFilter.numStages = DC_FILTER_STAGES;
   m_dcFilter.pState    = m_dcState;
   m_dcFilter.pCoeffs   = DC_FILTER;
   m_dcFilter.postShift = 0;
-#endif
 
-#if defined(MODE_DSTAR)
-  ::memset(m_gaussianState, 0x00U, 40U * sizeof(q15_t));
+  m_rrcFilter.numTaps = RRC_0_2_FILTER_LEN;
+  m_rrcFilter.pState  = m_rrcState;
+  m_rrcFilter.pCoeffs = RRC_0_2_FILTER;
+#if !defined (DSTARBOXCAR)
   m_gaussianFilter.numTaps = GAUSSIAN_0_5_FILTER_LEN;
   m_gaussianFilter.pState  = m_gaussianState;
   m_gaussianFilter.pCoeffs = GAUSSIAN_0_5_FILTER;
 #endif
-
-#if defined(MODE_DMR)
-  ::memset(m_rrc02State1, 0x00U, 70U * sizeof(q15_t));
-  m_rrc02Filter1.numTaps = RRC_0_2_FILTER_LEN;
-  m_rrc02Filter1.pState  = m_rrc02State1;
-  m_rrc02Filter1.pCoeffs = RRC_0_2_FILTER;
-#endif
-
-#if defined(MODE_YSF)
-  ::memset(m_rrc02State2, 0x00U, 70U * sizeof(q15_t));
-  m_rrc02Filter2.numTaps = RRC_0_2_FILTER_LEN;
-  m_rrc02Filter2.pState  = m_rrc02State2;
-  m_rrc02Filter2.pCoeffs = RRC_0_2_FILTER;
-#endif
-
-#if defined(MODE_P25)
-  ::memset(m_boxcar5State, 0x00U, 30U * sizeof(q15_t));
-  m_boxcar5Filter.numTaps = BOXCAR5_FILTER_LEN;
-  m_boxcar5Filter.pState  = m_boxcar5State;
-  m_boxcar5Filter.pCoeffs = BOXCAR5_FILTER;
-#endif
-
-#if defined(MODE_NXDN) && defined(USE_NXDN_BOXCAR)
-  ::memset(m_boxcar10State, 0x00U, 40U * sizeof(q15_t));
-  m_boxcar10Filter.numTaps = BOXCAR10_FILTER_LEN;
-  m_boxcar10Filter.pState  = m_boxcar10State;
-  m_boxcar10Filter.pCoeffs = BOXCAR10_FILTER;
-#endif
-
-#if defined(MODE_DPMR) || (defined(MODE_NXDN) && !defined(USE_NXDN_BOXCAR))
-  ::memset(m_nxdnState,      0x00U, 110U * sizeof(q15_t));
-  ::memset(m_nxdnISincState, 0x00U, 60U * sizeof(q15_t));
-
+  m_boxcarFilter.numTaps = BOXCAR_FILTER_LEN;
+  m_boxcarFilter.pState  = m_boxcarState;
+  m_boxcarFilter.pCoeffs = BOXCAR_FILTER;
+  
   m_nxdnFilter.numTaps = NXDN_0_2_FILTER_LEN;
   m_nxdnFilter.pState  = m_nxdnState;
   m_nxdnFilter.pCoeffs = NXDN_0_2_FILTER;
@@ -195,14 +133,6 @@ m_lockout(false)
   m_nxdnISincFilter.numTaps = NXDN_ISINC_FILTER_LEN;
   m_nxdnISincFilter.pState  = m_nxdnISincState;
   m_nxdnISincFilter.pCoeffs = NXDN_ISINC_FILTER;
-#endif
-
-#if defined(MODE_M17)
-  ::memset(m_rrc05State, 0x00U, 70U * sizeof(q15_t));
-  m_rrc05Filter.numTaps = RRC_0_5_FILTER_LEN;
-  m_rrc05Filter.pState  = m_rrc05State;
-  m_rrc05Filter.pCoeffs = RRC_0_5_FILTER;
-#endif
 
   initInt();
   
@@ -213,126 +143,129 @@ void CIO::selfTest()
 {
   bool ledValue = false;
 
-  for (uint8_t i = 0U; i < 6U; i++) {
+  for (uint8_t i = 0; i < 6; i++) {
     ledValue = !ledValue;
 
     // We exclude PTT to avoid trigger the transmitter
     setLEDInt(ledValue);
     setCOSInt(ledValue);
-#if defined(MODE_LEDS)
+#if defined(MODE_PINS)
     setDStarInt(ledValue);
     setDMRInt(ledValue);
     setYSFInt(ledValue);
     setP25Int(ledValue);
-#if !defined(USE_ALTERNATE_NXDN_LEDS)
     setNXDNInt(ledValue);
-#endif
-#if !defined(USE_ALTERNATE_M17_LEDS)
-    setM17Int(ledValue);
-#endif
-#if !defined(USE_ALTERNATE_POCSAG_LEDS)
     setPOCSAGInt(ledValue);
-#endif
-#if !defined(USE_ALTERNATE_FM_LEDS)
-    setFMInt(ledValue);
-#endif
-#if !defined(USE_ALTERNATE_DPMR_LEDS)
-    setDPMRInt(ledValue);
-#endif
 #endif
     delayInt(250);
   }
 
-#if defined(MODE_LEDS)
-  setDStarInt(false);
-  setDMRInt(false);
-  setYSFInt(false);
-  setP25Int(false);
-#if !defined(USE_ALTERNATE_NXDN_LEDS)
-  setNXDNInt(false);
-#endif
-#if !defined(USE_ALTERNATE_M17_LEDS)
-  setM17Int(false);
-#endif
-#if !defined(USE_ALTERNATE_POCSAG_LEDS)
-  setPOCSAGInt(false);
-#endif
-#if !defined(USE_ALTERNATE_FM_LEDS)
-  setFMInt(false);
-#endif
-#if !defined(USE_ALTERNATE_DPMR_LEDS)
-  setDPMRInt(false);
-#endif
+#if defined(MODE_PINS)
   setDStarInt(true);
-
-  delayInt(250);
-  setDMRInt(true);
-
-  delayInt(250);
-  setYSFInt(true);
-
-  delayInt(250);
-  setP25Int(true);
-
-#if !defined(USE_ALTERNATE_NXDN_LEDS)
-  delayInt(250);
-  setNXDNInt(true);
-#endif
-
-#if !defined(USE_ALTERNATE_M17_LEDS)
-  delayInt(250);
-  setM17Int(true);
-#endif
-
-#if !defined(USE_ALTERNATE_POCSAG_LEDS)
-  delayInt(250);
-  setPOCSAGInt(true);
-#endif
-
-#if !defined(USE_ALTERNATE_FM_LEDS)
-  delayInt(250);
-  setFMInt(true);
-#endif
-
-#if !defined(USE_ALTERNATE_DPMR_LEDS)
-  delayInt(250);
-  setDPMRInt(true);
-
-  delayInt(250);
-  setDPMRInt(false);
-#endif
-
-#if !defined(USE_ALTERNATE_FM_LEDS)
-  delayInt(250);
-  setFMInt(true);
-#endif
-
-#if !defined(USE_ALTERNATE_POCSAG_LEDS)
-  delayInt(250);
-  setPOCSAGInt(false);
-#endif
-
-#if !defined(USE_ALTERNATE_M17_LEDS)
-  delayInt(250);
-  setM17Int(false);
-#endif
-
-#if !defined(USE_ALTERNATE_NXDN_LEDS)
-  delayInt(250);
-  setNXDNInt(false);
-#endif
-
-  delayInt(250);
-  setP25Int(false);
-
-  delayInt(250);
-  setYSFInt(false);
-
-  delayInt(250);
   setDMRInt(false);
+  setYSFInt(false);
+  setP25Int(false);
+  setNXDNInt(false);
+  setPOCSAGInt(false);
 
   delayInt(250);
+
+  setDStarInt(true);
+  setDMRInt(true);
+  setYSFInt(false);
+  setP25Int(false);
+  setNXDNInt(false);
+  setPOCSAGInt(false);
+
+  delayInt(250);
+
+  setDStarInt(true);
+  setDMRInt(true);
+  setYSFInt(true);
+  setP25Int(false);
+  setNXDNInt(false);
+  setPOCSAGInt(false);
+  
+  delayInt(250);
+
+  setDStarInt(true);
+  setDMRInt(true);
+  setYSFInt(true);
+  setP25Int(true);
+  setNXDNInt(false);
+  setPOCSAGInt(false);
+  
+  delayInt(250);
+
+  setDStarInt(true);
+  setDMRInt(true);
+  setYSFInt(true);
+  setP25Int(true);
+  setNXDNInt(true);
+  setPOCSAGInt(false);
+  
+  delayInt(250);
+
+  setDStarInt(true);
+  setDMRInt(true);
+  setYSFInt(true);
+  setP25Int(true);
+  setNXDNInt(true);
+  setPOCSAGInt(true);
+  
+  delayInt(250);
+
+  setDStarInt(true);
+  setDMRInt(true);
+  setYSFInt(true);
+  setP25Int(true);
+  setNXDNInt(true);
+  setPOCSAGInt(false);
+  
+  delayInt(250);
+
+  setDStarInt(true);
+  setDMRInt(true);
+  setYSFInt(true);
+  setP25Int(true);
+  setNXDNInt(false);
+  setPOCSAGInt(false);
+
+  delayInt(250);
+  
+  setDStarInt(true);
+  setDMRInt(true);
+  setYSFInt(true);
+  setP25Int(false);
+  setNXDNInt(false);
+  setPOCSAGInt(false);
+
+  delayInt(250);
+
+  setDStarInt(true);
+  setDMRInt(true);
+  setYSFInt(false);
+  setP25Int(false);
+  setNXDNInt(false);
+  setPOCSAGInt(false);
+
+  delayInt(250);
+  
+  setDStarInt(true);
+  setDMRInt(false);
+  setYSFInt(false);
+  setP25Int(false);
+  setNXDNInt(false);
+  setPOCSAGInt(false);
+
+  delayInt(250);
+
   setDStarInt(false);
+  setDMRInt(false);
+  setYSFInt(false);
+  setP25Int(false);
+  setNXDNInt(false);
+  setPOCSAGInt(false);
 #endif
 }
 
@@ -345,7 +278,7 @@ void CIO::start()
 
   m_started = true;
 
-  setMode(STATE_IDLE);
+  setMode();
 }
 
 void CIO::process()
@@ -353,13 +286,12 @@ void CIO::process()
   m_ledCount++;
   if (m_started) {
     // Two seconds timeout
-    if (m_watchdog >= 48000U) {
-      if (m_modemState == STATE_DSTAR || m_modemState == STATE_DMR || m_modemState == STATE_YSF || m_modemState == STATE_P25 || m_modemState == STATE_NXDN || m_modemState == STATE_M17 || m_modemState == STATE_DPMR || m_modemState == STATE_POCSAG) {
-#if defined(MODE_DMR)
+    if (m_watchdog >= 96000U) {
+      if (m_modemState == STATE_DSTAR || m_modemState == STATE_DMR || m_modemState == STATE_YSF || m_modemState == STATE_P25 || m_modemState == STATE_NXDN) {
         if (m_modemState == STATE_DMR && m_tx)
           dmrTX.setStart(false);
-#endif
-        setMode(STATE_IDLE);
+        m_modemState = STATE_IDLE;
+        setMode();
       }
 
       m_watchdog = 0U;
@@ -368,14 +300,14 @@ void CIO::process()
 #if defined(CONSTANT_SRV_LED)
     setLEDInt(true);
 #else
-    if (m_ledCount >= 24000U) {
+    if (m_ledCount >= 48000U) {
       m_ledCount = 0U;
       m_ledValue = !m_ledValue;
       setLEDInt(m_ledValue);
     }
 #endif
   } else {
-    if (m_ledCount >= 240000U) {
+    if (m_ledCount >= 480000U) {
       m_ledCount = 0U;
       m_ledValue = !m_ledValue;
       setLEDInt(m_ledValue);
@@ -383,14 +315,14 @@ void CIO::process()
     return;
   }
 
-  if (m_useCOSAsLockout)
-    m_lockout = getCOSInt();
+#if defined(USE_COS_AS_LOCKOUT)
+  m_lockout = getCOSInt();
+#endif
 
   // Switch off the transmitter if needed
   if (m_txBuffer.getData() == 0U && m_tx) {
     m_tx = false;
     setPTTInt(m_pttInvert ? true : false);
-    DEBUG1("TX OFF");
   }
 
   if (m_rxBuffer.getData() >= RX_BLOCK_SIZE) {
@@ -399,16 +331,15 @@ void CIO::process()
     uint16_t rssi[RX_BLOCK_SIZE];
 
     for (uint16_t i = 0U; i < RX_BLOCK_SIZE; i++) {
-      TSample sample;
-      m_rxBuffer.get(sample);
-      control[i] = sample.control;
+      uint16_t sample;
+      m_rxBuffer.get(sample, control[i]);
       m_rssiBuffer.get(rssi[i]);
 
       // Detect ADC overflow
-      if (m_detect && (sample.sample == 0U || sample.sample == 4095U))
+      if (m_detect && (sample == 0U || sample == 4095U))
         m_adcOverflow++;
 
-      q15_t res1 = q15_t(sample.sample) - m_rxDCOffset;
+      q15_t res1 = q15_t(sample) - m_rxDCOffset;
       q31_t res2 = res1 * m_rxLevel;
       samples[i] = q15_t(__SSAT((res2 >> 15), 16));
     }
@@ -436,145 +367,83 @@ void CIO::process()
 #endif
 
     if (m_modemState == STATE_IDLE) {
-#if defined(MODE_DSTAR)
       if (m_dstarEnable) {
         q15_t GMSKVals[RX_BLOCK_SIZE];
 #if defined(USE_DCBLOCKER)
+	#if !defined (DSTARBOXCAR)
         ::arm_fir_fast_q15(&m_gaussianFilter, dcSamples, GMSKVals, RX_BLOCK_SIZE);
+    #else
+        ::arm_fir_fast_q15(&m_boxcarFilter, dcSamples, GMSKVals, RX_BLOCK_SIZE);
+	#endif
 #else
-        ::arm_fir_fast_q15(&m_gaussianFilter, samples, GMSKVals, RX_BLOCK_SIZE);
+	#if !defined (DSTARBOXCAR)
+    	::arm_fir_fast_q15(&m_gaussianFilter, samples, GMSKVals, RX_BLOCK_SIZE);
+	#else
+    	::arm_fir_fast_q15(&m_boxcarFilter, samples, GMSKVals, RX_BLOCK_SIZE);
+	#endif
 #endif
         dstarRX.samples(GMSKVals, rssi, RX_BLOCK_SIZE);
       }
-#endif
 
-#if defined(MODE_P25)
       if (m_p25Enable) {
         q15_t P25Vals[RX_BLOCK_SIZE];
 #if defined(USE_DCBLOCKER)
-        ::arm_fir_fast_q15(&m_boxcar5Filter, dcSamples, P25Vals, RX_BLOCK_SIZE);
+        ::arm_fir_fast_q15(&m_boxcarFilter, dcSamples, P25Vals, RX_BLOCK_SIZE);
 #else
-        ::arm_fir_fast_q15(&m_boxcar5Filter, samples, P25Vals, RX_BLOCK_SIZE);
+        ::arm_fir_fast_q15(&m_boxcarFilter, samples, P25Vals, RX_BLOCK_SIZE);
 #endif
         p25RX.samples(P25Vals, rssi, RX_BLOCK_SIZE);
       }
-#endif
 
-#if defined(MODE_NXDN)
       if (m_nxdnEnable) {
-        q15_t NXDNVals[RX_BLOCK_SIZE];
-#if defined(USE_NXDN_BOXCAR)
-#if defined(USE_DCBLOCKER)
-        ::arm_fir_fast_q15(&m_boxcar10Filter, dcSamples, NXDNVals, RX_BLOCK_SIZE);
-#else
-        ::arm_fir_fast_q15(&m_boxcar10Filter, samples, NXDNVals, RX_BLOCK_SIZE);
-#endif
-#else
         q15_t NXDNValsTmp[RX_BLOCK_SIZE];
 #if defined(USE_DCBLOCKER)
         ::arm_fir_fast_q15(&m_nxdnFilter, dcSamples, NXDNValsTmp, RX_BLOCK_SIZE);
 #else
         ::arm_fir_fast_q15(&m_nxdnFilter, samples, NXDNValsTmp, RX_BLOCK_SIZE);
 #endif
+        q15_t NXDNVals[RX_BLOCK_SIZE];
         ::arm_fir_fast_q15(&m_nxdnISincFilter, NXDNValsTmp, NXDNVals, RX_BLOCK_SIZE);
-#endif
+
         nxdnRX.samples(NXDNVals, rssi, RX_BLOCK_SIZE);
       }
-#endif
 
-#if defined(MODE_DMR)
-      if (m_dmrEnable) {
-        q15_t DMRVals[RX_BLOCK_SIZE];
-        ::arm_fir_fast_q15(&m_rrc02Filter1, samples, DMRVals, RX_BLOCK_SIZE);
-
-        if (m_duplex)
-          dmrIdleRX.samples(DMRVals, RX_BLOCK_SIZE);
-        else
-          dmrDMORX.samples(DMRVals, rssi, RX_BLOCK_SIZE);
-      }
-#endif
-
-#if defined(MODE_YSF)
-      if (m_ysfEnable) {
-        q15_t YSFVals[RX_BLOCK_SIZE];
-#if defined(USE_DCBLOCKER)
-        ::arm_fir_fast_q15(&m_rrc02Filter2, dcSamples, YSFVals, RX_BLOCK_SIZE);
-#else
-        ::arm_fir_fast_q15(&m_rrc02Filter2, samples, YSFVals, RX_BLOCK_SIZE);
-#endif
-        ysfRX.samples(YSFVals, rssi, RX_BLOCK_SIZE);
-      }
-#endif
-
-#if defined(MODE_M17)
-      if (m_m17Enable) {
+      if (m_dmrEnable || m_ysfEnable) {
         q15_t RRCVals[RX_BLOCK_SIZE];
-#if defined(USE_DCBLOCKER)
-        ::arm_fir_fast_q15(&m_rrc05Filter, dcSamples, RRCVals, RX_BLOCK_SIZE);
-#else
-        ::arm_fir_fast_q15(&m_rrc05Filter, samples, RRCVals, RX_BLOCK_SIZE);
-#endif
-        m17RX.samples(RRCVals, rssi, RX_BLOCK_SIZE);
+        ::arm_fir_fast_q15(&m_rrcFilter, samples, RRCVals, RX_BLOCK_SIZE);
+
+        if (m_ysfEnable)
+          ysfRX.samples(RRCVals, rssi, RX_BLOCK_SIZE);
+
+        if (m_dmrEnable) {
+          if (m_duplex)
+            dmrIdleRX.samples(RRCVals, RX_BLOCK_SIZE);
+          else
+            dmrDMORX.samples(RRCVals, rssi, RX_BLOCK_SIZE);
+        }
       }
-#endif
-
-#if defined(MODE_DPMR)
-      if (m_dpmrEnable) {
-        q15_t DPMRValsTmp[RX_BLOCK_SIZE];
-#if defined(USE_DCBLOCKER)
-        ::arm_fir_fast_q15(&m_nxdnFilter, dcSamples, DPMRValsTmp, RX_BLOCK_SIZE);
-#else
-        ::arm_fir_fast_q15(&m_nxdnFilter, samples, DPMRValsTmp, RX_BLOCK_SIZE);
-#endif
-
-        q15_t DPMRVals[RX_BLOCK_SIZE];
-        ::arm_fir_fast_q15(&m_nxdnISincFilter, DPMRValsTmp, DPMRVals, RX_BLOCK_SIZE);
-
-        dpmrRX.samples(DPMRVals, rssi, RX_BLOCK_SIZE);
-      }
-#endif
-
-#if defined(MODE_FM)
-      if (m_fmEnable) {
-        bool cos = getCOSInt();
-#if defined(USE_DCBLOCKER)
-        fm.samples(cos, dcSamples, RX_BLOCK_SIZE);
-#else
-        fm.samples(cos, samples, RX_BLOCK_SIZE);
-#endif
-      }
-#endif
-
-#if defined(MODE_FM) && defined(MODE_AX25)
-      if (m_ax25Enable) {
-#if defined(USE_DCBLOCKER)
-        ax25RX.samples(dcSamples, RX_BLOCK_SIZE);
-#else
-        ax25RX.samples(samples, RX_BLOCK_SIZE);
-#endif
-      }
-#endif
-    }
-
-#if defined(MODE_DSTAR)
-    else if (m_modemState == STATE_DSTAR) {
+    } else if (m_modemState == STATE_DSTAR) {
       if (m_dstarEnable) {
         q15_t GMSKVals[RX_BLOCK_SIZE];
 #if defined(USE_DCBLOCKER)
+	#if !defined (DSTARBOXCAR)
         ::arm_fir_fast_q15(&m_gaussianFilter, dcSamples, GMSKVals, RX_BLOCK_SIZE);
+	#else
+        ::arm_fir_fast_q15(&m_boxcarFilter, dcSamples, GMSKVals, RX_BLOCK_SIZE);
+	#endif
 #else
-        ::arm_fir_fast_q15(&m_gaussianFilter, samples, GMSKVals, RX_BLOCK_SIZE);
+	#if !defined (DSTARBOXCAR)
+		::arm_fir_fast_q15(&m_gaussianFilter, samples, GMSKVals, RX_BLOCK_SIZE);
+	#else
+		::arm_fir_fast_q15(&m_boxcarFilter, samples, GMSKVals, RX_BLOCK_SIZE);
+	#endif
 #endif
         dstarRX.samples(GMSKVals, rssi, RX_BLOCK_SIZE);
       }
-    }
-#endif
-
-#if defined(MODE_DMR)
-    else if (m_modemState == STATE_DMR) {
+    } else if (m_modemState == STATE_DMR) {
       if (m_dmrEnable) {
         q15_t DMRVals[RX_BLOCK_SIZE];
-        ::arm_fir_fast_q15(&m_rrc02Filter1, samples, DMRVals, RX_BLOCK_SIZE);
+        ::arm_fir_fast_q15(&m_rrcFilter, samples, DMRVals, RX_BLOCK_SIZE);
 
         if (m_duplex) {
           // If the transmitter isn't on, use the DMR idle RX to detect the wakeup CSBKs
@@ -586,124 +455,48 @@ void CIO::process()
           dmrDMORX.samples(DMRVals, rssi, RX_BLOCK_SIZE);
         }
       }
-    }
-#endif
-
-#if defined(MODE_YSF)
-    else if (m_modemState == STATE_YSF) {
+    } else if (m_modemState == STATE_YSF) {
       if (m_ysfEnable) {
         q15_t YSFVals[RX_BLOCK_SIZE];
 #if defined(USE_DCBLOCKER)
-        ::arm_fir_fast_q15(&m_rrc02Filter2, dcSamples, YSFVals, RX_BLOCK_SIZE);
+        ::arm_fir_fast_q15(&m_rrcFilter, dcSamples, YSFVals, RX_BLOCK_SIZE);
 #else
-        ::arm_fir_fast_q15(&m_rrc02Filter2, samples, YSFVals, RX_BLOCK_SIZE);
+        ::arm_fir_fast_q15(&m_rrcFilter, samples, YSFVals, RX_BLOCK_SIZE);
 #endif
         ysfRX.samples(YSFVals, rssi, RX_BLOCK_SIZE);
       }
-    }
-#endif
-
-#if defined(MODE_P25)
-    else if (m_modemState == STATE_P25) {
+    } else if (m_modemState == STATE_P25) {
       if (m_p25Enable) {
         q15_t P25Vals[RX_BLOCK_SIZE];
 #if defined(USE_DCBLOCKER)
-        ::arm_fir_fast_q15(&m_boxcar5Filter, dcSamples, P25Vals, RX_BLOCK_SIZE);
+        ::arm_fir_fast_q15(&m_boxcarFilter, dcSamples, P25Vals, RX_BLOCK_SIZE);
 #else
-        ::arm_fir_fast_q15(&m_boxcar5Filter, samples, P25Vals, RX_BLOCK_SIZE);
+        ::arm_fir_fast_q15(&m_boxcarFilter, samples, P25Vals, RX_BLOCK_SIZE);
 #endif
         p25RX.samples(P25Vals, rssi, RX_BLOCK_SIZE);
       }
-    }
-#endif
-
-#if defined(MODE_NXDN)
-    else if (m_modemState == STATE_NXDN) {
+    } else if (m_modemState == STATE_NXDN) {
       if (m_nxdnEnable) {
-        q15_t NXDNVals[RX_BLOCK_SIZE];
-#if defined(USE_NXDN_BOXCAR)
-#if defined(USE_DCBLOCKER)
-        ::arm_fir_fast_q15(&m_boxcar10Filter, dcSamples, NXDNVals, RX_BLOCK_SIZE);
-#else
-        ::arm_fir_fast_q15(&m_boxcar10Filter, samples, NXDNVals, RX_BLOCK_SIZE);
-#endif
-#else
         q15_t NXDNValsTmp[RX_BLOCK_SIZE];
 #if defined(USE_DCBLOCKER)
         ::arm_fir_fast_q15(&m_nxdnFilter, dcSamples, NXDNValsTmp, RX_BLOCK_SIZE);
 #else
         ::arm_fir_fast_q15(&m_nxdnFilter, samples, NXDNValsTmp, RX_BLOCK_SIZE);
 #endif
+        q15_t NXDNVals[RX_BLOCK_SIZE];
         ::arm_fir_fast_q15(&m_nxdnISincFilter, NXDNValsTmp, NXDNVals, RX_BLOCK_SIZE);
-#endif
+
         nxdnRX.samples(NXDNVals, rssi, RX_BLOCK_SIZE);
       }
-    }
-#endif
-
-#if defined(MODE_M17)
-    else if (m_modemState == STATE_M17) {
-      if (m_m17Enable) {
-        q15_t M17Vals[RX_BLOCK_SIZE];
-#if defined(USE_DCBLOCKER)
-        ::arm_fir_fast_q15(&m_rrc05Filter, dcSamples, M17Vals, RX_BLOCK_SIZE);
-#else
-        ::arm_fir_fast_q15(&m_rrc05Filter, samples, M17Vals, RX_BLOCK_SIZE);
-#endif
-        m17RX.samples(M17Vals, rssi, RX_BLOCK_SIZE);
-      }
-    }
-#endif
-
-#if defined(MODE_DPMR)
-    else if (m_modemState == STATE_DPMR) {
-      if (m_dpmrEnable) {
-        q15_t DPMRValsTmp[RX_BLOCK_SIZE];
-#if defined(USE_DCBLOCKER)
-        ::arm_fir_fast_q15(&m_nxdnFilter, dcSamples, DPMRValsTmp, RX_BLOCK_SIZE);
-#else
-        ::arm_fir_fast_q15(&m_nxdnFilter, samples, DPMRValsTmp, RX_BLOCK_SIZE);
-#endif
-
-        q15_t DPMRVals[RX_BLOCK_SIZE];
-        ::arm_fir_fast_q15(&m_nxdnISincFilter, DPMRValsTmp, DPMRVals, RX_BLOCK_SIZE);
-
-        dpmrRX.samples(DPMRVals, rssi, RX_BLOCK_SIZE);
-      }
-    }
-#endif
-
-#if defined(MODE_FM)
-    else if (m_modemState == STATE_FM) {
-      bool cos = getCOSInt();
-#if defined(USE_DCBLOCKER)
-      fm.samples(cos, dcSamples, RX_BLOCK_SIZE);
-
-#if defined(MODE_AX25)
-      if (m_ax25Enable)
-        ax25RX.samples(dcSamples, RX_BLOCK_SIZE);
-#endif
-#else
-      fm.samples(cos, samples, RX_BLOCK_SIZE);
-
-#if defined(MODE_AX25)
-      if (m_ax25Enable)
-        ax25RX.samples(samples, RX_BLOCK_SIZE);
-#endif
-#endif
-    }
-#endif
-
-#if defined(MODE_DSTAR)
-    else if (m_modemState == STATE_DSTARCAL) {
+    } else if (m_modemState == STATE_DSTARCAL) {
       q15_t GMSKVals[RX_BLOCK_SIZE];
-      ::arm_fir_fast_q15(&m_gaussianFilter, samples, GMSKVals, RX_BLOCK_SIZE);
-
-      calDStarRX.samples(GMSKVals, RX_BLOCK_SIZE);
-    }
+#if !defined (DSTARBOXCAR)
+    	::arm_fir_fast_q15(&m_gaussianFilter, samples, GMSKVals, RX_BLOCK_SIZE);
+#else
+    	::arm_fir_fast_q15(&m_boxcarFilter, samples, GMSKVals, RX_BLOCK_SIZE);
 #endif
-
-    else if (m_modemState == STATE_RSSICAL) {
+      calDStarRX.samples(GMSKVals, RX_BLOCK_SIZE);
+    } else if (m_modemState == STATE_RSSICAL) {
       calRSSI.samples(rssi, RX_BLOCK_SIZE);
     }
   }
@@ -721,7 +514,6 @@ void CIO::write(MMDVM_STATE mode, q15_t* samples, uint16_t length, const uint8_t
   if (!m_tx) {
     m_tx = true;
     setPTTInt(m_pttInvert ? false : true);
-    DEBUG1("TX ON");
   }
 
   q15_t txLevel = 0;
@@ -741,21 +533,9 @@ void CIO::write(MMDVM_STATE mode, q15_t* samples, uint16_t length, const uint8_t
     case STATE_NXDN:
       txLevel = m_nxdnTXLevel;
       break;
-    case STATE_M17:
-      txLevel = m_m17TXLevel;
-      break;
-    case STATE_DPMR:
-      txLevel = m_dpmrTXLevel;
-      break;
     case STATE_POCSAG:
       txLevel = m_pocsagTXLevel;
       break;
-    case STATE_FM:
-      txLevel = m_fmTXLevel;
-      break;
-    case STATE_AX25:
-      txLevel = m_ax25TXLevel;
-      break;
     default:
       txLevel = m_cwIdTXLevel;
       break;
@@ -771,9 +551,9 @@ void CIO::write(MMDVM_STATE mode, q15_t* samples, uint16_t length, const uint8_t
       m_dacOverflow++;
 
     if (control == NULL)
-      m_txBuffer.put({res3, MARK_NONE});
+      m_txBuffer.put(res3, MARK_NONE);
     else
-      m_txBuffer.put({res3, control[i]});
+      m_txBuffer.put(res3, control[i]);
   }
 }
 
@@ -795,43 +575,19 @@ void CIO::setADCDetection(bool detect)
   m_detect = detect;
 }
 
-void CIO::setMode(MMDVM_STATE state)
+void CIO::setMode()
 {
-  if (state == m_modemState)
-    return;
-
-#if defined(MODE_LEDS)
-  switch (m_modemState) {
-    case STATE_DSTAR:  setDStarInt(false);  break;
-    case STATE_DMR:    setDMRInt(false);    break;
-    case STATE_YSF:    setYSFInt(false);    break;
-    case STATE_P25:    setP25Int(false);    break;
-    case STATE_NXDN:   setNXDNInt(false);   break;
-    case STATE_M17:    setM17Int(false);    break;
-    case STATE_DPMR:   setDPMRInt(false);   break;
-    case STATE_POCSAG: setPOCSAGInt(false); break;
-    case STATE_FM:     setFMInt(false);     break;
-    default: break;
-  }
-
-  switch (state) {
-    case STATE_DSTAR:  setDStarInt(true);  break;
-    case STATE_DMR:    setDMRInt(true);    break;
-    case STATE_YSF:    setYSFInt(true);    break;
-    case STATE_P25:    setP25Int(true);    break;
-    case STATE_NXDN:   setNXDNInt(true);   break;
-    case STATE_M17:    setM17Int(true);    break;
-    case STATE_DPMR:   setDPMRInt(true);   break;
-    case STATE_POCSAG: setPOCSAGInt(true); break;
-    case STATE_FM:     setFMInt(true);     break;
-    default: break;
-  }
+#if defined(MODE_PINS)
+  setDStarInt(m_modemState == STATE_DSTAR);
+  setDMRInt(m_modemState   == STATE_DMR);
+  setYSFInt(m_modemState   == STATE_YSF);
+  setP25Int(m_modemState   == STATE_P25);
+  setNXDNInt(m_modemState  == STATE_NXDN);
+  setPOCSAGInt(m_modemState  == STATE_POCSAG);
 #endif
-
-  m_modemState = state;
 }
 
-void CIO::setParameters(bool rxInvert, bool txInvert, bool pttInvert, uint8_t rxLevel, uint8_t cwIdTXLevel, uint8_t dstarTXLevel, uint8_t dmrTXLevel, uint8_t ysfTXLevel, uint8_t p25TXLevel, uint8_t nxdnTXLevel, uint8_t m17TXLevel, uint8_t dpmrTXLevel, uint8_t pocsagTXLevel, uint8_t fmTXLevel, uint8_t ax25TXLevel, int16_t txDCOffset, int16_t rxDCOffset, bool useCOSAsLockout)
+void CIO::setParameters(bool rxInvert, bool txInvert, bool pttInvert, uint8_t rxLevel, uint8_t cwIdTXLevel, uint8_t dstarTXLevel, uint8_t dmrTXLevel, uint8_t ysfTXLevel, uint8_t p25TXLevel, uint8_t nxdnTXLevel, uint8_t pocsagTXLevel, int16_t txDCOffset, int16_t rxDCOffset)
 {
   m_pttInvert = pttInvert;
 
@@ -842,16 +598,10 @@ void CIO::setParameters(bool rxInvert, bool txInvert, bool pttInvert, uint8_t rx
   m_ysfTXLevel    = q15_t(ysfTXLevel * 128);
   m_p25TXLevel    = q15_t(p25TXLevel * 128);
   m_nxdnTXLevel   = q15_t(nxdnTXLevel * 128);
-  m_m17TXLevel    = q15_t(m17TXLevel * 128);
-  m_dpmrTXLevel   = q15_t(dpmrTXLevel * 128);
   m_pocsagTXLevel = q15_t(pocsagTXLevel * 128);
-  m_fmTXLevel     = q15_t(fmTXLevel * 128);
-  m_ax25TXLevel   = q15_t(ax25TXLevel * 128);
 
   m_rxDCOffset   = DC_OFFSET + rxDCOffset;
   m_txDCOffset   = DC_OFFSET + txDCOffset;
-
-  m_useCOSAsLockout = useCOSAsLockout;
   
   if (rxInvert)
     m_rxLevel = -m_rxLevel;
@@ -862,8 +612,6 @@ void CIO::setParameters(bool rxInvert, bool txInvert, bool pttInvert, uint8_t rx
     m_ysfTXLevel    = -m_ysfTXLevel;
     m_p25TXLevel    = -m_p25TXLevel;
     m_nxdnTXLevel   = -m_nxdnTXLevel;
-    m_m17TXLevel    = -m_m17TXLevel;
-    m_dpmrTXLevel   = -m_dpmrTXLevel;
     m_pocsagTXLevel = -m_pocsagTXLevel;
   }
 }
@@ -901,3 +649,4 @@ bool CIO::hasLockout() const
 {
   return m_lockout;
 }
+

IO.h

@@ -1,5 +1,5 @@
 /*
- *   Copyright (C) 2015,2016,2017,2018,2020,2021,2024 by Jonathan Naylor G4KLX
+ *   Copyright (C) 2015,2016,2017,2018 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
@@ -21,12 +21,8 @@
 
 #include "Globals.h"
 
-#include "RingBuffer.h"
-
-struct TSample {
-  volatile uint16_t sample;
-  volatile uint8_t control;
-};
+#include "SampleRB.h"
+#include "RSSIRB.h"
 
 class CIO {
 public:
@@ -42,11 +38,11 @@ public:
 
   void setDecode(bool dcd);
   void setADCDetection(bool detect);
-  void setMode(MMDVM_STATE state);
+  void setMode();
   
   void interrupt();
 
-  void setParameters(bool rxInvert, bool txInvert, bool pttInvert, uint8_t rxLevel, uint8_t cwIdTXLevel, uint8_t dstarTXLevel, uint8_t dmrTXLevel, uint8_t ysfTXLevel, uint8_t p25TXLevel, uint8_t nxdnTXLevel, uint8_t m17TXLevel, uint8_t dpmrLevel, uint8_t pocsagTXLevel, uint8_t fmTXLevel, uint8_t ax25TXLevel, int16_t txDCOffset, int16_t rxDCOffset, bool useCOSAsLockout);
+  void setParameters(bool rxInvert, bool txInvert, bool pttInvert, uint8_t rxLevel, uint8_t cwIdTXLevel, uint8_t dstarTXLevel, uint8_t dmrTXLevel, uint8_t ysfTXLevel, uint8_t p25TXLevel, uint8_t nxdnTXLevel, uint8_t pocsagTXLevel, int16_t txDCOffset, int16_t rxDCOffset);
 
   void getOverflow(bool& adcOverflow, bool& dacOverflow);
 
@@ -58,60 +54,32 @@ public:
   void resetWatchdog();
   uint32_t getWatchdog();
   
-  uint8_t getCPU() const;
-
-  void getUDID(uint8_t* buffer);
-
   void selfTest();
 
 private:
-  bool                  m_started;
+  bool                 m_started;
 
-  CRingBuffer<TSample>  m_rxBuffer;
-  CRingBuffer<TSample>  m_txBuffer;
-  CRingBuffer<uint16_t> m_rssiBuffer;
+  CSampleRB            m_rxBuffer;
+  CSampleRB            m_txBuffer;
+  CRSSIRB              m_rssiBuffer;
 
-#if defined(USE_DCBLOCKER)
   arm_biquad_casd_df1_inst_q31 m_dcFilter;
   q31_t                        m_dcState[4];
-#endif
 
-#if defined(MODE_DSTAR)
+  arm_fir_instance_q15 m_rrcFilter;
+#if !defined (DSTARBOXCAR)
   arm_fir_instance_q15 m_gaussianFilter;
-  q15_t                m_gaussianState[40U];      // NoTaps + BlockSize - 1, 12 + 20 - 1 plus some spare
 #endif
-
-#if defined(MODE_DMR)
-  arm_fir_instance_q15 m_rrc02Filter1;
-  q15_t                m_rrc02State1[70U];         // NoTaps + BlockSize - 1, 42 + 20 - 1 plus some spare
-#endif
-
-#if defined(MODE_YSF)
-  arm_fir_instance_q15 m_rrc02Filter2;
-  q15_t                m_rrc02State2[70U];         // NoTaps + BlockSize - 1, 42 + 20 - 1 plus some spare
-#endif
-
-#if defined(MODE_P25)
-  arm_fir_instance_q15 m_boxcar5Filter;
-  q15_t                m_boxcar5State[30U];        // NoTaps + BlockSize - 1,  6 + 20 - 1 plus some spare
-#endif
-
-#if defined(MODE_NXDN) && defined(USE_NXDN_BOXCAR)
-  arm_fir_instance_q15 m_boxcar10Filter;
-  q15_t                m_boxcar10State[40U];      // NoTaps + BlockSize - 1, 10 + 20 - 1 plus some spare
-#endif
-
-#if defined(MODE_DPMR) || (defined(MODE_NXDN) && !defined(USE_NXDN_BOXCAR))
+  arm_fir_instance_q15 m_boxcarFilter;
   arm_fir_instance_q15 m_nxdnFilter;
   arm_fir_instance_q15 m_nxdnISincFilter;
-  q15_t                m_nxdnState[110U];         // NoTaps + BlockSize - 1, 82 + 20 - 1 plus some spare
+  q15_t                m_rrcState[140U];          // NoTaps + BlockSize - 1, 82 + 20 - 1 plus some spare
+#if !defined (DSTARBOXCAR)
+  q15_t                m_gaussianState[80U];      // NoTaps + BlockSize - 1, 24 + 20 - 1 plus some spare
+#endif
+  q15_t                m_boxcarState[60U];        // NoTaps + BlockSize - 1, 12 + 20 - 1 plus some spare
+  q15_t                m_nxdnState[220U];         // NoTaps + BlockSize - 1, 162 + 20 - 1 plus some spare
   q15_t                m_nxdnISincState[60U];     // NoTaps + BlockSize - 1, 32 + 20 - 1 plus some spare
-#endif
-
-#if defined(MODE_M17)
-  arm_fir_instance_q15 m_rrc05Filter;
-  q15_t                m_rrc05State[70U];         // NoTaps + BlockSize - 1, 42 + 20 - 1 plus some spare
-#endif
 
   bool                 m_pttInvert;
   q15_t                m_rxLevel;
@@ -121,17 +89,11 @@ private:
   q15_t                m_ysfTXLevel;
   q15_t                m_p25TXLevel;
   q15_t                m_nxdnTXLevel;
-  q15_t                m_m17TXLevel;
-  q15_t                m_dpmrTXLevel;
   q15_t                m_pocsagTXLevel;
-  q15_t                m_fmTXLevel;
-  q15_t                m_ax25TXLevel;
 
   uint16_t             m_rxDCOffset;
   uint16_t             m_txDCOffset;
 
-  bool                 m_useCOSAsLockout;
-
   uint32_t             m_ledCount;
   bool                 m_ledValue;
 
@@ -160,11 +122,9 @@ private:
   void setP25Int(bool on);
   void setNXDNInt(bool on);
   void setPOCSAGInt(bool on);
-  void setM17Int(bool on);
-  void setDPMRInt(bool on);
-  void setFMInt(bool on);
   
   void delayInt(unsigned int dly);
 };
 
 #endif
+

IODue.cpp

@@ -1,5 +1,5 @@
 /*
- *   Copyright (C) 2015,2016,2017,2018,2020 by Jonathan Naylor G4KLX
+ *   Copyright (C) 2015,2016,2017,2018 by Jonathan Naylor G4KLX
  *   Copyright (C) 2015 by Jim Mclaughlin KI6ZUM
  *   Copyright (C) 2016 by Colin Durbridge G4EML
  *
@@ -35,7 +35,6 @@
 #define PIN_P25                19
 #define PIN_NXDN               20
 #define PIN_POCSAG             4
-#define PIN_FM                 5
 #define ADC_CHER_Chan          (1<<7)                 // ADC on Due pin A0  - Due AD7 - (1 << 7)
 #define ADC_ISR_EOC_Chan       ADC_ISR_EOC7
 #define ADC_CDR_Chan           7
@@ -51,7 +50,6 @@
 #define PIN_P25                6
 #define PIN_NXDN               5
 #define PIN_POCSAG             4
-#define PIN_FM                 3
 #define ADC_CHER_Chan          (1<<13)                // ADC on Due pin A11 - Due AD13 - (1 << 13)
 #define ADC_ISR_EOC_Chan       ADC_ISR_EOC13
 #define ADC_CDR_Chan           13
@@ -69,7 +67,6 @@
 #define PIN_P25                6
 #define PIN_NXDN               5
 #define PIN_POCSAG             4
-#define PIN_FM                 3
 #define ADC_CHER_Chan          (1<<7)                 // ADC on Due pin A0  - Due AD7 - (1 << 7)
 #define ADC_ISR_EOC_Chan       ADC_ISR_EOC7
 #define ADC_CDR_Chan           7
@@ -107,15 +104,9 @@ void CIO::initInt()
 #if !defined(USE_ALTERNATE_NXDN_LEDS)
   pinMode(PIN_NXDN,   OUTPUT);
 #endif
-#if !defined(USE_ALTERNATE_M17_LEDS)
-  pinMode(PIN_M17,    OUTPUT);
-#endif
 #if !defined(USE_ALTERNATE_POCSAG_LEDS)
   pinMode(PIN_POCSAG, OUTPUT);
 #endif
-#if !defined(USE_ALTERNATE_POCSAG_LEDS)
-  pinMode(PIN_FM,     OUTPUT);
-#endif
 #endif
 }
 
@@ -161,11 +152,11 @@ void CIO::startInt()
     TC_CMR_ACPA_CLEAR | TC_CMR_ACPC_CLEAR |
     TC_CMR_BCPB_CLEAR | TC_CMR_BCPC_CLEAR;
 #if defined(EXTERNAL_OSC)
-  t->TC_RC  = EXTERNAL_OSC / 24000;           // Counter resets on RC, so sets period in terms of the external clock
-  t->TC_RA  = EXTERNAL_OSC / 48000;           // Roughly square wave
+  t->TC_RC  = EXTERNAL_OSC / 48000;           // Counter resets on RC, so sets period in terms of the external clock
+  t->TC_RA  = EXTERNAL_OSC / 96000;           // Roughly square wave
 #else
-  t->TC_RC  = 1750;                           // Counter resets on RC, so sets period in terms of 42MHz internal clock
-  t->TC_RA  = 880;                            // Roughly square wave
+  t->TC_RC  = 875;                            // Counter resets on RC, so sets period in terms of 42MHz internal clock
+  t->TC_RA  = 438;                            // Roughly square wave
 #endif
   t->TC_CMR = (t->TC_CMR & 0xFFF0FFFF) | TC_CMR_ACPA_CLEAR | TC_CMR_ACPC_SET;  // Set clear and set from RA and RC compares
   t->TC_CCR = TC_CCR_CLKEN | TC_CCR_SWTRG;    // re-enable local clocking and switch to hardware trigger source.
@@ -188,13 +179,14 @@ void CIO::startInt()
 void CIO::interrupt()
 {
   if ((ADC->ADC_ISR & ADC_ISR_EOC_Chan) == ADC_ISR_EOC_Chan) {    // Ensure there was an End-of-Conversion and we read the ISR reg
-    TSample sample = {DC_OFFSET, MARK_NONE};
+    uint8_t control = MARK_NONE;
+    uint16_t sample = DC_OFFSET;
 
-    m_txBuffer.get(sample);
-    DACC->DACC_CDR = sample.sample;
+    m_txBuffer.get(sample, control);
+    DACC->DACC_CDR = sample;
 
-    sample.sample = ADC->ADC_CDR[ADC_CDR_Chan];
-    m_rxBuffer.put(sample);
+    sample = ADC->ADC_CDR[ADC_CDR_Chan];
+    m_rxBuffer.put(sample, control);
 
 #if defined(SEND_RSSI_DATA)
     m_rssiBuffer.put(ADC->ADC_CDR[RSSI_CDR_Chan]);
@@ -256,16 +248,6 @@ void CIO::setNXDNInt(bool on)
 #endif
 }
 
-void CIO::setM17Int(bool on)
-{
-#if defined(USE_ALTERNATE_M17_LEDS)
-  digitalWrite(PIN_DSTAR, on ? HIGH : LOW);
-  digitalWrite(PIN_P25,   on ? HIGH : LOW);
-#else
-  digitalWrite(PIN_M17, on ? HIGH : LOW);
-#endif
-}
-
 void CIO::setPOCSAGInt(bool on)
 {
 #if defined(USE_ALTERNATE_POCSAG_LEDS)
@@ -276,48 +258,10 @@ void CIO::setPOCSAGInt(bool on)
 #endif
 }
 
-void CIO::setFMInt(bool on)
-{
-#if defined(USE_ALTERNATE_FM_LEDS)
-  digitalWrite(PIN_DSTAR, on ? HIGH : LOW);
-  digitalWrite(PIN_YSF,   on ? HIGH : LOW);
-#else
-  digitalWrite(PIN_FM, on ? HIGH : LOW);
-#endif
-}
-
 void CIO::delayInt(unsigned int dly)
 {
   delay(dly);
 }
 
-uint8_t CIO::getCPU() const
-{
-  return 0U;
-}
-
-// Code taken from https://github.com/emagii/at91sam3s/blob/master/examples/eefc_uniqueid/main.c
-void CIO::getUDID(uint8_t* buffer)
-{
-  uint32_t status;
-
-  EFC1->EEFC_FCR = (0x5A << 24) | EFC_FCMD_STUI;
-  do {
-    status = EFC1->EEFC_FSR;
-  } while ( (status & EEFC_FSR_FRDY) == EEFC_FSR_FRDY );
-
-  for (uint8_t i = 0; i < 16; i+=4) {
-    buffer[i + 0] = *(uint32_t *)(IFLASH1_ADDR + i) >> 24;
-    buffer[i + 1] = *(uint32_t *)(IFLASH1_ADDR + i) >> 16;
-    buffer[i + 2] = *(uint32_t *)(IFLASH1_ADDR + i) >>  8;
-    buffer[i + 3] = *(uint32_t *)(IFLASH1_ADDR + i) >>  0;
-  }
-
-  EFC1->EEFC_FCR = (0x5A << 24) | EFC_FCMD_SPUI;
-  do {
-    status = EFC1->EEFC_FSR;
-  } while ( (status & EEFC_FSR_FRDY) != EEFC_FSR_FRDY );
-}
-
 #endif
 

IOPins.h

@@ -1,79 +0,0 @@
-/*
- *   Copyright (C) 2019,2020 by BG5HHP
- *
- *   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
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifndef _IO_PINS_H
-#define _IO_PINS_H
-
-#if !defined(CONFIG_H)
-#error "Requires Config.h to be included first!"
-#endif
-
-#if defined(STM32F4_RPT_HAT_TGO)
-    #include "pins/pins_f4_rpt_tgo.h"
-
-#elif defined(STM32F4_DISCOVERY)
-    #include "pins/pins_f4_discovery.h"
-
-#elif defined(STM32F4_PI)
-    #include "pins/pins_f4_pi.h"
-
-#elif defined(STM32F722_PI)
-    #include "pins/pins_f7_pi.h"
-
-#elif defined(STM32F4_F4M)
-    #include "pins/pins_f4_f4m.h"
-
-#elif defined(STM32F722_F7M)
-    #include "pins/pins_f7_f7m.h"
-
-#elif defined(STM32F722_RPT_HAT)
-    #include "pins/pins_f7_rpt_hat.h"
-
-#elif defined(STM32F4_NUCLEO)
-    #if defined(STM32F4_NUCLEO_MORPHO_HEADER)
-        #include "pins/pins_f4_nucleo_morpho.h"
-    #elif defined(STM32F4_NUCLEO_ARDUINO_HEADER)
-        #include "pins/pins_f4_nucleo_arduino.h"
-    #else
-        #error "Either STM32F4_NUCLEO_MORPHO_HEADER or STM32F4_NUCLEO_ARDUINO_HEADER need to be defined"
-    #endif
-
-#elif defined(STM32F7_NUCLEO)
-    #include "pins/pins_f7_nucleo.h"
-
-#elif defined(STM32F4_DVM)
-    #include "pins/pins_f4_stm32dvm_v3.h"
-
-#elif defined(STM32F7_DVM)
-    #include "pins/pins_f7_stm32dvm_v5.h"
-
-#elif defined(DRCC_DVM_NQF)
-    #include "pins/pins_f4_drcc_nqf.h"
-
-#elif defined(DRCC_DVM_HHP446)
-    #include "pins/pins_f4_drcc_hhp446.h"
-
-#elif defined(STM32F4_EDA_405) || defined(STM32F4_EDA_446)
-    #include "pins/pins_f4_stm32eda.h"
-
-#else
-    #error "A valid board type macro need to be defined."
-
-#endif
-
-#endif  //#ifndef _IO_PINS_H

IOSTM_CMSIS.cpp

@@ -0,0 +1,466 @@
+/*
+ *   Copyright (C) 2016 by Jim McLaughlin KI6ZUM
+ *   Copyright (C) 2016, 2017 by Andy Uribe CA6JAU
+ *   Copyright (C) 2017,2018 by Jonathan Naylor G4KLX
+ *   Copyright (C) 2017 by Wojciech Krutnik N0CALL
+ *
+ *   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
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "Config.h"
+#include "Globals.h"
+#include "IO.h"
+
+
+#if defined(STM32F1)
+
+#if defined(STM32F1_POG)
+/*
+Pin definitions for STM32F1 POG Board:
+
+PTT      PB12   output
+COSLED   PB5    output
+LED      PB4    output
+COS      PB13   input/PD
+
+DSTAR    PB7    output
+DMR      PB6    output
+YSF      PB8    output
+P25      PB9    output
+NXDN     PB10   output
+POCSAG   PB11   output
+
+RX       PB0    analog input (ADC1_8)
+RSSI     PB1    analog input (ADC2_9)
+TX       PA4    analog output (DAC_OUT1)
+
+EXT_CLK  PA15   input (AF: TIM2_CH1_ETR)
+
+USART1_TXD PA9  output (AF)
+USART1_RXD PA10  input (AF)
+
+*/
+
+#define PIN_PTT           12
+#define PORT_PTT          GPIOB
+#define BB_PTT            *((bitband_t)BITBAND_PERIPH(&PORT_PTT->ODR, PIN_PTT))
+#define PIN_COSLED        5
+#define PORT_COSLED       GPIOB
+#define BB_COSLED         *((bitband_t)BITBAND_PERIPH(&PORT_COSLED->ODR, PIN_COSLED))
+#define PIN_LED           4
+#define PORT_LED          GPIOB
+#define BB_LED            *((bitband_t)BITBAND_PERIPH(&PORT_LED->ODR, PIN_LED))
+#define PIN_COS           13
+#define PORT_COS          GPIOB
+#define BB_COS            *((bitband_t)BITBAND_PERIPH(&PORT_COS->IDR, PIN_COS))
+
+#define PIN_DSTAR         7
+#define PORT_DSTAR        GPIOB
+#define BB_DSTAR          *((bitband_t)BITBAND_PERIPH(&PORT_DSTAR->ODR, PIN_DSTAR))
+#define PIN_DMR           6
+#define PORT_DMR          GPIOB
+#define BB_DMR            *((bitband_t)BITBAND_PERIPH(&PORT_DMR->ODR, PIN_DMR))
+#define PIN_YSF           8
+#define PORT_YSF          GPIOB
+#define BB_YSF            *((bitband_t)BITBAND_PERIPH(&PORT_YSF->ODR, PIN_YSF))
+#define PIN_P25           9
+#define PORT_P25          GPIOB
+#define BB_P25            *((bitband_t)BITBAND_PERIPH(&PORT_P25->ODR, PIN_P25))
+#define PIN_NXDN          10
+#define PORT_NXDN         GPIOB
+#define BB_NXDN           *((bitband_t)BITBAND_PERIPH(&PORT_NXDN->ODR, PIN_NXDN))
+#define PIN_POCSAG        11
+#define PORT_POCSAG       GPIOB
+#define BB_POCSAG         *((bitband_t)BITBAND_PERIPH(&PORT_POCSAG->ODR, PIN_POCSAG))
+
+#define PIN_RX            0
+#define PIN_RX_ADC_CH     8
+#define PORT_RX           GPIOB
+#define PIN_RSSI          1
+#define PIN_RSSI_ADC_CH   9
+#define PORT_RSSI         GPIOB
+#define PIN_TX            4
+#define PIN_TX_DAC_CH     1
+#define PORT_TX           GPIOA
+
+#define PIN_EXT_CLK       15
+#define SRC_EXT_CLK       15
+#define PORT_EXT_CLK      GPIOA
+
+#define PIN_USART1_TXD    9
+#define PORT_USART1_TXD   GPIOA
+#define PIN_USART1_RXD    10
+#define PORT_USART1_RXD   GPIOA
+
+#else   // defined(STM32F1_POG)
+#error "Either STM32F1_POG, or sth need to be defined"
+#endif  // defined(STM32F1_POG)
+
+const uint16_t DC_OFFSET = 2048U;
+
+// Sampling frequency
+#define SAMP_FREQ   48000
+
+extern "C" {
+  void TIM2_IRQHandler() {
+    if ((TIM2->SR & TIM_SR_UIF) == TIM_SR_UIF) {
+      TIM2->SR = ~TIM_SR_UIF;   // clear UI flag
+      io.interrupt();
+    }
+  }
+}
+
+
+void delay(uint32_t cnt)
+{
+  while(cnt--)
+    asm("nop");
+}
+
+// source: http://www.freddiechopin.info/
+void GPIOConfigPin(GPIO_TypeDef *port_ptr, uint32_t pin, uint32_t mode_cnf_value)
+{
+	volatile uint32_t *cr_ptr;
+	uint32_t cr_value;
+
+	cr_ptr = &port_ptr->CRL;  // configuration of pins [0,7] is in CRL
+
+	if (pin >= 8)			        // is pin in [8; 15]?
+	{									        // configuration of pins [8,15] is in CRH
+		cr_ptr++;               // advance to next struct element CRL -> CRH
+		pin -= 8;               // crop the pin number
+	}
+
+	cr_value = *cr_ptr;			  // localize the CRL / CRH value
+
+	cr_value &= ~(0xF << (pin * 4));	// clear the MODE and CNF fields (now that pin is an analog input)
+	cr_value |= (mode_cnf_value << (pin * 4));	        // save new MODE and CNF value for desired pin
+
+	*cr_ptr = cr_value;				// save localized value to CRL / CRL
+}
+
+#if defined(STM32F1_POG)
+void FancyLEDEffect()
+{
+  bitband_t foo[] = {&BB_LED, &BB_COSLED, &BB_PTT, &BB_DMR, &BB_DSTAR, &BB_YSF, &BB_P25};
+   
+  for(int i=0; i<7; i++){
+    *foo[i] = 0x01;
+  }
+  GPIOConfigPin(PORT_USART1_TXD, PIN_USART1_TXD, GPIO_CRL_MODE0_1);
+  *((bitband_t)BITBAND_PERIPH(&PORT_USART1_TXD->ODR, PIN_USART1_TXD)) = 0x00;
+  delay(SystemCoreClock/1000*100);
+  for(int i=0; i<7; i++){
+    *foo[i] = 0x00;
+  }
+  *((bitband_t)BITBAND_PERIPH(&PORT_USART1_TXD->ODR, PIN_USART1_TXD)) = 0x01;
+  delay(SystemCoreClock/1000*20);
+  *((bitband_t)BITBAND_PERIPH(&PORT_USART1_TXD->ODR, PIN_USART1_TXD)) = 0x00;
+  delay(SystemCoreClock/1000*10);
+  *((bitband_t)BITBAND_PERIPH(&PORT_USART1_TXD->ODR, PIN_USART1_TXD)) = 0x01;
+  
+  *foo[0] = 0x01;
+  for(int i=1; i<7; i++){
+    delay(SystemCoreClock/1000*10);
+    *foo[i-1] = 0x00;
+    *foo[i] = 0x01;
+  }
+  for(int i=5; i>=0; i--){
+    delay(SystemCoreClock/1000*10);
+    *foo[i+1] = 0x00;
+    *foo[i] = 0x01;
+  }
+  delay(SystemCoreClock/1000*10);
+  *foo[5+1-6] = 0x00;
+  *((bitband_t)BITBAND_PERIPH(&PORT_USART1_TXD->ODR, PIN_USART1_TXD)) = 0x00;
+  delay(SystemCoreClock/1000*10);
+  *((bitband_t)BITBAND_PERIPH(&PORT_USART1_TXD->ODR, PIN_USART1_TXD)) = 0x01;
+  GPIOConfigPin(PORT_USART1_TXD, PIN_USART1_TXD, GPIO_CRL_MODE0_1|GPIO_CRL_CNF0_1);
+  delay(SystemCoreClock/1000*50);
+}
+#endif
+
+static inline void GPIOInit()
+{
+  RCC->APB2ENR |= RCC_APB2ENR_IOPAEN | RCC_APB2ENR_IOPBEN
+                  | RCC_APB2ENR_IOPCEN | RCC_APB2ENR_IOPDEN
+                  | RCC_APB2ENR_AFIOEN;	// enable all GPIOs
+                 
+	// set all ports to input with pull-down
+	GPIOA->CRL = 0x88888888;
+	GPIOA->CRH = 0x88888888;
+	GPIOA->ODR = 0;
+	GPIOB->CRL = 0x88888888;
+	GPIOB->CRH = 0x88888888;
+	GPIOB->ODR = 0;
+	GPIOC->CRL = 0x88888888;
+	GPIOC->CRH = 0x88888888;
+	GPIOC->ODR = 0;
+	GPIOD->CRL = 0x88888888;
+	GPIOD->CRH = 0x88888888;
+	GPIOD->ODR = 0;
+  
+  // configure ports
+  GPIOConfigPin(PORT_PTT,    PIN_PTT,    GPIO_CRL_MODE0_1);
+  GPIOConfigPin(PORT_COSLED, PIN_COSLED, GPIO_CRL_MODE0_1);
+  GPIOConfigPin(PORT_LED,    PIN_LED,    GPIO_CRL_MODE0_1);
+  GPIOConfigPin(PORT_COS,    PIN_COS,    GPIO_CRL_CNF0_1);
+  
+  GPIOConfigPin(PORT_DSTAR,  PIN_DSTAR,  GPIO_CRL_MODE0_1);
+  GPIOConfigPin(PORT_DMR,    PIN_DMR,    GPIO_CRL_MODE0_1);
+  GPIOConfigPin(PORT_YSF,    PIN_YSF,    GPIO_CRL_MODE0_1);
+  GPIOConfigPin(PORT_P25,    PIN_P25,    GPIO_CRL_MODE0_1);
+#if !defined(USE_ALTERNATE_NXDN_LEDS)
+  GPIOConfigPin(PORT_NXDN,   PIN_NXDN,   GPIO_CRL_MODE0_1);
+#endif
+#if !defined(USE_ALTERNATE_POCSAG_LEDS)
+  GPIOConfigPin(PORT_POCSAG, PIN_POCSAG, GPIO_CRL_MODE0_1);
+#endif
+
+  GPIOConfigPin(PORT_RX, PIN_RX, 0);
+#if defined(SEND_RSSI_DATA)
+  GPIOConfigPin(PORT_RSSI, PIN_RSSI, 0);
+#endif
+  GPIOConfigPin(PORT_TX, PIN_TX, 0);
+
+#if defined(EXTERNAL_OSC)
+#if defined(STM32F1_POG)
+  GPIOConfigPin(PORT_EXT_CLK, PIN_EXT_CLK, GPIO_CRL_CNF0_0);
+  AFIO->MAPR = (AFIO->MAPR & ~AFIO_MAPR_TIM2_REMAP) | AFIO_MAPR_TIM2_REMAP_0;
+#endif
+#endif
+
+  GPIOConfigPin(PORT_USART1_TXD, PIN_USART1_TXD, GPIO_CRL_MODE0_1|GPIO_CRL_CNF0_1);
+  GPIOConfigPin(PORT_USART1_RXD, PIN_USART1_RXD, GPIO_CRL_CNF0_0);
+  
+  AFIO->MAPR = (AFIO->MAPR & ~AFIO_MAPR_SWJ_CFG) | AFIO_MAPR_SWJ_CFG_1;
+}
+
+
+static inline void ADCInit()
+{
+  RCC->CFGR = (RCC->CFGR & ~RCC_CFGR_ADCPRE_Msk)
+              | RCC_CFGR_ADCPRE_DIV6; // ADC clock divided by 6 (72MHz/6 = 12MHz)
+  RCC->APB2ENR |= RCC_APB2ENR_ADC1EN;
+#if defined(SEND_RSSI_DATA)
+  RCC->APB2ENR |= RCC_APB2ENR_ADC2EN;
+#endif
+
+  // Init ADCs in dual mode (RSSI)
+#if defined(SEND_RSSI_DATA)
+  ADC1->CR1 = ADC_CR1_DUALMOD_1|ADC_CR1_DUALMOD_2;  // Regular simultaneous mode
+#endif
+
+  // Set sampling time to 7.5 cycles
+  if (PIN_RX_ADC_CH < 10) {
+    ADC1->SMPR2 = ADC_SMPR2_SMP0_0 << (3*PIN_RX_ADC_CH); 
+  } else {
+    ADC1->SMPR1 = ADC_SMPR1_SMP10_0 << (3*PIN_RX_ADC_CH);
+  }
+#if defined(SEND_RSSI_DATA)
+  if (PIN_RSSI_ADC_CH < 10) {
+    ADC2->SMPR2 = ADC_SMPR2_SMP0_0 << (3*PIN_RSSI_ADC_CH); 
+  } else {
+    ADC2->SMPR1 = ADC_SMPR1_SMP10_0 << (3*PIN_RSSI_ADC_CH);
+  }
+#endif
+
+  // Set conversion channel (single conversion)
+  ADC1->SQR3 = PIN_RX_ADC_CH;
+#if defined(SEND_RSSI_DATA)
+  ADC2->SQR3 = PIN_RSSI_ADC_CH;
+#endif
+
+  // Enable ADC
+  ADC1->CR2 |= ADC_CR2_ADON;
+
+#if defined(SEND_RSSI_DATA)
+  // Enable ADC2
+  ADC2->CR2 |= ADC_CR2_ADON;
+#endif
+
+  // Start calibration
+  delay(6*2);
+  ADC1->CR2 |= ADC_CR2_CAL;
+  while((ADC1->CR2 & ADC_CR2_CAL) == ADC_CR2_CAL)
+    ;
+#if defined(SEND_RSSI_DATA)
+  ADC2->CR2 |= ADC_CR2_CAL;
+  while((ADC2->CR2 & ADC_CR2_CAL) == ADC_CR2_CAL)
+    ;
+#endif
+  
+  // Trigger first conversion
+  ADC1->CR2 |= ADC_CR2_ADON;
+#if defined(SEND_RSSI_DATA)
+  ADC2->CR2 |= ADC_CR2_ADON;
+#endif
+}
+
+
+static inline void DACInit()
+{
+  RCC->APB1ENR |= RCC_APB1ENR_DACEN;
+
+  DAC->CR = DAC_CR_EN1;
+}
+
+
+static inline void TimerInit()
+{
+  RCC->APB1ENR |= RCC_APB1ENR_TIM2EN;
+
+#if defined(EXTERNAL_OSC)
+  // Enable external clock, prescaler /4
+  TIM2->SMCR = TIM_SMCR_ECE | TIM_SMCR_ETPS_1;
+#endif
+
+  // TIM2 output frequency
+  TIM2->PSC = 0;
+#if defined(EXTERNAL_OSC)
+  // TimerCount = ExternalOsc
+  //              /4 (external clock prescaler)
+  //              /SAMP_FREQ
+  TIM2->ARR = (uint16_t) ((EXTERNAL_OSC/(4*SAMP_FREQ)) - 1);
+#else
+  TIM2->ARR = (uint16_t) ((SystemCoreClock/(SAMP_FREQ)) - 1);
+#endif
+
+  // Enable TIse 1%-tolerance comM2 interrupt
+  TIM2->DIER = TIM_DIER_UIE;
+  NVIC_EnableIRQ(TIM2_IRQn);
+  
+  // Enable TIM2
+  TIM2->CR1 |= TIM_CR1_CEN;
+}
+
+
+void CIO::initInt()
+{
+  GPIOInit();
+  ADCInit();
+  DACInit();
+#if defined(STM32F1_POG)
+  FancyLEDEffect();
+#endif
+}
+
+void CIO::startInt()
+{
+  TimerInit();
+   
+  BB_COSLED = 0;
+  BB_LED = 1;
+}
+
+void CIO::interrupt()
+{
+  uint8_t control  = MARK_NONE;
+  uint16_t sample  = DC_OFFSET;
+  uint16_t rawRSSI = 0U;
+  bitband_t eoc = (bitband_t)BITBAND_PERIPH(&ADC1->SR, ADC_SR_EOS_Pos);
+  bitband_t adon = (bitband_t)BITBAND_PERIPH(&ADC1->CR2, ADC_CR2_ADON_Pos);
+#if defined(SEND_RSSI_DATA)
+  bitband_t rssi_adon = (bitband_t)BITBAND_PERIPH(&ADC2->CR2, ADC_CR2_ADON_Pos);
+#endif
+
+  if (*eoc) {
+    // trigger next conversion
+    *adon = 1;
+#if defined(SEND_RSSI_DATA)
+    *rssi_adon = 1;
+#endif
+    
+    m_txBuffer.get(sample, control);
+    DAC->DHR12R1 = sample;  // Send the value to the DAC
+
+    // Read value from ADC1 and ADC2
+    sample  = ADC1->DR;   // read conversion result; EOC is cleared by this read
+    m_rxBuffer.put(sample, control);
+#if defined(SEND_RSSI_DATA)
+    rawRSSI = ADC2->DR;
+    m_rssiBuffer.put(rawRSSI);
+#endif
+
+    m_watchdog++;
+  }
+}
+
+bool CIO::getCOSInt()
+{
+  return BB_COS;
+}
+
+void CIO::setLEDInt(bool on)
+{
+  BB_LED = !!on;
+}
+
+void CIO::setPTTInt(bool on)
+{
+  BB_PTT = !!on;
+}
+
+void CIO::setCOSInt(bool on)
+{
+  BB_COSLED = !!on;
+}
+
+void CIO::setDStarInt(bool on)
+{
+  BB_DSTAR = !!on;
+}
+
+void CIO::setDMRInt(bool on)
+{
+  BB_DMR = !!on;
+}
+
+void CIO::setYSFInt(bool on)
+{
+  BB_YSF = !!on;
+}
+
+void CIO::setP25Int(bool on)
+{
+  BB_P25 = !!on;
+}
+
+void CIO::setNXDNInt(bool on)
+{
+#if defined(USE_ALTERNATE_NXDN_LEDS)
+  BB_YSF = !!on;
+  BB_P25 = !!on;
+#else
+  BB_NXDN = !!on;
+#endif
+}
+
+void CIO::setPOCSAGInt(bool on)
+{
+#if defined(USE_ALTERNATE_POCSAG_LEDS)
+  BB_DSTAR = !!on;
+  BB_DMR   = !!on;
+#else
+  BB_POCSAG = !!on;
+#endif
+}
+
+void CIO::delayInt(unsigned int dly)
+{
+  delay(dly);
+}
+
+#endif

IOTeensy.cpp

@@ -1,5 +1,5 @@
 /*
- *   Copyright (C) 2016,2017,2018,2020 by Jonathan Naylor G4KLX
+ *   Copyright (C) 2016,2017,2018 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
@@ -37,11 +37,9 @@
 #if defined(__MK20DX256__)
 #define PIN_NXDN               2
 #define PIN_POCSAG             3
-#define PIN_FM                 4
 #else
 #define PIN_NXDN               24
 #define PIN_POCSAG             25
-#define PIN_FM                 26
 #endif
 #define PIN_ADC                5        // A0,  Pin 14
 #define PIN_RSSI               4        // Teensy 3.5/3.6, A16, Pin 35. Teensy 3.1/3.2, A17, Pin 28
@@ -75,15 +73,9 @@ void CIO::initInt()
 #if !defined(USE_ALTERNATE_NXDN_LEDS)
   pinMode(PIN_NXDN,   OUTPUT);
 #endif
-#if !defined(USE_ALTERNATE_M17_LEDS)
-  pinMode(PIN_M17,    OUTPUT);
-#endif
 #if !defined(USE_ALTERNATE_POCSAG_LEDS)
   pinMode(PIN_POCSAG, OUTPUT);
 #endif
-#if !defined(USE_ALTERNATE_FM_LEDS)
-  pinMode(PIN_FM,     OUTPUT);
-#endif
 #endif
 }
 
@@ -133,7 +125,7 @@ void CIO::startInt()
 #endif
 
 #if defined(EXTERNAL_OSC)
-  // Set ADC0 to trigger from the LPTMR at 24 kHz
+  // Set ADC0 to trigger from the LPTMR at 48 kHz
   SIM_SOPT7   = SIM_SOPT7_ADC0ALTTRGEN |                              // Enable ADC0 alternate trigger
                 SIM_SOPT7_ADC0TRGSEL(14);                             // Trigger ADC0 by LPTMR0
 
@@ -142,14 +134,14 @@ void CIO::startInt()
   SIM_SCGC5  |= SIM_SCGC5_LPTIMER;                                    // Enable Low Power Timer Access
   LPTMR0_CSR  = 0;                                                    // Disable
   LPTMR0_PSR  = LPTMR_PSR_PBYP;                                       // Bypass prescaler/filter
-  LPTMR0_CMR  = (EXTERNAL_OSC / 24000) - 1;                           // Frequency divided by CMR + 1
+  LPTMR0_CMR  = (EXTERNAL_OSC / 48000) - 1;                           // Frequency divided by CMR + 1
   LPTMR0_CSR  = LPTMR_CSR_TPS(2) |                                    // Pin: 0=CMP0, 1=xtal, 2=pin13
                 LPTMR_CSR_TMS;                                        // Mode Select, 0=timer, 1=counter
   LPTMR0_CSR |= LPTMR_CSR_TEN;                                        // Enable
 #else
-  // Setup PDB for ADC0 at 24 kHz
+  // Setup PDB for ADC0 at 48 kHz
   SIM_SCGC6  |= SIM_SCGC6_PDB;                                        // Enable PDB clock
-  PDB0_MOD    = (F_BUS / 24000) - 1;                                  // Timer period - 1
+  PDB0_MOD    = (F_BUS / 48000) - 1;                                  // Timer period - 1
   PDB0_IDLY   = 0;                                                    // Interrupt delay
   PDB0_CH0C1  = PDB_CHnC1_TOS | PDB_CHnC1_EN;                         // Enable pre-trigger for ADC0
   PDB0_SC     = PDB_SC_TRGSEL(15) | PDB_SC_PDBEN |                    // SW trigger, enable interrupts, continuous mode
@@ -164,14 +156,15 @@ void CIO::startInt()
 
 void CIO::interrupt()
 {
-   TSample sample = {DC_OFFSET, MARK_NONE};
+  uint8_t control = MARK_NONE;
+  uint16_t sample = DC_OFFSET;
 
-  m_txBuffer.get(sample);
-  *(int16_t *)&(DAC0_DAT0L) = sample.sample;
+  m_txBuffer.get(sample, control);
+  *(int16_t *)&(DAC0_DAT0L) = sample;
 
   if ((ADC0_SC1A & ADC_SC1_COCO) == ADC_SC1_COCO) {
-    sample.sample = ADC0_RA;
-    m_rxBuffer.put(sample);
+    sample = ADC0_RA;
+    m_rxBuffer.put(sample, control);
   }
     
 #if defined(SEND_RSSI_DATA)
@@ -240,16 +233,6 @@ void CIO::setNXDNInt(bool on)
 #endif
 }
 
-void CIO::setM17Int(bool on)
-{
-#if defined(USE_ALTERNATE_M17_LEDS)
-  digitalWrite(PIN_DSTAR, on ? HIGH : LOW);
-  digitalWrite(PIN_P25,   on ? HIGH : LOW);
-#else
-  digitalWrite(PIN_M17, on ? HIGH : LOW);
-#endif
-}
-
 void CIO::setPOCSAGInt(bool on)
 {
 #if defined(USE_ALTERNATE_POCSAG_LEDS)
@@ -260,30 +243,9 @@ void CIO::setPOCSAGInt(bool on)
 #endif
 }
 
-void CIO::setFMInt(bool on)
-{
-#if defined(USE_ALTERNATE_FM_LEDS)
-  digitalWrite(PIN_DSTAR, on ? HIGH : LOW);
-  digitalWrite(PIN_YSF,   on ? HIGH : LOW);
-#else
-  digitalWrite(PIN_FM, on ? HIGH : LOW);
-#endif
-}
-
 void CIO::delayInt(unsigned int dly)
 {
   delay(dly);
 }
 
-uint8_t CIO::getCPU() const
-{
-  return 1U;
-}
-
-void CIO::getUDID(uint8_t* buffer)
-{
-  ::memcpy(buffer, (void *)0x4058, 16U);
-}
-
 #endif
-

M17Defines.h

@@ -1,67 +0,0 @@
-/*
- *   Copyright (C) 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
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#if !defined(M17DEFINES_H)
-#define  M17DEFINES_H
-
-const unsigned int M17_RADIO_SYMBOL_LENGTH = 5U;      // At 24 kHz sample rate
-
-const unsigned int M17_FRAME_LENGTH_BITS    = 384U;
-const unsigned int M17_FRAME_LENGTH_BYTES   = M17_FRAME_LENGTH_BITS / 8U;
-const unsigned int M17_FRAME_LENGTH_SYMBOLS = M17_FRAME_LENGTH_BITS / 2U;
-const unsigned int M17_FRAME_LENGTH_SAMPLES = M17_FRAME_LENGTH_SYMBOLS * M17_RADIO_SYMBOL_LENGTH;
-
-const unsigned int M17_SYNC_LENGTH_BITS    = 16U;
-const unsigned int M17_SYNC_LENGTH_BYTES   = M17_SYNC_LENGTH_BITS / 8U;
-const unsigned int M17_SYNC_LENGTH_SYMBOLS = M17_SYNC_LENGTH_BITS / 2U;
-const unsigned int M17_SYNC_LENGTH_SAMPLES = M17_SYNC_LENGTH_SYMBOLS * M17_RADIO_SYMBOL_LENGTH;
-
-const uint8_t M17_LINK_SETUP_SYNC_BYTES[] = {0x55U, 0xF7U};
-const uint8_t M17_STREAM_SYNC_BYTES[]     = {0xFFU, 0x5DU};
-const uint8_t M17_EOF_SYNC_BYTES[]        = {0x55U, 0x5DU};
-
-const uint16_t M17_LINK_SETUP_SYNC_BITS = 0x55F7U;
-const uint16_t M17_STREAM_SYNC_BITS     = 0xFF5DU;
-const uint16_t M17_EOF_SYNC_BITS        = 0x555DU;
-
-// 5     5     F     7
-// 01 01 01 01 11 11 01 11
-// +3 +3 +3 +3 -3 -3 +3 -3
-
-const int8_t M17_LINK_SETUP_SYNC_SYMBOLS_VALUES[] = {+3, +3, +3, +3, -3, -3, +3, -3};
-
-const uint8_t M17_LINK_SETUP_SYNC_SYMBOLS = 0xF2U;
-
-// F     F     5     D
-// 11 11 11 11 01 01 11 01
-// -3 -3 -3 -3 +3 +3 -3 +3
-
-const int8_t M17_STREAM_SYNC_SYMBOLS_VALUES[] = {-3, -3, -3, -3, +3, +3, -3, +3};
-
-const uint8_t M17_STREAM_SYNC_SYMBOLS = 0x0DU;
-
-// 5     5     5     D
-// 01 01 01 01 01 01 11 01
-// +3 +3 +3 +3 +3 +3 -3 +3
-
-const int8_t M17_EOF_SYNC_SYMBOLS_VALUES[] = {+3, +3, +3, +3, +3, +3, -3, +3};
-
-const uint8_t M17_EOF_SYNC_SYMBOLS = 0xFDU;
-
-#endif
-

M17RX.cpp

@@ -1,485 +0,0 @@
-/*
- *   Copyright (C) 2009-2017,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
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include "Config.h"
-
-#if defined(MODE_M17)
-
-#include "Globals.h"
-#include "M17RX.h"
-#include "Utils.h"
-
-const q15_t SCALING_FACTOR = 18750;      // Q15(0.55)
-
-const uint8_t MAX_SYNC_BIT_START_ERRS = 0U;
-const uint8_t MAX_SYNC_BIT_RUN_ERRS   = 2U;
-
-const uint8_t MAX_SYNC_SYMBOL_START_ERRS = 0U;
-const uint8_t MAX_SYNC_SYMBOL_RUN_ERRS   = 1U;
-
-const uint8_t BIT_MASK_TABLE[] = {0x80U, 0x40U, 0x20U, 0x10U, 0x08U, 0x04U, 0x02U, 0x01U};
-
-#define WRITE_BIT1(p,i,b) p[(i)>>3] = (b) ? (p[(i)>>3] | BIT_MASK_TABLE[(i)&7]) : (p[(i)>>3] & ~BIT_MASK_TABLE[(i)&7])
-
-const uint8_t NOAVEPTR = 99U;
-
-const uint16_t NOENDPTR = 9999U;
-
-const unsigned int MAX_SYNC_FRAMES = 3U + 1U;
-
-CM17RX::CM17RX() :
-m_state(M17RXS_NONE),
-m_bitBuffer(),
-m_buffer(),
-m_bitPtr(0U),
-m_dataPtr(0U),
-m_startPtr(NOENDPTR),
-m_endPtr(NOENDPTR),
-m_syncPtr(NOENDPTR),
-m_minSyncPtr(NOENDPTR),
-m_maxSyncPtr(NOENDPTR),
-m_maxCorr(0),
-m_lostCount(0U),
-m_countdown(0U),
-m_nextState(M17RXS_NONE),
-m_centre(),
-m_centreVal(0),
-m_threshold(),
-m_thresholdVal(0),
-m_averagePtr(NOAVEPTR),
-m_rssiAccum(0U),
-m_rssiCount(0U)
-{
-}
-
-void CM17RX::reset()
-{
-  m_state        = M17RXS_NONE;
-  m_dataPtr      = 0U;
-  m_bitPtr       = 0U;
-  m_maxCorr      = 0;
-  m_averagePtr   = NOAVEPTR;
-  m_startPtr     = NOENDPTR;
-  m_endPtr       = NOENDPTR;
-  m_syncPtr      = NOENDPTR;
-  m_minSyncPtr   = NOENDPTR;
-  m_maxSyncPtr   = NOENDPTR;
-  m_centreVal    = 0;
-  m_thresholdVal = 0;
-  m_lostCount    = 0U;
-  m_countdown    = 0U;
-  m_nextState    = M17RXS_NONE;
-  m_rssiAccum    = 0U;
-  m_rssiCount    = 0U;
-}
-
-void CM17RX::samples(const q15_t* samples, uint16_t* rssi, uint8_t length)
-{
-  for (uint8_t i = 0U; i < length; i++) {
-    q15_t sample = samples[i];
-
-    m_rssiAccum += rssi[i];
-    m_rssiCount++;
-
-    m_bitBuffer[m_bitPtr] <<= 1;
-    if (sample < 0)
-      m_bitBuffer[m_bitPtr] |= 0x01U;
-
-    m_buffer[m_dataPtr] = sample;
-
-    switch (m_state) {
-    case M17RXS_LINK_SETUP:
-    case M17RXS_STREAM:
-      processData(sample);
-      break;
-    default:
-      processNone(sample);
-      break;
-    }
-
-    m_dataPtr++;
-    if (m_dataPtr >= M17_FRAME_LENGTH_SAMPLES)
-      m_dataPtr = 0U;
-
-    m_bitPtr++;
-    if (m_bitPtr >= M17_RADIO_SYMBOL_LENGTH)
-      m_bitPtr = 0U;
-  }
-}
-
-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);
-
-  if (ret1 || ret2) {
-    // On the first sync, start the countdown to the state change
-    if (m_countdown == 0U) {
-      m_rssiAccum = 0U;
-      m_rssiCount = 0U;
-
-      io.setDecode(true);
-      io.setADCDetection(true);
-
-      m_averagePtr = NOAVEPTR;
-
-      m_countdown = 5U;
-      
-      if (ret1) m_nextState = M17RXS_LINK_SETUP;
-      if (ret2) m_nextState = M17RXS_STREAM;
-    }
-  }
-
-  if (m_countdown > 0U)
-    m_countdown--;
-
-  if (m_countdown == 1U) {
-    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;
-
-    m_state     = m_nextState;
-    m_countdown = 0U;
-    m_nextState = M17RXS_NONE;
-  }
-}
-
-void CM17RX::processData(q15_t sample)
-{
-  bool eof = false;
-
-  if (m_minSyncPtr < m_maxSyncPtr) {
-    if (m_dataPtr >= m_minSyncPtr && m_dataPtr <= m_maxSyncPtr) {
-      bool ret = correlateSync(M17_STREAM_SYNC_SYMBOLS, M17_STREAM_SYNC_SYMBOLS_VALUES, M17_STREAM_SYNC_BYTES,  MAX_SYNC_SYMBOL_RUN_ERRS, MAX_SYNC_BIT_RUN_ERRS);
-
-      eof = correlateSync(M17_EOF_SYNC_SYMBOLS, M17_EOF_SYNC_SYMBOLS_VALUES, M17_EOF_SYNC_BYTES, MAX_SYNC_SYMBOL_RUN_ERRS, MAX_SYNC_BIT_RUN_ERRS);
-
-      if (ret) m_state = M17RXS_STREAM;
-    }
-  } else {
-    if (m_dataPtr >= m_minSyncPtr || m_dataPtr <= m_maxSyncPtr) {
-      bool ret = correlateSync(M17_STREAM_SYNC_SYMBOLS, M17_STREAM_SYNC_SYMBOLS_VALUES, M17_STREAM_SYNC_BYTES,  MAX_SYNC_SYMBOL_RUN_ERRS, MAX_SYNC_BIT_RUN_ERRS);
-
-      eof = correlateSync(M17_EOF_SYNC_SYMBOLS, M17_EOF_SYNC_SYMBOLS_VALUES, M17_EOF_SYNC_BYTES, MAX_SYNC_SYMBOL_RUN_ERRS, MAX_SYNC_BIT_RUN_ERRS);
-
-      if (ret) m_state = M17RXS_STREAM;
-    }
-  }
-
-  if (eof) {
-    DEBUG4("M17RX: eof sync found pos/centre/threshold", m_syncPtr, m_centreVal, m_thresholdVal);
-
-    io.setDecode(false);
-    io.setADCDetection(false);
-
-    serial.writeM17EOT();
-
-    m_state      = M17RXS_NONE;
-    m_endPtr     = NOENDPTR;
-    m_averagePtr = NOAVEPTR;
-    m_countdown  = 0U;
-    m_nextState  = M17RXS_NONE;
-    m_maxCorr    = 0;
-  }
-
-  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);
-
-    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;
-      default:
-        break;  
-    }
-
-    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 stream sync for too long, signal RXLOST and change to RX_NONE
-    m_lostCount--;
-    if (m_lostCount == 0U) {
-      DEBUG1("M17RX: 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] = m_lostCount == (MAX_SYNC_FRAMES - 1U) ? 0x01U : 0x00U;
-
-      switch (m_state) {
-        case M17RXS_LINK_SETUP:
-          writeRSSILinkSetup(frame);
-          break;
-        case M17RXS_STREAM:
-          writeRSSIStream(frame);
-          break;
-        default:
-          break;  
-      }
-
-      m_maxCorr   = 0;
-      m_nextState = M17RXS_NONE;
-    }
-  }
-}
-
-bool CM17RX::correlateSync(uint8_t syncSymbols, const int8_t* syncSymbolValues, const uint8_t* syncBytes, uint8_t maxSymbolErrs, uint8_t maxBitErrs)
-{
-  if (countBits8(m_bitBuffer[m_bitPtr] ^ syncSymbols) <= maxSymbolErrs) {
-    uint16_t ptr = m_dataPtr + M17_FRAME_LENGTH_SAMPLES - M17_SYNC_LENGTH_SAMPLES + M17_RADIO_SYMBOL_LENGTH;
-    if (ptr >= M17_FRAME_LENGTH_SAMPLES)
-      ptr -= M17_FRAME_LENGTH_SAMPLES;
-
-    q31_t corr = 0;
-    q15_t min =  16000;
-    q15_t max = -16000;
-
-    for (uint8_t i = 0U; i < M17_SYNC_LENGTH_SYMBOLS; i++) {
-      q15_t val = m_buffer[ptr];
-
-      if (val > max)
-        max = val;
-      if (val < min)
-        min = val;
-
-      switch (syncSymbolValues[i]) {
-      case +3:
-        corr -= (val + val + val);
-        break;
-      case +1:
-        corr -= val;
-        break;
-      case -1:
-        corr += val;
-        break;
-      default:  // -3
-        corr += (val + val + val);
-        break;
-      }
-
-      ptr += M17_RADIO_SYMBOL_LENGTH;
-      if (ptr >= M17_FRAME_LENGTH_SAMPLES)
-        ptr -= M17_FRAME_LENGTH_SAMPLES;
-    }
-
-    if (corr > m_maxCorr) {
-      if (m_averagePtr == NOAVEPTR) {
-        m_centreVal = (max + min) >> 1;
-
-        q31_t v1 = (max - m_centreVal) * SCALING_FACTOR;
-        m_thresholdVal = q15_t(v1 >> 15);
-      }
-
-      uint16_t startPtr = m_dataPtr + M17_FRAME_LENGTH_SAMPLES - M17_SYNC_LENGTH_SAMPLES + M17_RADIO_SYMBOL_LENGTH;
-      if (startPtr >= M17_FRAME_LENGTH_SAMPLES)
-        startPtr -= M17_FRAME_LENGTH_SAMPLES;
-
-      uint8_t sync[M17_SYNC_LENGTH_BYTES];
-      samplesToBits(startPtr, M17_SYNC_LENGTH_SYMBOLS, sync, 0U, m_centreVal, m_thresholdVal);
-
-      uint8_t errs = 0U;
-      for (uint8_t i = 0U; i < M17_SYNC_LENGTH_BYTES; i++)
-        errs += countBits8(sync[i] ^ syncBytes[i]);
-
-      if (errs <= maxBitErrs) {
-        m_maxCorr   = corr;
-        m_lostCount = MAX_SYNC_FRAMES;
-        m_syncPtr   = m_dataPtr;
-
-        m_startPtr = startPtr;
-
-        m_endPtr = m_dataPtr + M17_FRAME_LENGTH_SAMPLES - M17_SYNC_LENGTH_SAMPLES - 1U;
-        if (m_endPtr >= M17_FRAME_LENGTH_SAMPLES)
-          m_endPtr -= M17_FRAME_LENGTH_SAMPLES;
-
-        return true;
-      }
-    }
-  }
-
-  return false;
-}
-
-void CM17RX::calculateLevels(uint16_t start, uint16_t count)
-{
-  q15_t maxPos = -16000;
-  q15_t minPos =  16000;
-  q15_t maxNeg =  16000;
-  q15_t minNeg = -16000;
-
-  for (uint16_t i = 0U; i < count; i++) {
-    q15_t sample = m_buffer[start];
-
-    if (sample > 0) {
-      if (sample > maxPos)
-        maxPos = sample;
-      if (sample < minPos)
-        minPos = sample;
-    } else {
-      if (sample < maxNeg)
-        maxNeg = sample;
-      if (sample > minNeg)
-        minNeg = sample;
-    }
-
-    start += M17_RADIO_SYMBOL_LENGTH;
-    if (start >= M17_FRAME_LENGTH_SAMPLES)
-      start -= M17_FRAME_LENGTH_SAMPLES;
-  }
-
-  q15_t posThresh = (maxPos + minPos) >> 1;
-  q15_t negThresh = (maxNeg + minNeg) >> 1;
-
-  q15_t centre = (posThresh + negThresh) >> 1;
-
-  q15_t threshold = posThresh - centre;
-
-  DEBUG5("M17RX: pos/neg/centre/threshold", posThresh, negThresh, centre, threshold);
-
-  if (m_averagePtr == NOAVEPTR) {
-    for (uint8_t i = 0U; i < 16U; i++) {
-      m_centre[i] = centre;
-      m_threshold[i] = threshold;
-    }
-
-    m_averagePtr = 0U;
-  } else {
-    m_centre[m_averagePtr] = centre;
-    m_threshold[m_averagePtr] = threshold;
-
-    m_averagePtr++;
-    if (m_averagePtr >= 16U)
-      m_averagePtr = 0U;
-  }
-
-  m_centreVal = 0;
-  m_thresholdVal = 0;
-
-  for (uint8_t i = 0U; i < 16U; i++) {
-    m_centreVal += m_centre[i];
-    m_thresholdVal += m_threshold[i];
-  }
-
-  m_centreVal >>= 4;
-  m_thresholdVal >>= 4;
-}
-
-void CM17RX::samplesToBits(uint16_t start, uint16_t count, uint8_t* buffer, uint16_t offset, q15_t centre, q15_t threshold)
-{
-  for (uint16_t i = 0U; i < count; i++) {
-    q15_t sample = m_buffer[start] - centre;
-
-    if (sample < -threshold) {
-      WRITE_BIT1(buffer, offset, false);
-      offset++;
-      WRITE_BIT1(buffer, offset, true);
-      offset++;
-    } else if (sample < 0) {
-      WRITE_BIT1(buffer, offset, false);
-      offset++;
-      WRITE_BIT1(buffer, offset, false);
-      offset++;
-    } else if (sample < threshold) {
-      WRITE_BIT1(buffer, offset, true);
-      offset++;
-      WRITE_BIT1(buffer, offset, false);
-      offset++;
-    } else {
-      WRITE_BIT1(buffer, offset, true);
-      offset++;
-      WRITE_BIT1(buffer, offset, true);
-      offset++;
-    }
-
-    start += M17_RADIO_SYMBOL_LENGTH;
-    if (start >= M17_FRAME_LENGTH_SAMPLES)
-      start -= M17_FRAME_LENGTH_SAMPLES;
-  }
-}
-
-void CM17RX::writeRSSILinkSetup(uint8_t* data)
-{
-#if defined(SEND_RSSI_DATA)
-  if (m_rssiCount > 0U) {
-    uint16_t rssi = m_rssiAccum / m_rssiCount;
-
-    data[49U] = (rssi >> 8) & 0xFFU;
-    data[50U] = (rssi >> 0) & 0xFFU;
-
-    serial.writeM17LinkSetup(data, M17_FRAME_LENGTH_BYTES + 3U);
-  } else {
-    serial.writeM17LinkSetup(data, M17_FRAME_LENGTH_BYTES + 1U);
-  }
-#else
-  serial.writeM17LinkSetup(data, M17_FRAME_LENGTH_BYTES + 1U);
-#endif
-
-  m_rssiAccum = 0U;
-  m_rssiCount = 0U;
-}
-
-void CM17RX::writeRSSIStream(uint8_t* data)
-{
-#if defined(SEND_RSSI_DATA)
-  if (m_rssiCount > 0U) {
-    uint16_t rssi = m_rssiAccum / m_rssiCount;
-
-    data[49U] = (rssi >> 8) & 0xFFU;
-    data[50U] = (rssi >> 0) & 0xFFU;
-
-    serial.writeM17Stream(data, M17_FRAME_LENGTH_BYTES + 3U);
-  } else {
-    serial.writeM17Stream(data, M17_FRAME_LENGTH_BYTES + 1U);
-  }
-#else
-  serial.writeM17Stream(data, M17_FRAME_LENGTH_BYTES + 1U);
-#endif
-
-  m_rssiAccum = 0U;
-  m_rssiCount = 0U;
-}
-
-#endif
-

M17RX.h

@@ -1,77 +0,0 @@
-/*
- *   Copyright (C) 2015,2016,2017,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
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include "Config.h"
-
-#if defined(MODE_M17)
-
-#if !defined(M17RX_H)
-#define  M17RX_H
-
-#include "M17Defines.h"
-
-enum M17RX_STATE {
-  M17RXS_NONE,
-  M17RXS_LINK_SETUP,
-  M17RXS_STREAM
-};
-
-class CM17RX {
-public:
-  CM17RX();
-
-  void samples(const q15_t* samples, uint16_t* rssi, uint8_t length);
-
-  void reset();
-
-private:
-  M17RX_STATE m_state;
-  uint8_t     m_bitBuffer[M17_RADIO_SYMBOL_LENGTH];
-  q15_t       m_buffer[M17_FRAME_LENGTH_SAMPLES];
-  uint16_t    m_bitPtr;
-  uint16_t    m_dataPtr;
-  uint16_t    m_startPtr;
-  uint16_t    m_endPtr;
-  uint16_t    m_syncPtr;
-  uint16_t    m_minSyncPtr;
-  uint16_t    m_maxSyncPtr;
-  q31_t       m_maxCorr;
-  uint16_t    m_lostCount;
-  uint8_t     m_countdown;
-  M17RX_STATE m_nextState;
-  q15_t       m_centre[16U];
-  q15_t       m_centreVal;
-  q15_t       m_threshold[16U];
-  q15_t       m_thresholdVal;
-  uint8_t     m_averagePtr;
-  uint32_t    m_rssiAccum;
-  uint16_t    m_rssiCount;
-
-  void processNone(q15_t sample);
-  void processData(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 writeRSSILinkSetup(uint8_t* data);
-  void writeRSSIStream(uint8_t* data);
-};
-
-#endif
-
-#endif
-

M17TX.cpp

@@ -1,190 +0,0 @@
-/*
- *   Copyright (C) 2009-2018,2020,2021 by Jonathan Naylor G4KLX
- *   Copyright (C) 2017 by Andy Uribe CA6JAU
- *
- *   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
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include "Config.h"
-
-#if defined(MODE_M17)
-
-#include "Globals.h"
-#include "M17TX.h"
-
-#include "M17Defines.h"
-
-// Generated using rcosdesign(0.5, 8, 5, 'sqrt') in MATLAB
-static q15_t RRC_0_5_FILTER[] = {0, 0, 0, 0, -290, -174, 142, 432, 438, 90, -387, -561, -155, 658, 1225, 767,
-				  -980, -3326, -4648, -3062, 2527, 11552, 21705, 29724, 32767, 29724, 21705,
-				  11552, 2527, -3062, -4648, -3326, -980, 767, 1225, 658, -155, -561, -387, 90,
-				  438, 432, 142, -174, -290}; // numTaps = 45, L = 5
-const uint16_t RRC_0_5_FILTER_PHASE_LEN = 9U; // phaseLength = numTaps/L
-
-const q15_t M17_LEVELA =  1481;
-const q15_t M17_LEVELB =  494;
-const q15_t M17_LEVELC = -494;
-const q15_t M17_LEVELD = -1481;
-
-const uint8_t M17_START_SYNC = 0x77U;
-const uint8_t M17_END_SYNC   = 0xFFU;
-const uint8_t M17_HANG       = 0x00U;
-
-CM17TX::CM17TX() :
-m_buffer(TX_BUFFER_LEN),
-m_modFilter(),
-m_modState(),
-m_poBuffer(),
-m_poLen(0U),
-m_poPtr(0U),
-m_txDelay(240U),      // 200ms
-m_txHang(4800U),      // 4s
-m_txCount(0U)
-{
-  ::memset(m_modState, 0x00U, 16U * sizeof(q15_t));
-
-  m_modFilter.L           = M17_RADIO_SYMBOL_LENGTH;
-  m_modFilter.phaseLength = RRC_0_5_FILTER_PHASE_LEN;
-  m_modFilter.pCoeffs     = RRC_0_5_FILTER;
-  m_modFilter.pState      = m_modState;
-}
-
-void CM17TX::process()
-{
-  // If we have M17 data to transmit, do so.
-  if (m_poLen == 0U && m_buffer.getData() > 0U) {
-    if (!m_tx) {
-      for (uint16_t i = 0U; i < m_txDelay; i++)
-        m_poBuffer[m_poLen++] = M17_START_SYNC;
-    } else {
-      for (uint8_t i = 0U; i < M17_FRAME_LENGTH_BYTES; i++) {
-        uint8_t c = 0U;
-        m_buffer.get(c);
-        m_poBuffer[m_poLen++] = c;
-      }
-    }
-
-    m_poPtr = 0U;
-  }
-
-  if (m_poLen > 0U) {
-    // Transmit M17 data.
-    uint16_t space = io.getSpace();
-
-    while (space > (4U * M17_RADIO_SYMBOL_LENGTH)) {
-      uint8_t c = m_poBuffer[m_poPtr++];
-      writeByte(c);
-
-      // Reduce space and reset the hang timer.
-      space -= 4U * M17_RADIO_SYMBOL_LENGTH;
-      if (m_duplex)
-        m_txCount = m_txHang;
-
-      if (m_poPtr >= m_poLen) {
-        m_poPtr = 0U;
-        m_poLen = 0U;
-        return;
-      }
-    }
-  } else if (m_txCount > 0U) {
-    // Transmit silence until the hang timer has expired.
-    uint16_t space = io.getSpace();
-
-    while (space > (4U * M17_RADIO_SYMBOL_LENGTH)) {
-      writeSilence();
-
-      space -= 4U * M17_RADIO_SYMBOL_LENGTH;
-      m_txCount--;
-
-      if (m_txCount == 0U)
-        return;
-    }
-  }
-}
-
-uint8_t CM17TX::writeData(const uint8_t* data, uint8_t length)
-{
-  if (length != (M17_FRAME_LENGTH_BYTES + 1U))
-    return 4U;
-
-  uint16_t space = m_buffer.getSpace();
-  if (space < M17_FRAME_LENGTH_BYTES)
-    return 5U;
-
-  for (uint8_t i = 0U; i < M17_FRAME_LENGTH_BYTES; i++)
-    m_buffer.put(data[i + 1U]);
-
-  return 0U;
-}
-
-void CM17TX::writeByte(uint8_t c)
-{
-  q15_t inBuffer[4U];
-  q15_t outBuffer[M17_RADIO_SYMBOL_LENGTH * 4U];
-
-  const uint8_t MASK = 0xC0U;
-
-  for (uint8_t i = 0U; i < 4U; i++, c <<= 2) {
-    switch (c & MASK) {
-      case 0xC0U:
-        inBuffer[i] = M17_LEVELA;
-        break;
-      case 0x80U:
-        inBuffer[i] = M17_LEVELB;
-        break;
-      case 0x00U:
-        inBuffer[i] = M17_LEVELC;
-        break;
-      default:
-        inBuffer[i] = M17_LEVELD;
-        break;
-    }
-  }
-
-  ::arm_fir_interpolate_q15(&m_modFilter, inBuffer, outBuffer, 4U);
-
-  io.write(STATE_M17, outBuffer, M17_RADIO_SYMBOL_LENGTH * 4U);
-}
-
-void CM17TX::writeSilence()
-{
-  q15_t inBuffer[4U] = {0x00U, 0x00U, 0x00U, 0x00U};
-  q15_t outBuffer[M17_RADIO_SYMBOL_LENGTH * 4U];
-
-  ::arm_fir_interpolate_q15(&m_modFilter, inBuffer, outBuffer, 4U);
-
-  io.write(STATE_M17, outBuffer, M17_RADIO_SYMBOL_LENGTH * 4U);
-}
-
-void CM17TX::setTXDelay(uint8_t delay)
-{
-  m_txDelay = 600U + uint16_t(delay) * 12U;        // 500ms + tx delay
-
-  if (m_txDelay > 1200U)
-    m_txDelay = 1200U;
-}
-
-uint8_t CM17TX::getSpace() const
-{
-  return m_buffer.getSpace() / M17_FRAME_LENGTH_BYTES;
-}
-
-void CM17TX::setParams(uint8_t txHang)
-{
-  m_txHang = txHang * 1200U;
-}
-
-#endif
-

M17TX.h

@@ -1,60 +0,0 @@
-/*
- *   Copyright (C) 2015,2016,2017,2020 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
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include "Config.h"
-
-#if defined(MODE_M17)
-
-#if !defined(M17TX_H)
-#define  M17TX_H
-
-#include "RingBuffer.h"
-
-class CM17TX {
-public:
-  CM17TX();
-
-  uint8_t writeData(const uint8_t* data, uint8_t length);
-
-  void process();
-
-  void setTXDelay(uint8_t delay);
-
-  uint8_t getSpace() const;
-
-  void setParams(uint8_t txHang);
-
-private:
-  CRingBuffer<uint8_t>             m_buffer;
-  arm_fir_interpolate_instance_q15 m_modFilter;
-  q15_t                            m_modState[16U];    // blockSize + phaseLength - 1, 4 + 9 - 1 plus some spare
-  uint8_t                          m_poBuffer[1200U];
-  uint16_t                         m_poLen;
-  uint16_t                         m_poPtr;
-  uint16_t                         m_txDelay;
-  uint32_t                         m_txHang;
-  uint32_t                         m_txCount;
-
-  void writeByte(uint8_t c);
-  void writeSilence();
-};
-
-#endif
-
-#endif
-

MMDVM.cpp

@@ -1,5 +1,5 @@
 /*
- *   Copyright (C) 2015,2016,2017,2018,2020,2021,2024 by Jonathan Naylor G4KLX
+ *   Copyright (C) 2015,2016,2017,2018 by Jonathan Naylor G4KLX
  *   Copyright (C) 2016 by Mathis Schmieder DB9MAT
  *   Copyright (C) 2016 by Colin Durbridge G4EML
  *
@@ -18,7 +18,7 @@
  *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#if defined(STM32F4XX) || defined(STM32F7XX)
+#if defined(STM32F4XX) || defined(STM32F7XX) || defined(STM32F105xC)
 
 #include "Config.h"
 #include "Globals.h"
@@ -31,83 +31,40 @@ bool m_dmrEnable    = true;
 bool m_ysfEnable    = true;
 bool m_p25Enable    = true;
 bool m_nxdnEnable   = true;
-bool m_m17Enable    = true;
-bool m_dpmrEnable   = true;
 bool m_pocsagEnable = true;
-bool m_fmEnable     = true;
-bool m_ax25Enable   = true;
 
 bool m_duplex = true;
 
 bool m_tx  = false;
 bool m_dcd = false;
 
-#if defined(MODE_DSTAR)
-CDStarRX dstarRX;
-CDStarTX dstarTX;
+CDStarRX   dstarRX;
+CDStarTX   dstarTX;
+
+CDMRIdleRX dmrIdleRX;
+CDMRRX     dmrRX;
+CDMRTX     dmrTX;
+
+CDMRDMORX  dmrDMORX;
+CDMRDMOTX  dmrDMOTX;
+
+CYSFRX     ysfRX;
+CYSFTX     ysfTX;
+
+CP25RX     p25RX;
+CP25TX     p25TX;
+
+CNXDNRX    nxdnRX;
+CNXDNTX    nxdnTX;
+
+CPOCSAGTX  pocsagTX;
 
 CCalDStarRX calDStarRX;
 CCalDStarTX calDStarTX;
-#endif
-
-#if defined(MODE_DMR)
-CDMRIdleRX dmrIdleRX;
-CDMRRX dmrRX;
-CDMRTX dmrTX;
-
-CDMRDMORX dmrDMORX;
-CDMRDMOTX dmrDMOTX;
-
-CCalDMR calDMR;
-#endif
-
-#if defined(MODE_YSF)
-CYSFRX ysfRX;
-CYSFTX ysfTX;
-#endif
-
-#if defined(MODE_P25)
-CP25RX p25RX;
-CP25TX p25TX;
-
-CCalP25 calP25;
-#endif
-
-#if defined(MODE_NXDN)
-CNXDNRX nxdnRX;
-CNXDNTX nxdnTX;
-
-CCalNXDN calNXDN;
-#endif
-
-#if defined(MODE_M17)
-CM17RX m17RX;
-CM17TX m17TX;
-
-CCalM17 calM17;
-#endif
-
-#if defined(MODE_NXDN)
-CDPMRRX dpmrRX;
-CDPMRTX dpmrTX;
-#endif
-
-#if defined(MODE_POCSAG)
-CPOCSAGTX  pocsagTX;
-CCalPOCSAG calPOCSAG;
-#endif
-
-#if defined(MODE_FM)
-CFM    fm;
-CCalFM calFM;
-#endif
-
-#if defined(MODE_AX25)
-CAX25RX ax25RX;
-CAX25TX ax25TX;
-#endif
-
-CCalRSSI calRSSI;
+CCalDMR     calDMR;
+CCalP25     calP25;
+CCalNXDN    calNXDN;
+CCalRSSI    calRSSI;
 
 CCWIdTX cwIdTX;
 
@@ -126,94 +83,39 @@ void loop()
   io.process();
 
   // The following is for transmitting
-#if defined(MODE_DSTAR)
   if (m_dstarEnable && m_modemState == STATE_DSTAR)
     dstarTX.process();
-#endif
 
-#if defined(MODE_DMR)
   if (m_dmrEnable && m_modemState == STATE_DMR) {
     if (m_duplex)
       dmrTX.process();
     else
       dmrDMOTX.process();
   }
-#endif
 
-#if defined(MODE_YSF)
   if (m_ysfEnable && m_modemState == STATE_YSF)
     ysfTX.process();
-#endif
 
-#if defined(MODE_P25)
   if (m_p25Enable && m_modemState == STATE_P25)
     p25TX.process();
-#endif
 
-#if defined(MODE_NXDN)
   if (m_nxdnEnable && m_modemState == STATE_NXDN)
     nxdnTX.process();
-#endif
 
-#if defined(MODE_M17)
-  if (m_m17Enable && m_modemState == STATE_M17)
-    m17TX.process();
-#endif
-
-#if defined(MODE_DPMR)
-  if (m_dpmrEnable && m_modemState == STATE_DPMR)
-    dpmrTX.process();
-#endif
-
-#if defined(MODE_POCSAG)
   if (m_pocsagEnable && (m_modemState == STATE_POCSAG || pocsagTX.busy()))
     pocsagTX.process();
-#endif
 
-#if defined(MODE_AX25)
-  if (m_ax25Enable && (m_modemState == STATE_IDLE || m_modemState == STATE_FM))
-    ax25TX.process();
-#endif
-
-#if defined(MODE_FM)
-  if (m_fmEnable && m_modemState == STATE_FM)
-    fm.process();
-#endif
-
-#if defined(MODE_DSTAR)
   if (m_modemState == STATE_DSTARCAL)
     calDStarTX.process();
-#endif
 
-#if defined(MODE_DMR)
   if (m_modemState == STATE_DMRCAL || m_modemState == STATE_LFCAL || m_modemState == STATE_DMRCAL1K || m_modemState == STATE_DMRDMO1K)
     calDMR.process();
-#endif
 
-#if defined(MODE_FM)
-  if (m_modemState == STATE_FMCAL10K || m_modemState == STATE_FMCAL12K || m_modemState == STATE_FMCAL15K || m_modemState == STATE_FMCAL20K || m_modemState == STATE_FMCAL25K || m_modemState == STATE_FMCAL30K)
-    calFM.process();
-#endif
-
-#if defined(MODE_P25)
   if (m_modemState == STATE_P25CAL1K)
     calP25.process();
-#endif
 
-#if defined(MODE_NXDN)
   if (m_modemState == STATE_NXDNCAL1K)
     calNXDN.process();
-#endif
-
-#if defined(MODE_M17)
-  if (m_modemState == STATE_M17CAL)
-    calM17.process();
-#endif
-
-#if defined(MODE_POCSAG)
-  if (m_modemState == STATE_POCSAGCAL)
-    calPOCSAG.process();
-#endif
 
   if (m_modemState == STATE_IDLE)
     cwIdTX.process();

MMDVM.ino

@@ -1,5 +1,5 @@
 /*
- *   Copyright (C) 2015,2016,2017,2018,2020,2021,2024 by Jonathan Naylor G4KLX
+ *   Copyright (C) 2015,2016,2017,2018 by Jonathan Naylor G4KLX
  *   Copyright (C) 2016 by Colin Durbridge G4EML
  *
  *   This program is free software; you can redistribute it and/or modify
@@ -28,83 +28,40 @@ bool m_dmrEnable    = true;
 bool m_ysfEnable    = true;
 bool m_p25Enable    = true;
 bool m_nxdnEnable   = true;
-bool m_m17Enable    = true;
-bool m_dpmrEnable   = true;
 bool m_pocsagEnable = true;
-bool m_fmEnable     = true;
-bool m_ax25Enable   = true;
 
 bool m_duplex = true;
 
 bool m_tx  = false;
 bool m_dcd = false;
 
-#if defined(MODE_DSTAR)
-CDStarRX dstarRX;
-CDStarTX dstarTX;
+CDStarRX   dstarRX;
+CDStarTX   dstarTX;
+
+CDMRIdleRX dmrIdleRX;
+CDMRRX     dmrRX;
+CDMRTX     dmrTX;
+
+CDMRDMORX  dmrDMORX;
+CDMRDMOTX  dmrDMOTX;
+
+CYSFRX     ysfRX;
+CYSFTX     ysfTX;
+
+CP25RX     p25RX;
+CP25TX     p25TX;
+
+CNXDNRX    nxdnRX;
+CNXDNTX    nxdnTX;
+
+CPOCSAGTX  pocsagTX;
 
 CCalDStarRX calDStarRX;
 CCalDStarTX calDStarTX;
-#endif
-
-#if defined(MODE_DMR)
-CDMRIdleRX dmrIdleRX;
-CDMRRX dmrRX;
-CDMRTX dmrTX;
-
-CDMRDMORX dmrDMORX;
-CDMRDMOTX dmrDMOTX;
-
-CCalDMR calDMR;
-#endif
-
-#if defined(MODE_YSF)
-CYSFRX ysfRX;
-CYSFTX ysfTX;
-#endif
-
-#if defined(MODE_P25)
-CP25RX p25RX;
-CP25TX p25TX;
-
-CCalP25 calP25;
-#endif
-
-#if defined(MODE_NXDN)
-CNXDNRX nxdnRX;
-CNXDNTX nxdnTX;
-
-CCalNXDN calNXDN;
-#endif
-
-#if defined(MODE_M17)
-CM17RX m17RX;
-CM17TX m17TX;
-
-CCalM17 calM17;
-#endif
-
-#if defined(MODE_NXDN)
-CDPMRRX dpmrRX;
-CDPMRTX dpmrTX;
-#endif
-
-#if defined(MODE_POCSAG)
-CPOCSAGTX  pocsagTX;
-CCalPOCSAG calPOCSAG;
-#endif
-
-#if defined(MODE_FM)
-CFM    fm;
-CCalFM calFM;
-#endif
-
-#if defined(MODE_AX25)
-CAX25RX ax25RX;
-CAX25TX ax25TX;
-#endif
-
-CCalRSSI calRSSI;
+CCalDMR     calDMR;
+CCalP25     calP25;
+CCalNXDN    calNXDN;
+CCalRSSI    calRSSI;
 
 CCWIdTX cwIdTX;
 
@@ -123,94 +80,39 @@ void loop()
   io.process();
 
   // The following is for transmitting
-#if defined(MODE_DSTAR)
   if (m_dstarEnable && m_modemState == STATE_DSTAR)
     dstarTX.process();
-#endif
 
-#if defined(MODE_DMR)
   if (m_dmrEnable && m_modemState == STATE_DMR) {
     if (m_duplex)
       dmrTX.process();
     else
       dmrDMOTX.process();
   }
-#endif
 
-#if defined(MODE_YSF)
   if (m_ysfEnable && m_modemState == STATE_YSF)
     ysfTX.process();
-#endif
 
-#if defined(MODE_P25)
   if (m_p25Enable && m_modemState == STATE_P25)
     p25TX.process();
-#endif
 
-#if defined(MODE_NXDN)
   if (m_nxdnEnable && m_modemState == STATE_NXDN)
     nxdnTX.process();
-#endif
 
-#if defined(MODE_M17)
-  if (m_m17Enable && m_modemState == STATE_M17)
-    m17TX.process();
-#endif
-
-#if defined(MODE_DPMR)
-  if (m_dpmrEnable && m_modemState == STATE_DPMR)
-    dpmrTX.process();
-#endif
-
-#if defined(MODE_POCSAG)
   if (m_pocsagEnable && (m_modemState == STATE_POCSAG || pocsagTX.busy()))
     pocsagTX.process();
-#endif
 
-#if defined(MODE_AX25)
-  if (m_ax25Enable && (m_modemState == STATE_IDLE || m_modemState == STATE_FM))
-    ax25TX.process();
-#endif
-
-#if defined(MODE_FM)
-  if (m_fmEnable && m_modemState == STATE_FM)
-    fm.process();
-#endif
-
-#if defined(MODE_DSTAR)
   if (m_modemState == STATE_DSTARCAL)
     calDStarTX.process();
-#endif
 
-#if defined(MODE_DMR)
   if (m_modemState == STATE_DMRCAL || m_modemState == STATE_LFCAL || m_modemState == STATE_DMRCAL1K || m_modemState == STATE_DMRDMO1K)
     calDMR.process();
-#endif
 
-#if defined(MODE_FM)
-  if (m_modemState == STATE_FMCAL10K || m_modemState == STATE_FMCAL12K || m_modemState == STATE_FMCAL15K || m_modemState == STATE_FMCAL20K || m_modemState == STATE_FMCAL25K || m_modemState == STATE_FMCAL30K)
-    calFM.process();
-#endif
-
-#if defined(MODE_P25)
   if (m_modemState == STATE_P25CAL1K)
     calP25.process();
-#endif
 
-#if defined(MODE_NXDN)
   if (m_modemState == STATE_NXDNCAL1K)
     calNXDN.process();
-#endif
-
-#if defined(MODE_M17)
-  if (m_modemState == STATE_M17CAL)
-    calM17.process();
-#endif
-
-#if defined(MODE_POCSAG)
-  if (m_modemState == STATE_POCSAGCAL)
-    calPOCSAG.process();
-#endif
 
   if (m_modemState == STATE_IDLE)
     cwIdTX.process();

MMDVM_STM32F4xx.coproj

@@ -0,0 +1,360 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<Project version="2G - 2.0.5" name="MMDVM_STM32F4xx">
+  <Target name="MMDVM_Discovery_407" isCurrent="0">
+    <Device manufacturerId="9" manufacturerName="ST" chipId="261" chipName="STM32F407VG" boardId="" boardName="" boardUrl="" coreId="" coreName=""/>
+    <BuildOption>
+      <Compile>
+        <Option name="OptimizationLevel" value="4"/>
+        <Option name="UseFPU" value="0"/>
+        <Option name="UserEditCompiler" value=""/>
+        <Option name="SupportCPlusplus" value="1"/>
+        <Option name="FPU" value="2"/>
+        <Option name="DEBUG" value="2"/>
+        <Option name="WARNING" value="1"/>
+        <Includepaths>
+          <Includepath path="."/>
+        </Includepaths>
+        <DefinedSymbols>
+          <Define name="STM32F4XX"/>
+          <Define name="USE_STDPERIPH_DRIVER"/>
+          <Define name="__ASSEMBLY__"/>
+          <Define name="SUPPORT_CPLUSPLUS"/>
+          <Define name="STM32F40_41xxx"/>
+          <Define name="HSE_VALUE=8000000"/>
+          <Define name="STM32F4_DISCOVERY"/>
+          <Define name="__FPU_USED"/>
+        </DefinedSymbols>
+      </Compile>
+      <Link useDefault="0">
+        <Option name="DiscardUnusedSection" value="0"/>
+        <Option name="UserEditLinkder" value=""/>
+        <Option name="UseMemoryLayout" value="0"/>
+        <Option name="nostartfiles" value="1"/>
+        <Option name="LTO" value="0"/>
+        <Option name="IsNewStartupCode" value="1"/>
+        <Option name="Library" value="Semihosting"/>
+        <Option name="UserEditLinker" value="-lstdc++; --specs=nano.specs;"/>
+        <LinkedLibraries>
+          <Libset dir="stm32f4xx_lib\cmsis\lib\gcc\" libs="arm_cortexm4lf_math"/>
+        </LinkedLibraries>
+        <MemoryAreas debugInFlashNotRAM="1">
+          <Memory name="IROM1" type="ReadOnly" size="0x00100000" startValue="0x08000000"/>
+          <Memory name="IRAM1" type="ReadWrite" size="0x00020000" startValue="0x20000000"/>
+          <Memory name="IROM2" type="ReadOnly" size="" startValue=""/>
+          <Memory name="IRAM2" type="ReadWrite" size="0x00010000" startValue="0x10000000"/>
+        </MemoryAreas>
+        <LocateLinkFile path="./stm32f4xx_link.ld" type="0"/>
+      </Link>
+      <Output>
+        <Option name="OutputFileType" value="0"/>
+        <Option name="Path" value="./"/>
+        <Option name="Name" value="MMDVM_DIS"/>
+        <Option name="HEX" value="1"/>
+        <Option name="BIN" value="1"/>
+      </Output>
+      <User>
+        <UserRun name="Run#1" type="Before" checked="0" value=""/>
+        <UserRun name="Run#1" type="After" checked="0" value=""/>
+      </User>
+    </BuildOption>
+    <DebugOption>
+      <Option name="org.coocox.codebugger.gdbjtag.core.adapter" value="ST-Link"/>
+      <Option name="org.coocox.codebugger.gdbjtag.core.debugMode" value="SWD"/>
+      <Option name="org.coocox.codebugger.gdbjtag.core.clockDiv" value="1M"/>
+      <Option name="org.coocox.codebugger.gdbjtag.corerunToMain" value="1"/>
+      <Option name="org.coocox.codebugger.gdbjtag.core.jlinkgdbserver" value=""/>
+      <Option name="org.coocox.codebugger.gdbjtag.core.userDefineGDBScript" value=""/>
+      <Option name="org.coocox.codebugger.gdbjtag.core.targetEndianess" value="0"/>
+      <Option name="org.coocox.codebugger.gdbjtag.core.jlinkResetMode" value="Type 0: Normal"/>
+      <Option name="org.coocox.codebugger.gdbjtag.core.resetMode" value="SYSRESETREQ"/>
+      <Option name="org.coocox.codebugger.gdbjtag.core.ifSemihost" value="0"/>
+      <Option name="org.coocox.codebugger.gdbjtag.core.ifCacheRom" value="1"/>
+      <Option name="org.coocox.codebugger.gdbjtag.core.ipAddress" value="127.0.0.1"/>
+      <Option name="org.coocox.codebugger.gdbjtag.core.portNumber" value="2009"/>
+      <Option name="org.coocox.codebugger.gdbjtag.core.autoDownload" value="1"/>
+      <Option name="org.coocox.codebugger.gdbjtag.core.verify" value="1"/>
+      <Option name="org.coocox.codebugger.gdbjtag.core.downloadFuction" value="Erase Effected"/>
+      <Option name="org.coocox.codebugger.gdbjtag.core.defaultAlgorithm" value="STM32F4xx_1024.elf"/>
+    </DebugOption>
+    <ExcludeFile/>
+  </Target>
+  <Target name="MMDVM_Pi_446" isCurrent="0">
+    <Device manufacturerId="9" manufacturerName="ST" chipId="344" chipName="STM32F407VG" boardId="" boardName="" boardUrl="" coreId="" coreName=""/>
+    <BuildOption>
+      <Compile>
+        <Option name="OptimizationLevel" value="4"/>
+        <Option name="UseFPU" value="0"/>
+        <Option name="UserEditCompiler" value=""/>
+        <Option name="SupportCPlusplus" value="1"/>
+        <Option name="FPU" value="2"/>
+        <Includepaths>
+          <Includepath path="."/>
+        </Includepaths>
+        <DefinedSymbols>
+          <Define name="STM32F4XX"/>
+          <Define name="USE_STDPERIPH_DRIVER"/>
+          <Define name="__ASSEMBLY__"/>
+          <Define name="SUPPORT_CPLUSPLUS"/>
+          <Define name="__FPU_USED"/>
+          <Define name="STM32F446xx"/>
+          <Define name="HSE_VALUE=12000000"/>
+          <Define name="STM32F4_PI"/>
+          <Define name="ARDUINO_MODE_PINS"/>
+        </DefinedSymbols>
+      </Compile>
+      <Link useDefault="0">
+        <Option name="DiscardUnusedSection" value="0"/>
+        <Option name="UserEditLinkder" value=""/>
+        <Option name="UseMemoryLayout" value="0"/>
+        <Option name="nostartfiles" value="1"/>
+        <Option name="LTO" value="0"/>
+        <Option name="IsNewStartupCode" value="1"/>
+        <Option name="Library" value="Semihosting"/>
+        <Option name="UserEditLinker" value="-lstdc++; --specs=nano.specs;"/>
+        <LinkedLibraries>
+          <Libset dir="stm32f4xx_lib\cmsis\lib\gcc\" libs="arm_cortexm4lf_math"/>
+        </LinkedLibraries>
+        <MemoryAreas debugInFlashNotRAM="1">
+          <Memory name="IROM1" type="ReadOnly" size="0x00100000" startValue="0x08000000"/>
+          <Memory name="IRAM1" type="ReadWrite" size="0x00020000" startValue="0x20000000"/>
+          <Memory name="IROM2" type="ReadOnly" size="" startValue=""/>
+          <Memory name="IRAM2" type="ReadWrite" size="0x00010000" startValue="0x10000000"/>
+        </MemoryAreas>
+        <LocateLinkFile path="./stm32f4xx_link.ld" type="0"/>
+      </Link>
+      <Output>
+        <Option name="OutputFileType" value="0"/>
+        <Option name="Path" value="./"/>
+        <Option name="Name" value="MMDVM_PI"/>
+        <Option name="HEX" value="1"/>
+        <Option name="BIN" value="1"/>
+      </Output>
+      <User>
+        <UserRun name="Run#1" type="Before" checked="0" value=""/>
+        <UserRun name="Run#1" type="After" checked="0" value=""/>
+      </User>
+    </BuildOption>
+    <DebugOption>
+      <Option name="org.coocox.codebugger.gdbjtag.core.adapter" value="ST-Link"/>
+      <Option name="org.coocox.codebugger.gdbjtag.core.debugMode" value="SWD"/>
+      <Option name="org.coocox.codebugger.gdbjtag.core.clockDiv" value="1M"/>
+      <Option name="org.coocox.codebugger.gdbjtag.corerunToMain" value="1"/>
+      <Option name="org.coocox.codebugger.gdbjtag.core.jlinkgdbserver" value=""/>
+      <Option name="org.coocox.codebugger.gdbjtag.core.userDefineGDBScript" value=""/>
+      <Option name="org.coocox.codebugger.gdbjtag.core.targetEndianess" value="0"/>
+      <Option name="org.coocox.codebugger.gdbjtag.core.jlinkResetMode" value="Type 0: Normal"/>
+      <Option name="org.coocox.codebugger.gdbjtag.core.resetMode" value="SYSRESETREQ"/>
+      <Option name="org.coocox.codebugger.gdbjtag.core.ifSemihost" value="0"/>
+      <Option name="org.coocox.codebugger.gdbjtag.core.ifCacheRom" value="1"/>
+      <Option name="org.coocox.codebugger.gdbjtag.core.ipAddress" value="127.0.0.1"/>
+      <Option name="org.coocox.codebugger.gdbjtag.core.portNumber" value="2009"/>
+      <Option name="org.coocox.codebugger.gdbjtag.core.autoDownload" value="1"/>
+      <Option name="org.coocox.codebugger.gdbjtag.core.verify" value="1"/>
+      <Option name="org.coocox.codebugger.gdbjtag.core.downloadFuction" value="Erase Effected"/>
+      <Option name="org.coocox.codebugger.gdbjtag.core.defaultAlgorithm" value="STM32F4xx_1024.elf"/>
+    </DebugOption>
+    <ExcludeFile/>
+  </Target>
+  <Target name="MMDVM_Nucleo_446" isCurrent="1">
+    <Device manufacturerId="9" manufacturerName="ST" chipId="261" chipName="STM32F407VG" boardId="" boardName="" boardUrl="" coreId="" coreName=""/>
+    <BuildOption>
+      <Compile>
+        <Option name="OptimizationLevel" value="4"/>
+        <Option name="UseFPU" value="0"/>
+        <Option name="UserEditCompiler" value=""/>
+        <Option name="SupportCPlusplus" value="1"/>
+        <Option name="FPU" value="2"/>
+        <Option name="DEBUG" value="2"/>
+        <Option name="WARNING" value="0"/>
+        <Includepaths>
+          <Includepath path="."/>
+        </Includepaths>
+        <DefinedSymbols>
+          <Define name="STM32F4XX"/>
+          <Define name="USE_STDPERIPH_DRIVER"/>
+          <Define name="__ASSEMBLY__"/>
+          <Define name="SUPPORT_CPLUSPLUS"/>
+          <Define name="HSE_VALUE=8000000"/>
+          <Define name="__FPU_USED"/>
+          <Define name="STM32F4_NUCLEO"/>
+          <Define name="STM32F446xx"/>
+        </DefinedSymbols>
+      </Compile>
+      <Link useDefault="0">
+        <Option name="DiscardUnusedSection" value="0"/>
+        <Option name="UserEditLinkder" value=""/>
+        <Option name="UseMemoryLayout" value="0"/>
+        <Option name="nostartfiles" value="1"/>
+        <Option name="LTO" value="0"/>
+        <Option name="IsNewStartupCode" value="1"/>
+        <Option name="Library" value="Semihosting"/>
+        <Option name="UserEditLinker" value="-lstdc++; --specs=nano.specs;"/>
+        <LinkedLibraries>
+          <Libset dir="stm32f4xx_lib\cmsis\lib\gcc\" libs="arm_cortexm4lf_math"/>
+        </LinkedLibraries>
+        <MemoryAreas debugInFlashNotRAM="1">
+          <Memory name="IROM1" type="ReadOnly" size="0x00100000" startValue="0x08000000"/>
+          <Memory name="IRAM1" type="ReadWrite" size="0x00020000" startValue="0x20000000"/>
+          <Memory name="IROM2" type="ReadOnly" size="" startValue=""/>
+          <Memory name="IRAM2" type="ReadWrite" size="0x00010000" startValue="0x10000000"/>
+        </MemoryAreas>
+        <LocateLinkFile path="./stm32f4xx_link.ld" type="0"/>
+      </Link>
+      <Output>
+        <Option name="OutputFileType" value="0"/>
+        <Option name="Path" value="./"/>
+        <Option name="Name" value="MMDVM_NUCLEO"/>
+        <Option name="HEX" value="1"/>
+        <Option name="BIN" value="1"/>
+      </Output>
+      <User>
+        <UserRun name="Run#1" type="Before" checked="0" value=""/>
+        <UserRun name="Run#1" type="After" checked="0" value=""/>
+      </User>
+    </BuildOption>
+    <DebugOption>
+      <Option name="org.coocox.codebugger.gdbjtag.core.adapter" value="ST-Link"/>
+      <Option name="org.coocox.codebugger.gdbjtag.core.debugMode" value="SWD"/>
+      <Option name="org.coocox.codebugger.gdbjtag.core.clockDiv" value="1M"/>
+      <Option name="org.coocox.codebugger.gdbjtag.corerunToMain" value="1"/>
+      <Option name="org.coocox.codebugger.gdbjtag.core.jlinkgdbserver" value=""/>
+      <Option name="org.coocox.codebugger.gdbjtag.core.userDefineGDBScript" value=""/>
+      <Option name="org.coocox.codebugger.gdbjtag.core.targetEndianess" value="0"/>
+      <Option name="org.coocox.codebugger.gdbjtag.core.jlinkResetMode" value="Type 0: Normal"/>
+      <Option name="org.coocox.codebugger.gdbjtag.core.resetMode" value="SYSRESETREQ"/>
+      <Option name="org.coocox.codebugger.gdbjtag.core.ifSemihost" value="0"/>
+      <Option name="org.coocox.codebugger.gdbjtag.core.ifCacheRom" value="1"/>
+      <Option name="org.coocox.codebugger.gdbjtag.core.ipAddress" value="127.0.0.1"/>
+      <Option name="org.coocox.codebugger.gdbjtag.core.portNumber" value="2009"/>
+      <Option name="org.coocox.codebugger.gdbjtag.core.autoDownload" value="1"/>
+      <Option name="org.coocox.codebugger.gdbjtag.core.verify" value="1"/>
+      <Option name="org.coocox.codebugger.gdbjtag.core.downloadFuction" value="Erase Effected"/>
+      <Option name="org.coocox.codebugger.gdbjtag.core.defaultAlgorithm" value="STM32F4xx_1024.elf"/>
+    </DebugOption>
+    <ExcludeFile/>
+  </Target>
+  <Components path="./"/>
+  <LocalComponents/>
+  <Files>
+    <File name="DMRIdleRX.h" path="DMRIdleRX.h" type="1"/>
+    <File name="STM32F4XX_Lib/STM32F4xx_StdPeriph_Driver/source/stm32f4xx_dac.c" path="STM32F4XX_Lib/STM32F4xx_StdPeriph_Driver/source/stm32f4xx_dac.c" type="1"/>
+    <File name="DMRDMOTX.cpp" path="DMRDMOTX.cpp" type="1"/>
+    <File name="DMRRX.cpp" path="DMRRX.cpp" type="1"/>
+    <File name="YSFRX.cpp" path="YSFRX.cpp" type="1"/>
+    <File name="STM32F4XX_Lib/Device/stm32f4xx.h" path="STM32F4XX_Lib/Device/stm32f4xx.h" type="1"/>
+    <File name="SampleRB.cpp" path="SampleRB.cpp" type="1"/>
+    <File name="CalDStarTX.h" path="CalDStarTX.h" type="1"/>
+    <File name="CalNXDN.cpp" path="CalNXDN.cpp" type="1"/>
+    <File name="NXDNTX.cpp" path="NXDNTX.cpp" type="1"/>
+    <File name="STM32F4XX_Lib/CMSIS/Include/core_cm4.h" path="STM32F4XX_Lib/CMSIS/Include/core_cm4.h" type="1"/>
+    <File name="I2CTeensy.cpp" path="I2CTeensy.cpp" type="1"/>
+    <File name="DMRSlotRX.h" path="DMRSlotRX.h" type="1"/>
+    <File name="YSFRX.h" path="YSFRX.h" type="1"/>
+    <File name="STM32F4XX_Lib/STM32F4xx_StdPeriph_Driver/source/stm32f4xx_tim.c" path="STM32F4XX_Lib/STM32F4xx_StdPeriph_Driver/source/stm32f4xx_tim.c" type="1"/>
+    <File name="STM32F4XX_Lib/CMSIS/Include" path="" type="2"/>
+    <File name="NXDNRX.cpp" path="NXDNRX.cpp" type="1"/>
+    <File name="IO.cpp" path="IO.cpp" type="1"/>
+    <File name="DMRDMORX.cpp" path="DMRDMORX.cpp" type="1"/>
+    <File name="P25RX.h" path="P25RX.h" type="1"/>
+    <File name="STM32F4XX_Lib/STM32F4xx_StdPeriph_Driver/source/misc.c" path="STM32F4XX_Lib/STM32F4xx_StdPeriph_Driver/source/misc.c" type="1"/>
+    <File name="STM32F4XX_Lib/CMSIS" path="" type="2"/>
+    <File name="SerialArduino.cpp" path="SerialArduino.cpp" type="1"/>
+    <File name="SerialPort.cpp" path="SerialPort.cpp" type="1"/>
+    <File name="CalP25.cpp" path="CalP25.cpp" type="1"/>
+    <File name="STM32F4XX_Lib/Device/stm32f4xx_conf.h" path="STM32F4XX_Lib/Device/stm32f4xx_conf.h" type="1"/>
+    <File name="STM32F4XX_Lib/STM32F4xx_StdPeriph_Driver/source/stm32f4xx_adc.c" path="STM32F4XX_Lib/STM32F4xx_StdPeriph_Driver/source/stm32f4xx_adc.c" type="1"/>
+    <File name="IOSTM_CMSIS.cpp" path="IOSTM_CMSIS.cpp" type="1"/>
+    <File name="DStarTX.cpp" path="DStarTX.cpp" type="1"/>
+    <File name="STM32F4XX_Lib/STM32F4xx_StdPeriph_Driver/source/stm32f4xx_usart.c" path="STM32F4XX_Lib/STM32F4xx_StdPeriph_Driver/source/stm32f4xx_usart.c" type="1"/>
+    <File name="YSFTX.h" path="YSFTX.h" type="1"/>
+    <File name="SampleRB.h" path="SampleRB.h" type="1"/>
+    <File name="SerialSTM_CMSIS.cpp" path="SerialSTM_CMSIS.cpp" type="1"/>
+    <File name="DMRRX.h" path="DMRRX.h" type="1"/>
+    <File name="IOTeensy.cpp" path="IOTeensy.cpp" type="1"/>
+    <File name="MMDVM.cpp" path="MMDVM.cpp" type="1"/>
+    <File name="STM32F4XX_Lib/CMSIS/Include/core_cmSimd.h" path="STM32F4XX_Lib/CMSIS/Include/core_cmSimd.h" type="1"/>
+    <File name="POCSAGTX.cpp" path="POCSAGTX.cpp" type="1"/>
+    <File name="DMRDMORX.h" path="DMRDMORX.h" type="1"/>
+    <File name="GitVersion.h" path="GitVersion.h" type="1"/>
+    <File name="SerialPort.h" path="SerialPort.h" type="1"/>
+    <File name="STM32F4XX_Lib/STM32F4xx_StdPeriph_Driver/include/stm32f4xx_dac.h" path="STM32F4XX_Lib/STM32F4xx_StdPeriph_Driver/include/stm32f4xx_dac.h" type="1"/>
+    <File name="STM32F4XX_Lib/CMSIS/Include/core_cmFunc.h" path="STM32F4XX_Lib/CMSIS/Include/core_cmFunc.h" type="1"/>
+    <File name="STM32F4XX_Lib/Device/system_stm32f4xx.h" path="STM32F4XX_Lib/Device/system_stm32f4xx.h" type="1"/>
+    <File name="CWIdTX.h" path="CWIdTX.h" type="1"/>
+    <File name="CalDStarTX.cpp" path="CalDStarTX.cpp" type="1"/>
+    <File name="STM32F4XX_Lib/STM32F4xx_StdPeriph_Driver/source" path="" type="2"/>
+    <File name="POCSAGTX.h" path="POCSAGTX.h" type="1"/>
+    <File name="DMRDMOTX.h" path="DMRDMOTX.h" type="1"/>
+    <File name="CalDMR.h" path="CalDMR.h" type="1"/>
+    <File name="IODue.cpp" path="IODue.cpp" type="1"/>
+    <File name="DMRTX.cpp" path="DMRTX.cpp" type="1"/>
+    <File name="CalRSSI.h" path="CalRSSI.h" type="1"/>
+    <File name="P25RX.cpp" path="P25RX.cpp" type="1"/>
+    <File name="STM32F4XX_Lib/CMSIS/Lib/GCC" path="" type="2"/>
+    <File name="STM32F4XX_Lib" path="" type="2"/>
+    <File name="STM32F4XX_Lib/CMSIS/Include/core_cmInstr.h" path="STM32F4XX_Lib/CMSIS/Include/core_cmInstr.h" type="1"/>
+    <File name="DMRTX.h" path="DMRTX.h" type="1"/>
+    <File name="STM32F4XX_Lib/Device/system_stm32f4xx.c" path="STM32F4XX_Lib/Device/system_stm32f4xx.c" type="1"/>
+    <File name="RSSIRB.h" path="RSSIRB.h" type="1"/>
+    <File name="STM32F4XX_Lib/Device/startup/startup_stm32f4xx.c" path="STM32F4XX_Lib/Device/startup/startup_stm32f4xx.c" type="1"/>
+    <File name="STM32F4XX_Lib/Device/startup" path="" type="2"/>
+    <File name="SerialRB.h" path="SerialRB.h" type="1"/>
+    <File name="NXDNDefines.h" path="NXDNDefines.h" type="1"/>
+    <File name="STM32F4XX_Lib/STM32F4xx_StdPeriph_Driver/include/stm32f4xx_gpio.h" path="STM32F4XX_Lib/STM32F4xx_StdPeriph_Driver/include/stm32f4xx_gpio.h" type="1"/>
+    <File name="NXDNTX.h" path="NXDNTX.h" type="1"/>
+    <File name="STM32F4XX_Lib/STM32F4xx_StdPeriph_Driver" path="" type="2"/>
+    <File name="DMRDefines.h" path="DMRDefines.h" type="1"/>
+    <File name="CalDMR.cpp" path="CalDMR.cpp" type="1"/>
+    <File name="STM32F4XX_Lib/STM32F4xx_StdPeriph_Driver/include/stm32f4xx_adc.h" path="STM32F4XX_Lib/STM32F4xx_StdPeriph_Driver/include/stm32f4xx_adc.h" type="1"/>
+    <File name="SerialSTM.cpp" path="SerialSTM.cpp" type="1"/>
+    <File name="STM32F4XX_Lib/CMSIS/Lib/GCC/libarm_cortexM4lf_math.a" path="STM32F4XX_Lib/CMSIS/Lib/GCC/libarm_cortexM4lf_math.a" type="1"/>
+    <File name="DStarDefines.h" path="DStarDefines.h" type="1"/>
+    <File name="DStarRX.h" path="DStarRX.h" type="1"/>
+    <File name="NXDNRX.h" path="NXDNRX.h" type="1"/>
+    <File name="Config.h" path="Config.h" type="1"/>
+    <File name="RingBuff.h" path="RingBuff.h" type="1"/>
+    <File name="DMRSlotType.cpp" path="DMRSlotType.cpp" type="1"/>
+    <File name="Globals.h" path="Globals.h" type="1"/>
+    <File name="STM32F4XX_Lib/Device" path="" type="2"/>
+    <File name="CalDStarRX.cpp" path="CalDStarRX.cpp" type="1"/>
+    <File name="STM32F4XX_Lib/STM32F4xx_StdPeriph_Driver/include/stm32f4xx_tim.h" path="STM32F4XX_Lib/STM32F4xx_StdPeriph_Driver/include/stm32f4xx_tim.h" type="1"/>
+    <File name="CalNXDN.h" path="CalNXDN.h" type="1"/>
+    <File name="CalDStarRX.h" path="CalDStarRX.h" type="1"/>
+    <File name="STM32F4XX_Lib/STM32F4xx_StdPeriph_Driver/include" path="" type="2"/>
+    <File name="CalRSSI.cpp" path="CalRSSI.cpp" type="1"/>
+    <File name="IO.h" path="IO.h" type="1"/>
+    <File name="Utils.cpp" path="Utils.cpp" type="1"/>
+    <File name="STM32F4XX_Lib/CMSIS/Lib/.DS_Store" path="STM32F4XX_Lib/CMSIS/Lib/.DS_Store" type="1"/>
+    <File name="STM32F4XX_Lib/CMSIS/.DS_Store" path="STM32F4XX_Lib/CMSIS/.DS_Store" type="1"/>
+    <File name="Utils.h" path="Utils.h" type="1"/>
+    <File name="STM32F4XX_Lib/CMSIS/Lib" path="" type="2"/>
+    <File name="STM32F4XX_Lib/STM32F4xx_StdPeriph_Driver/.DS_Store" path="STM32F4XX_Lib/STM32F4xx_StdPeriph_Driver/.DS_Store" type="1"/>
+    <File name="STM32F4XX_Lib/CMSIS/Include/.DS_Store" path="STM32F4XX_Lib/CMSIS/Include/.DS_Store" type="1"/>
+    <File name="STM32F4XX_Lib/CMSIS/Include/arm_math.h" path="STM32F4XX_Lib/CMSIS/Include/arm_math.h" type="1"/>
+    <File name="YSFDefines.h" path="YSFDefines.h" type="1"/>
+    <File name="DStarTX.h" path="DStarTX.h" type="1"/>
+    <File name="STM32F4XX_Lib/STM32F4xx_StdPeriph_Driver/source/stm32f4xx_rcc.c" path="STM32F4XX_Lib/STM32F4xx_StdPeriph_Driver/source/stm32f4xx_rcc.c" type="1"/>
+    <File name="CalP25.h" path="CalP25.h" type="1"/>
+    <File name="STM32F4XX_Lib/Device/.DS_Store" path="STM32F4XX_Lib/Device/.DS_Store" type="1"/>
+    <File name="STM32F4XX_Lib/STM32F4xx_StdPeriph_Driver/include/stm32f4xx_rcc.h" path="STM32F4XX_Lib/STM32F4xx_StdPeriph_Driver/include/stm32f4xx_rcc.h" type="1"/>
+    <File name="P25Defines.h" path="P25Defines.h" type="1"/>
+    <File name="DMRSlotType.h" path="DMRSlotType.h" type="1"/>
+    <File name="Debug.h" path="Debug.h" type="1"/>
+    <File name="STM32F4XX_Lib/STM32F4xx_StdPeriph_Driver/include/misc.h" path="STM32F4XX_Lib/STM32F4xx_StdPeriph_Driver/include/misc.h" type="1"/>
+    <File name="P25TX.h" path="P25TX.h" type="1"/>
+    <File name="RSSIRB.cpp" path="RSSIRB.cpp" type="1"/>
+    <File name="DStarRX.cpp" path="DStarRX.cpp" type="1"/>
+    <File name="IOSTM.cpp" path="IOSTM.cpp" type="1"/>
+    <File name="DMRSlotRX.cpp" path="DMRSlotRX.cpp" type="1"/>
+    <File name="P25TX.cpp" path="P25TX.cpp" type="1"/>
+    <File name="SerialRB.cpp" path="SerialRB.cpp" type="1"/>
+    <File name="CWIdTX.cpp" path="CWIdTX.cpp" type="1"/>
+    <File name="DMRIdleRX.cpp" path="DMRIdleRX.cpp" type="1"/>
+    <File name="STM32F4XX_Lib/STM32F4xx_StdPeriph_Driver/include/stm32f4xx_usart.h" path="STM32F4XX_Lib/STM32F4xx_StdPeriph_Driver/include/stm32f4xx_usart.h" type="1"/>
+    <File name="STM32Utils.h" path="STM32Utils.h" type="1"/>
+    <File name="STM32F4XX_Lib/.DS_Store" path="STM32F4XX_Lib/.DS_Store" type="1"/>
+    <File name="YSFTX.cpp" path="YSFTX.cpp" type="1"/>
+    <File name="STM32F4XX_Lib/STM32F4xx_StdPeriph_Driver/source/stm32f4xx_gpio.c" path="STM32F4XX_Lib/STM32F4xx_StdPeriph_Driver/source/stm32f4xx_gpio.c" type="1"/>
+  </Files>
+  <Bookmarks/>
+</Project>

Makefile

@@ -25,7 +25,6 @@ F7_LIB_PATH=./STM32F7XX_Lib
 # MCU external clock frequency (Hz)
 CLK_MMDVM_PI=12000000
 CLK_NUCLEO=8000000
-CLK_12MHZ=12000000
 
 # Directory Structure
 BINDIR=bin
@@ -94,8 +93,6 @@ ifndef $(OSC)
 		OSC=$(CLK_MMDVM_PI)
 	else ifeq ($(MAKECMDGOALS),pi-f722)
 		OSC=$(CLK_MMDVM_PI)
-	else ifeq ($(MAKECMDGOALS),drcc_nqf)
-		OSC=$(CLK_12MHZ)
 	else
 		OSC=$(CLK_NUCLEO)
 	endif
@@ -131,21 +128,10 @@ DEFS_NUCLEO_F767=-DUSE_HAL_DRIVER -DSTM32F767xx -DSTM32F7XX -DSTM32F7_NUCLEO -DH
 DEFS_PI_F722=-DUSE_HAL_DRIVER -DSTM32F722xx -DSTM32F7XX -DSTM32F722_PI -DHSE_VALUE=$(OSC) -DMADEBYMAKEFILE
 # MMDVM-F7M F0DEI board:
 DEFS_F7M=-DUSE_HAL_DRIVER -DSTM32F722xx -DSTM32F7XX -DSTM32F722_F7M -DHSE_VALUE=$(OSC) -DMADEBYMAKEFILE
-# MMDVM_RPT_Hat F0DEI, DB9MAT, DF2ET board:
-DEFS_RPT_HAT=-DUSE_HAL_DRIVER -DSTM32F722xx -DSTM32F7XX -DSTM32F722_RPT_HAT -DHSE_VALUE=$(OSC) -DMADEBYMAKEFILE
-# RB STM32F4_DVM board:
+# MMDVM-F7-Hat F0DEI, DB9MAT, DF2ET board:
+DEFS_F7HAT=-DUSE_HAL_DRIVER -DSTM32F722xx -DSTM32F7XX -DSTM32F722_F7HAT -DHSE_VALUE=$(OSC) -DMADEBYMAKEFILE
+# STM32F4 DVM board:
 DEFS_DVM=-DUSE_STDPERIPH_DRIVER -DSTM32F4XX -DSTM32F446xx -DSTM32F4_DVM -DHSE_VALUE=$(OSC) -DMADEBYMAKEFILE
-# RB STM32F7 DVM board:
-DEFS_DVM722=-DUSE_HAL_DRIVER -DSTM32F722xx -DSTM32F7XX -DSTM32F7_DVM -DHSE_VALUE=$(OSC) -DMADEBYMAKEFILE
-# MMDVM_RPT_Hat BG4TGO, BG5HHP board:
-DEFS_RPT_HAT_TGO=-DUSE_STDPERIPH_DRIVER -DSTM32F4XX -DSTM32F40_41xxx -DSTM32F4_RPT_HAT_TGO -DHSE_VALUE=$(OSC) -DMADEBYMAKEFILE
-# DRCC_DVM BG7NQF board:
-DEFS_DRCC_DVM=-DUSE_STDPERIPH_DRIVER -DSTM32F4XX -DSTM32F446xx -DDRCC_DVM -DHSE_VALUE=$(OSC) -DMADEBYMAKEFILE
-# WA0EDA F405 MTR2K, MASTR3 board:
-DEFS_EDA_405=-DUSE_STDPERIPH_DRIVER -DSTM32F4XX -DSTM32F40_41xxx -DSTM32F4_EDA_405 -DHSE_VALUE=$(OSC) -DMADEBYMAKEFILE
-# WA0EDA F446 MTR2K, MASTR3 board:
-DEFS_EDA_446=-DUSE_STDPERIPH_DRIVER -DSTM32F4XX -DSTM32F446xx -DSTM32F4_EDA_446 -DHSE_VALUE=$(OSC) -DMADEBYMAKEFILE
-
 
 # Build compiler flags
 CFLAGS_F4=-c $(MCFLAGS_F4) $(INCLUDES_F4)
@@ -161,10 +147,10 @@ LDFLAGS_F722 =-T stm32f722_link.ld $(MCFLAGS_F7) --specs=nosys.specs $(INCLUDES_
 # Common flags
 CFLAGS=-Os -ffunction-sections -fdata-sections -fno-builtin -Wno-implicit -DCUSTOM_NEW -DNO_EXCEPTIONS
 CXXFLAGS=-Os -fno-exceptions -ffunction-sections -fdata-sections -fno-builtin -fno-rtti -DCUSTOM_NEW -DNO_EXCEPTIONS
-LDFLAGS=-Os --specs=nano.specs -Wl,-Map=bin/mmdvm.map
+LDFLAGS=-Os --specs=nano.specs
 
 # Build Rules
-.PHONY: all release dis pi pi-f722 f4m nucleo f767 dvm drcc_nqf clean
+.PHONY: all release dis pi pi-f722 f4m nucleo f767 dvm clean
 
 # Default target: Nucleo-64 F446RE board
 all: nucleo
@@ -193,17 +179,11 @@ f7m: CXXFLAGS+=$(CXXFLAGS_F7) $(DEFS_F7M)
 f7m: LDFLAGS+=$(LDFLAGS_F722)
 f7m: release_f7
 
-rpt_hat: GitVersion.h
-rpt_hat: CFLAGS+=$(CFLAGS_F7) $(DEFS_RPT_HAT)
-rpt_hat: CXXFLAGS+=$(CXXFLAGS_F7) $(DEFS_RPT_HAT)
-rpt_hat: LDFLAGS+=$(LDFLAGS_F722)
-rpt_hat: release_f7
-
-rpt_hat_tgo: GitVersion.h
-rpt_hat_tgo: CFLAGS+=$(CFLAGS_F4) $(DEFS_RPT_HAT_TGO)
-rpt_hat_tgo: CXXFLAGS+=$(CXXFLAGS_F4) $(DEFS_RPT_HAT_TGO)
-rpt_hat_tgo: LDFLAGS+=$(LDFLAGS_F4)
-rpt_hat_tgo: release_f4
+f7hat: GitVersion.h
+f7hat: CFLAGS+=$(CFLAGS_F7) $(DEFS_F7HAT)
+f7hat: CXXFLAGS+=$(CXXFLAGS_F7) $(DEFS_F7HAT)
+f7hat: LDFLAGS+=$(LDFLAGS_F722)
+f7hat: release_f7
 
 nucleo: GitVersion.h
 nucleo: CFLAGS+=$(CFLAGS_F4) $(DEFS_NUCLEO)
@@ -224,41 +204,11 @@ f767: LDFLAGS+=$(LDFLAGS_F767)
 f767: release_f7
 
 dvm: GitVersion.h
-dvm: CFLAGS+=$(CFLAGS_F4) $(DEFS_DVM) -DDRCC_DVM_446
-dvm: CXXFLAGS+=$(CXXFLAGS_F4) $(DEFS_DVM) -DDRCC_DVM_446
+dvm: CFLAGS+=$(CFLAGS_F4) $(DEFS_DVM)
+dvm: CXXFLAGS+=$(CXXFLAGS_F4) $(DEFS_DVM)
 dvm: LDFLAGS+=$(LDFLAGS_F4)
 dvm: release_f4
 
-dvm722: GitVersion.h
-dvm722: CFLAGS+=$(CFLAGS_F7) $(DEFS_DVM722) -DDRCC_DVM_722
-dvm722: CXXFLAGS+=$(CXXFLAGS_F7) $(DEFS_DVM722) -DDRCC_DVM_722
-dvm722: LDFLAGS+=$(LDFLAGS_F722)
-dvm722: release_f7
-
-drcc_nqf: GitVersion.h
-drcc_nqf: CFLAGS+=$(CFLAGS_F4) $(DEFS_DRCC_DVM) -DDRCC_DVM_NQF
-drcc_nqf: CXXFLAGS+=$(CXXFLAGS_F4) $(DEFS_DRCC_DVM) -DDRCC_DVM_NQF
-drcc_nqf: LDFLAGS+=$(LDFLAGS_F4)
-drcc_nqf: release_f4
-
-hhp446: GitVersion.h
-hhp446: CFLAGS+=$(CFLAGS_F4) $(DEFS_DRCC_DVM) -DDRCC_DVM_HHP446
-hhp446: CXXFLAGS+=$(CXXFLAGS_F4) $(DEFS_DRCC_DVM) -DDRCC_DVM_HHP446
-hhp446: LDFLAGS+=$(LDFLAGS_F4)
-hhp446: release_f4
-
-eda405: GitVersion.h
-eda405: CFLAGS+=$(CFLAGS_F4) $(DEFS_EDA_405)
-eda405: CXXFLAGS+=$(CXXFLAGS_F4) $(DEFS_EDA_405)
-eda405: LDFLAGS+=$(LDFLAGS_F4)
-eda405: release_f4
-
-eda446: GitVersion.h
-eda446: CFLAGS+=$(CFLAGS_F4) $(DEFS_EDA_446)
-eda446: CXXFLAGS+=$(CXXFLAGS_F4) $(DEFS_EDA_446)
-eda446: LDFLAGS+=$(LDFLAGS_F4)
-eda446: release_f4
-
 release_f4: $(BINDIR)
 release_f4: $(OBJDIR_F4)
 release_f4: $(BINDIR)/$(BINHEX_F4)
@@ -281,7 +231,7 @@ $(OBJDIR_F7):
 $(BINDIR)/$(BINHEX_F4): $(BINDIR)/$(BINELF_F4)
 	$(CP) -O ihex $< $@
 	@echo "Objcopy from ELF to IHEX complete!\n"
-
+	
 $(BINDIR)/$(BINBIN_F4): $(BINDIR)/$(BINELF_F4)
 	$(CP) -O binary $< $@
 	@echo "Objcopy from ELF to BINARY complete!\n"
@@ -294,7 +244,7 @@ $(BINDIR)/$(BINELF_F4): $(OBJ_F4)
 $(BINDIR)/$(BINHEX_F7): $(BINDIR)/$(BINELF_F7)
 	$(CP) -O ihex $< $@
 	@echo "Objcopy from ELF to IHEX complete!\n"
-
+	
 $(BINDIR)/$(BINBIN_F7): $(BINDIR)/$(BINELF_F7)
 	$(CP) -O binary $< $@
 	@echo "Objcopy from ELF to BINARY complete!\n"
@@ -368,31 +318,34 @@ endif
 deploy-pi:
 ifneq ($(wildcard /usr/local/bin/stm32flash),)
 	-/usr/local/bin/stm32flash -i 20,-21,21:-20,21 /dev/ttyAMA0
-	/usr/local/bin/stm32flash -v -w bin/$(BINBIN_F4) -g 0x0 -R /dev/ttyAMA0
+	-/usr/local/bin/stm32ld /dev/ttyAMA0 57600 bin/$(BINBIN_F4)
+	/usr/local/bin/stm32flash -v -w bin/$(BINBIN_F4) -g 0x0 -R -c /dev/ttyAMA0
 endif
 
 ifneq ($(wildcard /usr/bin/stm32flash),)
 	-/usr/bin/stm32flash -i 20,-21,21:-20,21 /dev/ttyAMA0
-	/usr/bin/stm32flash -v -w bin/$(BINBIN_F4) -g 0x0 -R /dev/ttyAMA0
+	-/usr/bin/stm32ld /dev/ttyAMA0 57600 bin/$(BINBIN_F4)
+	/usr/bin/stm32flash -v -w bin/$(BINBIN_F4) -g 0x0 -R -c /dev/ttyAMA0
 endif
 
 deploy-f4m: deploy-pi
 deploy-dvm: deploy-pi
-deploy-eda405: deploy-pi
-deploy-eda446: deploy-pi
 
 deploy-pi-f7:
 ifneq ($(wildcard /usr/local/bin/stm32flash),)
 	-/usr/local/bin/stm32flash -i 20,-21,21:-20,21 /dev/ttyAMA0
-	/usr/local/bin/stm32flash -v -w bin/$(BINBIN_F7) -g 0x0 -R /dev/ttyAMA0
+	-/usr/local/bin/stm32ld /dev/ttyAMA0 57600 bin/$(BINBIN_F7)
+	/usr/local/bin/stm32flash -v -w bin/$(BINBIN_F7) -g 0x0 -R -c /dev/ttyAMA0
+endif
 
-else ifneq ($(wildcard /usr/bin/stm32flash),)
+ifneq ($(wildcard /usr/bin/stm32flash),)
 	-/usr/bin/stm32flash -i 20,-21,21:-20,21 /dev/ttyAMA0
-	/usr/bin/stm32flash -v -w bin/$(BINBIN_F7) -g 0x0 -R /dev/ttyAMA0
+	-/usr/bin/stm32ld /dev/ttyAMA0 57600 bin/$(BINBIN_F7)
+	/usr/bin/stm32flash -v -w bin/$(BINBIN_F7) -g 0x0 -R -c /dev/ttyAMA0
 endif
 
 deploy-f7m:   deploy-pi-f7
-deploy-rpt_hat: deploy-pi-f7
+deploy-f7hat: deploy-pi-f7
 
 # Export the current git version if the index file exists, else 000...
 GitVersion.h:
@@ -407,7 +360,3 @@ else
 	echo "#define GITVERSION \"0000000\"" > $@
 endif
 endif
-
-flash_f4:
-	@echo "flashing firmware..."
-	st-flash write bin/$(BINBIN_F4) 0x8000000