Merge branch 'boxcar_dstar_correlator' into boxcar_dstar_correlator_48k

Fixes erroneous end sync seen on station having QSB

.gitignore

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

.gitmodules

@@ -1,9 +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
-[submodule "STM32F10X_Lib"]
-	path = STM32F10X_Lib
-	url = https://github.com/shawnchain/STM32F10X_Lib.git

CWIdTX.cpp

@@ -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}
 };
@@ -171,3 +170,4 @@ void CCWIdTX::reset()
   m_poPtr = 0U;
   m_n     = 0U;
 }
+

CalDMR.cpp

@@ -21,37 +21,25 @@
 #include "Globals.h"
 #include "CalDMR.h"
 
-// Voice LC BS Header, CC: 1, srcID: 1, dstID: TG9
+// Voice LC Header, CC: 1, srcID: 1, dstID: TG9
 const uint8_t VH_1K[] = {0x00U,
          0x00U, 0x20U, 0x08U, 0x08U, 0x02U, 0x38U, 0x15U, 0x00U, 0x2CU, 0xA0U, 0x14U,
          0x60U, 0x84U, 0x6DU, 0xFFU, 0x57U, 0xD7U, 0x5DU, 0xF5U, 0xDEU, 0x30U, 0x30U,
          0x01U, 0x10U, 0x01U, 0x40U, 0x03U, 0xC0U, 0x13U, 0xC1U, 0x1EU, 0x80U, 0x6FU};
 
-// Voice Term BS with LC, CC: 1, srcID: 1, dstID: TG9
+// Voice Term with LC, CC: 1, srcID: 1, dstID: TG9
 const uint8_t VT_1K[] = {0x00U,
          0x00U, 0x4FU, 0x08U, 0xDCU, 0x02U, 0x88U, 0x15U, 0x78U, 0x2CU, 0xD0U, 0x14U,
          0xC0U, 0x84U, 0xADU, 0xFFU, 0x57U, 0xD7U, 0x5DU, 0xF5U, 0xD9U, 0x65U, 0x24U,
          0x02U, 0x28U, 0x06U, 0x20U, 0x0FU, 0x80U, 0x1BU, 0xC1U, 0x07U, 0x80U, 0x5CU};
 
-// Voice LC MS Header, CC: 1, srcID: 1, dstID: TG9
-const uint8_t VH_DMO1K[] = {0x00U,
-         0x00U, 0x20U, 0x08U, 0x08U, 0x02U, 0x38U, 0x15U, 0x00U, 0x2CU, 0xA0U, 0x14U,
-         0x60U, 0x84U, 0x6DU, 0x5DU, 0x7FU, 0x77U, 0xFDU, 0x75U, 0x7EU, 0x30U, 0x30U,
-         0x01U, 0x10U, 0x01U, 0x40U, 0x03U, 0xC0U, 0x13U, 0xC1U, 0x1EU, 0x80U, 0x6FU};
-
-// Voice Term MS with LC, CC: 1, srcID: 1, dstID: TG9
-const uint8_t VT_DMO1K[] = {0x00U,
-         0x00U, 0x4FU, 0x08U, 0xDCU, 0x02U, 0x88U, 0x15U, 0x78U, 0x2CU, 0xD0U, 0x14U,
-         0xC0U, 0x84U, 0xADU, 0x5DU, 0x7FU, 0x77U, 0xFDU, 0x75U, 0x79U, 0x65U, 0x24U,
-         0x02U, 0x28U, 0x06U, 0x20U, 0x0FU, 0x80U, 0x1BU, 0xC1U, 0x07U, 0x80U, 0x5CU};
-
 // Voice coding data + FEC, 1031 Hz Test Pattern
 const uint8_t VOICE_1K[] = {0x00U,
          0xCEU, 0xA8U, 0xFEU, 0x83U, 0xACU, 0xC4U, 0x58U, 0x20U, 0x0AU, 0xCEU, 0xA8U,
          0xFEU, 0x83U, 0xA0U, 0x00U, 0x00U, 0x00U, 0x00U, 0x00U, 0x0CU, 0xC4U, 0x58U, 
          0x20U, 0x0AU, 0xCEU, 0xA8U, 0xFEU, 0x83U, 0xACU, 0xC4U, 0x58U, 0x20U, 0x0AU};
 
-// Embedded LC BS: CC: 1, srcID: 1, dstID: TG9
+// Embedded LC: CC: 1, srcID: 1, dstID: TG9
 const uint8_t SYNCEMB_1K[6][7] = {
          {0x07U, 0x55U, 0xFDU, 0x7DU, 0xF7U, 0x5FU, 0x70U},   // BS VOICE SYNC      (audio seq 0)
          {0x01U, 0x30U, 0x00U, 0x00U, 0x90U, 0x09U, 0x10U},   // EMB + Embedded LC1 (audio seq 1)
@@ -60,15 +48,6 @@ const uint8_t SYNCEMB_1K[6][7] = {
          {0x01U, 0x50U, 0xA1U, 0x71U, 0xD1U, 0x70U, 0x70U},   // EMB + Embedded LC4 (audio seq 4)
          {0x01U, 0x10U, 0x00U, 0x00U, 0x00U, 0x0EU, 0x20U}};  // EMB                (audio seq 5)
 
-// Embedded LC MS: CC: 1, srcID: 1, dstID: TG9
-const uint8_t SYNCEMB_DMO1K[6][7] = {
-         {0x07U, 0xF7U, 0xD5U, 0xDDU, 0x57U, 0xDFU, 0xD0U},   // MS VOICE SYNC      (audio seq 0)
-         {0x01U, 0x30U, 0x00U, 0x00U, 0x90U, 0x09U, 0x10U},   // EMB + Embedded LC1 (audio seq 1)
-         {0x01U, 0x70U, 0x00U, 0x90U, 0x00U, 0x07U, 0x40U},   // EMB + Embedded LC2 (audio seq 2)
-         {0x01U, 0x70U, 0x00U, 0x31U, 0x40U, 0x07U, 0x40U},   // EMB + Embedded LC3 (audio seq 3)
-         {0x01U, 0x50U, 0xA1U, 0x71U, 0xD1U, 0x70U, 0x70U},   // EMB + Embedded LC4 (audio seq 4)
-         {0x01U, 0x10U, 0x00U, 0x00U, 0x00U, 0x0EU, 0x20U}};  // EMB                (audio seq 5)
-
 // Short LC:
 // TS1: dstID: 0, ACTIVITY_NONE
 // TS2: dstID: TG9, ACTIVITY_VOICE
@@ -99,9 +78,6 @@ void CCalDMR::process()
     case STATE_DMRCAL1K:
       dmr1kcal();
       break;
-    case STATE_DMRDMO1K:
-      dmrdmo1k();
-      break;
     default:
       break;
   }
@@ -118,17 +94,6 @@ void CCalDMR::createData1k(uint8_t n)
   m_dmr1k[20U] |= SYNCEMB_1K[n][6] & 0xF0U;
 }
 
-void CCalDMR::createDataDMO1k(uint8_t n)
-{
-  for(uint8_t i = 0; i < 5U; i++)
-    m_dmr1k[i + 15U] = SYNCEMB_DMO1K[n][i + 1U];
-
-  m_dmr1k[14U] &= 0xF0U;
-  m_dmr1k[20U] &= 0x0FU;
-  m_dmr1k[14U] |= SYNCEMB_DMO1K[n][0] & 0x0FU;
-  m_dmr1k[20U] |= SYNCEMB_DMO1K[n][6] & 0xF0U;
-}
-
 void CCalDMR::dmr1kcal()
 {
   dmrTX.process();
@@ -174,40 +139,6 @@ void CCalDMR::dmr1kcal()
   }
 }
 
-void CCalDMR::dmrdmo1k()
-{
-  dmrDMOTX.process();
-
-  uint16_t space = dmrDMOTX.getSpace();
-  if (space < 1U)
-    return;
-
-  switch (m_state) {
-    case DMRCAL1K_VH:
-      dmrDMOTX.writeData(VH_DMO1K, DMR_FRAME_LENGTH_BYTES + 1U);
-      m_state = DMRCAL1K_VOICE;
-      break;
-    case DMRCAL1K_VOICE:
-      createDataDMO1k(m_audioSeq);
-      dmrDMOTX.writeData(m_dmr1k, DMR_FRAME_LENGTH_BYTES + 1U);
-      if(m_audioSeq == 5U) {
-        m_audioSeq = 0U;
-        if(!m_transmit)
-          m_state = DMRCAL1K_VT;
-      } else
-        m_audioSeq++;
-      break;
-    case DMRCAL1K_VT:
-      dmrDMOTX.writeData(VT_DMO1K, DMR_FRAME_LENGTH_BYTES + 1U);
-      m_state = DMRCAL1K_IDLE;
-      break;
-    default:
-        m_state = DMRCAL1K_IDLE;
-        m_audioSeq = 0U;
-      break;
-  }
-}
-
 uint8_t CCalDMR::write(const uint8_t* data, uint8_t length)
 {
   if (length != 1U)
@@ -215,7 +146,7 @@ uint8_t CCalDMR::write(const uint8_t* data, uint8_t length)
 
   m_transmit = data[0U] == 1U;
 
-  if(m_transmit && m_state == DMRCAL1K_IDLE && (m_modemState == STATE_DMRCAL1K || m_modemState == STATE_DMRDMO1K))
+  if(m_transmit && m_state == DMRCAL1K_IDLE && m_modemState == STATE_DMRCAL1K)
     m_state = DMRCAL1K_VH;
 
   return 0U;

CalDMR.h

@@ -37,9 +37,7 @@ public:
 
   void process();
   void dmr1kcal();
-  void dmrdmo1k();
   void createData1k(uint8_t n);
-  void createDataDMO1k(uint8_t n);
 
   uint8_t write(const uint8_t* data, uint8_t length);
 

CalDStarRX.cpp

@@ -24,7 +24,7 @@
 const unsigned int BUFFER_LENGTH = 200U;
 
 const uint32_t PLLMAX = 0x10000U;
-const uint32_t PLLINC = PLLMAX / DSTAR_RADIO_BIT_LENGTH;
+const uint32_t PLLINC = PLLMAX / DSTAR_RADIO_SYMBOL_LENGTH;
 const uint32_t INC    = PLLINC / 32U;
 
 // D-Star bit order version of 0x55 0x2D 0x16

CalFM.cpp

@@ -1,127 +0,0 @@
-/*
- *   Copyright (C) 2009-2015 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"
-#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, uint8_t length)
-{
-  if (length != 1U)
-    return 4U;
-
-  m_transmit = data[0U] == 1U;
-
-  return 0U;
-}

CalFM.h

@@ -1,51 +0,0 @@
-/*
- *   Copyright (C) 2009-2015 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.
- */
-
-#if !defined(CALFM_H)
-#define  CALFM_H
-
-#include "Config.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, uint8_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
-

CalNXDN.cpp

@@ -1,94 +0,0 @@
-/*
- *   Copyright (C) 2018 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"
-#include "Globals.h"
-#include "CalNXDN.h"
-
-// NXDN 1031 Hz Test Pattern, RAN: 1, Unit ID: 1, Dst Group ID: 1, Outbound Direction
-const uint8_t NXDN_CAL1K[4][49] = {
-                            {0x00U,
-                             0xCDU, 0xF5U, 0x9DU, 0x5DU, 0x7CU, 0xFAU, 0x0AU, 0x6EU, 0x8AU, 0x23U, 0x56U, 0xE8U,
-                             0x4CU, 0xAAU, 0xDEU, 0x8BU, 0x26U, 0xE4U, 0xF2U, 0x82U, 0x88U,
-                             0xC6U, 0x8AU, 0x74U, 0x29U, 0xA4U, 0xECU, 0xD0U, 0x08U, 0x22U,
-                             0xCEU, 0xA2U, 0xFCU, 0x01U, 0x8CU, 0xECU, 0xDAU, 0x0AU, 0xA0U,
-                             0xEEU, 0x8AU, 0x7EU, 0x2BU, 0x26U, 0xCCU, 0xF8U, 0x8AU, 0x08U},
-
-                            {0x00U,
-                             0xCDU, 0xF5U, 0x9DU, 0x5DU, 0x7CU, 0x6DU, 0xBBU, 0x0EU, 0xB3U, 0xA4U, 0x26U, 0xA8U,
-                             0x4CU, 0xAAU, 0xDEU, 0x8BU, 0x26U, 0xE4U, 0xF2U, 0x82U, 0x88U,
-                             0xC6U, 0x8AU, 0x74U, 0x29U, 0xA4U, 0xECU, 0xD0U, 0x08U, 0x22U,
-                             0xCEU, 0xA2U, 0xFCU, 0x01U, 0x8CU, 0xECU, 0xDAU, 0x0AU, 0xA0U,
-                             0xEEU, 0x8AU, 0x7EU, 0x2BU, 0x26U, 0xCCU, 0xF8U, 0x8AU, 0x08U},
-
-                            {0x00U,
-                             0xCDU, 0xF5U, 0x9DU, 0x5DU, 0x76U, 0x3AU, 0x1BU, 0x4AU, 0x81U, 0xA8U, 0xE2U, 0x80U,
-                             0x4CU, 0xAAU, 0xDEU, 0x8BU, 0x26U, 0xE4U, 0xF2U, 0x82U, 0x88U,
-                             0xC6U, 0x8AU, 0x74U, 0x29U, 0xA4U, 0xECU, 0xD0U, 0x08U, 0x22U,
-                             0xCEU, 0xA2U, 0xFCU, 0x01U, 0x8CU, 0xECU, 0xDAU, 0x0AU, 0xA0U,
-                             0xEEU, 0x8AU, 0x7EU, 0x2BU, 0x26U, 0xCCU, 0xF8U, 0x8AU, 0x08U},
-
-                            {0x00U,
-                             0xCDU, 0xF5U, 0x9DU, 0x5DU, 0x74U, 0x28U, 0x83U, 0x02U, 0xB0U, 0x2DU, 0x07U, 0xE2U,
-                             0x4CU, 0xAAU, 0xDEU, 0x8BU, 0x26U, 0xE4U, 0xF2U, 0x82U, 0x88U,
-                             0xC6U, 0x8AU, 0x74U, 0x29U, 0xA4U, 0xECU, 0xD0U, 0x08U, 0x22U,
-                             0xCEU, 0xA2U, 0xFCU, 0x01U, 0x8CU, 0xECU, 0xDAU, 0x0AU, 0xA0U,
-                             0xEEU, 0x8AU, 0x7EU, 0x2BU, 0x26U, 0xCCU, 0xF8U, 0x8AU, 0x08U}};
-
-CCalNXDN::CCalNXDN() :
-m_transmit(false),
-m_state(NXDNCAL1K_IDLE),
-m_audioSeq(0U)
-{
-}
-
-void CCalNXDN::process()
-{
-  nxdnTX.process();
-
-  uint16_t space = nxdnTX.getSpace();
-  if (space < 1U)
-    return;
-
-  switch (m_state) {
-    case NXDNCAL1K_TX:
-      nxdnTX.writeData(NXDN_CAL1K[m_audioSeq], NXDN_FRAME_LENGTH_BYTES + 1U);
-      m_audioSeq = (m_audioSeq + 1U) % 4U;
-      if(!m_transmit)
-        m_state = NXDNCAL1K_IDLE;
-      break;
-    default:
-        m_state = NXDNCAL1K_IDLE;
-        m_audioSeq = 0U;
-      break;
-  }
-}
-
-uint8_t CCalNXDN::write(const uint8_t* data, uint8_t length)
-{
-  if (length != 1U)
-    return 4U;
-
-  m_transmit = data[0U] == 1U;
-
-  if(m_transmit && m_state == NXDNCAL1K_IDLE)
-    m_state = NXDNCAL1K_TX;
-
-  return 0U;
-}
-

CalNXDN.h

@@ -1,44 +0,0 @@
-/*
- *   Copyright (C) 2018 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.
- */
-
-#if !defined(CALNXDN_H)
-#define  CALNXDN_H
-
-#include "Config.h"
-
-enum NXDNCAL1K {
-  NXDNCAL1K_IDLE,
-  NXDNCAL1K_TX
-};
-
-class CCalNXDN {
-public:
-  CCalNXDN();
-
-  void process();
-
-  uint8_t write(const uint8_t* data, uint8_t length);
-
-private:
-  bool      m_transmit;
-  NXDNCAL1K m_state;
-  uint8_t   m_audioSeq;
-};
-
-#endif
-

CalPOCSAG.cpp

@@ -1,49 +0,0 @@
-/*
- *   Copyright (C) 2019 by Florian Wolters DF2ET
- *
- *   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 "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, uint8_t length)
-{
-  if (length != 1U)
-    return 4U;
-
-  m_state = data[0U] == 1U ? POCSAGCAL_TX : POCSAGCAL_IDLE;
-
-  return 0U;
-}

CalPOCSAG.h

@@ -1,41 +0,0 @@
-/*
- *   Copyright (C) 2019 by Florian Wolters DF2ET
- *
- *   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(CALPOCSAG_H)
-#define  CALPOCSAG_H
-
-#include "Config.h"
-
-enum POCSAGCAL {
-  POCSAGCAL_IDLE,
-  POCSAGCAL_TX
-};
-
-class CCalPOCSAG {
-public:
-  CCalPOCSAG();
-
-  void process();
-
-  uint8_t write(const uint8_t* data, uint8_t length);
-
-private:
-  POCSAGCAL m_state;
-};
-
-#endif

Config.h

@@ -1,5 +1,5 @@
 /*
- *   Copyright (C) 2015,2016,2017,2018,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
@@ -35,27 +35,20 @@
 // For 19.2 MHz
 // #define EXTERNAL_OSC 19200000
 
-// Use a higher baudrate for host communication. Required for FM network !
-#define SERIAL_SPEED 115200 //suitable for most older boards (Arduino, Due STM32F1_POG etc). External FM will NOT work with this !
-// #define SERIAL_SPEED 230400 // Only works on newer board M4, M7, Teensy. External FM might work with this
-// #define SERIAL_SPEED 460800 // Only works on newer board M4, M7, Teensy. External FM should work with this
-
 // 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
+// Use pins to output the current mode
+// #define ARDUINO_MODE_PINS
 
 // For the original Arduino Due pin layout
 // #define ARDUINO_DUE_PAPA
 
-#if defined(STM32F1)
-// For the SQ6POG board
-#define STM32F1_POG
-#else
 // For the ZUM V1.0 and V1.0.1 boards pin layout
 #define ARDUINO_DUE_ZUM_V10
-#endif
+
+// For the SQ6POG board
+// #define STM32F1_POG
 
 // For the SP8NTH board
 // #define ARDUINO_DUE_NTH
@@ -64,11 +57,8 @@
 // #define STM32F4_NUCLEO_MORPHO_HEADER
 // #define STM32F4_NUCLEO_ARDUINO_HEADER
 
-// Use separate mode pins to switch external channel/filters/bandwidth for example
-// #define MODE_PINS
-
-// For the VK6MST Pi3 Shield communicating over i2c. i2c address & speed defined in i2cTeensy.cpp
-// #define VK6MST_TEENSY_PI3_SHIELD_I2C
+// Use separate mode pins to switch external filters/bandwidth for example
+// #define STM32F4_NUCLEO_MODE_PINS
 
 // Pass RSSI information to the host
 // #define SEND_RSSI_DATA
@@ -76,20 +66,4 @@
 // Use the modem as a serial repeater for Nextion displays
 // #define SERIAL_REPEATER
 
-// To reduce CPU load, you can remove the DC blocker by commenting out the next line
-#define USE_DCBLOCKER
-
-// Constant Service LED once repeater is running 
-// Do not use if employing an external hardware watchdog 
-// #define CONSTANT_SRV_LED
-
-// Use the YSF and P25 LEDs for NXDN
-// #define USE_ALTERNATE_NXDN_LEDS
-
-// Use the D-Star and DMR LEDs for POCSAG
-// #define USE_ALTERNATE_POCSAG_LEDS
-
-// Use the D-Star and YSF LEDs for FM
-#define USE_ALTERNATE_FM_LEDS
-
 #endif

DMRDMORX.h

@@ -22,7 +22,7 @@
 #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,

DMRDMOTX.cpp

@@ -22,10 +22,16 @@
 #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;
@@ -38,13 +44,6 @@ const uint8_t BIT_MASK_TABLE[] = {0x80U, 0x40U, 0x20U, 0x10U, 0x08U, 0x04U, 0x02
 #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])
 #define READ_BIT1(p,i)    (p[(i)>>3] & BIT_MASK_TABLE[(i)&7])
 
-// PR FILL pattern
-const uint8_t PR_FILL[] =
-        {0x63U, 0xEAU, 0x00U, 0x76U, 0x6CU, 0x76U, 0xC4U, 0x52U, 0xC8U, 0x78U,
-         0x09U, 0x2DU, 0xB8U, 0x79U, 0x27U, 0x57U, 0x9BU, 0x31U, 0xBCU, 0x3EU,
-         0xEAU, 0x45U, 0xC3U, 0x30U, 0x49U, 0x17U, 0x93U, 0xAEU, 0x8BU, 0x6DU,
-         0xA4U, 0xA5U, 0xADU, 0xA2U, 0xF1U, 0x35U, 0xB5U, 0x3CU, 0x1EU};
-
 const uint8_t DMR_SYNC = 0x5FU;
 
 CDMRDMOTX::CDMRDMOTX() :
@@ -73,11 +72,11 @@ 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]);
+      for (unsigned int i = 0U; i < 72U; i++)
+        m_poBuffer[i] = DMR_SYNC;
 
-      for (unsigned int i = 0U; i < 39U; i++)
-        m_poBuffer[i + DMR_FRAME_LENGTH_BYTES] = PR_FILL[i];
+      for (unsigned int i = 0U; i < DMR_FRAME_LENGTH_BYTES; i++)
+        m_poBuffer[i + 39U] = m_fifo.get();
 
       m_poLen = 72U;
     }

DMRDMOTX.h

@@ -23,7 +23,7 @@
 #include "Config.h"
 #include "DMRDefines.h"
 
-#include "RingBuffer.h"
+#include "SerialRB.h"
 
 class CDMRDMOTX {
 public:
@@ -38,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];

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;

DMRSlotRX.cpp

@@ -22,8 +22,8 @@
 #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)
 
@@ -97,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;

DMRSlotRX.h

@@ -44,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;
@@ -62,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);

DMRTX.cpp

@@ -22,10 +22,16 @@
 #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;
@@ -54,7 +60,6 @@ const uint8_t BIT_MASK_TABLE[] = {0x80U, 0x40U, 0x20U, 0x10U, 0x08U, 0x04U, 0x02
 #define READ_BIT1(p,i)    (p[(i)>>3] & BIT_MASK_TABLE[(i)&7])
 
 const uint32_t STARTUP_COUNT = 20U;
-const uint32_t ABORT_COUNT = 6U;
 
 CDMRTX::CDMRTX() :
 m_fifo(),
@@ -70,7 +75,6 @@ m_poBuffer(),
 m_poLen(0U),
 m_poPtr(0U),
 m_frameCount(0U),
-m_abortCount(),
 m_abort()
 {
   ::memset(m_modState, 0x00U, 16U * sizeof(q15_t));
@@ -85,9 +89,6 @@ m_abort()
 
   m_abort[0U] = false;
   m_abort[1U] = false;
-
-  m_abortCount[0U] = 0U;
-  m_abortCount[1U] = 0U;
 }
 
 void CDMRTX::process()
@@ -215,12 +216,10 @@ uint8_t CDMRTX::writeAbort(const uint8_t* data, uint8_t length)
 
   switch (data[0U]) {
     case 1U:
-      m_abortCount[0U] = 0U;
       m_abort[0U] = true;
       return 0U;
 
     case 2U:
-      m_abortCount[1U] = 0U;
       m_abort[1U] = true;
       return 0U;
 
@@ -234,8 +233,6 @@ void CDMRTX::setStart(bool start)
   m_state = start ? DMRTXSTATE_SLOT1 : DMRTXSTATE_IDLE;
 
   m_frameCount = 0U;
-  m_abortCount[0U] = 0U;
-  m_abortCount[1U] = 0U;
 
   m_abort[0U] = false;
   m_abort[1U] = false;
@@ -291,9 +288,9 @@ uint8_t CDMRTX::getSpace2() const
 
 void CDMRTX::createData(uint8_t slotIndex)
 {
-  if (m_fifo[slotIndex].getData() >= DMR_FRAME_LENGTH_BYTES && m_frameCount >= STARTUP_COUNT && m_abortCount[slotIndex] >= ABORT_COUNT) {
+  if (m_fifo[slotIndex].getData() > 0U && m_frameCount >= STARTUP_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 {
@@ -344,8 +341,6 @@ void CDMRTX::createCal()
 void CDMRTX::createCACH(uint8_t txSlotIndex, uint8_t rxSlotIndex)
 {
   m_frameCount++;
-  m_abortCount[0U]++;
-  m_abortCount[1U]++;
 
   if (m_cachPtr >= 12U)
     m_cachPtr = 0U;

DMRTX.h

@@ -23,7 +23,7 @@
 #include "Config.h"
 #include "DMRDefines.h"
 
-#include "RingBuffer.h"
+#include "SerialRB.h"
 
 enum DMRTXSTATE {
   DMRTXSTATE_IDLE,
@@ -59,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;
@@ -72,7 +72,6 @@ private:
   uint16_t                         m_poLen;
   uint16_t                         m_poPtr;
   uint32_t                         m_frameCount;
-  uint32_t                         m_abortCount[2U];
   bool                             m_abort[2U];
 
   void createData(uint8_t slotIndex);

DStarDefines.h

@@ -1,5 +1,5 @@
 /*
- *   Copyright (C) 2009-2015 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,30 +19,50 @@
 #if !defined(DSTARDEFINES_H)
 #define  DSTARDEFINES_H
 
-const unsigned int DSTAR_RADIO_BIT_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;
-const unsigned int DSTAR_HEADER_LENGTH_BITS  = DSTAR_HEADER_LENGTH_BYTES * 8U;
+const unsigned int DSTAR_HEADER_LENGTH_BYTES   = 41U;
 
-const unsigned int DSTAR_FEC_SECTION_LENGTH_BYTES = 83U;
-const unsigned int DSTAR_FEC_SECTION_LENGTH_BITS  = 660U;
+const unsigned int DSTAR_FEC_SECTION_LENGTH_BYTES   = 83U;
+const unsigned int DSTAR_FEC_SECTION_LENGTH_SYMBOLS = 660U;
+const unsigned int DSTAR_FEC_SECTION_LENGTH_SAMPLES = DSTAR_FEC_SECTION_LENGTH_SYMBOLS * DSTAR_RADIO_SYMBOL_LENGTH;
 
-const unsigned int DSTAR_DATA_LENGTH_BYTES = 12U;
-const unsigned int DSTAR_DATA_LENGTH_BITS  = DSTAR_DATA_LENGTH_BYTES * 8U;
+const unsigned int DSTAR_DATA_LENGTH_BYTES   = 12U;
+const unsigned int DSTAR_DATA_LENGTH_SYMBOLS = DSTAR_DATA_LENGTH_BYTES * 8U;
+const unsigned int DSTAR_DATA_LENGTH_SAMPLES = DSTAR_DATA_LENGTH_SYMBOLS * DSTAR_RADIO_SYMBOL_LENGTH;
 
-const uint8_t      DSTAR_EOT_BYTES[] = {0x55, 0x55, 0x55, 0x55, 0xC8, 0x7A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
-const unsigned int DSTAR_EOT_LENGTH_BYTES = 6U;
-const unsigned int DSTAR_EOT_LENGTH_BITS  = DSTAR_EOT_LENGTH_BYTES * 8U;
+const unsigned int DSTAR_END_SYNC_LENGTH_BYTES = 6U;
+const unsigned int DSTAR_END_SYNC_LENGTH_BITS  = DSTAR_END_SYNC_LENGTH_BYTES * 8U;
 
-const uint8_t      DSTAR_DATA_SYNC_LENGTH_BYTES = 3U;
-const uint8_t      DSTAR_DATA_SYNC_LENGTH_BITS  = DSTAR_DATA_SYNC_LENGTH_BYTES * 8U;
+const unsigned int DSTAR_FRAME_SYNC_LENGTH_BYTES   = 3U;
+const unsigned int DSTAR_FRAME_SYNC_LENGTH_SYMBOLS = DSTAR_FRAME_SYNC_LENGTH_BYTES * 8U;
+const unsigned int DSTAR_FRAME_SYNC_LENGTH_SAMPLES = DSTAR_FRAME_SYNC_LENGTH_SYMBOLS * DSTAR_RADIO_SYMBOL_LENGTH;
 
-const uint8_t      DSTAR_DATA_SYNC_BYTES[] = {0x9E, 0x8D, 0x32, 0x88, 0x26, 0x1A, 0x3F, 0x61, 0xE8, 0x55, 0x2D, 0x16};
+const unsigned int DSTAR_DATA_SYNC_LENGTH_BYTES   = 3U;
+const unsigned int DSTAR_DATA_SYNC_LENGTH_SYMBOLS = DSTAR_DATA_SYNC_LENGTH_BYTES * 8U;
+const unsigned int DSTAR_DATA_SYNC_LENGTH_SAMPLES = DSTAR_DATA_SYNC_LENGTH_SYMBOLS * DSTAR_RADIO_SYMBOL_LENGTH;
 
-const uint8_t      DSTAR_SLOW_DATA_TYPE_TEXT   = 0x40U;
-const uint8_t      DSTAR_SLOW_DATA_TYPE_HEADER = 0x50U;
+const uint8_t DSTAR_DATA_SYNC_BYTES[] = {0x9E, 0x8D, 0x32, 0x88, 0x26, 0x1A, 0x3F, 0x61, 0xE8, 0x55, 0x2D, 0x16};
 
-const uint8_t      DSTAR_SCRAMBLER_BYTES[] = {0x70U, 0x4FU, 0x93U};
+// D-Star bit order version of 0x55 0x6E 0x0A
+const uint32_t DSTAR_FRAME_SYNC_DATA = 0x00557650U;
+const uint32_t DSTAR_FRAME_SYNC_MASK = 0x00FFFFFFU;
+const bool     DSTAR_FRAME_SYNC_SYMBOLS[] = {false, true, false, true, false, true, false, true, false, true, true, true, false, true, true, false, false, true, false, true, false, false, false, false};
+
+// D-Star bit order version of 0x55 0x2D 0x16
+const uint32_t DSTAR_DATA_SYNC_DATA = 0x00AAB468U;
+const uint32_t DSTAR_DATA_SYNC_MASK = 0x00FFFFFFU;
+const bool     DSTAR_DATA_SYNC_SYMBOLS[] = {true, false, true, false, true, false, true, false, true, false, true, true, false, true, false, false, false, true, true, false, true, false, false, false};
+
+// D-Star bit order version of 0x55 0x55 0xC8 0x7A
+const uint32_t DSTAR_END_SYNC_DATA = 0xAAAA135EU;
+const uint32_t DSTAR_END_SYNC_MASK = 0xFFFFFFFFU;
+const uint8_t  DSTAR_END_SYNC_BYTES[] = {0x55, 0x55, 0x55, 0x55, 0xC8, 0x7A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+
+const uint8_t  DSTAR_SLOW_DATA_TYPE_TEXT   = 0x40U;
+const uint8_t  DSTAR_SLOW_DATA_TYPE_HEADER = 0x50U;
+
+const uint8_t  DSTAR_SCRAMBLER_BYTES[] = {0x70U, 0x4FU, 0x93U};
 
 #endif
 

DStarRX.cpp

@@ -22,18 +22,12 @@
 #include "DStarRX.h"
 #include "Utils.h"
 
-const unsigned int BUFFER_LENGTH = 200U;
-
-const uint32_t PLLMAX = 0x10000U;
-const uint32_t PLLINC = PLLMAX / DSTAR_RADIO_BIT_LENGTH;
-const uint32_t INC    = PLLINC / 32U;
-
-const unsigned int MAX_SYNC_BITS = 100U * DSTAR_DATA_LENGTH_BITS;
+const unsigned int MAX_FRAMES = 150U;
 
 // D-Star bit order version of 0x55 0x55 0x6E 0x0A
 const uint32_t FRAME_SYNC_DATA = 0x00557650U;
 const uint32_t FRAME_SYNC_MASK = 0x00FFFFFFU;
-const uint8_t  FRAME_SYNC_ERRS = 2U;
+const uint8_t  FRAME_SYNC_ERRS = 1U;
 
 // D-Star bit order version of 0x55 0x2D 0x16
 const uint32_t DATA_SYNC_DATA = 0x00AAB468U;
@@ -237,14 +231,24 @@ const uint16_t CCITT_TABLE[] = {
   0xf78fU, 0xe606U, 0xd49dU, 0xc514U, 0xb1abU, 0xa022U, 0x92b9U, 0x8330U,
   0x7bc7U, 0x6a4eU, 0x58d5U, 0x495cU, 0x3de3U, 0x2c6aU, 0x1ef1U, 0x0f78U};
 
+const uint16_t NOENDPTR = 9999U;
+
 CDStarRX::CDStarRX() :
-m_pll(0U),
-m_prev(false),
 m_rxState(DSRXS_NONE),
-m_patternBuffer(0x00U),
-m_rxBuffer(),
-m_rxBufferBits(0U),
-m_dataBits(0U),
+m_bitBuffer(),
+m_headerBuffer(),
+m_dataBuffer(),
+m_bitPtr(0U),
+m_headerPtr(0U),
+m_dataPtr(0U),
+m_startPtr(NOENDPTR),
+m_syncPtr(NOENDPTR),
+m_minSyncPtr(NOENDPTR),
+m_maxSyncPtr(NOENDPTR),
+m_maxFrameCorr(0),
+m_maxDataCorr(0),
+m_frameCount(0U),
+m_countdown(0U),
 m_mar(0U),
 m_pathMetric(),
 m_pathMemory0(),
@@ -259,14 +263,20 @@ m_rssiCount(0U)
 
 void CDStarRX::reset()
 {
-  m_pll           = 0U;
-  m_prev          = false;
-  m_rxState       = DSRXS_NONE;
-  m_patternBuffer = 0x00U;
-  m_rxBufferBits  = 0U;
-  m_dataBits      = 0U;
-  m_rssiAccum     = 0U;
-  m_rssiCount     = 0U;
+  m_rxState      = DSRXS_NONE;
+  m_headerPtr    = 0U;
+  m_dataPtr      = 0U;
+  m_bitPtr       = 0U;
+  m_maxFrameCorr = 0;
+  m_maxDataCorr  = 0;
+  m_startPtr     = NOENDPTR;
+  m_syncPtr      = NOENDPTR;
+  m_minSyncPtr   = NOENDPTR;
+  m_maxSyncPtr   = NOENDPTR;
+  m_frameCount   = 0U;
+  m_countdown    = 0U;
+  m_rssiAccum    = 0U;
+  m_rssiCount    = 0U;
 }
 
 void CDStarRX::samples(const q15_t* samples, const uint16_t* rssi, uint8_t length)
@@ -275,125 +285,117 @@ void CDStarRX::samples(const q15_t* samples, const uint16_t* rssi, uint8_t lengt
     m_rssiAccum += rssi[i];
     m_rssiCount++;
 
-    bool bit = samples[i] < 0;
+    q15_t sample = samples[i];
 
-    if (bit != m_prev) {
-      if (m_pll < (PLLMAX / 2U))
-        m_pll += INC;
-      else
-        m_pll -= INC;
+    m_bitBuffer[m_bitPtr] <<= 1;
+    if (sample < 0)
+      m_bitBuffer[m_bitPtr] |= 0x01U;
+
+    m_dataBuffer[m_dataPtr] = sample;
+
+    switch (m_rxState) {
+      case DSRXS_HEADER:
+        processHeader(sample);
+        break;
+      case DSRXS_DATA:
+        processData();
+        break;
+      default:
+        processNone(sample);
+        break;
     }
 
-    m_prev = bit;
+    m_dataPtr++;
+    if (m_dataPtr >= DSTAR_DATA_LENGTH_SAMPLES)
+      m_dataPtr = 0U;
 
-    m_pll += PLLINC;
-
-    if (m_pll >= PLLMAX) {
-      m_pll -= PLLMAX;
-
-      switch (m_rxState) {
-        case DSRXS_NONE:
-          processNone(bit);
-          break;
-        case DSRXS_HEADER:
-          processHeader(bit);
-          break;
-        case DSRXS_DATA:
-          processData(bit);
-          break;
-        default:
-          break;
-      }
-    }
+    m_bitPtr++;
+    if (m_bitPtr >= DSTAR_RADIO_SYMBOL_LENGTH)
+      m_bitPtr = 0U;
   }
 }
 
-void CDStarRX::processNone(bool bit)
+void CDStarRX::processNone(q15_t sample)
 {
-  m_patternBuffer <<= 1;
-  if (bit)
-    m_patternBuffer |= 0x01U;
-
   // Fuzzy matching of the frame sync sequence
-  if (countBits32((m_patternBuffer & FRAME_SYNC_MASK) ^ FRAME_SYNC_DATA) <= FRAME_SYNC_ERRS) {
-    DEBUG1("DStarRX: found frame sync in None");
-
-    ::memset(m_rxBuffer, 0x00U, DSTAR_FEC_SECTION_LENGTH_BYTES);
-    m_rxBufferBits = 0U;
+  bool ret = correlateFrameSync();
+  if (ret) {
+    m_countdown = 5U;
+	
+    m_headerBuffer[m_headerPtr] = sample;
+    m_headerPtr++;
 
     m_rssiAccum = 0U;
     m_rssiCount = 0U;
 
     m_rxState = DSRXS_HEADER;
+
     return;
   }
 
-  // Exact matching of the data sync bit sequence
-  if (countBits32((m_patternBuffer & DATA_SYNC_MASK) ^ DATA_SYNC_DATA) == 0U) {
+  // Fuzzy matching of the data sync bit sequence
+  ret = correlateDataSync();
+  if (ret) {
     DEBUG1("DStarRX: found data sync in None");
 
     io.setDecode(true);
     io.setADCDetection(true);
 
-    // Suppress RSSI on the dummy sync message
-    m_rssiAccum = 0U;
-    m_rssiCount = 0U;
-
-    ::memcpy(m_rxBuffer, DSTAR_DATA_SYNC_BYTES, DSTAR_DATA_LENGTH_BYTES);
-    writeRSSIData(m_rxBuffer);
-
-    ::memset(m_rxBuffer, 0x00U, DSTAR_DATA_LENGTH_BYTES + 2U);
-    m_rxBufferBits = 0U;
-
-    m_dataBits  = MAX_SYNC_BITS;
-    m_rxState   = DSRXS_DATA;
-    return;
+    m_rxState = DSRXS_DATA;
   }
 }
 
-void CDStarRX::processHeader(bool bit)
+void CDStarRX::processHeader(q15_t sample)
 {
-  m_patternBuffer <<= 1;
-  if (bit)
-    m_patternBuffer |= 0x01U;
+  if (m_countdown > 0U) {
+    correlateFrameSync();
+    m_countdown--;
+  }
 
-  WRITE_BIT2(m_rxBuffer, m_rxBufferBits, bit);
-  m_rxBufferBits++;
+  m_headerBuffer[m_headerPtr] = sample;
+  m_headerPtr++;
 
   // A full FEC header
-  if (m_rxBufferBits == DSTAR_FEC_SECTION_LENGTH_BITS) {
-    // Process the scrambling, interleaving and FEC, then return if the chcksum was correct
-    unsigned char header[DSTAR_HEADER_LENGTH_BYTES];
-    bool ok = rxHeader(m_rxBuffer, header);
-    if (ok) {
+  if (m_headerPtr == (DSTAR_FEC_SECTION_LENGTH_SAMPLES + DSTAR_RADIO_SYMBOL_LENGTH)) {
+    uint8_t buffer[DSTAR_FEC_SECTION_LENGTH_BYTES];
+    samplesToBits(m_headerBuffer, DSTAR_RADIO_SYMBOL_LENGTH, DSTAR_FEC_SECTION_LENGTH_SYMBOLS, buffer, DSTAR_FEC_SECTION_LENGTH_SAMPLES);
+
+    // Process the scrambling, interleaving and FEC, then return true if the chcksum was correct
+    uint8_t header[DSTAR_HEADER_LENGTH_BYTES];
+    bool ok = rxHeader(buffer, header);
+    if (!ok) {
+      // The checksum failed, return to looking for syncs
+      m_rxState = DSRXS_NONE;
+      m_maxFrameCorr = 0;
+      m_maxDataCorr  = 0;
+    } else {
       io.setDecode(true);
       io.setADCDetection(true);
 
       writeRSSIHeader(header);
-
-      ::memset(m_rxBuffer, 0x00U, DSTAR_DATA_LENGTH_BYTES + 2U);
-      m_rxBufferBits = 0U;
-
-      m_rxState  = DSRXS_DATA;
-      m_dataBits = MAX_SYNC_BITS;
-    } else {
-      // The checksum failed, return to looking for syncs
-      m_rxState = DSRXS_NONE;
     }
   }
+
+  // Ready to start the first data section
+  if (m_headerPtr == (DSTAR_FEC_SECTION_LENGTH_SAMPLES + 2U * DSTAR_RADIO_SYMBOL_LENGTH)) {
+    m_frameCount = 0U;
+    m_dataPtr    = 0U;
+
+    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);
+
+    m_rxState = DSRXS_DATA;
+  }
 }
 
-void CDStarRX::processData(bool bit)
+void CDStarRX::processData()
 {
-  m_patternBuffer <<= 1;
-  if (bit)
-    m_patternBuffer |= 0x01U;
-
-  WRITE_BIT2(m_rxBuffer, m_rxBufferBits, bit);
-  m_rxBufferBits++;
-
   // Fuzzy matching of the end frame sequences
-  if (countBits32((m_patternBuffer & END_SYNC_MASK) ^ 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);
@@ -401,35 +403,24 @@ void CDStarRX::processData(bool bit)
 
     serial.writeDStarEOT();
 
+    m_maxFrameCorr = 0;
+    m_maxDataCorr  = 0;
+
     m_rxState = DSRXS_NONE;
     return;
   }
 
   // Fuzzy matching of the data sync bit sequence
-  bool syncSeen = false;
-  if (m_rxBufferBits >= (DSTAR_DATA_LENGTH_BITS - 3U)) {
-    if (countBits32((m_patternBuffer & DATA_SYNC_MASK) ^ DATA_SYNC_DATA) <= DATA_SYNC_ERRS) {
-      m_rxBufferBits = DSTAR_DATA_LENGTH_BITS;
-      m_dataBits     = MAX_SYNC_BITS;
-      syncSeen       = true;
-    }
+  if (m_minSyncPtr < m_maxSyncPtr) {
+    if (m_dataPtr >= m_minSyncPtr && m_dataPtr <= m_maxSyncPtr)
+      correlateDataSync();
+  } else {
+    if (m_dataPtr >= m_minSyncPtr || m_dataPtr <= m_maxSyncPtr)
+      correlateDataSync();
   }
 
-  // Check to see if the sync is arriving late
-  if (m_rxBufferBits == DSTAR_DATA_LENGTH_BITS && !syncSeen) {
-    for (uint8_t i = 1U; i <= 3U; i++) {
-      uint32_t syncMask = DATA_SYNC_MASK >> i;
-      uint32_t syncData = DATA_SYNC_DATA >> i;
-      if (countBits32((m_patternBuffer & syncMask) ^ syncData) <= DATA_SYNC_ERRS) {
-        m_rxBufferBits -= i;
-        break;
-      }
-    }
-  }
-
-  m_dataBits--;
-
-  if (m_dataBits == 0U) {
+  // We've not seen a data sync for too long, signal RXLOST and change to RX_NONE
+  if (m_frameCount >= MAX_FRAMES) {
     DEBUG1("DStarRX: data sync timed out, lost lock");
 
     io.setDecode(false);
@@ -437,24 +428,35 @@ void CDStarRX::processData(bool bit)
 
     serial.writeDStarLost();
 
+    m_maxFrameCorr = 0;
+    m_maxDataCorr  = 0;
+
     m_rxState = DSRXS_NONE;
     return;
   }
 
-  // Send a data frame to the host if the required number of bits have been received, or if a data sync has been seen
-  if (m_rxBufferBits == DSTAR_DATA_LENGTH_BITS) {
-    if (syncSeen) {
-      m_rxBuffer[9U]  = DSTAR_DATA_SYNC_BYTES[9U];
-      m_rxBuffer[10U] = DSTAR_DATA_SYNC_BYTES[10U];
-      m_rxBuffer[11U] = DSTAR_DATA_SYNC_BYTES[11U];
-	    writeRSSIData(m_rxBuffer);
-    } else {
-	    serial.writeDStarData(m_rxBuffer, DSTAR_DATA_LENGTH_BYTES);
-	  }
+  // Send a data frame to the host if the required number of bits have been received
+  if (m_dataPtr == m_maxSyncPtr) {
+    uint8_t buffer[DSTAR_DATA_LENGTH_BYTES + 2U];
+    samplesToBits(m_dataBuffer, m_startPtr, DSTAR_DATA_LENGTH_SYMBOLS, buffer, DSTAR_DATA_LENGTH_SAMPLES);
 
-    // Start the next frame
-    ::memset(m_rxBuffer, 0x00U, DSTAR_DATA_LENGTH_BYTES + 2U);
-    m_rxBufferBits = 0U;
+    if ((m_frameCount % 21U) == 0U) {
+      if (m_frameCount == 0U) {
+        buffer[9U]  = DSTAR_DATA_SYNC_BYTES[9U];
+        buffer[10U] = DSTAR_DATA_SYNC_BYTES[10U];
+        buffer[11U] = DSTAR_DATA_SYNC_BYTES[11U];
+        DEBUG5("DStarRX: found start/sync/max/min", m_startPtr, m_syncPtr, m_maxSyncPtr, m_minSyncPtr);
+      }
+
+      writeRSSIData(buffer);
+    } else {
+      serial.writeDStarData(buffer, DSTAR_DATA_LENGTH_BYTES);
+    }
+
+    m_frameCount++;
+
+    m_maxFrameCorr = 0;
+    m_maxDataCorr  = 0;
   }
 }
 
@@ -500,6 +502,105 @@ void CDStarRX::writeRSSIData(unsigned char* data)
   m_rssiCount = 0U;
 }
 
+bool CDStarRX::correlateFrameSync()
+{
+  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;
+
+    q31_t corr = 0;
+
+    for (uint8_t i = 0U; i < DSTAR_FRAME_SYNC_LENGTH_SYMBOLS; i++) {
+      q15_t val = m_dataBuffer[ptr];
+
+      if (DSTAR_FRAME_SYNC_SYMBOLS[i])
+        corr -= val;
+      else
+        corr += val;
+
+      ptr += DSTAR_RADIO_SYMBOL_LENGTH;
+      if (ptr >= DSTAR_DATA_LENGTH_SAMPLES)
+        ptr -= DSTAR_DATA_LENGTH_SAMPLES;
+    }
+
+    if (corr > m_maxFrameCorr) {
+      m_maxFrameCorr = corr;
+      m_headerPtr    = 0U;
+      return true;
+    }
+  }
+
+  return false;
+}
+
+bool CDStarRX::correlateDataSync()
+{
+  uint8_t maxErrs = 0U;
+  if (m_rxState == DSRXS_DATA)
+    maxErrs = DATA_SYNC_ERRS;
+
+  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;
+
+    q31_t corr = 0;
+
+    for (uint8_t i = 0U; i < DSTAR_DATA_SYNC_LENGTH_SYMBOLS; i++) {
+      q15_t val = m_dataBuffer[ptr];
+
+      if (DSTAR_DATA_SYNC_SYMBOLS[i])
+        corr -= val;
+      else
+        corr += val;
+
+      ptr += DSTAR_RADIO_SYMBOL_LENGTH;
+      if (ptr >= DSTAR_DATA_LENGTH_SAMPLES)
+        ptr -= DSTAR_DATA_LENGTH_SAMPLES;
+    }
+
+    if (corr > m_maxDataCorr) {
+      m_maxDataCorr = corr;
+      m_frameCount  = 0U;
+
+      m_syncPtr    = m_dataPtr;
+
+      m_startPtr   = m_dataPtr + DSTAR_RADIO_SYMBOL_LENGTH;
+      if (m_startPtr >= DSTAR_DATA_LENGTH_SAMPLES)
+        m_startPtr -= DSTAR_DATA_LENGTH_SAMPLES;
+
+      m_maxSyncPtr = m_syncPtr + 1U;
+      if (m_maxSyncPtr >= DSTAR_DATA_LENGTH_SAMPLES)
+        m_maxSyncPtr -= DSTAR_DATA_LENGTH_SAMPLES;
+
+      m_minSyncPtr = m_syncPtr + DSTAR_DATA_LENGTH_SAMPLES - 1U;
+      if (m_minSyncPtr >= DSTAR_DATA_LENGTH_SAMPLES)
+        m_minSyncPtr -= DSTAR_DATA_LENGTH_SAMPLES;
+
+      return true;
+    }
+  }
+
+  return false;
+}
+
+void CDStarRX::samplesToBits(const q15_t* inBuffer, uint16_t start, uint16_t count, uint8_t* outBuffer, uint16_t limit)
+{
+  for (uint16_t i = 0U; i < count; i++) {
+    q15_t sample = inBuffer[start];
+
+    if (sample < 0)
+      WRITE_BIT2(outBuffer, i, true);
+    else
+      WRITE_BIT2(outBuffer, i, false);
+
+    start += DSTAR_RADIO_SYMBOL_LENGTH;
+    if (start >= limit)
+      start -= limit;
+  }
+}
+
 bool CDStarRX::rxHeader(uint8_t* in, uint8_t* out)
 {
   int i;

DStarRX.h

@@ -37,13 +37,21 @@ public:
   void reset();
 
 private:
-  uint32_t     m_pll;
-  bool         m_prev;
   DSRX_STATE   m_rxState;
-  uint32_t     m_patternBuffer;
-  uint8_t      m_rxBuffer[100U];
-  unsigned int m_rxBufferBits;
-  unsigned int m_dataBits;
+  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;
+  uint16_t     m_headerPtr;
+  uint16_t     m_dataPtr;
+  uint16_t     m_startPtr;
+  uint16_t     m_syncPtr;
+  uint16_t     m_minSyncPtr;
+  uint16_t     m_maxSyncPtr;
+  q31_t        m_maxFrameCorr;
+  q31_t        m_maxDataCorr;
+  uint16_t     m_frameCount;
+  uint8_t      m_countdown;
   unsigned int m_mar;
   int          m_pathMetric[4U];
   unsigned int m_pathMemory0[42U];
@@ -54,9 +62,12 @@ private:
   uint32_t     m_rssiAccum;
   uint16_t     m_rssiCount;
   
-  void    processNone(bool bit);
-  void    processHeader(bool bit);
-  void    processData(bool bit);
+  void    processNone(q15_t sample);
+  void    processHeader(q15_t sample);
+  void    processData();
+  bool    correlateFrameSync();
+  bool    correlateDataSync();
+  void    samplesToBits(const q15_t* inBuffer, uint16_t start, uint16_t count, uint8_t* outBuffer, uint16_t limit);
   void    writeRSSIHeader(unsigned char* header);
   void    writeRSSIData(unsigned char* data);
   bool    rxHeader(uint8_t* in, uint8_t* out);

DStarTX.cpp

@@ -27,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;
@@ -196,9 +198,9 @@ 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_BIT_LENGTH;
+  m_modFilter.L           = DSTAR_RADIO_SYMBOL_LENGTH;
   m_modFilter.phaseLength = GAUSSIAN_0_35_FILTER_PHASE_LEN;
   m_modFilter.pCoeffs     = GAUSSIAN_0_35_FILTER;
   m_modFilter.pState      = m_modState;
@@ -216,13 +218,12 @@ void CDStarTX::process()
       for (uint16_t i = 0U; i < m_txDelay; i++)
         m_poBuffer[m_poLen++] = BIT_SYNC;
     } else {
-      uint8_t dummy;
       // Pop the type byte off
-      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);
@@ -240,23 +241,21 @@ 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_EOT_LENGTH_BYTES; i++)
-        m_poBuffer[m_poLen++] = DSTAR_EOT_BYTES[i];
+      for (uint8_t i = 0U; i < DSTAR_END_SYNC_LENGTH_BYTES; i++)
+        m_poBuffer[m_poLen++] = DSTAR_END_SYNC_BYTES[i];
     }
      
     m_poPtr = 0U;
@@ -265,11 +264,11 @@ void CDStarTX::process()
   if (m_poLen > 0U) {
     uint16_t space = io.getSpace();
     
-    while (space > (8U * DSTAR_RADIO_BIT_LENGTH)) {
+    while (space > (8U * DSTAR_RADIO_SYMBOL_LENGTH)) {
       uint8_t c = m_poBuffer[m_poPtr++];
       writeByte(c);
 
-      space -= 8U * DSTAR_RADIO_BIT_LENGTH;
+      space -= 8U * DSTAR_RADIO_SYMBOL_LENGTH;
       
       if (m_poPtr >= m_poLen) {
         m_poPtr = 0U;
@@ -391,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]);
@@ -415,7 +414,7 @@ void CDStarTX::txHeader(const uint8_t* in, uint8_t* out) const
 void CDStarTX::writeByte(uint8_t c)
 {
   q15_t inBuffer[8U];
-  q15_t outBuffer[DSTAR_RADIO_BIT_LENGTH * 8U];
+  q15_t outBuffer[DSTAR_RADIO_SYMBOL_LENGTH * 8U];
 
   uint8_t mask = 0x01U;
 
@@ -430,7 +429,7 @@ void CDStarTX::writeByte(uint8_t c)
 
   ::arm_fir_interpolate_q15(&m_modFilter, inBuffer, outBuffer, 8U);
   
-  io.write(STATE_DSTAR, outBuffer, DSTAR_RADIO_BIT_LENGTH * 8U);
+  io.write(STATE_DSTAR, outBuffer, DSTAR_RADIO_SYMBOL_LENGTH * 8U);
 }
 
 void CDStarTX::setTXDelay(uint8_t delay)

DStarTX.h

@@ -21,7 +21,7 @@
 
 #include "Config.h"
 
-#include "RingBuffer.h"
+#include "SerialRB.h"
 
 class CDStarTX {
 public:
@@ -38,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;

FM.cpp

@@ -1,782 +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"
-#include "Globals.h"
-#include "FM.h"
-
-
-const uint16_t FM_TX_BLOCK_SIZE = 100U;
-const uint16_t FM_SERIAL_BLOCK_SIZE = 84U;//this is the number of sample pairs to send over serial. One sample pair is 3bytes.
-                                          //three times this value shall never exceed 252
-const uint16_t FM_SERIAL_BLOCK_SIZE_BYTES = FM_SERIAL_BLOCK_SIZE * 3U;
-
-CFM::CFM() :
-m_callsign(),
-m_rfAck(),
-m_extAck(),
-m_ctcssRX(),
-m_ctcssTX(),
-m_timeoutTone(),
-m_state(FS_LISTENING),
-m_callsignAtStart(false),
-m_callsignAtEnd(false),
-m_callsignAtLatch(false),
-m_callsignTimer(),
-m_timeoutTimer(),
-m_holdoffTimer(),
-m_kerchunkTimer(),
-m_kerchunkTX(true),
-m_ackMinTimer(),
-m_ackDelayTimer(),
-m_hangTimer(),
-m_statusTimer(),
-m_filterStage1(  724,   1448,   724, 32768, -37895, 21352),//3rd order Cheby Filter 300 to 2700Hz, 0.2dB passband ripple, sampling rate 24kHz
-m_filterStage2(32768,      0,-32768, 32768, -50339, 19052),
-m_filterStage3(32768, -65536, 32768, 32768, -64075, 31460),
-m_blanking(),
-m_useCOS(true),
-m_cosInvert(false),
-m_rfAudioBoost(1U),
-m_extAudioBoost(1U),
-m_downsampler(400U),// 100 ms of audio
-m_extEnabled(false),
-m_rxLevel(1),
-m_inputRFRB(2401U),   // 100ms of audio + 1 sample
-m_outputRFRB(2400U),  // 100ms of audio
-m_inputExtRB()
-{
-  m_statusTimer.setTimeout(1U, 0U);
-
-  insertDelay(100U);
-}
-
-void CFM::samples(bool cos, q15_t* samples, uint8_t length)
-{
-  if (m_useCOS) {
-    if (m_cosInvert)
-      cos = !cos;
-  } else {
-    cos = true;
-  }
-
-  clock(length);
-
-  uint8_t i = 0U;
-  for (; i < length; i++) {
-    // ARMv7-M has hardware integer division 
-    q15_t currentRFSample = q15_t((q31_t(samples[i]) << 8) / m_rxLevel);
-    uint8_t ctcssState = m_ctcssRX.process(currentRFSample);
-
-    if (!m_useCOS) {
-      // Delay the audio by 100ms to better match the CTCSS detector output
-      m_inputRFRB.put(currentRFSample);
-      m_inputRFRB.get(currentRFSample);
-    }
-
-    q15_t currentExtSample;
-    bool inputExt = m_inputExtRB.getSample(currentExtSample);//always consume the external input data so it does not overflow
-    inputExt = inputExt && m_extEnabled;
-
-    if (!inputExt && (CTCSS_NOT_READY(ctcssState)) && m_modemState != STATE_FM) {
-      //Not enough samples to determine if you have CTCSS, just carry on. But only if we haven't any external data in the queue
-      continue;
-    } else if ((inputExt || CTCSS_READY(ctcssState)) && m_modemState != STATE_FM) {
-      //we had enough samples for CTCSS and we are in some other mode than FM
-      bool validCTCSS = CTCSS_VALID(ctcssState);
-      stateMachine(validCTCSS && cos, inputExt);
-      if (m_modemState != STATE_FM)
-        continue;
-    } else if ((inputExt || CTCSS_NOT_READY(ctcssState)) && m_modemState == STATE_FM && i == length - 1) {
-      //Not enough samples for CTCSS but we already are in FM, trigger the state machine
-      //but do not trigger the state machine on every single sample, save CPU!
-      bool validCTCSS = CTCSS_VALID(ctcssState);
-      stateMachine(validCTCSS && cos, inputExt);
-    }
-
-    q15_t currentSample = currentRFSample;
-    q15_t currentBoost  = m_rfAudioBoost;
-    if (m_state == FS_RELAYING_EXT || m_state == FS_KERCHUNK_EXT) {
-      currentSample = currentExtSample;
-      currentBoost  = m_extAudioBoost;
-    }
-
-    // Only let RF audio through when relaying RF audio
-    if (m_state == FS_RELAYING_RF || m_state == FS_KERCHUNK_RF || m_state == FS_RELAYING_EXT || m_state == FS_KERCHUNK_EXT) {
-      currentSample = m_blanking.process(currentSample);
-      if (m_extEnabled && (m_state == FS_RELAYING_RF || m_state == FS_KERCHUNK_RF))
-        m_downsampler.addSample(currentSample);
-
-      currentSample *= currentBoost;
-    } else {
-      currentSample = 0;
-    }
-
-    if (!m_callsign.isRunning() && !m_extAck.isRunning())
-      currentSample += m_rfAck.getHighAudio();
-
-    if (!m_callsign.isRunning() && !m_rfAck.isRunning())
-      currentSample += m_extAck.getHighAudio();
-
-    if (!m_rfAck.isRunning() && !m_extAck.isRunning()) {
-      if (m_state == FS_LISTENING)
-        currentSample += m_callsign.getHighAudio();
-      else
-        currentSample += m_callsign.getLowAudio();
-    }
-
-    if (!m_callsign.isRunning() && !m_rfAck.isRunning() && !m_extAck.isRunning())
-      currentSample += m_timeoutTone.getAudio();
-
-    currentSample = m_filterStage3.filter(m_filterStage2.filter(m_filterStage1.filter(currentSample)));
-
-    currentSample += m_ctcssTX.getAudio();
-
-    m_outputRFRB.put(currentSample);
-  }
-}
-
-void CFM::process()
-{
-  uint16_t space = io.getSpace();
-  uint16_t length = m_outputRFRB.getData();
-
-  if (space > 10U && length >= FM_TX_BLOCK_SIZE ) {
-    space -= 2U;
-    if (length > FM_TX_BLOCK_SIZE)
-      length = FM_TX_BLOCK_SIZE;
-    if (space > FM_TX_BLOCK_SIZE)
-      space = FM_TX_BLOCK_SIZE;
-    if (length > space)
-      length = space;
-
-    q15_t samples[FM_TX_BLOCK_SIZE];
-
-    for (uint16_t i = 0U; i < length; i++) {
-      q15_t sample = 0;
-      m_outputRFRB.get(sample);
-      samples[i] = sample;
-    }
-
-    io.write(STATE_FM, samples, length);
-  }
-
-  if (m_extEnabled) {
-    uint16_t length = m_downsampler.getData();
-
-    if (length >= FM_SERIAL_BLOCK_SIZE) {
-      if (length > FM_SERIAL_BLOCK_SIZE)
-        length = FM_SERIAL_BLOCK_SIZE;
-        
-      TSamplePairPack serialSamples[FM_SERIAL_BLOCK_SIZE];
-
-      for (uint16_t j = 0U; j < length; j++)
-        m_downsampler.getPackedData(serialSamples[j]);
-
-      serial.writeFMData((uint8_t*)serialSamples, length * sizeof(TSamplePairPack));
-    }
-  }
-}
-
-void CFM::reset()
-{
-  m_state = FS_LISTENING;
-
-  m_callsignTimer.stop();
-  m_timeoutTimer.stop();
-  m_kerchunkTimer.stop();
-  m_ackMinTimer.stop();
-  m_ackDelayTimer.stop();
-  m_hangTimer.stop();
-  m_statusTimer.stop();
-
-  m_ctcssRX.reset();
-  m_rfAck.stop();
-  m_extAck.stop();
-  m_callsign.stop();
-  m_timeoutTone.stop();
-
-  m_outputRFRB.reset();
-  m_inputExtRB.reset();
-
-  m_downsampler.reset();
-}
-
-uint8_t CFM::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)
-{
-  m_callsignAtStart = callsignAtStart;
-  m_callsignAtEnd   = callsignAtEnd;
-  m_callsignAtLatch = callsignAtLatch;
-
-  uint16_t holdoffTime  = holdoff * 60U;
-  uint16_t callsignTime = time * 60U;
-
-  m_holdoffTimer.setTimeout(holdoffTime, 0U);
-  m_callsignTimer.setTimeout(callsignTime, 0U);
-
-  if (holdoffTime > 0U)
-    m_holdoffTimer.start();
-
-  return m_callsign.setParams(callsign, speed, frequency, highLevel, lowLevel);
-}
-
-uint8_t CFM::setAck(const char* rfAck, uint8_t speed, uint16_t frequency, uint8_t minTime, uint16_t delay, uint8_t level)
-{
-  m_ackDelayTimer.setTimeout(0U, delay);
-
-  if (minTime > 0U)
-    m_ackMinTimer.setTimeout(minTime, delay);
-
-  return m_rfAck.setParams(rfAck, speed, frequency, level, level);
-}
-
-uint8_t CFM::setMisc(uint16_t timeout, uint8_t timeoutLevel, uint8_t ctcssFrequency, uint8_t ctcssHighThreshold, uint8_t ctcssLowThreshold, uint8_t ctcssLevel, uint8_t kerchunkTime, bool kerchunkTX, uint8_t hangTime, bool useCOS, bool cosInvert, uint8_t rfAudioBoost, uint8_t maxDev, uint8_t rxLevel)
-{
-  m_useCOS    = useCOS;
-  m_cosInvert = cosInvert;
-
-  m_rfAudioBoost = q15_t(rfAudioBoost);
-
-  m_timeoutTimer.setTimeout(timeout, 0U);
-
-  m_kerchunkTimer.setTimeout(kerchunkTime, 0U);
-  m_kerchunkTX = kerchunkTX;
-
-  m_hangTimer.setTimeout(hangTime, 0U);
-
-  m_timeoutTone.setParams(timeoutLevel);
-  m_blanking.setParams(maxDev, timeoutLevel);
-
-  m_rxLevel = rxLevel; //q15_t(255)/q15_t(rxLevel >> 1);
-
-  uint8_t ret = m_ctcssRX.setParams(ctcssFrequency, ctcssHighThreshold, ctcssLowThreshold);
-  if (ret != 0U)
-    return ret;
-
-  return m_ctcssTX.setParams(ctcssFrequency, ctcssLevel);
-}
-
-uint8_t CFM::setExt(const char* ack, uint8_t audioBoost, uint8_t speed, uint16_t frequency, uint8_t level)
-{
-  m_extEnabled = true;
-
-  m_extAudioBoost = q15_t(audioBoost);
-
-  return m_extAck.setParams(ack, speed, frequency, level, level);
-}
-
-void CFM::stateMachine(bool validRFSignal, bool validExtSignal)
-{
-  switch (m_state) {
-    case FS_LISTENING:
-      listeningState(validRFSignal, validExtSignal);
-      break;
-    case FS_KERCHUNK_RF:
-      kerchunkRFState(validRFSignal);
-      break;
-    case FS_RELAYING_RF:
-      relayingRFState(validRFSignal);
-      break;
-    case FS_RELAYING_WAIT_RF:
-      relayingRFWaitState(validRFSignal);
-      break;
-    case FS_TIMEOUT_RF:
-      timeoutRFState(validRFSignal);
-      break;
-    case FS_TIMEOUT_WAIT_RF:
-      timeoutRFWaitState(validRFSignal);
-      break;
-    case FS_KERCHUNK_EXT:
-      kerchunkExtState(validExtSignal);
-      break;
-    case FS_RELAYING_EXT:
-      relayingExtState(validExtSignal);
-      break;
-    case FS_RELAYING_WAIT_EXT:
-      relayingExtWaitState(validExtSignal);
-      break;
-    case FS_TIMEOUT_EXT:
-      timeoutExtState(validExtSignal);
-      break;
-    case FS_TIMEOUT_WAIT_EXT:
-      timeoutExtWaitState(validExtSignal);
-      break;
-    case FS_HANG:
-      hangState(validRFSignal, validExtSignal);
-      break;
-    default:
-      break;
-  }
-
-  if (m_state == FS_LISTENING && !m_rfAck.isWanted() && !m_extAck.isWanted() && !m_callsign.isWanted()) {
-    m_outputRFRB.reset();
-    m_downsampler.reset();
-  }
-}
-
-void CFM::clock(uint8_t length)
-{
-  m_callsignTimer.clock(length);
-  m_timeoutTimer.clock(length);
-  m_holdoffTimer.clock(length);
-  m_kerchunkTimer.clock(length);
-  m_ackMinTimer.clock(length);
-  m_ackDelayTimer.clock(length);
-  m_hangTimer.clock(length);
-  m_statusTimer.clock(length);
-
-  if (m_statusTimer.isRunning() && m_statusTimer.hasExpired()) {
-    serial.writeFMStatus(m_state);
-    m_statusTimer.start();
-  }
-}
-
-void CFM::listeningState(bool validRFSignal, bool validExtSignal)
-{
-  if (validRFSignal) {
-    if (m_kerchunkTimer.getTimeout() > 0U) {
-      DEBUG1("State to KERCHUNK_RF");
-      m_state = FS_KERCHUNK_RF;
-      m_kerchunkTimer.start();
-      if (m_callsignAtStart && !m_callsignAtLatch)
-        sendCallsign();
-    } else {
-      DEBUG1("State to RELAYING_RF");
-      m_state = FS_RELAYING_RF;
-      if (m_callsignAtStart)
-        sendCallsign();
-    }
-
-    if (m_state == FS_RELAYING_RF || (m_state == FS_KERCHUNK_RF && m_kerchunkTX)) {
-      insertSilence(50U);
-
-      beginRelaying();
-
-      m_callsignTimer.start();
-
-      io.setDecode(true);
-      io.setADCDetection(true);
-
-      m_statusTimer.start();
-      serial.writeFMStatus(m_state);
-    }
-  } else if (validExtSignal) {
-    if (m_kerchunkTimer.getTimeout() > 0U) {
-      DEBUG1("State to KERCHUNK_EXT");
-      m_state = FS_KERCHUNK_EXT;
-      m_kerchunkTimer.start();
-      if (m_callsignAtStart && !m_callsignAtLatch)
-        sendCallsign();
-    } else {
-      DEBUG1("State to RELAYING_EXT");
-      m_state = FS_RELAYING_EXT;
-      if (m_callsignAtStart)
-        sendCallsign();
-    }
-
-    if (m_state == FS_RELAYING_EXT || (m_state == FS_KERCHUNK_EXT && m_kerchunkTX)) {
-      insertSilence(50U);
-
-      beginRelaying();
-
-      m_callsignTimer.start();
-
-      m_statusTimer.start();
-      serial.writeFMStatus(m_state);
-    }
-  }
-}
-
-void CFM::kerchunkRFState(bool validSignal)
-{
-  if (validSignal) {
-    if (m_kerchunkTimer.hasExpired()) {
-      DEBUG1("State to RELAYING_RF");
-      m_state = FS_RELAYING_RF;
-      m_kerchunkTimer.stop();
-      if (!m_kerchunkTX) {
-        insertSilence(50U);
-
-        beginRelaying();
-
-        m_callsignTimer.start();
-
-        io.setDecode(true);
-        io.setADCDetection(true);
-
-        m_statusTimer.start();
-        serial.writeFMStatus(m_state);
-      }
-      if (m_callsignAtStart && m_callsignAtLatch) {
-        sendCallsign();
-        m_callsignTimer.start();
-      }
-    }
-  } else {
-    io.setDecode(false);
-    io.setADCDetection(false);
-
-    DEBUG1("State to LISTENING");
-    m_state = FS_LISTENING;
-    m_kerchunkTimer.stop();
-    m_timeoutTimer.stop();
-    m_ackMinTimer.stop();
-    m_callsignTimer.stop();
-    m_statusTimer.stop();
-
-    if (m_extEnabled)
-      serial.writeFMEOT();
-  }
-}
-
-void CFM::relayingRFState(bool validSignal)
-{
-  if (validSignal) {
-    if (m_timeoutTimer.isRunning() && m_timeoutTimer.hasExpired()) {
-      DEBUG1("State to TIMEOUT_RF");
-      m_state = FS_TIMEOUT_RF;
-      m_ackMinTimer.stop();
-      m_timeoutTimer.stop();
-      m_timeoutTone.start();
-
-      if (m_extEnabled)
-        serial.writeFMEOT();
-    }
-  } else {
-    io.setDecode(false);
-    io.setADCDetection(false);
-
-    DEBUG1("State to RELAYING_WAIT_RF");
-    m_state = FS_RELAYING_WAIT_RF;
-    m_ackDelayTimer.start();
-
-    if (m_extEnabled)
-      serial.writeFMEOT();
-  }
-
-  if (m_callsignTimer.isRunning() && m_callsignTimer.hasExpired()) {
-    sendCallsign();
-    m_callsignTimer.start();
-  }
-}
-
-void CFM::relayingRFWaitState(bool validSignal)
-{
-  if (validSignal) {
-    io.setDecode(true);
-    io.setADCDetection(true);
-
-    DEBUG1("State to RELAYING_RF");
-    m_state = FS_RELAYING_RF;
-    m_ackDelayTimer.stop();
-  } else {
-    if (m_ackDelayTimer.isRunning() && m_ackDelayTimer.hasExpired()) {
-      DEBUG1("State to HANG");
-      m_state = FS_HANG;
-
-      if (m_ackMinTimer.isRunning()) {
-        if (m_ackMinTimer.hasExpired()) {
-          DEBUG1("Send RF ack");
-          m_rfAck.start();
-          m_ackMinTimer.stop();
-        }
-      } else {
-          DEBUG1("Send RF ack");
-          m_rfAck.start();
-          m_ackMinTimer.stop();
-      }
-
-      m_ackDelayTimer.stop();
-      m_timeoutTimer.stop();
-      m_hangTimer.start();
-    }
-  }
-
-  if (m_callsignTimer.isRunning() && m_callsignTimer.hasExpired()) {
-    sendCallsign();
-    m_callsignTimer.start();
-  }
-}
-
-void CFM::kerchunkExtState(bool validSignal)
-{
-  if (validSignal) {
-    if (m_kerchunkTimer.hasExpired()) {
-      DEBUG1("State to RELAYING_EXT");
-      m_state = FS_RELAYING_EXT;
-      m_kerchunkTimer.stop();
-      if (!m_kerchunkTX) {
-        insertSilence(50U);
-
-        beginRelaying();
-
-        m_callsignTimer.start();
-
-        m_statusTimer.start();
-        serial.writeFMStatus(m_state);
-      }
-      if (m_callsignAtStart && m_callsignAtLatch) {
-        sendCallsign();
-        m_callsignTimer.start();
-      }
-    }
-  } else {
-    DEBUG1("State to LISTENING");
-    m_state = FS_LISTENING;
-    m_kerchunkTimer.stop();
-    m_timeoutTimer.stop();
-    m_ackMinTimer.stop();
-    m_callsignTimer.stop();
-    m_statusTimer.stop();
-  }
-}
-
-void CFM::relayingExtState(bool validSignal)
-{
-  if (validSignal) {
-    if (m_timeoutTimer.isRunning() && m_timeoutTimer.hasExpired()) {
-      DEBUG1("State to TIMEOUT_EXT");
-      m_state = FS_TIMEOUT_EXT;
-      m_ackMinTimer.stop();
-      m_timeoutTimer.stop();
-      m_timeoutTone.start();
-    }
-  } else {
-    DEBUG1("State to RELAYING_WAIT_EXT");
-    m_state = FS_RELAYING_WAIT_EXT;
-    m_ackDelayTimer.start();
-  }
-
-  if (m_callsignTimer.isRunning() && m_callsignTimer.hasExpired()) {
-    sendCallsign();
-    m_callsignTimer.start();
-  }
-}
-
-void CFM::relayingExtWaitState(bool validSignal)
-{
-  if (validSignal) {
-    DEBUG1("State to RELAYING_EXT");
-    m_state = FS_RELAYING_EXT;
-    m_ackDelayTimer.stop();
-  } else {
-    if (m_ackDelayTimer.isRunning() && m_ackDelayTimer.hasExpired()) {
-      DEBUG1("State to HANG");
-      m_state = FS_HANG;
-
-      if (m_ackMinTimer.isRunning()) {
-        if (m_ackMinTimer.hasExpired()) {
-          DEBUG1("Send Ext ack");
-          m_extAck.start();
-          m_ackMinTimer.stop();
-        }
-      } else {
-          DEBUG1("Send Ext ack");
-          m_extAck.start();
-          m_ackMinTimer.stop();
-      }
-
-      m_ackDelayTimer.stop();
-      m_timeoutTimer.stop();
-      m_hangTimer.start();
-    }
-  }
-
-  if (m_callsignTimer.isRunning() && m_callsignTimer.hasExpired()) {
-    sendCallsign();
-    m_callsignTimer.start();
-  }
-}
-
-void CFM::hangState(bool validRFSignal, bool validExtSignal)
-{
-  if (validRFSignal) {
-    io.setDecode(true);
-    io.setADCDetection(true);
-
-    DEBUG1("State to RELAYING_RF");
-    m_state = FS_RELAYING_RF;
-    DEBUG1("Stop ack");
-    m_rfAck.stop();
-    m_extAck.stop();
-    beginRelaying();
-  } else if (validExtSignal) {
-    DEBUG1("State to RELAYING_EXT");
-    m_state = FS_RELAYING_EXT;
-    DEBUG1("Stop ack");
-    m_rfAck.stop();
-    m_extAck.stop();
-    beginRelaying();
-  } else {
-    if (m_hangTimer.isRunning() && m_hangTimer.hasExpired()) {
-      DEBUG1("State to LISTENING");
-      m_state = FS_LISTENING;
-      m_hangTimer.stop();
-      m_statusTimer.stop();
-
-      if (m_callsignAtEnd)
-        sendCallsign();
-
-      m_callsignTimer.stop();
-
-    }
-  }
-
-  if (m_callsignTimer.isRunning() && m_callsignTimer.hasExpired()) {
-    sendCallsign();
-    m_callsignTimer.start();
-  }
-}
-
-void CFM::timeoutRFState(bool validSignal)
-{
-  if (!validSignal) {
-    io.setDecode(false);
-    io.setADCDetection(false);
-
-    DEBUG1("State to TIMEOUT_WAIT_RF");
-    m_state = FS_TIMEOUT_WAIT_RF;
-
-    if (m_callsignAtEnd)
-        sendCallsign();
-
-    m_ackDelayTimer.start();
-  }
-
-  if (m_callsignTimer.isRunning() && m_callsignTimer.hasExpired()) {
-    sendCallsign();
-    m_callsignTimer.start();
-  }
-}
-
-void CFM::timeoutRFWaitState(bool validSignal)
-{
-  if (validSignal) {
-    io.setDecode(true);
-    io.setADCDetection(true);
-
-    DEBUG1("State to TIMEOUT_RF");
-    m_state = FS_TIMEOUT_RF;
-    m_ackDelayTimer.stop();
-  } else {
-    if (m_ackDelayTimer.isRunning() && m_ackDelayTimer.hasExpired()) {
-      DEBUG1("State to HANG");
-      m_state = FS_HANG;
-      m_timeoutTone.stop();
-      DEBUG1("Send RF ack");
-      m_rfAck.start();
-      m_ackDelayTimer.stop();
-      m_ackMinTimer.stop();
-      m_timeoutTimer.stop();
-      m_hangTimer.start();
-    }
-  }
-
-  if (m_callsignTimer.isRunning() && m_callsignTimer.hasExpired()) {
-    sendCallsign();
-    m_callsignTimer.start();
-  }
-}
-
-void CFM::timeoutExtState(bool validSignal)
-{
-  if (!validSignal) {
-    DEBUG1("State to TIMEOUT_WAIT_EXT");
-    m_state = FS_TIMEOUT_WAIT_EXT;
-    m_ackDelayTimer.start();
-  }
-
-  if (m_callsignTimer.isRunning() && m_callsignTimer.hasExpired()) {
-    sendCallsign();
-    m_callsignTimer.start();
-  }
-}
-
-void CFM::timeoutExtWaitState(bool validSignal)
-{
-  if (validSignal) {
-    DEBUG1("State to TIMEOUT_EXT");
-    m_state = FS_TIMEOUT_EXT;
-    m_ackDelayTimer.stop();
-  } else {
-    if (m_ackDelayTimer.isRunning() && m_ackDelayTimer.hasExpired()) {
-      DEBUG1("State to HANG");
-      m_state = FS_HANG;
-      m_timeoutTone.stop();
-      DEBUG1("Send Ext ack");
-      m_extAck.start();
-      m_ackDelayTimer.stop();
-      m_ackMinTimer.stop();
-      m_timeoutTimer.stop();
-      m_hangTimer.start();
-    }
-  }
-
-  if (m_callsignTimer.isRunning() && m_callsignTimer.hasExpired()) {
-    sendCallsign();
-    m_callsignTimer.start();
-  }
-}
-void CFM::sendCallsign()
-{
-  if (m_holdoffTimer.isRunning()) {
-    if (m_holdoffTimer.hasExpired()) {
-      DEBUG1("Send callsign");
-      m_callsign.start();
-      m_holdoffTimer.start();
-    }
-  } else {
-    DEBUG1("Send callsign");
-    m_callsign.start();
-  }
-}
-
-void CFM::beginRelaying()
-{
-  m_timeoutTimer.start();
-  m_ackMinTimer.start();
-}
-
-uint8_t CFM::getSpace() const
-{
-  // The amount of free space for receiving external audio, in frames.
-  return m_inputExtRB.getSpace() / FM_SERIAL_BLOCK_SIZE_BYTES;
-}
-
-uint8_t CFM::writeData(const uint8_t* data, uint8_t length)
-{
-  //todo check if length is a multiple of 3
-  m_inputExtRB.addData(data, length);
-  return 0U;
-}
-
-void CFM::insertDelay(uint16_t ms)
-{
-  uint32_t nSamples = ms * 24U;
-
-  for (uint32_t i = 0U; i < nSamples; i++)
-    m_inputRFRB.put(0);
-}
-
-void CFM::insertSilence(uint16_t ms)
-{
-  uint32_t nSamples = ms * 24U;
-
-  for (uint32_t i = 0U; i < nSamples; i++)
-    m_outputRFRB.put(0);
-}

FM.h

@@ -1,128 +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(FM_H)
-#define  FM_H
-
-#include "Config.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"
-
-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, bool kerchunkTX, uint8_t hangTime, bool useCOS, bool cosInvert, 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;
-  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;
-  bool                 m_kerchunkTX;
-  CFMTimer             m_ackMinTimer;
-  CFMTimer             m_ackDelayTimer;
-  CFMTimer             m_hangTimer;
-  CFMTimer             m_statusTimer;
-  CFMDirectFormI       m_filterStage1;
-  CFMDirectFormI       m_filterStage2;
-  CFMDirectFormI       m_filterStage3;
-  CFMBlanking          m_blanking;
-  bool                 m_useCOS;
-  bool                 m_cosInvert;
-  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;
-
-  void stateMachine(bool validRFSignal, bool validExtSignal);
-  void listeningState(bool validRFSignal, bool validExtSignal);
-  void kerchunkRFState(bool validSignal);
-  void relayingRFState(bool validSignal);
-  void relayingRFWaitState(bool validSignal);
-  void timeoutRFState(bool validSignal);
-  void timeoutRFWaitState(bool validSignal);
-  void kerchunkExtState(bool validSignal);
-  void relayingExtState(bool validSignal);
-  void relayingExtWaitState(bool validSignal);
-  void timeoutExtState(bool validSignal);
-  void timeoutExtWaitState(bool validSignal);
-  void hangState(bool validRFSignal, bool validExtSignal);
-
-  void clock(uint8_t length);
-
-  void sendCallsign();
-  void beginRelaying();
-
-  void insertDelay(uint16_t ms);
-  void insertSilence(uint16_t ms);
-};
-
-#endif

FMBlanking.cpp

@@ -1,82 +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"
-#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;
-}

FMBlanking.h

@@ -1,41 +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(FMBlanking_H)
-#define  FMBlanking_H
-
-#include "Config.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

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"
-#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_result(CTS_NONE)
-{
-}
-
-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;
-}
-
-uint8_t 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);
-
-  m_result &= ~CTS_READY;
-
-  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 previousCTCSSValid = CTCSS_VALID(m_result);
-
-    q31_t threshold = m_highThreshold;
-    if (previousCTCSSValid)
-      threshold = m_lowThreshold;
-
-    m_result |= CTS_READY;
-    if (value >= threshold)
-      m_result |= CTS_VALID;
-    else
-      m_result &= ~CTS_VALID;
-
-    if (previousCTCSSValid != CTCSS_VALID(m_result))
-      DEBUG4("CTCSS Value / Threshold / Valid", value, threshold, CTCSS_VALID(m_result));
-
-    m_count = 0U;
-    m_q0 = 0;
-    m_q1 = 0;
-  }
-
-  return m_result;
-}
-
-void CFMCTCSSRX::reset()
-{
-  m_q0 = 0;
-  m_q1 = 0;
-  m_result = CTS_NONE;
-  m_count  = 0U;
-}

FMCTCSSRX.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.
- */
-
-#if !defined(FMCTCSSRX_H)
-#define  FMCTCSSRX_H
-
-#include "Config.h"
-
-const uint8_t CTS_NONE  = 0U;
-const uint8_t CTS_READY = 1U;
-const uint8_t CTS_VALID = 2U;
-
-#define CTCSS_READY(a) ((a & CTS_READY) != 0)
-#define CTCSS_NOT_READY(a) ((a & CTS_READY) == 0)
-#define CTCSS_VALID(a) ((a & CTS_VALID) != 0)
-#define CTCSS_NOT_VALID(a) ((a & CTS_VALID) == 0)
-
-class CFMCTCSSRX {
-public:
-  CFMCTCSSRX();
-
-  uint8_t setParams(uint8_t frequency, uint8_t highThreshold, uint8_t lowThreshold);
-  
-  uint8_t 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;
-  uint8_t  m_result;
-};
-
-#endif

FMCTCSSTX.cpp

@@ -1,125 +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"
-#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()
-{
-  q15_t sample = m_values[m_n++];
-  if(m_n >= m_length)
-    m_n = 0U;
-  
-  return sample;
-}

FMCTCSSTX.h

@@ -1,38 +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(FMCTCSSTX_H)
-#define  FMCTCSSTX_H
-
-#include "Config.h"
-
-class CFMCTCSSTX {
-public:
-  CFMCTCSSTX();
-
-  uint8_t setParams(uint8_t frequency, uint8_t level);
-
-  q15_t getAudio();
-
-private:
-  q15_t*   m_values;
-  uint16_t m_length;
-  uint16_t m_n;
-};
-
-#endif

FMDirectForm1.h

@@ -1,111 +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 <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
-		register 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 */

FMDownsampler.cpp

@@ -1,74 +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"
-#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;
-}

FMDownsampler.h

@@ -1,42 +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.
- */
-
-#if !defined(FMDOWNSAMPLER_H)
-#define FMDOWNSAMPLER_H
-
-#include "Config.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

FMKeyer.cpp

@@ -1,216 +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"
-#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;
-}

FMKeyer.h

@@ -1,54 +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(FMKeyer_H)
-#define  FMKeyer_H
-
-#include "Config.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

FMSamplePairPack.h

@@ -1,29 +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.
- */
-
-#if !defined(TSAMPLEPACK_H)
-#define TSAMPLEPACK_H
-
-struct TSamplePairPack {
-  uint8_t byte0;
-  uint8_t byte1;
-  uint8_t byte2;
-};
-
-#endif

FMTimeout.cpp

@@ -1,76 +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"
-#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 * 128);
-}
-
-q15_t CFMTimeout::getAudio()
-{
-  q15_t sample = 0U;
-  if (!m_running)
-    return sample;
-
-  if (m_pos > 12000U) {
-    q31_t sample = BUSY_AUDIO[m_n] * m_level;
-    sample = q15_t(__SSAT((sample >> 15), 16));
-
-    m_n++;
-    if (m_n >= BUSY_AUDIO_LEN)
-      m_n = 0U;
-  } else {
-    sample = 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;
-}

FMTimeout.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.
- */
-
-#if !defined(FMTimeout_H)
-#define  FMTimeout_H
-
-#include "Config.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

FMTimer.cpp

@@ -1,70 +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"
-#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;
-}

FMTimer.h

@@ -1,47 +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.
- */
-
-#if !defined(FMTimer_H)
-#define  FMTimer_H
-
-#include "Config.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

FMUpSampler.cpp

@@ -1,97 +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 "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);
-}

FMUpSampler.h

@@ -1,48 +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.
- */
-
-
-#if !defined(FMUPSAMPLER_H)
-#define FMUPSAMPLER_H
-
-#include "Config.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

Globals.h

@@ -1,5 +1,5 @@
 /*
- *   Copyright (C) 2015,2016,2017,2018,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
@@ -28,7 +28,6 @@
 #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__) || defined(STM32F105xC)
@@ -49,28 +48,15 @@ enum MMDVM_STATE {
   STATE_DMR       = 2,
   STATE_YSF       = 3,
   STATE_P25       = 4,
-  STATE_NXDN      = 5,
-  STATE_POCSAG    = 6,
-  STATE_FM        = 10,
 
   // Dummy states start at 90
-  STATE_NXDNCAL1K = 91,
-  STATE_DMRDMO1K  = 92,
   STATE_P25CAL1K  = 93,
   STATE_DMRCAL1K  = 94,
   STATE_LFCAL     = 95,
   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_DSTARCAL  = 99
 };
 
 #include "SerialPort.h"
@@ -85,21 +71,14 @@ enum MMDVM_STATE {
 #include "YSFTX.h"
 #include "P25RX.h"
 #include "P25TX.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 "Debug.h"
 #include "IO.h"
-#include "FM.h"
 
 const uint8_t  MARK_SLOT1 = 0x08U;
 const uint8_t  MARK_SLOT2 = 0x04U;
@@ -107,14 +86,8 @@ 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;
-
-#if defined(STM32F105xC) || defined(__MK20DX256__)
-const uint16_t TX_BUFFER_LEN = 2000U;
-#else
-const uint16_t TX_BUFFER_LEN = 4000U;
-#endif
+const uint16_t TX_RINGBUFFER_SIZE = 1000U;
+const uint16_t RX_RINGBUFFER_SIZE = 1200U;
 
 extern MMDVM_STATE m_modemState;
 
@@ -122,9 +95,6 @@ extern bool m_dstarEnable;
 extern bool m_dmrEnable;
 extern bool m_ysfEnable;
 extern bool m_p25Enable;
-extern bool m_nxdnEnable;
-extern bool m_pocsagEnable;
-extern bool m_fmEnable;
 
 extern bool m_duplex;
 
@@ -150,22 +120,13 @@ extern CYSFTX ysfTX;
 extern CP25RX p25RX;
 extern CP25TX p25TX;
 
-extern CNXDNRX nxdnRX;
-extern CNXDNTX nxdnTX;
-
-extern CPOCSAGTX pocsagTX;
-
-extern CFM fm;
-
 extern CCalDStarRX calDStarRX;
 extern CCalDStarTX calDStarTX;
 extern CCalDMR     calDMR;
-extern CCalFM      calFM;
 extern CCalP25     calP25;
-extern CCalNXDN    calNXDN;
-extern CCalPOCSAG  calPOCSAG;
 extern CCalRSSI    calRSSI;
 
 extern CCWIdTX cwIdTX;
 
 #endif
+

I2CTeensy.cpp

@@ -1,235 +0,0 @@
-/*
- *   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.
- *
- *   28-4-2017 Created for MMDVM Pi shield for Teensy by Chris Huitema
- */
-
-#include "Config.h"
-#include "Globals.h"
-
-#if defined(VK6MST_TEENSY_PI3_SHIELD_I2C)
-
-#include <i2c_t3.h>   //available here https://github.com/nox771/i2c_t3 or maybe the normal wire will work #include <wire.h> justs need to test i guess
-
-#define I2C_ADDRESS   0x22
-#define I2C_SPEED     100000
-
-// Function prototypes
-void receiveEvent(size_t count);
-void requestEvent(void);
-
-#define TX_FIFO_SIZE 512U
-#define RX_FIFO_SIZE 512U
-
-volatile uint8_t  TXfifo[TX_FIFO_SIZE];
-volatile uint8_t  RXfifo[RX_FIFO_SIZE];
-volatile uint16_t TXfifohead, TXfifotail;
-volatile uint16_t RXfifohead, RXfifotail;
-
-// Init queues
-void TXfifoinit(void)
-{
-   TXfifohead = 0U;
-   TXfifotail = 0U;
-}
-
-void RXfifoinit()
-{
-   RXfifohead = 0U;
-   RXfifotail = 0U;
-}
-
-// How full is queue
-
-uint16_t TXfifolevel(void)
-{
-   uint32_t tail = TXfifotail;
-   uint32_t head = TXfifohead;
-
-   if (tail > head)
-      return TX_FIFO_SIZE + head - tail;
-   else
-      return head - tail;
-}
-
-uint16_t RXfifolevel(void)
-{
-   uint32_t tail = RXfifotail;
-   uint32_t head = RXfifohead;
-
-   if (tail > head)
-      return RX_FIFO_SIZE + head - tail;
-   else
-      return head - tail;
-}
-
-
-uint8_t TXfifoput(uint8_t next)
-{
-   if (TXfifolevel() < TX_FIFO_SIZE) {
-      TXfifo[TXfifohead] = next;
-
-      TXfifohead++;
-      if (TXfifohead >= TX_FIFO_SIZE)
-         TXfifohead = 0U;
-      return 1U;
-   } else {
-      return 0U; // signal an overflow occurred by returning a zero count
-   }
-}
-
-void I2Cbegin(void)
-{
-  // Setup for Slave mode, address 0x22, pins 18/19, external pullups, speed in hz
-  Wire.begin(I2C_SLAVE, I2C_ADDRESS, I2C_PINS_18_19, I2C_PULLUP_EXT, I2C_SPEED);
-
-    // register events
-    Wire.onReceive(receiveEvent);
-    Wire.onRequest(requestEvent);
-
-    // initialize the fifos
-    TXfifoinit();
-    RXfifoinit();
-}
-
-
-int I2Cavailable(void)
-{
-  if (RXfifolevel() > 0U)
-      return 1U;
-    else
-      return 0U;
-}
-
-
-uint8_t I2Cread(void)
-{
-  uint8_t data_c = RXfifo[RXfifotail];
-
-   RXfifotail++;
-   if (RXfifotail >= RX_FIFO_SIZE)
-      RXfifotail = 0U;
-
-   return data_c;
-}
-
-
-void I2Cwrite(const uint8_t* data, uint16_t length)
-{
-   for (uint16_t i = 0U; i < length; i++)
-      TXfifoput(data[i]);   //puts it in the fifo
-}
-
-//
-// handle Rx Event (incoming I2C data)
-//
-void receiveEvent(size_t count)
-{
-  for (uint16_t i = 0U; i < count; i++)
-  {
-    if (RXfifolevel() < RX_FIFO_SIZE) {
-      RXfifo[RXfifohead] = Wire.readByte();
-      if (RXfifo[RXfifohead] != -1){
-        RXfifohead++;
-        if (RXfifohead >= RX_FIFO_SIZE) RXfifohead = 0U;
-      }
-    } else {
-      Wire.readByte();                  // drop data if mem full.
-    }
-    
-  }
-}
-
-//
-// handle Tx Event (outgoing I2C data)
-//
-void requestEvent(void)
-{
-    if (TXfifolevel() > 0) {
-      if (Wire.write(TXfifo[TXfifotail])){  //write to i2c
-        TXfifotail++;
-        if (TXfifotail >= TX_FIFO_SIZE) TXfifotail = 0U;
-      }  
-    }
-}
-
-
-
-/************************************/
-
-void CSerialPort::beginInt(uint8_t n, int speed)
-{
-  switch (n) {
-    case 1U:
-      return I2Cbegin();
-    case 3U:
-      Serial3.begin(speed);
-      break;
-    default:
-      break;
-  }
-}
-
-int CSerialPort::availableInt(uint8_t n)
-{
-  switch (n) {
-    case 1U:
-      return I2Cavailable();
-    case 3U:
-      return Serial3.available();
-    default:
-      return false;
-  }
-}
-
-int CSerialPort::availableForWriteInt(uint8_t n)
-{
-  switch (n) {
-    case 3U:
-      return Serial3.availableForWrite();
-    default:
-      return false;
-  }
-}
-
-uint8_t CSerialPort::readInt(uint8_t n)
-{
-  switch (n) {
-    case 1U:
-      return I2Cread();
-    case 3U:
-      return Serial3.read();
-    default:
-      return 0U;
-  }
-}
-
-void CSerialPort::writeInt(uint8_t n, const uint8_t* data, uint16_t length, bool flush)
-{
-  switch (n) {
-    case 1U:
-      I2Cwrite(data, length);
-      break;
-    case 3U:
-      Serial3.write(data, length);
-      if (flush)
-        Serial3.flush();
-      break;
-    default:
-      break;
-  }
-}
-
-#endif

IO.cpp

@@ -1,5 +1,5 @@
 /*
- *   Copyright (C) 2015,2016,2017,2018,2020 by Jonathan Naylor G4KLX
+ *   Copyright (C) 2015,2016,2017 by Jonathan Naylor G4KLX
  *   Copyright (C) 2015 by Jim Mclaughlin KI6ZUM
  *   Copyright (C) 2016 by Colin Durbridge G4EML
  *
@@ -23,34 +23,12 @@
 #include "IO.h"
 
 // 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}
+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
 
-// 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;
-
-// 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,
-                                  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;
-
-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};
-const uint16_t NXDN_ISINC_FILTER_LEN = 32U;
-
-// 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;
-
 // One symbol boxcar filter
-static q15_t   BOXCAR_FILTER[] = {12000, 12000, 12000, 12000, 12000, 0};
-const uint16_t BOXCAR_FILTER_LEN = 6U;
+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;
 
@@ -61,16 +39,8 @@ m_txBuffer(TX_RINGBUFFER_SIZE),
 m_rssiBuffer(RX_RINGBUFFER_SIZE),
 m_dcFilter(),
 m_dcState(),
-m_rrcFilter(),
-m_gaussianFilter(),
 m_boxcarFilter(),
-m_nxdnFilter(),
-m_nxdnISincFilter(),
-m_rrcState(),
-m_gaussianState(),
 m_boxcarState(),
-m_nxdnState(),
-m_nxdnISincState(),
 m_pttInvert(false),
 m_rxLevel(128 * 128),
 m_cwIdTXLevel(128 * 128),
@@ -78,9 +48,6 @@ m_dstarTXLevel(128 * 128),
 m_dmrTXLevel(128 * 128),
 m_ysfTXLevel(128 * 128),
 m_p25TXLevel(128 * 128),
-m_nxdnTXLevel(128 * 128),
-m_pocsagTXLevel(128 * 128),
-m_fmTXLevel(128 * 128),
 m_rxDCOffset(DC_OFFSET),
 m_txDCOffset(DC_OFFSET),
 m_ledCount(0U),
@@ -91,38 +58,18 @@ m_dacOverflow(0U),
 m_watchdog(0U),
 m_lockout(false)
 {
-  ::memset(m_rrcState,      0x00U,  70U * sizeof(q15_t));
-  ::memset(m_gaussianState, 0x00U,  40U * sizeof(q15_t));
-  ::memset(m_boxcarState,   0x00U,  30U * sizeof(q15_t));
-  ::memset(m_nxdnState,     0x00U, 110U * sizeof(q15_t));
-  ::memset(m_nxdnISincState, 0x00U, 60U * sizeof(q15_t));
-  ::memset(m_dcState,       0x00U,   4U * sizeof(q31_t));
+  ::memset(m_boxcarState, 0x00U, 30U * 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;
 
-  m_rrcFilter.numTaps = RRC_0_2_FILTER_LEN;
-  m_rrcFilter.pState  = m_rrcState;
-  m_rrcFilter.pCoeffs = RRC_0_2_FILTER;
-
-  m_gaussianFilter.numTaps = GAUSSIAN_0_5_FILTER_LEN;
-  m_gaussianFilter.pState  = m_gaussianState;
-  m_gaussianFilter.pCoeffs = GAUSSIAN_0_5_FILTER;
-
   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;
-  
-  m_nxdnISincFilter.numTaps = NXDN_ISINC_FILTER_LEN;
-  m_nxdnISincFilter.pState  = m_nxdnISincState;
-  m_nxdnISincFilter.pCoeffs = NXDN_ISINC_FILTER;
-
   initInt();
   
   selfTest();
@@ -138,75 +85,69 @@ void CIO::selfTest()
     // We exclude PTT to avoid trigger the transmitter
     setLEDInt(ledValue);
     setCOSInt(ledValue);
-#if defined(MODE_LEDS)
+#if defined(ARDUINO_MODE_PINS)
     setDStarInt(ledValue);
     setDMRInt(ledValue);
     setYSFInt(ledValue);
     setP25Int(ledValue);
-    setNXDNInt(ledValue);
-    setPOCSAGInt(ledValue);
-    setFMInt(ledValue);
 #endif
     delayInt(250);
   }
 
-#if defined(MODE_LEDS)
+#if defined(ARDUINO_MODE_PINS)
   setDStarInt(true);
   setDMRInt(false);
   setYSFInt(false);
   setP25Int(false);
-  setNXDNInt(false);
-  setPOCSAGInt(false);
-  setFMInt(false);
 
   delayInt(250);
+
+  setDStarInt(true);
   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_POCSAG_LEDS)
-  delayInt(250);
-  setPOCSAGInt(true);
-#endif
-
-#if !defined(USE_ALTERNATE_FM_LEDS)
-  delayInt(250);
-  setFMInt(true);
-
-  delayInt(250);
-  setFMInt(false);
-#endif
-
-#if !defined(USE_ALTERNATE_POCSAG_LEDS)
-  delayInt(250);
-  setPOCSAGInt(false);
-#endif
-
-#if !defined(USE_ALTERNATE_NXDN_LEDS)
-  delayInt(250);
-  setNXDNInt(false);
-#endif
-
-  delayInt(250);
+  setYSFInt(false);
   setP25Int(false);
 
   delayInt(250);
+
+  setDStarInt(true);
+  setDMRInt(true);
+  setYSFInt(true);
+  setP25Int(false);
+  
+  delayInt(250);
+
+  setDStarInt(true);
+  setDMRInt(true);
+  setYSFInt(true);
+  setP25Int(true);
+
+  delayInt(250);
+  
+  setDStarInt(true);
+  setDMRInt(true);
+  setYSFInt(true);
+  setP25Int(false);
+
+  delayInt(250);
+
+  setDStarInt(true);
+  setDMRInt(true);
   setYSFInt(false);
+  setP25Int(false);
 
   delayInt(250);
+  
+  setDStarInt(true);
   setDMRInt(false);
+  setYSFInt(false);
+  setP25Int(false);
 
   delayInt(250);
+
   setDStarInt(false);
+  setDMRInt(false);
+  setYSFInt(false);
+  setP25Int(false);
 #endif
 }
 
@@ -227,8 +168,8 @@ 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_POCSAG) {
+    if (m_watchdog >= 96000U) {
+      if (m_modemState == STATE_DSTAR || m_modemState == STATE_DMR || m_modemState == STATE_YSF) {
         if (m_modemState == STATE_DMR && m_tx)
           dmrTX.setStart(false);
         m_modemState = STATE_IDLE;
@@ -238,17 +179,13 @@ void CIO::process()
       m_watchdog = 0U;
     }
 
-#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);
@@ -264,7 +201,6 @@ void CIO::process()
   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) {
@@ -273,16 +209,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));
     }
@@ -290,152 +225,65 @@ void CIO::process()
     if (m_lockout)
       return;
 
-#if defined(USE_DCBLOCKER)
-    q31_t q31Samples[RX_BLOCK_SIZE];
-    ::arm_q15_to_q31(samples, q31Samples, RX_BLOCK_SIZE);
-
-    q31_t dcValues[RX_BLOCK_SIZE];
-    ::arm_biquad_cascade_df1_q31(&m_dcFilter, q31Samples, dcValues, RX_BLOCK_SIZE);
+    q15_t vals[RX_BLOCK_SIZE];
+    ::arm_fir_fast_q15(&m_boxcarFilter, samples, vals, RX_BLOCK_SIZE);
 
     q31_t dcLevel = 0;
+    q31_t dcValues[RX_BLOCK_SIZE];
+    q31_t q31Vals[RX_BLOCK_SIZE];
+
+    ::arm_q15_to_q31(vals, q31Vals, RX_BLOCK_SIZE);
+    ::arm_biquad_cascade_df1_q31(&m_dcFilter, q31Vals, dcValues, RX_BLOCK_SIZE);
+
     for (uint8_t i = 0U; i < RX_BLOCK_SIZE; i++)
       dcLevel += dcValues[i];
     dcLevel /= RX_BLOCK_SIZE;
 
     q15_t offset = q15_t(__SSAT((dcLevel >> 16), 16));;
 
-    q15_t dcSamples[RX_BLOCK_SIZE];
+    q15_t dcVals[RX_BLOCK_SIZE];
     for (uint8_t i = 0U; i < RX_BLOCK_SIZE; i++)
-      dcSamples[i] = samples[i] - offset;
-#endif
+      dcVals[i] = vals[i] - offset;
 
     if (m_modemState == STATE_IDLE) {
-      if (m_dstarEnable) {
-        q15_t GMSKVals[RX_BLOCK_SIZE];
-#if defined(USE_DCBLOCKER)
-        ::arm_fir_fast_q15(&m_gaussianFilter, dcSamples, GMSKVals, RX_BLOCK_SIZE);
-#else
-        ::arm_fir_fast_q15(&m_gaussianFilter, samples, GMSKVals, RX_BLOCK_SIZE);
-#endif
-        dstarRX.samples(GMSKVals, rssi, RX_BLOCK_SIZE);
+      if (m_dstarEnable)
+        dstarRX.samples(dcVals, rssi, RX_BLOCK_SIZE);
+
+      if (m_p25Enable)
+        p25RX.samples(dcVals, rssi, RX_BLOCK_SIZE);
+
+      if (m_dmrEnable) {
+        if (m_duplex)
+          dmrIdleRX.samples(vals, RX_BLOCK_SIZE);
+        else
+          dmrDMORX.samples(vals, rssi, RX_BLOCK_SIZE);
       }
 
-      if (m_p25Enable) {
-        q15_t P25Vals[RX_BLOCK_SIZE];
-#if defined(USE_DCBLOCKER)
-        ::arm_fir_fast_q15(&m_boxcarFilter, dcSamples, P25Vals, RX_BLOCK_SIZE);
-#else
-        ::arm_fir_fast_q15(&m_boxcarFilter, samples, P25Vals, RX_BLOCK_SIZE);
-#endif
-        p25RX.samples(P25Vals, rssi, RX_BLOCK_SIZE);
-      }
-
-      if (m_nxdnEnable) {
-        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);
-
-        nxdnRX.samples(NXDNVals, rssi, RX_BLOCK_SIZE);
-      }
-
-      if (m_dmrEnable || m_ysfEnable) {
-        q15_t RRCVals[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);
-        }
-      }
-
-      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
-      }
+      if (m_ysfEnable)
+        ysfRX.samples(dcVals, rssi, RX_BLOCK_SIZE);
     } else if (m_modemState == STATE_DSTAR) {
-      if (m_dstarEnable) {
-        q15_t GMSKVals[RX_BLOCK_SIZE];
-#if defined(USE_DCBLOCKER)
-        ::arm_fir_fast_q15(&m_gaussianFilter, dcSamples, GMSKVals, RX_BLOCK_SIZE);
-#else
-        ::arm_fir_fast_q15(&m_gaussianFilter, samples, GMSKVals, RX_BLOCK_SIZE);
-#endif
-        dstarRX.samples(GMSKVals, rssi, RX_BLOCK_SIZE);
-      }
+      if (m_dstarEnable)
+        dstarRX.samples(dcVals, rssi, RX_BLOCK_SIZE);
     } else if (m_modemState == STATE_DMR) {
       if (m_dmrEnable) {
-        q15_t 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
           if (m_tx)
-            dmrRX.samples(DMRVals, rssi, control, RX_BLOCK_SIZE);
+            dmrRX.samples(vals, rssi, control, RX_BLOCK_SIZE);
           else
-            dmrIdleRX.samples(DMRVals, RX_BLOCK_SIZE);
+            dmrIdleRX.samples(vals, RX_BLOCK_SIZE);
         } else {
-          dmrDMORX.samples(DMRVals, rssi, RX_BLOCK_SIZE);
+          dmrDMORX.samples(vals, rssi, RX_BLOCK_SIZE);
         }
       }
     } else if (m_modemState == STATE_YSF) {
-      if (m_ysfEnable) {
-        q15_t YSFVals[RX_BLOCK_SIZE];
-#if defined(USE_DCBLOCKER)
-        ::arm_fir_fast_q15(&m_rrcFilter, dcSamples, YSFVals, RX_BLOCK_SIZE);
-#else
-        ::arm_fir_fast_q15(&m_rrcFilter, samples, YSFVals, RX_BLOCK_SIZE);
-#endif
-        ysfRX.samples(YSFVals, rssi, RX_BLOCK_SIZE);
-      }
+      if (m_ysfEnable)
+        ysfRX.samples(dcVals, rssi, RX_BLOCK_SIZE);
     } else if (m_modemState == STATE_P25) {
-      if (m_p25Enable) {
-        q15_t P25Vals[RX_BLOCK_SIZE];
-#if defined(USE_DCBLOCKER)
-        ::arm_fir_fast_q15(&m_boxcarFilter, dcSamples, P25Vals, RX_BLOCK_SIZE);
-#else
-        ::arm_fir_fast_q15(&m_boxcarFilter, samples, P25Vals, RX_BLOCK_SIZE);
-#endif
-        p25RX.samples(P25Vals, rssi, RX_BLOCK_SIZE);
-      }
-    } else if (m_modemState == STATE_NXDN) {
-      if (m_nxdnEnable) {
-        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);
-
-        nxdnRX.samples(NXDNVals, rssi, RX_BLOCK_SIZE);
-      }
-    } else if (m_modemState == STATE_FM) {
-      bool cos = getCOSInt();
-#if defined(USE_DCBLOCKER)
-      fm.samples(cos, dcSamples, RX_BLOCK_SIZE);
-#else
-      fm.samples(cos, samples, RX_BLOCK_SIZE);
-#endif
+      if (m_p25Enable)
+        p25RX.samples(dcVals, rssi, RX_BLOCK_SIZE);
     } 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);
+      calDStarRX.samples(vals, RX_BLOCK_SIZE);
     } else if (m_modemState == STATE_RSSICAL) {
       calRSSI.samples(rssi, RX_BLOCK_SIZE);
     }
@@ -454,7 +302,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;
@@ -471,15 +318,6 @@ void CIO::write(MMDVM_STATE mode, q15_t* samples, uint16_t length, const uint8_t
     case STATE_P25:
       txLevel = m_p25TXLevel;
       break;
-    case STATE_NXDN:
-      txLevel = m_nxdnTXLevel;
-      break;
-    case STATE_POCSAG:
-      txLevel = m_pocsagTXLevel;
-      break;
-    case STATE_FM:
-      txLevel = m_fmTXLevel;
-      break;
     default:
       txLevel = m_cwIdTXLevel;
       break;
@@ -495,9 +333,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]);
   }
 }
 
@@ -521,30 +359,24 @@ void CIO::setADCDetection(bool detect)
 
 void CIO::setMode()
 {
-#if defined(MODE_LEDS)
+#if defined(ARDUINO_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);
-  setFMInt(m_modemState == STATE_FM);
 #endif
 }
 
-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, uint8_t fmTXLevel, int16_t txDCOffset, int16_t rxDCOffset)
+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, int16_t txDCOffset, int16_t rxDCOffset)
 {
   m_pttInvert = pttInvert;
 
-  m_rxLevel       = q15_t(rxLevel * 128);
-  m_cwIdTXLevel   = q15_t(cwIdTXLevel * 128);
-  m_dstarTXLevel  = q15_t(dstarTXLevel * 128);
-  m_dmrTXLevel    = q15_t(dmrTXLevel * 128);
-  m_ysfTXLevel    = q15_t(ysfTXLevel * 128);
-  m_p25TXLevel    = q15_t(p25TXLevel * 128);
-  m_nxdnTXLevel   = q15_t(nxdnTXLevel * 128);
-  m_pocsagTXLevel = q15_t(pocsagTXLevel * 128);
-  m_fmTXLevel     = q15_t(fmTXLevel * 128);
+  m_rxLevel      = q15_t(rxLevel * 128);
+  m_cwIdTXLevel  = q15_t(cwIdTXLevel * 128);
+  m_dstarTXLevel = q15_t(dstarTXLevel * 128);
+  m_dmrTXLevel   = q15_t(dmrTXLevel * 128);
+  m_ysfTXLevel   = q15_t(ysfTXLevel * 128);
+  m_p25TXLevel   = q15_t(p25TXLevel * 128);
 
   m_rxDCOffset   = DC_OFFSET + rxDCOffset;
   m_txDCOffset   = DC_OFFSET + txDCOffset;
@@ -553,12 +385,10 @@ void CIO::setParameters(bool rxInvert, bool txInvert, bool pttInvert, uint8_t rx
     m_rxLevel = -m_rxLevel;
   
   if (txInvert) {
-    m_dstarTXLevel  = -m_dstarTXLevel;
-    m_dmrTXLevel    = -m_dmrTXLevel;
-    m_ysfTXLevel    = -m_ysfTXLevel;
-    m_p25TXLevel    = -m_p25TXLevel;
-    m_nxdnTXLevel   = -m_nxdnTXLevel;
-    m_pocsagTXLevel = -m_pocsagTXLevel;
+    m_dstarTXLevel = -m_dstarTXLevel;
+    m_dmrTXLevel   = -m_dmrTXLevel;
+    m_ysfTXLevel   = -m_ysfTXLevel;
+    m_p25TXLevel   = -m_p25TXLevel;
   }
 }
 
@@ -595,3 +425,4 @@ bool CIO::hasLockout() const
 {
   return m_lockout;
 }
+

IO.h

@@ -1,5 +1,5 @@
 /*
- *   Copyright (C) 2015,2016,2017,2018,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
@@ -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:
@@ -46,7 +42,7 @@ public:
   
   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 pocsagTXLevel, uint8_t fmTXLevel, int16_t txDCOffset, int16_t rxDCOffset);
+  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, int16_t txDCOffset, int16_t rxDCOffset);
 
   void getOverflow(bool& adcOverflow, bool& dacOverflow);
 
@@ -61,25 +57,17 @@ public:
   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;
 
   arm_biquad_casd_df1_inst_q31 m_dcFilter;
   q31_t                        m_dcState[4];
 
-  arm_fir_instance_q15 m_rrcFilter;
-  arm_fir_instance_q15 m_gaussianFilter;
   arm_fir_instance_q15 m_boxcarFilter;
-  arm_fir_instance_q15 m_nxdnFilter;
-  arm_fir_instance_q15 m_nxdnISincFilter;
-  q15_t                m_rrcState[70U];           // NoTaps + BlockSize - 1, 42 + 20 - 1 plus some spare
-  q15_t                m_gaussianState[40U];      // NoTaps + BlockSize - 1, 12 + 20 - 1 plus some spare
   q15_t                m_boxcarState[30U];        // NoTaps + BlockSize - 1, 6 + 20 - 1 plus some spare
-  q15_t                m_nxdnState[110U];         // NoTaps + BlockSize - 1, 82 + 20 - 1 plus some spare
-  q15_t                m_nxdnISincState[60U];     // NoTaps + BlockSize - 1, 32 + 20 - 1 plus some spare
 
   bool                 m_pttInvert;
   q15_t                m_rxLevel;
@@ -88,9 +76,6 @@ private:
   q15_t                m_dmrTXLevel;
   q15_t                m_ysfTXLevel;
   q15_t                m_p25TXLevel;
-  q15_t                m_nxdnTXLevel;
-  q15_t                m_pocsagTXLevel;
-  q15_t                m_fmTXLevel;
 
   uint16_t             m_rxDCOffset;
   uint16_t             m_txDCOffset;
@@ -121,11 +106,9 @@ private:
   void setDMRInt(bool on);
   void setYSFInt(bool on);
   void setP25Int(bool on);
-  void setNXDNInt(bool on);
-  void setPOCSAGInt(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 by Jonathan Naylor G4KLX
  *   Copyright (C) 2015 by Jim Mclaughlin KI6ZUM
  *   Copyright (C) 2016 by Colin Durbridge G4EML
  *
@@ -33,9 +33,6 @@
 #define PIN_DMR                17
 #define PIN_YSF                18
 #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
@@ -49,9 +46,6 @@
 #define PIN_DMR                8
 #define PIN_YSF                7
 #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
@@ -67,9 +61,6 @@
 #define PIN_DMR                8
 #define PIN_YSF                7
 #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
@@ -98,21 +89,12 @@ void CIO::initInt()
   pinMode(PIN_LED,    OUTPUT);
   pinMode(PIN_COS,    INPUT);
 
-#if defined(MODE_LEDS)
+#if defined(ARDUINO_MODE_PINS)
   // Set up the mode output pins
   pinMode(PIN_DSTAR,  OUTPUT);
   pinMode(PIN_DMR,    OUTPUT);
   pinMode(PIN_YSF,    OUTPUT);
   pinMode(PIN_P25,    OUTPUT);
-#if !defined(USE_ALTERNATE_NXDN_LEDS)
-  pinMode(PIN_NXDN,   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
 }
 
@@ -158,11 +140,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.
@@ -185,13 +167,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]);
@@ -243,36 +226,6 @@ void CIO::setP25Int(bool on)
   digitalWrite(PIN_P25, on ? HIGH : LOW);
 }
 
-void CIO::setNXDNInt(bool on)
-{
-#if defined(USE_ALTERNATE_NXDN_LEDS)
-  digitalWrite(PIN_YSF, on ? HIGH : LOW);
-  digitalWrite(PIN_P25, on ? HIGH : LOW);
-#else
-  digitalWrite(PIN_NXDN, on ? HIGH : LOW);
-#endif
-}
-
-void CIO::setPOCSAGInt(bool on)
-{
-#if defined(USE_ALTERNATE_POCSAG_LEDS)
-  digitalWrite(PIN_DSTAR, on ? HIGH : LOW);
-  digitalWrite(PIN_DMR,   on ? HIGH : LOW);
-#else
-  digitalWrite(PIN_POCSAG, on ? HIGH : LOW);
-#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);

IOPins.h

@@ -1,70 +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(DRCC_DVM_NQF)
-    #include "pins/pins_f4_drcc_nqf.h"
-
-#else
-    #error "A valid board type macro need to be defined."
-
-#endif
-
-#endif  //#ifndef _IO_PINS_H

IOSTM.cpp

@@ -1,8 +1,7 @@
 /*
  *   Copyright (C) 2016 by Jim McLaughlin KI6ZUM
- *   Copyright (C) 2016,2017,2018 by Andy Uribe CA6JAU
- *   Copyright (C) 2017,2018,2020 by Jonathan Naylor G4KLX
- *   Copyright (C) 2019,2020 by BG5HHP
+ *   Copyright (C) 2016, 2017 by Andy Uribe CA6JAU
+ *   Copyright (C) 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
@@ -24,13 +23,557 @@
 #include "IO.h"
 
 #if defined(STM32F4XX) || defined(STM32F7XX)
-#include "IOPins.h"
 
+#if defined(STM32F4_DISCOVERY)
+/*
+Pin definitions for STM32F4 Discovery Board:
+
+PTT      PB13   output           P1 Pin37
+COSLED   PA7    output           P1 Pin17
+LED      PD15   output           P1 Pin47
+COS      PA5    input            P1 Pin15
+
+DSTAR    PD12   output           P1 Pin44
+DMR      PD13   output           P1 Pin45
+YSF      PD14   output           P1 Pin46
+P25      PD11   output           P1 Pin43
+
+RX       PA0    analog input     P1 Pin12
+RSSI     PA1    analog input     P1 Pin11
+TX       PA4    analog output    P1 Pin16
+
+EXT_CLK  PA15   input            P2 Pin40
+*/
+
+#define PIN_COS           GPIO_Pin_5
+#define PORT_COS          GPIOA
+#define RCC_Per_COS       RCC_AHB1Periph_GPIOA
+
+#define PIN_PTT           GPIO_Pin_13
+#define PORT_PTT          GPIOB
+#define RCC_Per_PTT       RCC_AHB1Periph_GPIOB
+
+#define PIN_COSLED        GPIO_Pin_7
+#define PORT_COSLED       GPIOA
+#define RCC_Per_COSLED    RCC_AHB1Periph_GPIOA
+
+#define PIN_LED           GPIO_Pin_15
+#define PORT_LED          GPIOD
+#define RCC_Per_LED       RCC_AHB1Periph_GPIOD
+
+#define PIN_P25           GPIO_Pin_11
+#define PORT_P25          GPIOD
+#define RCC_Per_P25       RCC_AHB1Periph_GPIOD
+
+#define PIN_DSTAR         GPIO_Pin_12
+#define PORT_DSTAR        GPIOD
+#define RCC_Per_DSTAR     RCC_AHB1Periph_GPIOD
+
+#define PIN_DMR           GPIO_Pin_13
+#define PORT_DMR          GPIOD
+#define RCC_Per_DMR       RCC_AHB1Periph_GPIOD
+
+#define PIN_YSF           GPIO_Pin_14
+#define PORT_YSF          GPIOD
+#define RCC_Per_YSF       RCC_AHB1Periph_GPIOD
+
+#define PIN_EXT_CLK       GPIO_Pin_15
+#define SRC_EXT_CLK       GPIO_PinSource15
+#define PORT_EXT_CLK      GPIOA
+
+#define PIN_RX            GPIO_Pin_0
+#define PIN_RX_CH         ADC_Channel_0
+#define PORT_RX           GPIOA
+#define RCC_Per_RX        RCC_AHB1Periph_GPIOA
+
+#define PIN_RSSI          GPIO_Pin_1
+#define PIN_RSSI_CH       ADC_Channel_1
+#define PORT_RSSI         GPIOA
+#define RCC_Per_RSSI      RCC_AHB1Periph_GPIOA
+
+#define PIN_TX            GPIO_Pin_4
+#define PIN_TX_CH         DAC_Channel_1
+
+#elif defined(STM32F4_PI)
+/*
+Pin definitions for STM32F4 Pi Board:
+
+PTT      PB13   output
+COSLED   PB14   output
+LED      PB15   output
+COS      PC0    input
+
+DSTAR    PC7    output
+DMR      PC8    output
+YSF      PA8    output
+P25      PC9    output
+
+RX       PA0    analog input
+RSSI     PA7    analog input
+TX       PA4    analog output
+
+EXT_CLK  PA15   input
+*/
+
+#define PIN_COS           GPIO_Pin_0
+#define PORT_COS          GPIOC
+#define RCC_Per_COS       RCC_AHB1Periph_GPIOC
+
+#define PIN_PTT           GPIO_Pin_13
+#define PORT_PTT          GPIOB
+#define RCC_Per_PTT       RCC_AHB1Periph_GPIOB
+
+#define PIN_COSLED        GPIO_Pin_14
+#define PORT_COSLED       GPIOB
+#define RCC_Per_COSLED    RCC_AHB1Periph_GPIOB
+
+#define PIN_LED           GPIO_Pin_15
+#define PORT_LED          GPIOB
+#define RCC_Per_LED       RCC_AHB1Periph_GPIOB
+
+#define PIN_P25           GPIO_Pin_9
+#define PORT_P25          GPIOC
+#define RCC_Per_P25       RCC_AHB1Periph_GPIOC
+
+#define PIN_DSTAR         GPIO_Pin_7
+#define PORT_DSTAR        GPIOC
+#define RCC_Per_DSTAR     RCC_AHB1Periph_GPIOC
+
+#define PIN_DMR           GPIO_Pin_8
+#define PORT_DMR          GPIOC
+#define RCC_Per_DMR       RCC_AHB1Periph_GPIOC
+
+#define PIN_YSF           GPIO_Pin_8
+#define PORT_YSF          GPIOA
+#define RCC_Per_YSF       RCC_AHB1Periph_GPIOA
+
+#define PIN_EXT_CLK       GPIO_Pin_15
+#define SRC_EXT_CLK       GPIO_PinSource15
+#define PORT_EXT_CLK      GPIOA
+
+#define PIN_RX            GPIO_Pin_0
+#define PIN_RX_CH         ADC_Channel_0
+#define PORT_RX           GPIOA
+#define RCC_Per_RX        RCC_AHB1Periph_GPIOA
+
+#define PIN_RSSI          GPIO_Pin_7
+#define PIN_RSSI_CH       ADC_Channel_7
+#define PORT_RSSI         GPIOA
+#define RCC_Per_RSSI      RCC_AHB1Periph_GPIOA
+
+#define PIN_TX            GPIO_Pin_4
+#define PIN_TX_CH         DAC_Channel_1
+
+#elif defined(STM32F722_PI)
+/*
+Pin definitions for STM32F722 Pi Board:
+
+PTT      PB13   output
+COSLED   PB14   output
+LED      PB15   output
+COS      PC0    input
+
+DSTAR    PC7    output
+DMR      PC8    output
+YSF      PA8    output
+P25      PC9    output
+
+RX       PA0    analog input
+RSSI     PA7    analog input
+TX       PA4    analog output
+
+EXT_CLK  PA15   input
+*/
+
+#define PIN_COS           GPIO_Pin_0
+#define PORT_COS          GPIOC
+#define RCC_Per_COS       RCC_AHB1Periph_GPIOC
+
+#define PIN_PTT           GPIO_Pin_13
+#define PORT_PTT          GPIOB
+#define RCC_Per_PTT       RCC_AHB1Periph_GPIOB
+
+#define PIN_COSLED        GPIO_Pin_14
+#define PORT_COSLED       GPIOB
+#define RCC_Per_COSLED    RCC_AHB1Periph_GPIOB
+
+#define PIN_LED           GPIO_Pin_15
+#define PORT_LED          GPIOB
+#define RCC_Per_LED       RCC_AHB1Periph_GPIOB
+
+#define PIN_P25           GPIO_Pin_9
+#define PORT_P25          GPIOC
+#define RCC_Per_P25       RCC_AHB1Periph_GPIOC
+
+#define PIN_DSTAR         GPIO_Pin_7
+#define PORT_DSTAR        GPIOC
+#define RCC_Per_DSTAR     RCC_AHB1Periph_GPIOC
+
+#define PIN_DMR           GPIO_Pin_8
+#define PORT_DMR          GPIOC
+#define RCC_Per_DMR       RCC_AHB1Periph_GPIOC
+
+#define PIN_YSF           GPIO_Pin_8
+#define PORT_YSF          GPIOA
+#define RCC_Per_YSF       RCC_AHB1Periph_GPIOA
+
+#define PIN_EXT_CLK       GPIO_Pin_15
+#define SRC_EXT_CLK       GPIO_PinSource15
+#define PORT_EXT_CLK      GPIOA
+
+#define PIN_RX            GPIO_Pin_0
+#define PIN_RX_CH         ADC_Channel_0
+#define PORT_RX           GPIOA
+#define RCC_Per_RX        RCC_AHB1Periph_GPIOA
+
+#define PIN_RSSI          GPIO_Pin_7
+#define PIN_RSSI_CH       ADC_Channel_7
+#define PORT_RSSI         GPIOA
+#define RCC_Per_RSSI      RCC_AHB1Periph_GPIOA
+
+#define PIN_TX            GPIO_Pin_4
+#define PIN_TX_CH         DAC_Channel_1
+
+#elif defined(STM32F4_F4M)
+/*
+Pin definitions for MMDVM-F4M Pi-Hat F0DEI board:
+
+PTT      PB13   output
+COSLED   PB14   output
+LED      PB15   output
+COS      PC0    input
+
+DSTAR    PC7    output
+DMR      PC8    output
+YSF      PA8    output
+P25      PC9    output
+
+RX       PA0    analog input
+RSSI     PA7    analog input
+TX       PA4    analog output
+
+EXT_CLK  PA15   input
+*/
+
+#define PIN_COS           GPIO_Pin_0
+#define PORT_COS          GPIOC
+#define RCC_Per_COS       RCC_AHB1Periph_GPIOC
+
+#define PIN_PTT           GPIO_Pin_13
+#define PORT_PTT          GPIOB
+#define RCC_Per_PTT       RCC_AHB1Periph_GPIOB
+
+#define PIN_COSLED        GPIO_Pin_14
+#define PORT_COSLED       GPIOB
+#define RCC_Per_COSLED    RCC_AHB1Periph_GPIOB
+
+#define PIN_LED           GPIO_Pin_15
+#define PORT_LED          GPIOB
+#define RCC_Per_LED       RCC_AHB1Periph_GPIOB
+
+#define PIN_P25           GPIO_Pin_9
+#define PORT_P25          GPIOC
+#define RCC_Per_P25       RCC_AHB1Periph_GPIOC
+
+#define PIN_DSTAR         GPIO_Pin_7
+#define PORT_DSTAR        GPIOC
+#define RCC_Per_DSTAR     RCC_AHB1Periph_GPIOC
+
+#define PIN_DMR           GPIO_Pin_8
+#define PORT_DMR          GPIOC
+#define RCC_Per_DMR       RCC_AHB1Periph_GPIOC
+
+#define PIN_YSF           GPIO_Pin_8
+#define PORT_YSF          GPIOA
+#define RCC_Per_YSF       RCC_AHB1Periph_GPIOA
+
+#define PIN_EXT_CLK       GPIO_Pin_15
+#define SRC_EXT_CLK       GPIO_PinSource15
+#define PORT_EXT_CLK      GPIOA
+
+#define PIN_RX            GPIO_Pin_0
+#define PIN_RX_CH         ADC_Channel_0
+#define PORT_RX           GPIOA
+#define RCC_Per_RX        RCC_AHB1Periph_GPIOA
+
+#define PIN_RSSI          GPIO_Pin_7
+#define PIN_RSSI_CH       ADC_Channel_7
+#define PORT_RSSI         GPIOA
+#define RCC_Per_RSSI      RCC_AHB1Periph_GPIOA
+
+#define PIN_TX            GPIO_Pin_4
+#define PIN_TX_CH         DAC_Channel_1
+
+#elif defined(STM32F4_NUCLEO)
+
+#if defined(STM32F4_NUCLEO_MORPHO_HEADER)
+/*
+Pin definitions for STM32F4 Nucleo boards (ST Morpho header):
+
+PTT      PB13   output           CN10 Pin30
+COSLED   PB14   output           CN10 Pin28
+LED      PA5    output           CN10 Pin11
+COS      PB15   input            CN10 Pin26
+
+DSTAR    PB10   output           CN10 Pin25
+DMR      PB4    output           CN10 Pin27
+YSF      PB5    output           CN10 Pin29
+P25      PB3    output           CN10 Pin31
+
+MDSTAR   PC4    output           CN10 Pin34
+MDMR     PC5    output           CN10 Pin6
+MYSF     PC2    output           CN7 Pin35
+MP25     PC3    output           CN7 Pin37
+
+RX       PA0    analog input     CN7 Pin28
+RSSI     PA1    analog input     CN7 Pin30
+TX       PA4    analog output    CN7 Pin32
+
+EXT_CLK  PA15   input            CN7 Pin17
+*/
+
+#define PIN_COS           GPIO_Pin_15
+#define PORT_COS          GPIOB
+#define RCC_Per_COS       RCC_AHB1Periph_GPIOB
+
+#define PIN_PTT           GPIO_Pin_13
+#define PORT_PTT          GPIOB
+#define RCC_Per_PTT       RCC_AHB1Periph_GPIOB
+
+#define PIN_COSLED        GPIO_Pin_14
+#define PORT_COSLED       GPIOB
+#define RCC_Per_COSLED    RCC_AHB1Periph_GPIOB
+
+#define PIN_LED           GPIO_Pin_5
+#define PORT_LED          GPIOA
+#define RCC_Per_LED       RCC_AHB1Periph_GPIOA
+
+#define PIN_P25           GPIO_Pin_3
+#define PORT_P25          GPIOB
+#define RCC_Per_P25       RCC_AHB1Periph_GPIOB
+
+#define PIN_DSTAR         GPIO_Pin_10
+#define PORT_DSTAR        GPIOB
+#define RCC_Per_DSTAR     RCC_AHB1Periph_GPIOB
+
+#define PIN_DMR           GPIO_Pin_4
+#define PORT_DMR          GPIOB
+#define RCC_Per_DMR       RCC_AHB1Periph_GPIOB
+
+#define PIN_YSF           GPIO_Pin_5
+#define PORT_YSF          GPIOB
+#define RCC_Per_YSF       RCC_AHB1Periph_GPIOB
+
+#if defined(STM32F4_NUCLEO_MODE_PINS)
+#define PIN_MP25          GPIO_Pin_3
+#define PORT_MP25         GPIOC
+#define RCC_Per_MP25      RCC_AHB1Periph_GPIOC
+
+#define PIN_MDSTAR        GPIO_Pin_4
+#define PORT_MDSTAR       GPIOC
+#define RCC_Per_MDSTAR    RCC_AHB1Periph_GPIOC
+
+#define PIN_MDMR          GPIO_Pin_5
+#define PORT_MDMR         GPIOC
+#define RCC_Per_MDMR      RCC_AHB1Periph_GPIOC
+
+#define PIN_MYSF          GPIO_Pin_2
+#define PORT_MYSF         GPIOC
+#define RCC_Per_MYSF      RCC_AHB1Periph_GPIOC
+#endif
+
+#define PIN_EXT_CLK       GPIO_Pin_15
+#define SRC_EXT_CLK       GPIO_PinSource15
+#define PORT_EXT_CLK      GPIOA
+
+#define PIN_RX            GPIO_Pin_0
+#define PIN_RX_CH         ADC_Channel_0
+#define PORT_RX           GPIOA
+#define RCC_Per_RX        RCC_AHB1Periph_GPIOA
+
+#define PIN_RSSI          GPIO_Pin_1
+#define PIN_RSSI_CH       ADC_Channel_1
+#define PORT_RSSI         GPIOA
+#define RCC_Per_RSSI      RCC_AHB1Periph_GPIOA
+
+#define PIN_TX            GPIO_Pin_4
+#define PIN_TX_CH         DAC_Channel_1
+
+#elif defined(STM32F4_NUCLEO_ARDUINO_HEADER)
+/*
+Pin definitions for STM32F4 Nucleo boards (Arduino header):
+
+PTT      PB10   output           CN9 Pin7
+COSLED   PB3    output           CN9 Pin4
+LED      PB5    output           CN9 Pin5
+COS      PB4    input            CN9 Pin6
+
+DSTAR    PA1    output           CN8 Pin2
+DMR      PA4    output           CN8 Pin3
+YSF      PB0    output           CN8 Pin4
+P25      PC1    output           CN8 Pin5
+
+RX       PA0    analog input     CN8 Pin1
+RSSI     PC0    analog input     CN8 Pin6
+TX       PA5    analog output    CN5 Pin6
+
+EXT_CLK  PB8    input            CN5 Pin10
+*/
+
+#define PIN_COS           GPIO_Pin_4
+#define PORT_COS          GPIOB
+#define RCC_Per_COS       RCC_AHB1Periph_GPIOB
+
+#define PIN_PTT           GPIO_Pin_10
+#define PORT_PTT          GPIOB
+#define RCC_Per_PTT       RCC_AHB1Periph_GPIOB
+
+#define PIN_COSLED        GPIO_Pin_3
+#define PORT_COSLED       GPIOB
+#define RCC_Per_COSLED    RCC_AHB1Periph_GPIOB
+
+#define PIN_LED           GPIO_Pin_5
+#define PORT_LED          GPIOB
+#define RCC_Per_LED       RCC_AHB1Periph_GPIOB
+
+#define PIN_P25           GPIO_Pin_1
+#define PORT_P25          GPIOC
+#define RCC_Per_P25       RCC_AHB1Periph_GPIOC
+
+#define PIN_DSTAR         GPIO_Pin_1
+#define PORT_DSTAR        GPIOA
+#define RCC_Per_DSTAR     RCC_AHB1Periph_GPIOA
+
+#define PIN_DMR           GPIO_Pin_4
+#define PORT_DMR          GPIOA
+#define RCC_Per_DMR       RCC_AHB1Periph_GPIOA
+
+#define PIN_YSF           GPIO_Pin_0
+#define PORT_YSF          GPIOB
+#define RCC_Per_YSF       RCC_AHB1Periph_GPIOB
+
+#define PIN_EXT_CLK       GPIO_Pin_8
+#define SRC_EXT_CLK       GPIO_PinSource8
+#define PORT_EXT_CLK      GPIOB
+
+#define PIN_RX            GPIO_Pin_0
+#define PIN_RX_CH         ADC_Channel_0
+#define PORT_RX           GPIOA
+#define RCC_Per_RX        RCC_AHB1Periph_GPIOA
+
+#define PIN_RSSI          GPIO_Pin_0
+#define PIN_RSSI_CH       ADC_Channel_10
+#define PORT_RSSI         GPIOC
+#define RCC_Per_RSSI      RCC_AHB1Periph_GPIOC
+
+#define PIN_TX            GPIO_Pin_5
+#define PIN_TX_CH         DAC_Channel_2
+
+#else
+#error "Either STM32F4_NUCLEO_MORPHO_HEADER or STM32F4_NUCLEO_ARDUINO_HEADER need to be defined in Config.h"
+#endif
+
+#elif defined(STM32F7_NUCLEO)
+/*
+Pin definitions for STM32F7 Nucleo boards (ST Morpho header):
+
+PTT      PB13   output           CN12 Pin30
+COSLED   PB14   output           CN12 Pin28
+LED      PA5    output           CN12 Pin11
+COS      PB15   input            CN12 Pin26
+
+DSTAR    PB10   output           CN12 Pin25
+DMR      PB4    output           CN12 Pin27
+YSF      PB5    output           CN12 Pin29
+P25      PB3    output           CN12 Pin31
+
+MDSTAR   PC4    output           CN12 Pin34
+MDMR     PC5    output           CN12 Pin6
+MYSF     PC2    output           CN11 Pin35
+MP25     PC3    output           CN11 Pin37
+
+RX       PA0    analog input     CN11 Pin28
+RSSI     PA1    analog input     CN11 Pin30
+TX       PA4    analog output    CN11 Pin32
+
+EXT_CLK  PA15   input            CN11 Pin17
+*/
+
+#define PIN_COS           GPIO_Pin_15
+#define PORT_COS          GPIOB
+#define RCC_Per_COS       RCC_AHB1Periph_GPIOB
+
+#define PIN_PTT           GPIO_Pin_13
+#define PORT_PTT          GPIOB
+#define RCC_Per_PTT       RCC_AHB1Periph_GPIOB
+
+#define PIN_COSLED        GPIO_Pin_14
+#define PORT_COSLED       GPIOB
+#define RCC_Per_COSLED    RCC_AHB1Periph_GPIOB
+
+#define PIN_LED           GPIO_Pin_5
+#define PORT_LED          GPIOA
+#define RCC_Per_LED       RCC_AHB1Periph_GPIOA
+
+#define PIN_P25           GPIO_Pin_3
+#define PORT_P25          GPIOB
+#define RCC_Per_P25       RCC_AHB1Periph_GPIOB
+
+#define PIN_DSTAR         GPIO_Pin_10
+#define PORT_DSTAR        GPIOB
+#define RCC_Per_DSTAR     RCC_AHB1Periph_GPIOB
+
+#define PIN_DMR           GPIO_Pin_4
+#define PORT_DMR          GPIOB
+#define RCC_Per_DMR       RCC_AHB1Periph_GPIOB
+
+#define PIN_YSF           GPIO_Pin_5
+#define PORT_YSF          GPIOB
+#define RCC_Per_YSF       RCC_AHB1Periph_GPIOB
+
+#if defined(STM32F4_NUCLEO_MODE_PINS)
+#define PIN_MP25          GPIO_Pin_3
+#define PORT_MP25         GPIOC
+#define RCC_Per_MP25      RCC_AHB1Periph_GPIOC
+
+#define PIN_MDSTAR        GPIO_Pin_4
+#define PORT_MDSTAR       GPIOC
+#define RCC_Per_MDSTAR    RCC_AHB1Periph_GPIOC
+
+#define PIN_MDMR          GPIO_Pin_5
+#define PORT_MDMR         GPIOC
+#define RCC_Per_MDMR      RCC_AHB1Periph_GPIOC
+
+#define PIN_MYSF          GPIO_Pin_2
+#define PORT_MYSF         GPIOC
+#define RCC_Per_MYSF      RCC_AHB1Periph_GPIOC
+#endif
+
+#define PIN_EXT_CLK       GPIO_Pin_15
+#define SRC_EXT_CLK       GPIO_PinSource15
+#define PORT_EXT_CLK      GPIOA
+
+#define PIN_RX            GPIO_Pin_0
+#define PIN_RX_CH         ADC_Channel_0
+#define PORT_RX           GPIOA
+#define RCC_Per_RX        RCC_AHB1Periph_GPIOA
+
+#define PIN_RSSI          GPIO_Pin_1
+#define PIN_RSSI_CH       ADC_Channel_1
+#define PORT_RSSI         GPIOA
+#define RCC_Per_RSSI      RCC_AHB1Periph_GPIOA
+
+#define PIN_TX            GPIO_Pin_4
+#define PIN_TX_CH         DAC_Channel_1
+
+#else
+#error "Either STM32F4_DISCOVERY, STM32F4_PI, STM32F722_PI, STM32F4_F4M, STM32F4_NUCLEO or STM32F7_NUCLEO need to be defined"
+#endif
 
 const uint16_t DC_OFFSET = 2048U;
 
 // Sampling frequency
-#define SAMP_FREQ   24000
+#define SAMP_FREQ   48000
 
 extern "C" {
    void TIM2_IRQHandler() {
@@ -73,7 +616,7 @@ void CIO::initInt()
    GPIO_InitStruct.GPIO_Mode  = GPIO_Mode_IN;
    GPIO_Init(PORT_COS, &GPIO_InitStruct);
 
-#if defined(MODE_LEDS)
+#if defined(ARDUINO_MODE_PINS)
    // DSTAR pin
    RCC_AHB1PeriphClockCmd(RCC_Per_DSTAR, ENABLE);
    GPIO_InitStruct.GPIO_Pin   = PIN_DSTAR;
@@ -97,34 +640,9 @@ void CIO::initInt()
    GPIO_InitStruct.GPIO_Pin   = PIN_P25;
    GPIO_InitStruct.GPIO_Mode  = GPIO_Mode_OUT;
    GPIO_Init(PORT_P25, &GPIO_InitStruct);
-
-#if !defined(USE_ALTERNATE_NXDN_LEDS)
-   // NXDN pin
-   RCC_AHB1PeriphClockCmd(RCC_Per_NXDN, ENABLE);
-   GPIO_InitStruct.GPIO_Pin   = PIN_NXDN;
-   GPIO_InitStruct.GPIO_Mode  = GPIO_Mode_OUT;
-   GPIO_Init(PORT_NXDN, &GPIO_InitStruct);
 #endif
 
-#if !defined(USE_ALTERNATE_POCSAG_LEDS)
-   // POCSAG pin
-   RCC_AHB1PeriphClockCmd(RCC_Per_POCSAG, ENABLE);
-   GPIO_InitStruct.GPIO_Pin   = PIN_POCSAG;
-   GPIO_InitStruct.GPIO_Mode  = GPIO_Mode_OUT;
-   GPIO_Init(PORT_POCSAG, &GPIO_InitStruct);
-#endif
-
-#if !defined(USE_ALTERNATE_FM_LEDS)
-   // FM pin
-   RCC_AHB1PeriphClockCmd(RCC_Per_FM, ENABLE);
-   GPIO_InitStruct.GPIO_Pin   = PIN_FM;
-   GPIO_InitStruct.GPIO_Mode  = GPIO_Mode_OUT;
-   GPIO_Init(PORT_FM, &GPIO_InitStruct);
-#endif
-
-#endif
-
-#if defined(MODE_PINS) && defined(STM32F4_NUCLEO_MORPHO_HEADER) && (defined(STM32F4_NUCLEO) || defined(STM32F722_RPT_HAT))
+#if defined(STM32F4_NUCLEO_MODE_PINS) && defined(STM32F4_NUCLEO_MORPHO_HEADER) && defined(STM32F4_NUCLEO)
    // DSTAR mode pin
    RCC_AHB1PeriphClockCmd(RCC_Per_MDSTAR, ENABLE);
    GPIO_InitStruct.GPIO_Pin   = PIN_MDSTAR;
@@ -148,31 +666,6 @@ void CIO::initInt()
    GPIO_InitStruct.GPIO_Pin   = PIN_MP25;
    GPIO_InitStruct.GPIO_Mode  = GPIO_Mode_OUT;
    GPIO_Init(PORT_MP25, &GPIO_InitStruct);
-
-#if !defined(USE_ALTERNATE_NXDN_LEDS)
-   // NXDN mode pin
-   RCC_AHB1PeriphClockCmd(RCC_Per_MNXDN, ENABLE);
-   GPIO_InitStruct.GPIO_Pin   = PIN_MNXDN;
-   GPIO_InitStruct.GPIO_Mode  = GPIO_Mode_OUT;
-   GPIO_Init(PORT_MNXDN, &GPIO_InitStruct);
-#endif
-
-#if !defined(USE_ALTERNATE_POCSAG_LEDS)
-   // POCSAG mode pin
-   RCC_AHB1PeriphClockCmd(RCC_Per_MPOCSAG, ENABLE);
-   GPIO_InitStruct.GPIO_Pin   = PIN_MPOCSAG;
-   GPIO_InitStruct.GPIO_Mode  = GPIO_Mode_OUT;
-   GPIO_Init(PORT_MPOCSAG, &GPIO_InitStruct);
-#endif
-
-#if !defined(USE_ALTERNATE_FM_LEDS)
-   // FM mode pin
-   RCC_AHB1PeriphClockCmd(RCC_Per_MFM, ENABLE);
-   GPIO_InitStruct.GPIO_Pin   = PIN_MFM;
-   GPIO_InitStruct.GPIO_Mode  = GPIO_Mode_OUT;
-   GPIO_Init(PORT_MFM, &GPIO_InitStruct);
-#endif
-
 #endif
 }
 
@@ -326,24 +819,25 @@ void CIO::startInt()
 
 void CIO::interrupt()
 {
-   TSample sample = {DC_OFFSET, MARK_NONE};
+   uint8_t control  = MARK_NONE;
+   uint16_t sample  = DC_OFFSET;
    uint16_t rawRSSI = 0U;
 
-   m_txBuffer.get(sample);
+   m_txBuffer.get(sample, control);
 
    // Send the value to the DAC
 #if defined(STM32F4_NUCLEO) && defined(STM32F4_NUCLEO_ARDUINO_HEADER)
-   DAC_SetChannel2Data(DAC_Align_12b_R, sample.sample);
+   DAC_SetChannel2Data(DAC_Align_12b_R, sample);
 #else
-   DAC_SetChannel1Data(DAC_Align_12b_R, sample.sample);
+   DAC_SetChannel1Data(DAC_Align_12b_R, sample);
 #endif
 
    // Read value from ADC1 and ADC2
    if ((ADC_GetFlagStatus(ADC1, ADC_FLAG_EOC) == RESET)) {
       // shouldn't be still in reset at this point so null the sample value?
-      sample.sample  = 0U;
+      sample  = 0U;
    } else {
-      sample.sample  = ADC_GetConversionValue(ADC1);
+      sample  = ADC_GetConversionValue(ADC1);
 #if defined(SEND_RSSI_DATA)
       rawRSSI = ADC_GetConversionValue(ADC2);
 #endif
@@ -353,7 +847,7 @@ void CIO::interrupt()
    ADC_ClearFlag(ADC1, ADC_FLAG_EOC);
    ADC_SoftwareStartConv(ADC1);
 
-   m_rxBuffer.put(sample);
+   m_rxBuffer.put(sample, control);
    m_rssiBuffer.put(rawRSSI);
 
    m_watchdog++;
@@ -361,7 +855,7 @@ void CIO::interrupt()
 
 bool CIO::getCOSInt()
 {
-   return GPIO_ReadInputDataBit(PORT_COS, PIN_COS) == Bit_SET;
+   return GPIO_ReadOutputDataBit(PORT_COS, PIN_COS) == Bit_SET;
 }
 
 void CIO::setLEDInt(bool on)
@@ -381,107 +875,36 @@ void CIO::setCOSInt(bool on)
 
 void CIO::setDStarInt(bool on)
 {
-#if defined(MODE_LEDS)
    GPIO_WriteBit(PORT_DSTAR, PIN_DSTAR, on ? Bit_SET : Bit_RESET);
-#endif
-#if defined(MODE_PINS) && defined(STM32F4_NUCLEO_MORPHO_HEADER) && (defined(STM32F4_NUCLEO) || defined(STM32F722_RPT_HAT))
+#if defined(STM32F4_NUCLEO_MODE_PINS) && defined(STM32F4_NUCLEO_MORPHO_HEADER) && defined(STM32F4_NUCLEO)
    GPIO_WriteBit(PORT_MDSTAR, PIN_MDSTAR, on ? Bit_SET : Bit_RESET);
 #endif
 }
 
 void CIO::setDMRInt(bool on)
 {
-#if defined(MODE_LEDS)
    GPIO_WriteBit(PORT_DMR, PIN_DMR, on ? Bit_SET : Bit_RESET);
-#endif
-#if defined(MODE_PINS) && defined(STM32F4_NUCLEO_MORPHO_HEADER) && (defined(STM32F4_NUCLEO) || defined(STM32F722_RPT_HAT))
+#if defined(STM32F4_NUCLEO_MODE_PINS) && defined(STM32F4_NUCLEO_MORPHO_HEADER) && defined(STM32F4_NUCLEO)
    GPIO_WriteBit(PORT_MDMR, PIN_MDMR, on ? Bit_SET : Bit_RESET);
 #endif
 }
 
 void CIO::setYSFInt(bool on)
 {
-#if defined(MODE_LEDS)
    GPIO_WriteBit(PORT_YSF, PIN_YSF, on ? Bit_SET : Bit_RESET);
-#endif
-#if defined(MODE_PINS) && defined(STM32F4_NUCLEO_MORPHO_HEADER) && (defined(STM32F4_NUCLEO) || defined(STM32F722_RPT_HAT))
+#if defined(STM32F4_NUCLEO_MODE_PINS) && defined(STM32F4_NUCLEO_MORPHO_HEADER) && defined(STM32F4_NUCLEO)
    GPIO_WriteBit(PORT_MYSF, PIN_MYSF, on ? Bit_SET : Bit_RESET);
 #endif
 }
 
 void CIO::setP25Int(bool on)
 {
-#if defined(MODE_LEDS)
    GPIO_WriteBit(PORT_P25, PIN_P25, on ? Bit_SET : Bit_RESET);
-#endif
-#if defined(MODE_PINS) && defined(STM32F4_NUCLEO_MORPHO_HEADER) && (defined(STM32F4_NUCLEO) || defined(STM32F722_RPT_HAT))
+#if defined(STM32F4_NUCLEO_MODE_PINS) && defined(STM32F4_NUCLEO_MORPHO_HEADER) && defined(STM32F4_NUCLEO)
    GPIO_WriteBit(PORT_MP25, PIN_MP25, on ? Bit_SET : Bit_RESET);
 #endif
 }
 
-void CIO::setNXDNInt(bool on)
-{
-#if defined(MODE_LEDS)
-#if defined(USE_ALTERNATE_NXDN_LEDS)
-   GPIO_WriteBit(PORT_YSF, PIN_YSF, on ? Bit_SET : Bit_RESET);
-   GPIO_WriteBit(PORT_P25, PIN_P25, on ? Bit_SET : Bit_RESET);
-#else
-   GPIO_WriteBit(PORT_NXDN, PIN_NXDN, on ? Bit_SET : Bit_RESET);
-#endif
-#endif
-
-#if defined(MODE_PINS) && defined(STM32F4_NUCLEO_MORPHO_HEADER) && (defined(STM32F4_NUCLEO) || defined(STM32F722_RPT_HAT))
-#if defined(USE_ALTERNATE_NXDN_LEDS)
-   GPIO_WriteBit(PORT_MYSF, PIN_MYSF, on ? Bit_SET : Bit_RESET);
-   GPIO_WriteBit(PORT_MP25, PIN_MP25, on ? Bit_SET : Bit_RESET);
-#else
-   GPIO_WriteBit(PORT_MNXDN, PIN_MNXDN, on ? Bit_SET : Bit_RESET);
-#endif
-#endif
-}
-
-void CIO::setPOCSAGInt(bool on)
-{
-#if defined(MODE_LEDS)
-#if defined(USE_ALTERNATE_POCSAG_LEDS)
-   GPIO_WriteBit(PORT_DSTAR, PIN_DSTAR, on ? Bit_SET : Bit_RESET);
-   GPIO_WriteBit(PORT_DMR,   PIN_DMR,   on ? Bit_SET : Bit_RESET);
-#else
-   GPIO_WriteBit(PORT_POCSAG,  PIN_POCSAG, on ? Bit_SET : Bit_RESET);
-#endif
-#endif
-
-#if defined(MODE_PINS) && defined(STM32F4_NUCLEO_MORPHO_HEADER) && (defined(STM32F4_NUCLEO) || defined(STM32F722_RPT_HAT))
-#if defined(USE_ALTERNATE_POCSAG_LEDS)
-   GPIO_WriteBit(PORT_MDSTAR, PIN_MDSTAR, on ? Bit_SET : Bit_RESET);
-   GPIO_WriteBit(PORT_MDMR,   PIN_MDMR,   on ? Bit_SET : Bit_RESET);
-#else
-   GPIO_WriteBit(PORT_MPOCSAG, PIN_MPOCSAG, on ? Bit_SET : Bit_RESET);
-#endif
-#endif
-}
-
-void CIO::setFMInt(bool on)
-{
-#if defined(MODE_LEDS)
-#if defined(USE_ALTERNATE_FM_LEDS)
-   GPIO_WriteBit(PORT_DSTAR, PIN_DSTAR, on ? Bit_SET : Bit_RESET);
-   GPIO_WriteBit(PORT_YSF,   PIN_YSF,   on ? Bit_SET : Bit_RESET);
-#else
-   GPIO_WriteBit(PORT_FM,  PIN_FM, on ? Bit_SET : Bit_RESET);
-#endif
-#endif
-
-#if defined(MODE_PINS) && defined(STM32F4_NUCLEO_MORPHO_HEADER) && (defined(STM32F4_NUCLEO) || defined(STM32F722_RPT_HAT))
-#if defined(USE_ALTERNATE_FM_LEDS)
-   GPIO_WriteBit(PORT_MDSTAR, PIN_MDSTAR, on ? Bit_SET : Bit_RESET);
-   GPIO_WriteBit(PORT_MYSF,   PIN_MYSF,   on ? Bit_SET : Bit_RESET);
-#else
-   GPIO_WriteBit(PORT_MFM, PIN_MFM, on ? Bit_SET : Bit_RESET);
-#endif
-#endif
-}
-
 // Simple delay function for STM32
 // Example from: http://thehackerworkshop.com/?p=1209
 void CIO::delayInt(unsigned int dly)

IOSTM_CMSIS.cpp

@@ -1,7 +1,7 @@
 /*
  *   Copyright (C) 2016 by Jim McLaughlin KI6ZUM
  *   Copyright (C) 2016, 2017 by Andy Uribe CA6JAU
- *   Copyright (C) 2017,2018,2020 by Jonathan Naylor G4KLX
+ *   Copyright (C) 2017 by Jonathan Naylor G4KLX
  *   Copyright (C) 2017 by Wojciech Krutnik N0CALL
  *
  *   This program is free software; you can redistribute it and/or modify
@@ -39,9 +39,6 @@ DSTAR    PB7    output
 DMR      PB6    output
 YSF      PB8    output
 P25      PB9    output
-NXDN     PB10   output
-POCSAG   PB11   output
-FM       PB12   output
 
 RX       PB0    analog input (ADC1_8)
 RSSI     PB1    analog input (ADC2_9)
@@ -79,15 +76,6 @@ USART1_RXD PA10  input (AF)
 #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_FM            14
-#define PORT_FM           GPIOB
-#define BB_FM             *((bitband_t)BITBAND_PERIPH(&PORT_FM->ODR, PIN_FM))
 
 #define PIN_RX            0
 #define PIN_RX_ADC_CH     8
@@ -115,7 +103,7 @@ USART1_RXD PA10  input (AF)
 const uint16_t DC_OFFSET = 2048U;
 
 // Sampling frequency
-#define SAMP_FREQ   24000
+#define SAMP_FREQ   48000
 
 extern "C" {
   void TIM2_IRQHandler() {
@@ -158,35 +146,16 @@ void GPIOConfigPin(GPIO_TypeDef *port_ptr, uint32_t pin, uint32_t mode_cnf_value
 #if defined(STM32F1_POG)
 void FancyLEDEffect()
 {
-  int ledCount = 10;
-
-  bitband_t foo[] = {&BB_LED, &BB_COSLED, &BB_PTT, &BB_DMR, &BB_DSTAR, &BB_YSF, &BB_P25,
-#if defined(USE_ALTERNATE_NXDN_LEDS)
-	NULL,
-#else
-	&BB_NXDN,
-#endif
-#if defined(USE_ALTERNATE_POCSAG_LEDS)
-	NULL,
-#else
-  	&BB_POCSAG,
-#endif
-#if defined(USE_ALTERNATE_FM_LEDS)
-	NULL};
-#else
-	&BB_FM};
-#endif
-
-  for(int i=0; i<ledCount; i++){
-    if(foo[i] != NULL)
-      *foo[i] = 0x01;
+  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<ledCount; i++){
-    if(foo[i] != NULL)
-      *foo[i] = 0x00;
+  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);
@@ -195,22 +164,18 @@ void FancyLEDEffect()
   *((bitband_t)BITBAND_PERIPH(&PORT_USART1_TXD->ODR, PIN_USART1_TXD)) = 0x01;
   
   *foo[0] = 0x01;
-  for(int i=1; i<ledCount; i++){
+  for(int i=1; i<7; i++){
     delay(SystemCoreClock/1000*10);
-    if (foo[i-1] != NULL)
-      *foo[i-1] = 0x00;
-    if (foo[i] != NULL)
-      *foo[i] = 0x01;
+    *foo[i-1] = 0x00;
+    *foo[i] = 0x01;
   }
-  for(int i=ledCount - 2; i>=0; i--) {
+  for(int i=5; i>=0; i--){
     delay(SystemCoreClock/1000*10);
-    if (foo[i+1] != NULL)
-      *foo[i+1] = 0x00;
-    if (foo[i] != NULL)
-      *foo[i] = 0x01;
+    *foo[i+1] = 0x00;
+    *foo[i] = 0x01;
   }
   delay(SystemCoreClock/1000*10);
-  *foo[0] = 0x00;
+  *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;
@@ -240,25 +205,16 @@ static inline void GPIOInit()
 	GPIOD->ODR = 0;
   
   // configure ports
-  GPIOConfigPin(PORT_PTT,    PIN_PTT,    GPIO_CRL_MODE0_1);
+  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_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);
   
-  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
-#if !defined(USE_ALTERNATE_FM_LEDS)
-  GPIOConfigPin(PORT_FM,     PIN_FM,     GPIO_CRL_MODE0_1);
-#endif
-
   GPIOConfigPin(PORT_RX, PIN_RX, 0);
 #if defined(SEND_RSSI_DATA)
   GPIOConfigPin(PORT_RSSI, PIN_RSSI, 0);
@@ -397,10 +353,9 @@ void CIO::startInt()
 
 void CIO::interrupt()
 {
-  TSample sample = {DC_OFFSET, MARK_NONE};
-#if defined(SEND_RSSI_DATA)
+  uint8_t control  = MARK_NONE;
+  uint16_t sample  = DC_OFFSET;
   uint16_t rawRSSI = 0U;
-#endif
   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)
@@ -414,12 +369,12 @@ void CIO::interrupt()
     *rssi_adon = 1;
 #endif
     
-    m_txBuffer.get(sample);
-    DAC->DHR12R1 = sample.sample;  // Send the value to the DAC
+    m_txBuffer.get(sample, control);
+    DAC->DHR12R1 = sample;  // Send the value to the DAC
 
     // Read value from ADC1 and ADC2
-    sample.sample  = ADC1->DR;   // read conversion result; EOC is cleared by this read
-    m_rxBuffer.put(sample);
+    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);
@@ -469,36 +424,6 @@ 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::setFMInt(bool on)
-{
-#if defined(USE_ALTERNATE_FM_LEDS)
-  BB_DSTAR = !!on;
-  BB_YSF   = !!on;
-#else
-  BB_FM = !!on;
-#endif
-}
-
 void CIO::delayInt(unsigned int dly)
 {
   delay(dly);

IOTeensy.cpp

@@ -1,5 +1,5 @@
 /*
- *   Copyright (C) 2016,2017,2018,2020 by Jonathan Naylor G4KLX
+ *   Copyright (C) 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
@@ -34,15 +34,6 @@
 #define PIN_DMR                10
 #define PIN_YSF                11
 #define PIN_P25                12
-#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
 
@@ -66,21 +57,12 @@ void CIO::initInt()
   pinMode(PIN_LED,    OUTPUT);
   pinMode(PIN_COS,    INPUT);
 
-#if defined(MODE_LEDS)
+#if defined(ARDUINO_MODE_PINS)
   // Set up the mode output pins
   pinMode(PIN_DSTAR,  OUTPUT);
   pinMode(PIN_DMR,    OUTPUT);
   pinMode(PIN_YSF,    OUTPUT);
   pinMode(PIN_P25,    OUTPUT);
-#if !defined(USE_ALTERNATE_NXDN_LEDS)
-  pinMode(PIN_NXDN,   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
 }
 
@@ -130,7 +112,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
 
@@ -139,14 +121,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
@@ -161,14 +143,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)
@@ -227,36 +210,6 @@ void CIO::setP25Int(bool on)
   digitalWrite(PIN_P25, on ? HIGH : LOW);
 }
 
-void CIO::setNXDNInt(bool on)
-{
-#if defined(USE_ALTERNATE_NXDN_LEDS)
-  digitalWrite(PIN_YSF, on ? HIGH : LOW);
-  digitalWrite(PIN_P25, on ? HIGH : LOW);
-#else
-  digitalWrite(PIN_NXDN, on ? HIGH : LOW);
-#endif
-}
-
-void CIO::setPOCSAGInt(bool on)
-{
-#if defined(USE_ALTERNATE_POCSAG_LEDS)
-  digitalWrite(PIN_DSTAR, on ? HIGH : LOW);
-  digitalWrite(PIN_DMR,   on ? HIGH : LOW);
-#else
-  digitalWrite(PIN_POCSAG, on ? HIGH : LOW);
-#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);

MMDVM.cpp

@@ -1,5 +1,5 @@
 /*
- *   Copyright (C) 2015,2016,2017,2018,2020 by Jonathan Naylor G4KLX
+ *   Copyright (C) 2015,2016,2017 by Jonathan Naylor G4KLX
  *   Copyright (C) 2016 by Mathis Schmieder DB9MAT
  *   Copyright (C) 2016 by Colin Durbridge G4EML
  *
@@ -26,13 +26,10 @@
 // Global variables
 MMDVM_STATE m_modemState = STATE_IDLE;
 
-bool m_dstarEnable  = true;
-bool m_dmrEnable    = true;
-bool m_ysfEnable    = true;
-bool m_p25Enable    = true;
-bool m_nxdnEnable   = true;
-bool m_pocsagEnable = true;
-bool m_fmEnable     = true;
+bool m_dstarEnable = true;
+bool m_dmrEnable   = true;
+bool m_ysfEnable   = true;
+bool m_p25Enable   = true;
 
 bool m_duplex = true;
 
@@ -55,20 +52,10 @@ CYSFTX     ysfTX;
 CP25RX     p25RX;
 CP25TX     p25TX;
 
-CNXDNRX    nxdnRX;
-CNXDNTX    nxdnTX;
-
-CPOCSAGTX  pocsagTX;
-
-CFM        fm;
-
 CCalDStarRX calDStarRX;
 CCalDStarTX calDStarTX;
 CCalDMR     calDMR;
 CCalP25     calP25;
-CCalNXDN    calNXDN;
-CCalFM      calFM;
-CCalPOCSAG  calPOCSAG;
 CCalRSSI    calRSSI;
 
 CCWIdTX cwIdTX;
@@ -104,33 +91,15 @@ void loop()
   if (m_p25Enable && m_modemState == STATE_P25)
     p25TX.process();
 
-  if (m_nxdnEnable && m_modemState == STATE_NXDN)
-    nxdnTX.process();
-
-  if (m_pocsagEnable && (m_modemState == STATE_POCSAG || pocsagTX.busy()))
-    pocsagTX.process();
-
-  if (m_fmEnable && m_modemState == STATE_FM)
-    fm.process();
-
   if (m_modemState == STATE_DSTARCAL)
     calDStarTX.process();
 
-  if (m_modemState == STATE_DMRCAL || m_modemState == STATE_LFCAL || m_modemState == STATE_DMRCAL1K || m_modemState == STATE_DMRDMO1K)
+  if (m_modemState == STATE_DMRCAL || m_modemState == STATE_LFCAL || m_modemState == STATE_DMRCAL1K)
     calDMR.process();
 
   if (m_modemState == STATE_P25CAL1K)
     calP25.process();
 
-  if (m_modemState == STATE_NXDNCAL1K)
-    calNXDN.process();
-
-  if (m_modemState == STATE_POCSAGCAL)
-    calPOCSAG.process();
-
-  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();
-
   if (m_modemState == STATE_IDLE)
     cwIdTX.process();
 }
@@ -144,3 +113,4 @@ int main()
 }
 
 #endif
+

MMDVM.ino

@@ -1,5 +1,5 @@
 /*
- *   Copyright (C) 2015,2016,2017,2018,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
@@ -23,13 +23,10 @@
 // Global variables
 MMDVM_STATE m_modemState = STATE_IDLE;
 
-bool m_dstarEnable  = true;
-bool m_dmrEnable    = true;
-bool m_ysfEnable    = true;
-bool m_p25Enable    = true;
-bool m_nxdnEnable   = true;
-bool m_pocsagEnable = true;
-bool m_fmEnable     = true;
+bool m_dstarEnable = true;
+bool m_dmrEnable   = true;
+bool m_ysfEnable   = true;
+bool m_p25Enable   = true;
 
 bool m_duplex = true;
 
@@ -52,20 +49,10 @@ CYSFTX     ysfTX;
 CP25RX     p25RX;
 CP25TX     p25TX;
 
-CNXDNRX    nxdnRX;
-CNXDNTX    nxdnTX;
-
-CPOCSAGTX  pocsagTX;
-
-CFM        fm;
-
 CCalDStarRX calDStarRX;
 CCalDStarTX calDStarTX;
 CCalDMR     calDMR;
-CCalFM      calFM;
 CCalP25     calP25;
-CCalNXDN    calNXDN;
-CCalPOCSAG  calPOCSAG;
 CCalRSSI    calRSSI;
 
 CCWIdTX cwIdTX;
@@ -101,33 +88,16 @@ void loop()
   if (m_p25Enable && m_modemState == STATE_P25)
     p25TX.process();
 
-  if (m_nxdnEnable && m_modemState == STATE_NXDN)
-    nxdnTX.process();
-
-  if (m_pocsagEnable && (m_modemState == STATE_POCSAG || pocsagTX.busy()))
-    pocsagTX.process();
-
-  if (m_fmEnable && m_modemState == STATE_FM)
-    fm.process();
-
   if (m_modemState == STATE_DSTARCAL)
     calDStarTX.process();
 
-  if (m_modemState == STATE_DMRCAL || m_modemState == STATE_LFCAL || m_modemState == STATE_DMRCAL1K || m_modemState == STATE_DMRDMO1K)
+  if (m_modemState == STATE_DMRCAL || m_modemState == STATE_LFCAL || m_modemState == STATE_DMRCAL1K)
     calDMR.process();
 
-  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();
-
   if (m_modemState == STATE_P25CAL1K)
     calP25.process();
 
-  if (m_modemState == STATE_NXDNCAL1K)
-    calNXDN.process();
-
-  if (m_modemState == STATE_POCSAGCAL)
-    calPOCSAG.process();
-
   if (m_modemState == STATE_IDLE)
     cwIdTX.process();
 }
+

MMDVM_STM32F4xx.coproj

@@ -0,0 +1,338 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<Project version="2G - 1.7.8" name="MMDVM_STM32F4xx">
+  <Target name="MMDVM_Discovery_407" isCurrent="1">
+    <Device manufacturerId="9" manufacturerName="ST" chipId="344" chipName="STM32F407VG" boardId="" boardName=""/>
+    <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="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=""/>
+    <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="0">
+    <Device manufacturerId="9" manufacturerName="ST" chipId="344" chipName="STM32F407VG" boardId="" boardName=""/>
+    <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="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="./">
+  </Components>
+  <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="CalRSSI.cpp" path="CalRSSI.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="STM32F4XX_Lib/CMSIS/Include/core_cm4.h" path="STM32F4XX_Lib/CMSIS/Include/core_cm4.h" type="1"/>
+    <File name="DMRSlotRX.h" path="DMRSlotRX.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="YSFRX.h" path="YSFRX.h" type="1"/>
+    <File name="STM32F4XX_Lib/CMSIS/Include" path="" type="2"/>
+    <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="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="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="SampleRB.h" path="SampleRB.h" type="1"/>
+    <File name="YSFTX.h" path="YSFTX.h" type="1"/>
+    <File name="DMRRX.h" path="DMRRX.h" type="1"/>
+    <File name="CalRSSI.h" path="CalRSSI.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="DMRDMORX.h" path="DMRDMORX.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="CWIdTX.h" path="CWIdTX.h" type="1"/>
+    <File name="STM32F4XX_Lib/Device/system_stm32f4xx.h" path="STM32F4XX_Lib/Device/system_stm32f4xx.h" type="1"/>
+    <File name="STM32F4XX_Lib/CMSIS/Include/core_cmFunc.h" path="STM32F4XX_Lib/CMSIS/Include/core_cmFunc.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="CalDMR.h" path="CalDMR.h" type="1"/>
+    <File name="DMRDMOTX.h" path="DMRDMOTX.h" type="1"/>
+    <File name="IODue.cpp" path="IODue.cpp" type="1"/>
+    <File name="DMRTX.cpp" path="DMRTX.cpp" 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="STM32F4XX_Lib/STM32F4xx_StdPeriph_Driver/include/stm32f4xx_gpio.h" path="STM32F4XX_Lib/STM32F4xx_StdPeriph_Driver/include/stm32f4xx_gpio.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="Config.h" path="Config.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="CalDStarRX.h" path="CalDStarRX.h" type="1"/>
+    <File name="STM32F4XX_Lib/STM32F4xx_StdPeriph_Driver/include" path="" type="2"/>
+    <File name="IO.h" path="IO.h" type="1"/>
+    <File name="Utils.cpp" path="Utils.cpp" type="1"/>
+    <File name="STM32F4XX_Lib/CMSIS/.DS_Store" path="STM32F4XX_Lib/CMSIS/.DS_Store" type="1"/>
+    <File name="STM32F4XX_Lib/CMSIS/Lib/.DS_Store" path="STM32F4XX_Lib/CMSIS/Lib/.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="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="DMRSlotRX.cpp" path="DMRSlotRX.cpp" type="1"/>
+    <File name="IOSTM.cpp" path="IOSTM.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="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>
+</Project>

Makefile

@@ -1,4 +1,4 @@
-#  Copyright (C) 2016,2017,2018 by Andy Uribe CA6JAU
+#  Copyright (C) 2016,2017 by Andy Uribe CA6JAU
 #  Copyright (C) 2016 by Jim McLaughlin KI6ZUM
 
 #  This program is free software; you can redistribute it and/or modify
@@ -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
@@ -129,17 +126,6 @@ DEFS_NUCLEO=-DUSE_STDPERIPH_DRIVER -DSTM32F4XX -DSTM32F446xx -DSTM32F4_NUCLEO -D
 DEFS_NUCLEO_F767=-DUSE_HAL_DRIVER -DSTM32F767xx -DSTM32F7XX -DSTM32F7_NUCLEO -DHSE_VALUE=$(OSC) -DMADEBYMAKEFILE
 # MMDVM-Pi F722 board:
 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
-# STM32F4 DVM board:
-DEFS_DVM=-DUSE_STDPERIPH_DRIVER -DSTM32F4XX -DSTM32F446xx -DSTM32F4_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
-
 
 # Build compiler flags
 CFLAGS_F4=-c $(MCFLAGS_F4) $(INCLUDES_F4)
@@ -158,7 +144,7 @@ CXXFLAGS=-Os -fno-exceptions -ffunction-sections -fdata-sections -fno-builtin -f
 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 clean
 
 # Default target: Nucleo-64 F446RE board
 all: nucleo
@@ -181,24 +167,6 @@ f4m: CXXFLAGS+=$(CXXFLAGS_F4) $(DEFS_F4M)
 f4m: LDFLAGS+=$(LDFLAGS_F4)
 f4m: release_f4
 
-f7m: GitVersion.h
-f7m: CFLAGS+=$(CFLAGS_F7) $(DEFS_F7M)
-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
-
 nucleo: GitVersion.h
 nucleo: CFLAGS+=$(CFLAGS_F4) $(DEFS_NUCLEO)
 nucleo: CXXFLAGS+=$(CXXFLAGS_F4) $(DEFS_NUCLEO)
@@ -217,18 +185,6 @@ f767: CXXFLAGS+=$(CXXFLAGS_F7) $(DEFS_NUCLEO_F767)
 f767: LDFLAGS+=$(LDFLAGS_F767)
 f767: release_f7
 
-dvm: GitVersion.h
-dvm: CFLAGS+=$(CFLAGS_F4) $(DEFS_DVM)
-dvm: CXXFLAGS+=$(CXXFLAGS_F4) $(DEFS_DVM)
-dvm: LDFLAGS+=$(LDFLAGS_F4)
-dvm: release_f4
-
-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
-
 release_f4: $(BINDIR)
 release_f4: $(OBJDIR_F4)
 release_f4: $(BINDIR)/$(BINHEX_F4)
@@ -251,7 +207,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"
@@ -264,7 +220,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"
@@ -349,20 +305,19 @@ ifneq ($(wildcard /usr/bin/stm32flash),)
 endif
 
 deploy-f4m: deploy-pi
-deploy-dvm: 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/stm32ld /dev/ttyAMA0 57600 bin/$(BINBIN_F7)
 	/usr/local/bin/stm32flash -v -w bin/$(BINBIN_F7) -g 0x0 -R -c /dev/ttyAMA0
-
-else 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 -c /dev/ttyAMA0
 endif
 
-deploy-f7m:   deploy-pi-f7
-deploy-rpt_hat: deploy-pi-f7
+ifneq ($(wildcard /usr/bin/stm32flash),)
+	-/usr/bin/stm32flash -i 20,-21,21:-20,21 /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
 
 # Export the current git version if the index file exists, else 000...
 GitVersion.h:
@@ -377,7 +332,3 @@ else
 	echo "#define GITVERSION \"0000000\"" > $@
 endif
 endif
-
-flash_f4:
-	@echo "flashing firmware..."
-	st-flash write bin/$(BINBIN_F4) 0x8000000

Makefile.Arduino

@@ -1,5 +1,5 @@
 #!/usr/bin/make
-# makefile for the arduino due (works with arduino IDE 1.6.12)
+# makefile for the arduino due (works with arduino IDE 1.6.11)
 #
 # The original file can be found at https://github.com/pauldreik/arduino-due-makefile
 #
@@ -34,7 +34,7 @@ OBJCOPY:=$(ADIR)/packages/arduino/tools/arm-none-eabi-gcc/4.8.3-2014q1/bin/arm-n
 
 C:=$(CC)
 #SAM:=arduino/sam/
-SAM:=$(ADIR)/packages/arduino/hardware/sam/1.6.12
+SAM:=$(ADIR)/packages/arduino/hardware/sam/1.6.11
 #CMSIS:=arduino/sam/system/CMSIS/
 #LIBSAM:=arduino/sam/system/libsam
 TMPDIR:=$(PWD)/build

Makefile.CMSIS

@@ -25,7 +25,7 @@ STARTUP:=$(SYSDIR)/startup_stm32f105xc.S
 STARTUP_DEFS=
 
 # Include directory for CMSIS
-CMSISDIR:=STM32F10X_Lib/CMSIS
+CMSISDIR:=/opt/STM32Cube_FW_F1_V1.4.0/Drivers/CMSIS
 
 # Libraries
 LIBDIR:=
@@ -65,7 +65,7 @@ COMMON_FLAGS =-mthumb -mlittle-endian -mcpu=$(MCPU)
 COMMON_FLAGS+= -Wall
 COMMON_FLAGS+= -I. -I$(CMSISDIR)/Include -I$(CMSISDIR)/Device/ST/STM32F1xx/Include -I$(SYSDIR)
 COMMON_FLAGS+=  $(addprefix -I,$(INCDIR))
-COMMON_FLAGS+= -D$(MCU) -DMADEBYMAKEFILE -DSTM32F1
+COMMON_FLAGS+= -D$(MCU)
 COMMON_FLAGS+= -Os -flto -ffunction-sections -fdata-sections
 COMMON_FLAGS+= -g
 # Assembler flags
@@ -91,7 +91,7 @@ DEPENDS:=$(CSRC:%.c=$(OBJDIR)/%.d) $(CXXSRC:%.cpp=$(OBJDIR)/%.d)
 
 # Targets
 .PHONY: all
-all: GitVersion.h $(DIS) $(HEX)
+all: $(DIS) $(HEX)
 	$(SIZE) $(ELF)
 
 .PHONY: program
@@ -116,7 +116,7 @@ debug: $(ELF)
 
 .PHONY: clean
 clean:
-	$(RM) $(OBJ) $(HEX) $(ELF) $(DIS) $(MAP) $(DEPENDS) GitVersion.h
+	$(RM) $(OBJ) $(HEX) $(ELF) $(DIS) $(MAP) $(DEPENDS)
 
 # implicit rules
 .elf.hex:
@@ -149,17 +149,3 @@ $(DIS): $(ELF)
 
 # include dependecies
 -include $(DEPENDS)
-
-# Export the current git version if the index file exists, else 000...
-GitVersion.h:
-ifdef SYSTEMROOT
-	echo #define GITVERSION "0000000" > $@
-else ifdef SystemRoot
-	echo #define GITVERSION "0000000" > $@
-else
-ifneq ("$(wildcard .git/index)","")
-	echo "#define GITVERSION \"$(shell git rev-parse --short HEAD)\"" > $@
-else
-	echo "#define GITVERSION \"0000000\"" > $@
-endif
-endif

NXDNDefines.h

@@ -1,50 +0,0 @@
-/*
- *   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
- *   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(NXDNDEFINES_H)
-#define  NXDNDEFINES_H
-
-const unsigned int NXDN_RADIO_SYMBOL_LENGTH = 10U;      // At 24 kHz sample rate
-
-const unsigned int NXDN_FRAME_LENGTH_BITS    = 384U;
-const unsigned int NXDN_FRAME_LENGTH_BYTES   = NXDN_FRAME_LENGTH_BITS / 8U;
-const unsigned int NXDN_FRAME_LENGTH_SYMBOLS = NXDN_FRAME_LENGTH_BITS / 2U;
-const unsigned int NXDN_FRAME_LENGTH_SAMPLES = NXDN_FRAME_LENGTH_SYMBOLS * NXDN_RADIO_SYMBOL_LENGTH;
-
-const unsigned int NXDN_FSW_LENGTH_BITS    = 20U;
-const unsigned int NXDN_FSW_LENGTH_SYMBOLS = NXDN_FSW_LENGTH_BITS / 2U;
-const unsigned int NXDN_FSW_LENGTH_SAMPLES = NXDN_FSW_LENGTH_SYMBOLS * NXDN_RADIO_SYMBOL_LENGTH;
-
-const uint8_t NXDN_FSW_BYTES[]      = {0xCDU, 0xF5U, 0x90U};
-const uint8_t NXDN_FSW_BYTES_MASK[] = {0xFFU, 0xFFU, 0xF0U};
-const uint8_t NXDN_FSW_BYTES_LENGTH = 3U;
-
-const uint32_t NXDN_FSW_BITS      = 0x000CDF59U;
-const uint32_t NXDN_FSW_BITS_MASK = 0x000FFFFFU;
-
-// C     D      F     5      9
-// 11 00 11 01  11 11 01 01  10 01
-// -3 +1 -3 +3  -3 -3 +3 +3  -1 +3
-
-const int8_t NXDN_FSW_SYMBOLS_VALUES[] = {-3, +1, -3, +3, -3, -3, +3, +3, -1, +3};
-
-const uint16_t NXDN_FSW_SYMBOLS      = 0x014DU;
-const uint16_t NXDN_FSW_SYMBOLS_MASK = 0x03FFU;
-
-#endif
-

NXDNRX.cpp

@@ -1,405 +0,0 @@
-/*
- *   Copyright (C) 2009-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
- *   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 "NXDNRX.h"
-#include "Utils.h"
-
-const q15_t SCALING_FACTOR = 18750;      // Q15(0.55)
-
-const uint8_t MAX_FSW_BIT_START_ERRS = 1U;
-const uint8_t MAX_FSW_BIT_RUN_ERRS   = 3U;
-
-const uint8_t MAX_FSW_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_FSW_FRAMES = 5U + 1U;
-
-CNXDNRX::CNXDNRX() :
-m_state(NXDNRXS_NONE),
-m_bitBuffer(),
-m_buffer(),
-m_bitPtr(0U),
-m_dataPtr(0U),
-m_startPtr(NOENDPTR),
-m_endPtr(NOENDPTR),
-m_fswPtr(NOENDPTR),
-m_minFSWPtr(NOENDPTR),
-m_maxFSWPtr(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 CNXDNRX::reset()
-{
-  m_state        = NXDNRXS_NONE;
-  m_dataPtr      = 0U;
-  m_bitPtr       = 0U;
-  m_maxCorr      = 0;
-  m_averagePtr   = NOAVEPTR;
-  m_startPtr     = NOENDPTR;
-  m_endPtr       = NOENDPTR;
-  m_fswPtr       = NOENDPTR;
-  m_minFSWPtr    = NOENDPTR;
-  m_maxFSWPtr    = NOENDPTR;
-  m_centreVal    = 0;
-  m_thresholdVal = 0;
-  m_lostCount    = 0U;
-  m_countdown    = 0U;
-  m_rssiAccum    = 0U;
-  m_rssiCount    = 0U;
-}
-
-void CNXDNRX::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 NXDNRXS_DATA:
-      processData(sample);
-      break;
-    default:
-      processNone(sample);
-      break;
-    }
-
-    m_dataPtr++;
-    if (m_dataPtr >= NXDN_FRAME_LENGTH_SAMPLES)
-      m_dataPtr = 0U;
-
-    m_bitPtr++;
-    if (m_bitPtr >= NXDN_RADIO_SYMBOL_LENGTH)
-      m_bitPtr = 0U;
-  }
-}
-
-void CNXDNRX::processNone(q15_t sample)
-{
-  bool ret = correlateFSW();
-  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_minFSWPtr = m_fswPtr + NXDN_FRAME_LENGTH_SAMPLES - 1U;
-    if (m_minFSWPtr >= NXDN_FRAME_LENGTH_SAMPLES)
-      m_minFSWPtr -= NXDN_FRAME_LENGTH_SAMPLES;
-
-    m_maxFSWPtr = m_fswPtr + 1U;
-    if (m_maxFSWPtr >= NXDN_FRAME_LENGTH_SAMPLES)
-      m_maxFSWPtr -= NXDN_FRAME_LENGTH_SAMPLES;
-
-    m_state      = NXDNRXS_DATA;
-    m_countdown  = 0U;
-  }
-}
-
-void CNXDNRX::processData(q15_t sample)
-{
-  if (m_minFSWPtr < m_maxFSWPtr) {
-    if (m_dataPtr >= m_minFSWPtr && m_dataPtr <= m_maxFSWPtr)
-      correlateFSW();
-  } else {
-    if (m_dataPtr >= m_minFSWPtr || m_dataPtr <= m_maxFSWPtr)
-      correlateFSW();
-  }
-
-  if (m_dataPtr == m_endPtr) {
-    // Only update the centre and threshold if they are from a good sync
-    if (m_lostCount == MAX_FSW_FRAMES) {
-      m_minFSWPtr = m_fswPtr + NXDN_FRAME_LENGTH_SAMPLES - 1U;
-      if (m_minFSWPtr >= NXDN_FRAME_LENGTH_SAMPLES)
-        m_minFSWPtr -= NXDN_FRAME_LENGTH_SAMPLES;
-
-      m_maxFSWPtr = m_fswPtr + 1U;
-      if (m_maxFSWPtr >= NXDN_FRAME_LENGTH_SAMPLES)
-        m_maxFSWPtr -= NXDN_FRAME_LENGTH_SAMPLES;
-    }
-
-    calculateLevels(m_startPtr, NXDN_FRAME_LENGTH_SYMBOLS);
-
-    DEBUG4("NXDNRX: sync found pos/centre/threshold", m_fswPtr, m_centreVal, m_thresholdVal);
-
-    uint8_t frame[NXDN_FRAME_LENGTH_BYTES + 3U];
-    samplesToBits(m_startPtr, NXDN_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("NXDNRX: sync timed out, lost lock");
-
-      io.setDecode(false);
-      io.setADCDetection(false);
-
-      serial.writeNXDNLost();
-
-      m_state      = NXDNRXS_NONE;
-      m_endPtr     = NOENDPTR;
-      m_averagePtr = NOAVEPTR;
-      m_countdown  = 0U;
-      m_maxCorr    = 0;
-    } else {
-      frame[0U] = m_lostCount == (MAX_FSW_FRAMES - 1U) ? 0x01U : 0x00U;
-      writeRSSIData(frame);
-      m_maxCorr = 0;
-    }
-  }
-}
-
-bool CNXDNRX::correlateFSW()
-{
-  if (countBits32((m_bitBuffer[m_bitPtr] & NXDN_FSW_SYMBOLS_MASK) ^ NXDN_FSW_SYMBOLS) <= MAX_FSW_SYMBOLS_ERRS) {
-    uint16_t ptr = m_dataPtr + NXDN_FRAME_LENGTH_SAMPLES - NXDN_FSW_LENGTH_SAMPLES + NXDN_RADIO_SYMBOL_LENGTH;
-    if (ptr >= NXDN_FRAME_LENGTH_SAMPLES)
-      ptr -= NXDN_FRAME_LENGTH_SAMPLES;
-
-    q31_t corr = 0;
-    q15_t min =  16000;
-    q15_t max = -16000;
-
-    for (uint8_t i = 0U; i < NXDN_FSW_LENGTH_SYMBOLS; i++) {
-      q15_t val = m_buffer[ptr];
-
-      if (val > max)
-        max = val;
-      if (val < min)
-        min = val;
-
-      switch (NXDN_FSW_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 += NXDN_RADIO_SYMBOL_LENGTH;
-      if (ptr >= NXDN_FRAME_LENGTH_SAMPLES)
-        ptr -= NXDN_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 + NXDN_FRAME_LENGTH_SAMPLES - NXDN_FSW_LENGTH_SAMPLES + NXDN_RADIO_SYMBOL_LENGTH;
-      if (startPtr >= NXDN_FRAME_LENGTH_SAMPLES)
-        startPtr -= NXDN_FRAME_LENGTH_SAMPLES;
-
-      uint8_t sync[NXDN_FSW_BYTES_LENGTH];
-      samplesToBits(startPtr, NXDN_FSW_LENGTH_SYMBOLS, sync, 0U, m_centreVal, m_thresholdVal);
-
-      uint8_t maxErrs;
-      if (m_state == NXDNRXS_NONE)
-        maxErrs = MAX_FSW_BIT_START_ERRS;
-      else
-        maxErrs = MAX_FSW_BIT_RUN_ERRS;
-
-     uint8_t errs = 0U;
-      for (uint8_t i = 0U; i < NXDN_FSW_BYTES_LENGTH; i++)
-        errs += countBits8((sync[i] & NXDN_FSW_BYTES_MASK[i]) ^ NXDN_FSW_BYTES[i]);
-
-      if (errs <= maxErrs) {
-        m_maxCorr   = corr;
-        m_lostCount = MAX_FSW_FRAMES;
-        m_fswPtr    = m_dataPtr;
-
-        m_startPtr = startPtr;
-
-        m_endPtr = m_dataPtr + NXDN_FRAME_LENGTH_SAMPLES - NXDN_FSW_LENGTH_SAMPLES - 1U;
-        if (m_endPtr >= NXDN_FRAME_LENGTH_SAMPLES)
-          m_endPtr -= NXDN_FRAME_LENGTH_SAMPLES;
-
-        return true;
-      }
-    }
-  }
-
-  return false;
-}
-
-void CNXDNRX::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 += NXDN_RADIO_SYMBOL_LENGTH;
-    if (start >= NXDN_FRAME_LENGTH_SAMPLES)
-      start -= NXDN_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("NXDNRX: 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 CNXDNRX::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 += NXDN_RADIO_SYMBOL_LENGTH;
-    if (start >= NXDN_FRAME_LENGTH_SAMPLES)
-      start -= NXDN_FRAME_LENGTH_SAMPLES;
-  }
-}
-
-void CNXDNRX::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.writeNXDNData(data, NXDN_FRAME_LENGTH_BYTES + 3U);
-  } else {
-    serial.writeNXDNData(data, NXDN_FRAME_LENGTH_BYTES + 1U);
-  }
-#else
-  serial.writeNXDNData(data, NXDN_FRAME_LENGTH_BYTES + 1U);
-#endif
-
-  m_rssiAccum = 0U;
-  m_rssiCount = 0U;
-}
-

NXDNRX.h

@@ -1,69 +0,0 @@
-/*
- *   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
- *   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(NXDNRX_H)
-#define  NXDNRX_H
-
-#include "Config.h"
-#include "NXDNDefines.h"
-
-enum NXDNRX_STATE {
-  NXDNRXS_NONE,
-  NXDNRXS_DATA
-};
-
-class CNXDNRX {
-public:
-  CNXDNRX();
-
-  void samples(const q15_t* samples, uint16_t* rssi, uint8_t length);
-
-  void reset();
-
-private:
-  NXDNRX_STATE m_state;
-  uint16_t     m_bitBuffer[NXDN_RADIO_SYMBOL_LENGTH];
-  q15_t        m_buffer[NXDN_FRAME_LENGTH_SAMPLES];
-  uint16_t     m_bitPtr;
-  uint16_t     m_dataPtr;
-  uint16_t     m_startPtr;
-  uint16_t     m_endPtr;
-  uint16_t     m_fswPtr;
-  uint16_t     m_minFSWPtr;
-  uint16_t     m_maxFSWPtr;
-  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 processData(q15_t sample);
-  bool correlateFSW();
-  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 writeRSSIData(uint8_t* data);
-};
-
-#endif
-

NXDNTX.cpp

@@ -1,202 +0,0 @@
-/*
- *   Copyright (C) 2009-2018,2020 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"
-#include "Globals.h"
-#include "NXDNTX.h"
-
-#include "NXDNDefines.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 NXDN_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 NXDN_SINC_FILTER_LEN = 22U;
-
-const q15_t NXDN_LEVELA =  735;
-const q15_t NXDN_LEVELB =  245;
-const q15_t NXDN_LEVELC = -245;
-const q15_t NXDN_LEVELD = -735;
-
-const uint8_t NXDN_PREAMBLE[] = {0x57U, 0x75U, 0xFDU};
-const uint8_t NXDN_SYNC = 0x5FU;
-
-CNXDNTX::CNXDNTX() :
-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           = NXDN_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 = NXDN_SINC_FILTER_LEN;
-  m_sincFilter.pState  = m_sincState;
-  m_sincFilter.pCoeffs = NXDN_SINC_FILTER;
-}
-
-void CNXDNTX::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++] = NXDN_SYNC;
-      m_poBuffer[m_poLen++] = NXDN_PREAMBLE[0U];
-      m_poBuffer[m_poLen++] = NXDN_PREAMBLE[1U];
-      m_poBuffer[m_poLen++] = NXDN_PREAMBLE[2U];
-    } else {
-      for (uint8_t i = 0U; i < NXDN_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 * NXDN_RADIO_SYMBOL_LENGTH)) {
-      uint8_t c = m_poBuffer[m_poPtr++];
-      writeByte(c);
-
-      space -= 4U * NXDN_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 * NXDN_RADIO_SYMBOL_LENGTH)) {
-      writeSilence();
-
-      space -= 4U * NXDN_RADIO_SYMBOL_LENGTH;
-      m_txCount--;
-
-      if (m_txCount == 0U)
-        return;
-    }
-  }
-}
-
-uint8_t CNXDNTX::writeData(const uint8_t* data, uint8_t length)
-{
-  if (length != (NXDN_FRAME_LENGTH_BYTES + 1U))
-    return 4U;
-
-  uint16_t space = m_buffer.getSpace();
-  if (space < NXDN_FRAME_LENGTH_BYTES)
-    return 5U;
-
-  for (uint8_t i = 0U; i < NXDN_FRAME_LENGTH_BYTES; i++)
-    m_buffer.put(data[i + 1U]);
-
-  return 0U;
-}
-
-void CNXDNTX::writeByte(uint8_t c)
-{
-  q15_t inBuffer[4U];
-  q15_t intBuffer[NXDN_RADIO_SYMBOL_LENGTH * 4U];
-  q15_t outBuffer[NXDN_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] = NXDN_LEVELA;
-        break;
-      case 0x80U:
-        inBuffer[i] = NXDN_LEVELB;
-        break;
-      case 0x00U:
-        inBuffer[i] = NXDN_LEVELC;
-        break;
-      default:
-        inBuffer[i] = NXDN_LEVELD;
-        break;
-    }
-  }
-
-  ::arm_fir_interpolate_q15(&m_modFilter, inBuffer, intBuffer, 4U);
-
-  ::arm_fir_fast_q15(&m_sincFilter, intBuffer, outBuffer, NXDN_RADIO_SYMBOL_LENGTH * 4U);
-
-  io.write(STATE_NXDN, outBuffer, NXDN_RADIO_SYMBOL_LENGTH * 4U);
-}
-
-void CNXDNTX::writeSilence()
-{
-  q15_t inBuffer[4U] = {0x00U, 0x00U, 0x00U, 0x00U};
-  q15_t intBuffer[NXDN_RADIO_SYMBOL_LENGTH * 4U];
-  q15_t outBuffer[NXDN_RADIO_SYMBOL_LENGTH * 4U];
-
-  ::arm_fir_interpolate_q15(&m_modFilter, inBuffer, intBuffer, 4U);
-
-  ::arm_fir_fast_q15(&m_sincFilter, intBuffer, outBuffer, NXDN_RADIO_SYMBOL_LENGTH * 4U);
-
-  io.write(STATE_NXDN, outBuffer, NXDN_RADIO_SYMBOL_LENGTH * 4U);
-}
-
-void CNXDNTX::setTXDelay(uint8_t delay)
-{
-  m_txDelay = 300U + uint16_t(delay) * 6U;        // 500ms + tx delay
-
-  if (m_txDelay > 1200U)
-    m_txDelay = 1200U;
-}
-
-uint8_t CNXDNTX::getSpace() const
-{
-  return m_buffer.getSpace() / NXDN_FRAME_LENGTH_BYTES;
-}
-
-void CNXDNTX::setParams(uint8_t txHang)
-{
-  m_txHang = txHang * 600U;
-}

NXDNTX.h

@@ -1,57 +0,0 @@
-/*
- *   Copyright (C) 2015,2016,2017,2018,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(NXDNTX_H)
-#define  NXDNTX_H
-
-#include "Config.h"
-
-#include "RingBuffer.h"
-
-class CNXDNTX {
-public:
-  CNXDNTX();
-
-  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;
-  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

P25Defines.h

@@ -1,6 +1,5 @@
 /*
  *   Copyright (C) 2016,2017 by Jonathan Naylor G4KLX
- *   Copyright (C) 2018 by Bryan Biedenkapp <[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
@@ -20,7 +19,7 @@
 #if !defined(P25DEFINES_H)
 #define  P25DEFINES_H
 
-const unsigned int P25_RADIO_SYMBOL_LENGTH = 5U;      // At 24 kHz sample rate
+const unsigned int P25_RADIO_SYMBOL_LENGTH = 10U;      // At 48 kHz sample rate
 
 const unsigned int P25_HDR_FRAME_LENGTH_BYTES      = 99U;
 const unsigned int P25_HDR_FRAME_LENGTH_BITS       = P25_HDR_FRAME_LENGTH_BYTES * 8U;
@@ -42,25 +41,14 @@ const unsigned int P25_TERM_FRAME_LENGTH_BITS      = P25_TERM_FRAME_LENGTH_BYTES
 const unsigned int P25_TERM_FRAME_LENGTH_SYMBOLS   = P25_TERM_FRAME_LENGTH_BYTES * 4U;
 const unsigned int P25_TERM_FRAME_LENGTH_SAMPLES   = P25_TERM_FRAME_LENGTH_SYMBOLS * P25_RADIO_SYMBOL_LENGTH;
 
-const unsigned int P25_TSDU_FRAME_LENGTH_BYTES     = 45U;
-const unsigned int P25_TSDU_FRAME_LENGTH_BITS      = P25_TSDU_FRAME_LENGTH_BYTES * 8U; 
-const unsigned int P25_TSDU_FRAME_LENGTH_SYMBOLS   = P25_TSDU_FRAME_LENGTH_BYTES * 4U; 
-const unsigned int P25_TSDU_FRAME_LENGTH_SAMPLES   = P25_TSDU_FRAME_LENGTH_SYMBOLS * P25_RADIO_SYMBOL_LENGTH;
-
-const unsigned int P25_PDU_HDR_FRAME_LENGTH_BYTES = 45U;
-const unsigned int P25_PDU_HDR_FRAME_LENGTH_BITS = P25_PDU_HDR_FRAME_LENGTH_BYTES * 8U;
-const unsigned int P25_PDU_HDR_FRAME_LENGTH_SYMBOLS = P25_PDU_HDR_FRAME_LENGTH_BYTES * 4U;
-const unsigned int P25_PDU_HDR_FRAME_LENGTH_SAMPLES = P25_PDU_HDR_FRAME_LENGTH_SYMBOLS * P25_RADIO_SYMBOL_LENGTH;
-
 const unsigned int P25_SYNC_LENGTH_BYTES   = 6U;
 const unsigned int P25_SYNC_LENGTH_BITS    = P25_SYNC_LENGTH_BYTES * 8U;
 const unsigned int P25_SYNC_LENGTH_SYMBOLS = P25_SYNC_LENGTH_BYTES * 4U;
 const unsigned int P25_SYNC_LENGTH_SAMPLES = P25_SYNC_LENGTH_SYMBOLS * P25_RADIO_SYMBOL_LENGTH;
 
-const unsigned int P25_NID_LENGTH_BYTES    = 8U;
-const unsigned int P25_NID_LENGTH_BITS     = P25_NID_LENGTH_BYTES * 8U;
-const unsigned int P25_NID_LENGTH_SYMBOLS  = P25_NID_LENGTH_BYTES * 4U; 
-const unsigned int P25_NID_LENGTH_SAMPLES  = P25_NID_LENGTH_SYMBOLS * P25_RADIO_SYMBOL_LENGTH;
+const unsigned int P25_NID_LENGTH_BITS     = 64U;
+const unsigned int P25_NID_LENGTH_SYMBOLS  = 32U;
+const unsigned int P25_NID_LENGTH_SAMPLESS = P25_NID_LENGTH_SYMBOLS * P25_RADIO_SYMBOL_LENGTH;
 
 const uint8_t P25_SYNC_BYTES[] = {0x55U, 0x75U, 0xF5U, 0xFFU, 0x77U, 0xFFU};
 const uint8_t P25_SYNC_BYTES_LENGTH  = 6U;
@@ -77,13 +65,5 @@ const int8_t P25_SYNC_SYMBOLS_VALUES[] = {+3, +3, +3, +3, +3, -3, +3, +3, -3, -3
 const uint32_t P25_SYNC_SYMBOLS      = 0x00FB30A0U;
 const uint32_t P25_SYNC_SYMBOLS_MASK = 0x00FFFFFFU;
 
-const uint8_t P25_DUID_HDU = 0x00U;             // Header Data Unit
-const uint8_t P25_DUID_TDU = 0x03U;             // Simple Terminator Data Unit
-const uint8_t P25_DUID_LDU1 = 0x05U;            // Logical Link Data Unit 1
-const uint8_t P25_DUID_TSDU = 0x07U;            // Trunking System Data Unit
-const uint8_t P25_DUID_LDU2 = 0x0AU;            // Logical Link Data Unit 2
-const uint8_t P25_DUID_PDU = 0x0CU;             // Packet Data Unit 
-const uint8_t P25_DUID_TDULC = 0x0FU;           // Terminator Data Unit with Link Control
-
 #endif
 

P25RX.cpp

@@ -1,6 +1,5 @@
 /*
  *   Copyright (C) 2009-2017 by Jonathan Naylor G4KLX
- *   Copyright (C) 2018 by Bryan Biedenkapp <[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
@@ -24,8 +23,6 @@
 
 const q15_t SCALING_FACTOR = 18750;      // Q15(0.57)
 
-const uint8_t CORRELATION_COUNTDOWN = 10U;//5U;
-
 const uint8_t MAX_SYNC_BIT_START_ERRS = 2U;
 const uint8_t MAX_SYNC_BIT_RUN_ERRS   = 4U;
 
@@ -63,8 +60,7 @@ m_threshold(),
 m_thresholdVal(0),
 m_averagePtr(NOAVEPTR),
 m_rssiAccum(0U),
-m_rssiCount(0U),
-m_duid(0U)
+m_rssiCount(0U)
 {
 }
 
@@ -88,7 +84,6 @@ void CP25RX::reset()
   m_countdown     = 0U;
   m_rssiAccum     = 0U;
   m_rssiCount     = 0U;
-  m_duid          = 0U;
 }
 
 void CP25RX::samples(const q15_t* samples, uint16_t* rssi, uint8_t length)
@@ -118,10 +113,8 @@ void CP25RX::samples(const q15_t* samples, uint16_t* rssi, uint8_t length)
     }
 
     m_dataPtr++;
-    if (m_dataPtr >= P25_LDU_FRAME_LENGTH_SAMPLES) {
+    if (m_dataPtr >= P25_LDU_FRAME_LENGTH_SAMPLES)
       m_dataPtr = 0U;
-      m_duid = 0U;
-    }
 
     m_bitPtr++;
     if (m_bitPtr >= P25_RADIO_SYMBOL_LENGTH)
@@ -143,7 +136,7 @@ void CP25RX::processNone(q15_t sample)
 
       m_averagePtr = NOAVEPTR;
 
-      m_countdown = CORRELATION_COUNTDOWN;
+      m_countdown = 5U;
     }
   }
 
@@ -176,79 +169,16 @@ void CP25RX::processHdr(q15_t sample)
   }
 
   if (m_dataPtr == m_maxSyncPtr) {
-    uint16_t nidStartPtr = m_hdrStartPtr + P25_SYNC_LENGTH_SAMPLES;
-    if (nidStartPtr >= P25_LDU_FRAME_LENGTH_SAMPLES)
-        nidStartPtr -= P25_LDU_FRAME_LENGTH_SAMPLES;
+    if (m_hdrSyncPtr != m_lduSyncPtr) {
+      calculateLevels(m_hdrStartPtr, P25_HDR_FRAME_LENGTH_SYMBOLS);
 
-    uint8_t nid[2U];
-    samplesToBits(nidStartPtr, (2U * 4U), nid, 0U, m_centreVal, m_thresholdVal);
-    // DEBUG3("P25RX: nid (b0 - b1)", nid[0U], nid[1U]);
+      DEBUG4("P25RX: sync found in Hdr pos/centre/threshold", m_hdrSyncPtr, m_centreVal, m_thresholdVal);
 
-    m_duid = nid[1U] & 0x0F;
+      uint8_t frame[P25_HDR_FRAME_LENGTH_BYTES + 1U];
+      samplesToBits(m_hdrStartPtr, P25_HDR_FRAME_LENGTH_SYMBOLS, frame, 8U, m_centreVal, m_thresholdVal);
 
-    switch (m_duid) {
-        case P25_DUID_HDU: {
-                calculateLevels(m_hdrStartPtr, P25_HDR_FRAME_LENGTH_SYMBOLS);
-
-                DEBUG4("P25RX: sync found in Hdr pos/centre/threshold", m_hdrSyncPtr, m_centreVal, m_thresholdVal);
-
-                uint8_t frame[P25_HDR_FRAME_LENGTH_BYTES + 1U];
-                samplesToBits(m_hdrStartPtr, P25_HDR_FRAME_LENGTH_SYMBOLS, frame, 8U, m_centreVal, m_thresholdVal);
-
-                frame[0U] = 0x01U;
-                serial.writeP25Hdr(frame, P25_HDR_FRAME_LENGTH_BYTES + 1U);
-            }
-            break;
-		case P25_DUID_PDU: {
-				calculateLevels(m_hdrSyncPtr, P25_PDU_HDR_FRAME_LENGTH_SYMBOLS);
-
-				DEBUG4("P25RX: sync found in PDU pos/centre/threshold", m_hdrSyncPtr, m_centreVal, m_thresholdVal);
-
-				uint8_t frame[P25_PDU_HDR_FRAME_LENGTH_BYTES + 1U];
-				samplesToBits(m_hdrSyncPtr, P25_PDU_HDR_FRAME_LENGTH_SYMBOLS, frame, 8U, m_centreVal, m_thresholdVal);
-
-				frame[0U] = 0x01U;
-				serial.writeP25Hdr(frame, P25_PDU_HDR_FRAME_LENGTH_BYTES + 1U);
-			}
-			break;
-		case P25_DUID_TSDU: {
-                calculateLevels(m_hdrStartPtr, P25_TSDU_FRAME_LENGTH_SYMBOLS);
-
-                DEBUG4("P25RX: sync found in TSDU pos/centre/threshold", m_hdrSyncPtr, m_centreVal, m_thresholdVal);
-
-                uint8_t frame[P25_TSDU_FRAME_LENGTH_BYTES + 1U];
-                samplesToBits(m_hdrStartPtr, P25_TSDU_FRAME_LENGTH_SYMBOLS, frame, 8U, m_centreVal, m_thresholdVal);
-
-                frame[0U] = 0x01U;
-                serial.writeP25Hdr(frame, P25_TSDU_FRAME_LENGTH_BYTES + 1U);
-            }
-            break;
-        case P25_DUID_TDU: {
-                calculateLevels(m_hdrStartPtr, P25_TERM_FRAME_LENGTH_SYMBOLS);
-
-                DEBUG4("P25RX: sync found in TDU pos/centre/threshold", m_hdrSyncPtr, m_centreVal, m_thresholdVal);
-
-                uint8_t frame[P25_TERM_FRAME_LENGTH_BYTES + 1U];
-                samplesToBits(m_hdrStartPtr, P25_TERM_FRAME_LENGTH_SYMBOLS, frame, 8U, m_centreVal, m_thresholdVal);
-
-                frame[0U] = 0x01U;
-                serial.writeP25Hdr(frame, P25_TERM_FRAME_LENGTH_BYTES + 1U);
-            }
-            break;
-        case P25_DUID_TDULC: {
-                calculateLevels(m_hdrStartPtr, P25_TERMLC_FRAME_LENGTH_SYMBOLS);
-
-                DEBUG4("P25RX: sync found in TDULC pos/centre/threshold", m_hdrSyncPtr, m_centreVal, m_thresholdVal);
-
-                uint8_t frame[P25_TERMLC_FRAME_LENGTH_BYTES + 1U];
-                samplesToBits(m_hdrStartPtr, P25_TERMLC_FRAME_LENGTH_SYMBOLS, frame, 8U, m_centreVal, m_thresholdVal);
-
-                frame[0U] = 0x01U;
-                serial.writeP25Hdr(frame, P25_TERMLC_FRAME_LENGTH_BYTES + 1U);
-            }
-            break;
-        default:
-            break;
+      frame[0U] = 0x01U;
+      serial.writeP25Hdr(frame, P25_HDR_FRAME_LENGTH_BYTES + 1U);
     }
 
     m_minSyncPtr = m_lduSyncPtr + P25_LDU_FRAME_LENGTH_SAMPLES - 1U;
@@ -308,7 +238,6 @@ void CP25RX::processLdu(q15_t sample)
       m_averagePtr = NOAVEPTR;
       m_countdown  = 0U;
       m_maxCorr    = 0;
-      m_duid       = 0U;
 		} else {
       frame[0U] = m_lostCount == (MAX_SYNC_FRAMES - 1U) ? 0x01U : 0x00U;
       writeRSSILdu(frame);

P25RX.h

@@ -1,6 +1,5 @@
 /*
  *   Copyright (C) 2015,2016,2017 by Jonathan Naylor G4KLX
- *   Copyright (C) 2018 by Bryan Biedenkapp <[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
@@ -60,7 +59,6 @@ private:
   uint8_t     m_averagePtr;
   uint32_t    m_rssiAccum;
   uint16_t    m_rssiCount;
-  uint8_t     m_duid;
 
   void processNone(q15_t sample);
   void processHdr(q15_t sample);

P25TX.cpp

@@ -1,5 +1,5 @@
 /*
- *   Copyright (C) 2016,2017,2020 by Jonathan Naylor G4KLX
+ *   Copyright (C) 2016,2017 by Jonathan Naylor G4KLX
  *   Copyright (C) 2017 by Andy Uribe CA6JAU
  *
  *   This program is free software; you can redistribute it and/or modify
@@ -23,17 +23,23 @@
 
 #include "P25Defines.h"
 
-// Generated using rcosdesign(0.2, 8, 5, 'normal') in MATLAB
-// numTaps = 40, L = 5
-static q15_t RC_0_2_FILTER[] = {-897, -1636, -1840, -1278, 0, 1613, 2936, 3310, 2315, 0, -3011, -5627, -6580, -4839,
-                                0, 7482, 16311, 24651, 30607, 32767, 30607, 24651, 16311, 7482, 0, -4839, -6580, -5627,
-                               -3011, 0, 2315, 3310, 2936, 1613, 0, -1278, -1840, -1636, -897, 0}; // numTaps = 40, L = 5
+// Generated using rcosdesign(0.2, 8, 10, 'normal') in MATLAB
+static q15_t RC_0_2_FILTER[] = {-444, -897, -1311, -1636, -1825, -1840, -1659, -1278, -712, 0,
+                               800, 1613, 2354, 2936, 3277, 3310, 2994, 2315, 1296, 0, -1478,
+                               -3011, -4448, -5627, -6386, -6580, -6090, -4839, -2800, 0, 3474,
+                               7482, 11835, 16311, 20666, 24651, 28032, 30607, 32219, 32767,
+                               32219, 30607, 28032, 24651, 20666, 16311, 11835, 7482, 3474, 0,
+                               -2800, -4839, -6090, -6580, -6386, -5627, -4448, -3011, -1478,
+                               0, 1296, 2315, 2994, 3310, 3277, 2936, 2354, 1613, 800, 0, -712,
+                               -1278, -1659, -1840, -1825, -1636, -1311, -897, -444, 0}; // numTaps = 80, L = 10
 const uint16_t RC_0_2_FILTER_PHASE_LEN = 8U; // phaseLength = numTaps/L
 
-static q15_t LOWPASS_FILTER[] = {124, -188, -682, 1262, 556, -621, -1912, -911, 2058, 3855, 1234, -4592, -7692, -2799,
-                                8556, 18133, 18133, 8556, -2799, -7692, -4592, 1234, 3855, 2058, -911, -1912, -621,
-                                556, 1262, -682, -188, 124};
-const uint16_t LOWPASS_FILTER_LEN = 32U;
+// Generated in MATLAB using the following commands, and then normalised for unity gain
+// shape2 = 'Inverse-sinc Lowpass';
+// d2 = fdesign.interpolator(1, shape2);  
+// h2 = design(d2, 'SystemObject', true);
+static q15_t LOWPASS_FILTER[] = {1294, -2251, 4312, -8402, 20999, 20999, -8402, 4312, -2251, 1294};
+const uint16_t LOWPASS_FILTER_LEN = 10U;
 
 const q15_t P25_LEVELA =  1260;
 const q15_t P25_LEVELB =   420;
@@ -43,7 +49,7 @@ const q15_t P25_LEVELD = -1260;
 const uint8_t P25_START_SYNC = 0x77U;
 
 CP25TX::CP25TX() :
-m_buffer(TX_BUFFER_LEN),
+m_buffer(1500U),
 m_modFilter(),
 m_lpFilter(),
 m_modState(),
@@ -51,12 +57,10 @@ m_lpState(),
 m_poBuffer(),
 m_poLen(0U),
 m_poPtr(0U),
-m_txDelay(240U),      // 200ms
-m_txHang(6000U),      // 5s
-m_txCount(0U)
+m_txDelay(240U)       // 200ms
 {
   ::memset(m_modState, 0x00U, 16U * sizeof(q15_t));
-  ::memset(m_lpState,  0x00U, 60U * sizeof(q15_t));
+  ::memset(m_lpState,  0x00U, 70U * sizeof(q15_t));
 
   m_modFilter.L           = P25_RADIO_SYMBOL_LENGTH;
   m_modFilter.phaseLength = RC_0_2_FILTER_PHASE_LEN;
@@ -70,16 +74,17 @@ m_txCount(0U)
 
 void CP25TX::process()
 {
-  if (m_poLen == 0U && m_buffer.getData() > 0U) {
+  if (m_buffer.getData() == 0U && m_poLen == 0U)
+    return;
+
+  if (m_poLen == 0U) {
     if (!m_tx) {
       for (uint16_t i = 0U; i < m_txDelay; i++)
         m_poBuffer[m_poLen++] = P25_START_SYNC;
     } else {
-      uint8_t length;
-      m_buffer.get(length);
+      uint8_t length = m_buffer.get();
       for (uint8_t i = 0U; i < length; i++) {
-        uint8_t c = 0U;
-        m_buffer.get(c);
+        uint8_t c = m_buffer.get();
         m_poBuffer[m_poLen++] = c;
       }
     }
@@ -95,28 +100,13 @@ void CP25TX::process()
       writeByte(c);
 
       space -= 4U * P25_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 * P25_RADIO_SYMBOL_LENGTH)) {
-      writeSilence();
-
-      space -= 4U * P25_RADIO_SYMBOL_LENGTH;
-      m_txCount--;
-
-      if (m_txCount == 0U)
-        return;
-    }
   }
 }
 
@@ -168,19 +158,6 @@ void CP25TX::writeByte(uint8_t c)
   io.write(STATE_P25, outBuffer, P25_RADIO_SYMBOL_LENGTH * 4U);
 }
 
-void CP25TX::writeSilence()
-{
-  q15_t inBuffer[4U] = {0x00U, 0x00U, 0x00U, 0x00U};
-  q15_t intBuffer[P25_RADIO_SYMBOL_LENGTH * 4U];
-  q15_t outBuffer[P25_RADIO_SYMBOL_LENGTH * 4U];
-
-  ::arm_fir_interpolate_q15(&m_modFilter, inBuffer, intBuffer, 4U);
-
-  ::arm_fir_fast_q15(&m_lpFilter, intBuffer, outBuffer, P25_RADIO_SYMBOL_LENGTH * 4U);
-
-  io.write(STATE_P25, outBuffer, P25_RADIO_SYMBOL_LENGTH * 4U);
-}
-
 void CP25TX::setTXDelay(uint8_t delay)
 {
   m_txDelay = 600U + uint16_t(delay) * 12U;        // 500ms + tx delay
@@ -193,8 +170,3 @@ uint8_t CP25TX::getSpace() const
 {
   return m_buffer.getSpace() / P25_LDU_FRAME_LENGTH_BYTES;
 }
-
-void CP25TX::setParams(uint8_t txHang)
-{
-  m_txHang = txHang * 1200U;
-}

P25TX.h

@@ -1,5 +1,5 @@
 /*
- *   Copyright (C) 2016,2017,2020 by Jonathan Naylor G4KLX
+ *   Copyright (C) 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
@@ -21,7 +21,7 @@
 
 #include "Config.h"
 
-#include "RingBuffer.h"
+#include "SerialRB.h"
 
 class CP25TX {
 public:
@@ -35,23 +35,19 @@ public:
 
   uint8_t getSpace() const;
 
-  void setParams(uint8_t txHang);
-
 private:
-  CRingBuffer<uint8_t>                        m_buffer;
+  CSerialRB                        m_buffer;
   arm_fir_interpolate_instance_q15 m_modFilter;
   arm_fir_instance_q15             m_lpFilter;
   q15_t                            m_modState[16U];    // blockSize + phaseLength - 1, 4 + 9 - 1 plus some spare
-  q15_t                            m_lpState[60U];     // NoTaps + BlockSize - 1, 32 + 20 - 1 plus some spare
+  q15_t                            m_lpState[70U];     // NoTaps + BlockSize - 1, 44 + 20 - 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
+

POCSAGTX.cpp

@@ -1,149 +0,0 @@
-/*
- *   Copyright (C) 2009-2018,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"
-#include "Globals.h"
-#include "POCSAGTX.h"
-
-const uint16_t POCSAG_FRAME_LENGTH_BYTES = 17U * sizeof(uint32_t);
-
-const uint16_t POCSAG_PREAMBLE_LENGTH_BYTES = 18U * sizeof(uint32_t);
-
-const uint16_t POCSAG_RADIO_SYMBOL_LENGTH = 20U;
-
-const q15_t POCSAG_LEVEL1[] = { 1700,  1700,  1700,  1700,  1700,  1700,  1700,  1700,  1700,  1700,  1700,  1700,  1700,  1700,  1700,  1700,  1700,  1700,  1700,  1700};
-const q15_t POCSAG_LEVEL0[] = {-1700, -1700, -1700, -1700, -1700, -1700, -1700, -1700, -1700, -1700, -1700, -1700, -1700, -1700, -1700, -1700, -1700, -1700, -1700, -1700};
-
-static q15_t SHAPING_FILTER[] = {5461, 5461, 5461, 5461, 5461, 5461};
-const uint16_t SHAPING_FILTER_LEN = 6U;
-
-const uint8_t POCSAG_SYNC = 0xAAU;
-
-CPOCSAGTX::CPOCSAGTX() :
-m_buffer(4000U),
-m_modFilter(),
-m_modState(),
-m_poBuffer(),
-m_poLen(0U),
-m_poPtr(0U),
-m_txDelay(POCSAG_PREAMBLE_LENGTH_BYTES)
-{
-  ::memset(m_modState, 0x00U, 170U * sizeof(q15_t));
-
-  m_modFilter.numTaps = SHAPING_FILTER_LEN;
-  m_modFilter.pState  = m_modState;
-  m_modFilter.pCoeffs = SHAPING_FILTER;
-}
-
-void CPOCSAGTX::process()
-{
-  if (m_buffer.getData() == 0U && m_poLen == 0U)
-    return;
-
-  if (m_poLen == 0U) {
-    if (!m_tx) {
-      for (uint16_t i = 0U; i < m_txDelay; i++)
-        m_poBuffer[m_poLen++] = POCSAG_SYNC;
-    } else {
-      for (uint8_t i = 0U; i < POCSAG_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 > (8U * POCSAG_RADIO_SYMBOL_LENGTH)) {
-      uint8_t c = m_poBuffer[m_poPtr++];
-      writeByte(c);
-
-      space -= 8U * POCSAG_RADIO_SYMBOL_LENGTH;
-      
-      if (m_poPtr >= m_poLen) {
-        m_poPtr = 0U;
-        m_poLen = 0U;
-        return;
-      }
-    }
-  }
-}
-
-bool CPOCSAGTX::busy()
-{
-  if (m_poLen > 0U || m_buffer.getData() > 0U)
-    return true;
-  else
-    return false;
-}
-
-uint8_t CPOCSAGTX::writeData(const uint8_t* data, uint8_t length)
-{
-  if (length != POCSAG_FRAME_LENGTH_BYTES)
-    return 4U;
-
-  uint16_t space = m_buffer.getSpace();
-  if (space < POCSAG_FRAME_LENGTH_BYTES)
-    return 5U;
-
-  for (uint8_t i = 0U; i < POCSAG_FRAME_LENGTH_BYTES; i++)
-    m_buffer.put(data[i]);
-
-  return 0U;
-}
-
-void CPOCSAGTX::writeByte(uint8_t c)
-{
-  q15_t inBuffer[POCSAG_RADIO_SYMBOL_LENGTH * 8U];
-  q15_t outBuffer[POCSAG_RADIO_SYMBOL_LENGTH * 8U];
-
-  const uint8_t MASK = 0x80U;
-
-  uint8_t n = 0U;
-  for (uint8_t i = 0U; i < 8U; i++, c <<= 1, n += POCSAG_RADIO_SYMBOL_LENGTH) {
-    switch (c & MASK) {
-      case 0x80U:
-        ::memcpy(inBuffer + n, POCSAG_LEVEL1, POCSAG_RADIO_SYMBOL_LENGTH * sizeof(q15_t));
-        break;
-      default:
-        ::memcpy(inBuffer + n, POCSAG_LEVEL0, POCSAG_RADIO_SYMBOL_LENGTH * sizeof(q15_t));
-        break;
-    }
-  }
-
-  ::arm_fir_fast_q15(&m_modFilter, inBuffer, outBuffer, POCSAG_RADIO_SYMBOL_LENGTH * 8U);
-
-  io.write(STATE_POCSAG, outBuffer, POCSAG_RADIO_SYMBOL_LENGTH * 8U);
-}
-
-void CPOCSAGTX::setTXDelay(uint8_t delay)
-{
-  m_txDelay = POCSAG_PREAMBLE_LENGTH_BYTES + (delay * 3U) / 2U;
-
-  if (m_txDelay > 150U)
-    m_txDelay = 150U;
-}
-
-uint8_t CPOCSAGTX::getSpace() const
-{
-  return m_buffer.getSpace() / POCSAG_FRAME_LENGTH_BYTES;
-}

POCSAGTX.h

@@ -1,53 +0,0 @@
-/*
- *   Copyright (C) 2015-2019 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(POCSAGTX_H)
-#define  POCSAGTX_H
-
-#include "Config.h"
-
-#include "RingBuffer.h"
-
-class CPOCSAGTX {
-public:
-  CPOCSAGTX();
-
-  uint8_t writeData(const uint8_t* data, uint8_t length);
-
-  void writeByte(uint8_t c);
-
-  void process();
-
-  void setTXDelay(uint8_t delay);
-
-  uint8_t getSpace() const;
-
-  bool busy();
-
-private:
-  CRingBuffer<uint8_t>            m_buffer;
-  arm_fir_instance_q15 m_modFilter;
-  q15_t                m_modState[170U];     // NoTaps + BlockSize - 1, 6 + 160 - 1 plus some spare
-  uint8_t              m_poBuffer[200U];
-  uint16_t             m_poLen;
-  uint16_t             m_poPtr;
-  uint16_t             m_txDelay;
-};
-
-#endif
-

README.md

@@ -1,7 +1,7 @@
-This is the source code of the MMDVM firmware that supports D-Star, DMR, System Fusion, P25, NXDN, and POCSAG modes.
+This is the source code of the MMDVM firmware that supports D-Star, DMR, System Fusion and P25 modes.
 
-It runs on the Arduino Due, the ST-Micro STM32F1xxx, STM32F4xxx and STM32F7xxx processors, as well as the Teensy 3.1/3.2/3.5/3.6. What these platforms have in common is the use of an ARM Cortex-M3 or M4 processor with a clock speed greater than 70 MHz, and access to at least one analogue to digital converter and one digital to analogue converter.
+It runs on the Arduino Due, the ST-Micro STM32F407-DISCO and STM32F446-NUCLEO, as well as the Teensy 3.1/3.2/3.5/3.6. What these platforms have in common is the use of an ARM Cortex-M3 or M4 processor with a clock speed greater than 70 MHz, and access to at least one analogue to digital converter and one digital to analogue converter. A Cortex-M7 processor is also probably adequate.
 
-In order to build this software for the Arduino Due, you will need to edit a file within the Arduino GUI and that is detailed in the BUILD.txt file. The STM32 support is being supplied via the Coocox IDE with ARM GCC. The Teensy support uses Teensyduino.
+In order to build this software for the Arduino Due, you will need to edit a file within the Arduino GUI and that is detailed in the BUILD.txt file. The STM32 support is being supplied via the Coocox IDE with ARM GCC. The Teensy support is via the latest beta of Teensyduino.
 
 This software is licenced under the GPL v2 and is intended for amateur and educational use only. Use of this software for commercial purposes is strictly forbidden.

RSSIRB.cpp

@@ -0,0 +1,104 @@
+/*
+TX fifo control - Copyright (C) KI6ZUM 2015
+Copyright (C) 2015,2016 by Jonathan Naylor G4KLX
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Library General Public
+License as published by the Free Software Foundation; either
+version 2 of the License, or (at your option) any later version.
+
+This library 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
+Library General Public License for more details.
+
+You should have received a copy of the GNU Library General Public
+License along with this library; if not, write to the
+Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+Boston, MA  02110-1301, USA.
+*/
+
+#include "RSSIRB.h"
+
+CRSSIRB::CRSSIRB(uint16_t length) :
+m_length(length),
+m_rssi(NULL),
+m_head(0U),
+m_tail(0U),
+m_full(false),
+m_overflow(false)
+{
+  m_rssi = new uint16_t[length];
+}
+
+uint16_t CRSSIRB::getSpace() const
+{
+  uint16_t n = 0U;
+
+  if (m_tail == m_head)
+    n = m_full ? 0U : m_length;
+  else if (m_tail < m_head)
+    n = m_length - m_head + m_tail;
+  else
+    n = m_tail - m_head;
+
+  if (n > m_length)
+    n = 0U;
+
+  return n;
+}
+
+uint16_t CRSSIRB::getData() const
+{
+  if (m_tail == m_head)
+    return m_full ? m_length : 0U;
+  else if (m_tail < m_head)
+    return m_head - m_tail;
+  else
+    return m_length - m_tail + m_head;
+}
+
+bool CRSSIRB::put(uint16_t rssi)
+{
+  if (m_full) {
+    m_overflow = true;
+    return false;
+  }
+
+  m_rssi[m_head] = rssi;
+
+  m_head++;
+  if (m_head >= m_length)
+    m_head = 0U;
+
+  if (m_head == m_tail)
+    m_full = true;
+
+  return true;
+}
+
+bool CRSSIRB::get(uint16_t& rssi)
+{
+  if (m_head == m_tail && !m_full)
+    return false;
+
+  rssi  = m_rssi[m_tail];
+
+  m_full = false;
+
+  m_tail++;
+  if (m_tail >= m_length)
+    m_tail = 0U;
+
+  return true;
+}
+
+bool CRSSIRB::hasOverflowed()
+{
+  bool overflow = m_overflow;
+
+  m_overflow = false;
+
+  return overflow;
+}
+

RSSIRB.h

@@ -0,0 +1,59 @@
+/*
+Serial fifo control - Copyright (C) KI6ZUM 2015
+Copyright (C) 2015,2016 by Jonathan Naylor G4KLX
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Library General Public
+License as published by the Free Software Foundation; either
+version 2 of the License, or (at your option) any later version.
+
+This library 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
+Library General Public License for more details.
+
+You should have received a copy of the GNU Library General Public
+License along with this library; if not, write to the
+Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+Boston, MA  02110-1301, USA.
+*/
+
+#if !defined(RSSIRB_H)
+#define  RSSIRB_H
+
+#if defined(STM32F4XX)
+#include "stm32f4xx.h"
+#elif defined(STM32F7XX)
+#include "stm32f7xx.h"
+#elif defined(STM32F105xC)
+#include "stm32f1xx.h"
+#include <cstddef>
+#else
+#include <Arduino.h>
+#endif
+
+class CRSSIRB {
+public:
+  CRSSIRB(uint16_t length);
+  
+  uint16_t getSpace() const;
+  
+  uint16_t getData() const;
+
+  bool put(uint16_t rssi);
+
+  bool get(uint16_t& rssi);
+
+  bool hasOverflowed();
+
+private:
+  uint16_t           m_length;
+  volatile uint16_t* m_rssi;
+  volatile uint16_t  m_head;
+  volatile uint16_t  m_tail;
+  volatile bool      m_full;
+  bool               m_overflow;
+};
+
+#endif
+

RingBuffer.h

@@ -1,77 +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.
- */
-
-#if !defined(RINGBUFFER_H)
-#define  RINGBUFFER_H
-
-#if defined(STM32F4XX)
-#include "stm32f4xx.h"
-#elif defined(STM32F7XX)
-#include "stm32f7xx.h"
-#elif defined(STM32F105xC)
-#include "stm32f1xx.h"
-#include <cstddef>
-#else
-#include <Arduino.h>
-#undef PI
-#endif
-
-#if defined(__SAM3X8E__) || defined(STM32F105xC)
-#define  ARM_MATH_CM3
-#elif defined(STM32F7XX)
-#define  ARM_MATH_CM7
-#elif defined(STM32F4XX) || defined(__MK20DX256__) || defined(__MK64FX512__) || defined(__MK66FX1M0__)
-#define  ARM_MATH_CM4
-#else
-#error "Unknown processor type"
-#endif
-
-#include <arm_math.h>
-
-template <typename TDATATYPE>
-class CRingBuffer {
-public:
-  CRingBuffer(uint16_t length = 370U);
-  
-  uint16_t getSpace() const;
-  
-  uint16_t getData() const;
-
-  bool put(TDATATYPE item) volatile;
-
-  bool get(TDATATYPE& item) volatile;
-
-  TDATATYPE peek() const;
-
-  bool hasOverflowed();
-
-  void reset();
-
-private:
-  uint16_t              m_length;
-  TDATATYPE*            m_buffer;
-  volatile uint16_t     m_head;
-  volatile uint16_t     m_tail;
-  volatile bool         m_full;
-  bool                  m_overflow;
-};
-
-#include "RingBuffer.impl.h"
-
-#endif

RingBuffer.impl.h

@@ -1,114 +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 "RingBuffer.h"
-
-template <typename TDATATYPE> CRingBuffer<TDATATYPE>::CRingBuffer(uint16_t length) :
-m_length(length),
-m_head(0U),
-m_tail(0U),
-m_full(false),
-m_overflow(false)
-{
-  m_buffer = new TDATATYPE[length];
-}
-
-template <typename TDATATYPE> uint16_t CRingBuffer<TDATATYPE>::getSpace() const
-{
-  uint16_t n = 0U;
-
-  if (m_tail == m_head)
-    n = m_full ? 0U : m_length;
-  else if (m_tail < m_head)
-    n = m_length - m_head + m_tail;
-  else
-    n = m_tail - m_head;
-
-  if (n > m_length)
-    n = 0U;
-
-  return n;
-}
-
-template <typename TDATATYPE> uint16_t CRingBuffer<TDATATYPE>::getData() const
-{
-  if (m_tail == m_head)
-    return m_full ? m_length : 0U;
-  else if (m_tail < m_head)
-    return m_head - m_tail;
-  else
-    return m_length - m_tail + m_head;
-}
-
-template <typename TDATATYPE> bool CRingBuffer<TDATATYPE>::put(TDATATYPE item) volatile
-{
-  if (m_full) {
-    m_overflow = true;
-    return false;
-  }
-
-  m_buffer[m_head] = item;
-
-  m_head++;
-  if (m_head >= m_length)
-    m_head = 0U;
-
-  if (m_head == m_tail)
-    m_full = true;
-
-  return true;
-}
-
-template <typename TDATATYPE> TDATATYPE CRingBuffer<TDATATYPE>::peek() const
-{
-  return m_buffer[m_tail];
-}
-
-template <typename TDATATYPE> bool CRingBuffer<TDATATYPE>::get(TDATATYPE& item) volatile
-{
-  if (m_head == m_tail && !m_full)
-    return false;
-
-  item = m_buffer[m_tail];
-
-  m_full = false;
-
-  m_tail++;
-  if (m_tail >= m_length)
-    m_tail = 0U;
-
-  return true;
-}
-
-template <typename TDATATYPE> bool CRingBuffer<TDATATYPE>::hasOverflowed()
-{
-  bool overflow = m_overflow;
-
-  m_overflow = false;
-
-  return overflow;
-}
-
-template <typename TDATATYPE> void CRingBuffer<TDATATYPE>::reset()
-{
-  m_head = 0U;
-  m_tail = 0U;
-  m_full     = false;
-  m_overflow = false;
-}

STMUART.cpp

@@ -1,100 +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.
- */
-
-#if defined(STM32F4XX) || defined(STM32F7XX)
-
-#include "STMUART.h"
-
-CSTMUART::CSTMUART() :
-m_usart(NULL)
-{
-
-}
-
-void CSTMUART::init(USART_TypeDef* usart)
-{
-  m_usart = usart;
-}
-
-void CSTMUART::write(const uint8_t * data, uint16_t length)
-{
-  if(length == 0U || m_usart == NULL)
-    return;
-
-
-  m_txFifo.put(data[0]);
-  USART_ITConfig(m_usart, USART_IT_TXE, ENABLE);//switch TX IRQ is on
-
-  for(uint16_t i = 1U; i < length; i++) {
-    m_txFifo.put(data[i]);
-  }
-
-  USART_ITConfig(m_usart, USART_IT_TXE, ENABLE);//make sure TX IRQ is on
-}
-
-uint8_t CSTMUART::read()
-{
-  return m_rxFifo.get();
-}
-
-void CSTMUART::handleIRQ()
-{
-  if(m_usart == NULL)
-    return;
-
-  if (USART_GetITStatus(m_usart, USART_IT_RXNE)) {
-    if(!m_rxFifo.isFull())
-      m_rxFifo.put((uint8_t) USART_ReceiveData(m_usart));
-    USART_ClearITPendingBit(USART1, USART_IT_RXNE);
-  }
-
-  if (USART_GetITStatus(m_usart, USART_IT_TXE)) {
-    if(!m_txFifo.isEmpty())
-      USART_SendData(m_usart, m_txFifo.get());
-
-    USART_ClearITPendingBit(m_usart, USART_IT_TXE);
-
-    if (m_txFifo.isEmpty()) // if there's no more data to transmit then turn off TX interrupts
-      USART_ITConfig(m_usart, USART_IT_TXE, DISABLE);
-  }
-}
-
-  // Flushes the transmit shift register
-// warning: this call is blocking
-void CSTMUART::flush()
-{
-  if(m_usart == NULL)
-    return;
-
-   // wait until the TXE shows the shift register is empty
-   while (USART_GetITStatus(m_usart, USART_FLAG_TXE))
-      ;
-}
-
-uint16_t CSTMUART::available()
-{
-  return m_rxFifo.isEmpty() ? 0U : 1U;
-}
-
-uint16_t CSTMUART::availableForWrite()
-{
-  return m_txFifo.isFull() ? 0U : 1U;
-}
-
-#endif

STMUART.h

@@ -1,91 +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.
- */
-
-#if defined(STM32F4XX) || defined(STM32F7XX)
-#if !defined(STMUART_H)
-#define STMUART_H
-
-#if defined(STM32F4XX)
-#include "stm32f4xx.h"
-#elif defined(STM32F7XX)
-#include "stm32f7xx.h"
-#endif
-
-const uint16_t BUFFER_SIZE = 2048U; //needs to be a power of 2 !
-const uint16_t BUFFER_MASK = BUFFER_SIZE - 1;
-
-class CSTMUARTFIFO {
-public:
-  CSTMUARTFIFO() :
-  m_head(0U),
-  m_tail(0U)
-  {
-  }
-
-  void put(uint8_t data)
-  {
-    m_buffer[BUFFER_MASK & (m_head++)] = data;
-  }
-
-  uint8_t get()
-  {
-    return m_buffer[BUFFER_MASK & (m_tail++)];
-  }
-
-  void reset()
-  {
-    m_tail = 0U;
-    m_head = 0U;
-  }
-
-  bool isEmpty()
-  {
-    return m_tail == m_head;
-  }
-
-  bool isFull()
-  {
-    return ((m_head + 1U) & BUFFER_MASK) == (m_tail & BUFFER_MASK);
-  }
-
-private:
-  volatile uint8_t  m_buffer[BUFFER_SIZE];
-  volatile uint16_t m_head;
-  volatile uint16_t m_tail;
-};
-
-class CSTMUART {
-public:
-  CSTMUART();
-  void init(USART_TypeDef* usart);
-  void write(const uint8_t * data, uint16_t length);
-  uint8_t read();
-  void handleIRQ();
-  void flush();
-  uint16_t available();
-  uint16_t availableForWrite();
-
-private:
-  USART_TypeDef * m_usart;
-  CSTMUARTFIFO    m_rxFifo;
-  CSTMUARTFIFO    m_txFifo;
-};
-
-#endif
-#endif

SampleRB.cpp

@@ -0,0 +1,108 @@
+/*
+TX fifo control - Copyright (C) KI6ZUM 2015
+Copyright (C) 2015,2016 by Jonathan Naylor G4KLX
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Library General Public
+License as published by the Free Software Foundation; either
+version 2 of the License, or (at your option) any later version.
+
+This library 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
+Library General Public License for more details.
+
+You should have received a copy of the GNU Library General Public
+License along with this library; if not, write to the
+Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+Boston, MA  02110-1301, USA.
+*/
+
+#include "SampleRB.h"
+
+CSampleRB::CSampleRB(uint16_t length) :
+m_length(length),
+m_samples(NULL),
+m_control(NULL),
+m_head(0U),
+m_tail(0U),
+m_full(false),
+m_overflow(false)
+{
+  m_samples = new uint16_t[length];
+  m_control = new uint8_t[length];
+}
+
+uint16_t CSampleRB::getSpace() const
+{
+  uint16_t n = 0U;
+
+  if (m_tail == m_head)
+    n = m_full ? 0U : m_length;
+  else if (m_tail < m_head)
+    n = m_length - m_head + m_tail;
+  else
+    n = m_tail - m_head;
+
+  if (n > m_length)
+    n = 0U;
+
+  return n;
+}
+
+uint16_t CSampleRB::getData() const
+{
+  if (m_tail == m_head)
+    return m_full ? m_length : 0U;
+  else if (m_tail < m_head)
+    return m_head - m_tail;
+  else
+    return m_length - m_tail + m_head;
+}
+
+bool CSampleRB::put(uint16_t sample, uint8_t control)
+{
+  if (m_full) {
+    m_overflow = true;
+    return false;
+  }
+
+  m_samples[m_head] = sample;
+  m_control[m_head] = control;
+
+  m_head++;
+  if (m_head >= m_length)
+    m_head = 0U;
+
+  if (m_head == m_tail)
+    m_full = true;
+
+  return true;
+}
+
+bool CSampleRB::get(uint16_t& sample, uint8_t& control)
+{
+  if (m_head == m_tail && !m_full)
+    return false;
+
+  sample  = m_samples[m_tail];
+  control = m_control[m_tail];
+
+  m_full = false;
+
+  m_tail++;
+  if (m_tail >= m_length)
+    m_tail = 0U;
+
+  return true;
+}
+
+bool CSampleRB::hasOverflowed()
+{
+  bool overflow = m_overflow;
+
+  m_overflow = false;
+
+  return overflow;
+}
+

SampleRB.h

@@ -0,0 +1,60 @@
+/*
+Serial fifo control - Copyright (C) KI6ZUM 2015
+Copyright (C) 2015,2016 by Jonathan Naylor G4KLX
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Library General Public
+License as published by the Free Software Foundation; either
+version 2 of the License, or (at your option) any later version.
+
+This library 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
+Library General Public License for more details.
+
+You should have received a copy of the GNU Library General Public
+License along with this library; if not, write to the
+Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+Boston, MA  02110-1301, USA.
+*/
+
+#if !defined(SAMPLERB_H)
+#define  SAMPLERB_H
+
+#if defined(STM32F4XX)
+#include "stm32f4xx.h"
+#elif defined(STM32F7XX)
+#include "stm32f7xx.h"
+#elif defined(STM32F105xC)
+#include "stm32f1xx.h"
+#include <cstddef>
+#else
+#include <Arduino.h>
+#endif
+
+class CSampleRB {
+public:
+  CSampleRB(uint16_t length);
+  
+  uint16_t getSpace() const;
+  
+  uint16_t getData() const;
+
+  bool put(uint16_t sample, uint8_t control);
+
+  bool get(uint16_t& sample, uint8_t& control);
+
+  bool hasOverflowed();
+
+private:
+  uint16_t           m_length;
+  volatile uint16_t* m_samples;
+  volatile uint8_t*  m_control;
+  volatile uint16_t  m_head;
+  volatile uint16_t  m_tail;
+  volatile bool      m_full;
+  bool               m_overflow;
+};
+
+#endif
+

SerialArduino.cpp

@@ -21,10 +21,7 @@
 
 #include "SerialPort.h"
 
-#if defined(VK6MST_TEENSY_PI3_SHIELD_I2C)
-//it will load I2CTeensy.cpp
-
-#elif defined(__SAM3X8E__) || defined(__MK20DX256__) || defined(__MK64FX512__) || defined(__MK66FX1M0__)
+#if defined(__SAM3X8E__) || defined(__MK20DX256__) || defined(__MK64FX512__) || defined(__MK66FX1M0__)
 
 void CSerialPort::beginInt(uint8_t n, int speed)
 {

SerialPort.cpp

@@ -1,5 +1,5 @@
 /*
- *   Copyright (C) 2013,2015-2020 by Jonathan Naylor G4KLX
+ *   Copyright (C) 2013,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
@@ -60,61 +60,30 @@ const uint8_t MMDVM_P25_HDR      = 0x30U;
 const uint8_t MMDVM_P25_LDU      = 0x31U;
 const uint8_t MMDVM_P25_LOST     = 0x32U;
 
-const uint8_t MMDVM_NXDN_DATA    = 0x40U;
-const uint8_t MMDVM_NXDN_LOST    = 0x41U;
-
-const uint8_t MMDVM_POCSAG_DATA  = 0x50U;
-
-const uint8_t MMDVM_FM_PARAMS1   = 0x60U;
-const uint8_t MMDVM_FM_PARAMS2   = 0x61U;
-const uint8_t MMDVM_FM_PARAMS3   = 0x62U;
-const uint8_t MMDVM_FM_PARAMS4   = 0x63U;
-const uint8_t MMDVM_FM_DATA      = 0x65U;
-const uint8_t MMDVM_FM_STATUS    = 0x66U;
-const uint8_t MMDVM_FM_EOT       = 0x67U;
-
 const uint8_t MMDVM_ACK          = 0x70U;
 const uint8_t MMDVM_NAK          = 0x7FU;
 
 const uint8_t MMDVM_SERIAL       = 0x80U;
 
-const uint8_t MMDVM_TRANSPARENT  = 0x90U;
-const uint8_t MMDVM_QSO_INFO     = 0x91U;
-
 const uint8_t MMDVM_DEBUG1       = 0xF1U;
 const uint8_t MMDVM_DEBUG2       = 0xF2U;
 const uint8_t MMDVM_DEBUG3       = 0xF3U;
 const uint8_t MMDVM_DEBUG4       = 0xF4U;
 const uint8_t MMDVM_DEBUG5       = 0xF5U;
 
-#if EXTERNAL_OSC == 12000000
-#define TCXO "12.0000 MHz"
-#elif EXTERNAL_OSC == 12288000
-#define TCXO "12.2880 MHz"
-#elif EXTERNAL_OSC == 14400000
-#define TCXO "14.4000 MHz"
-#elif EXTERNAL_OSC == 19200000
-#define TCXO "19.2000 Mhz"
-#else
-#define TCXO "NO TCXO"
-#endif
 
-#if defined(DRCC_DVM_NQF)
-#define	HW_TYPE	"MMDVM DRCC_DVM_NQF"
-#elif defined(STM32F4_RPT_HAT_TGO)
-#define	HW_TYPE	"MMDVM RPT_HAT_TGO"
+#if defined(EXTERNAL_OSC)
+#define DESCRIPTION              "MMDVM 20170501 TCXO 48kHz (D-Star/DMR/YSF/P25/RSSI/CW Id)"
 #else
-#define	HW_TYPE	"MMDVM"
+#define DESCRIPTION              "MMDVM 20170501 48kHz (D-Star/DMR/YSF/P25/RSSI/CW Id)"
 #endif
 
-#define DESCRIPTION "20200620 (D-Star/DMR/System Fusion/P25/NXDN/POCSAG/FM)"
-
 #if defined(GITVERSION)
-#define concat(h, a, b, c) h " " a " " b " GitID #" c ""
-const char HARDWARE[] = concat(HW_TYPE, DESCRIPTION, TCXO, GITVERSION);
+#define concat(a, b) a " GitID #" b ""
+const char HARDWARE[] = concat(DESCRIPTION, GITVERSION);
 #else
-#define concat(h, a, b, c, d) h " " a " " b " (Build: " c " " d ")"
-const char HARDWARE[] = concat(HW_TYPE, DESCRIPTION, TCXO, __TIME__, __DATE__);
+#define concat(a, b, c) a " (Build: " b " " c ")"
+const char HARDWARE[] = concat(DESCRIPTION, __TIME__, __DATE__);
 #endif
 
 const uint8_t PROTOCOL_VERSION   = 1U;
@@ -158,11 +127,11 @@ void CSerialPort::getStatus()
 {
   io.resetWatchdog();
 
-  uint8_t reply[20U];
+  uint8_t reply[15U];
 
   // Send all sorts of interesting internal values
   reply[0U]  = MMDVM_FRAME_START;
-  reply[1U]  = 14U;
+  reply[1U]  = 11U;
   reply[2U]  = MMDVM_GET_STATUS;
 
   reply[3U]  = 0x00U;
@@ -174,12 +143,6 @@ void CSerialPort::getStatus()
     reply[3U] |= 0x04U;
   if (m_p25Enable)
     reply[3U] |= 0x08U;
-  if (m_nxdnEnable)
-    reply[3U] |= 0x10U;
-  if (m_pocsagEnable)
-    reply[3U] |= 0x20U;
-  if (m_fmEnable)
-    reply[3U] |= 0x40U;
 
   reply[4U]  = uint8_t(m_modemState);
 
@@ -234,27 +197,12 @@ void CSerialPort::getStatus()
   else
     reply[10U] = 0U;
 
-  if (m_nxdnEnable)
-    reply[11U] = nxdnTX.getSpace();
-  else
-    reply[11U] = 0U;
-
-  if (m_pocsagEnable)
-    reply[12U] = pocsagTX.getSpace();
-  else
-    reply[12U] = 0U;
-
-  if (m_fmEnable)
-    reply[13U] = fm.getSpace();
-  else
-    reply[13U] = 0U;
-
-  writeInt(1U, reply, 14);
+  writeInt(1U, reply, 11);
 }
 
 void CSerialPort::getVersion()
 {
-  uint8_t reply[150U];
+  uint8_t reply[100U];
 
   reply[0U] = MMDVM_FRAME_START;
   reply[1U] = 0U;
@@ -273,7 +221,7 @@ void CSerialPort::getVersion()
 
 uint8_t CSerialPort::setConfig(const uint8_t* data, uint8_t length)
 {
-  if (length < 21U)
+  if (length < 15U)
     return 4U;
 
   bool rxInvert  = (data[0U] & 0x01U) == 0x01U;
@@ -284,13 +232,10 @@ uint8_t CSerialPort::setConfig(const uint8_t* data, uint8_t length)
 
   m_debug = (data[0U] & 0x10U) == 0x10U;
 
-  bool dstarEnable  = (data[1U] & 0x01U) == 0x01U;
-  bool dmrEnable    = (data[1U] & 0x02U) == 0x02U;
-  bool ysfEnable    = (data[1U] & 0x04U) == 0x04U;
-  bool p25Enable    = (data[1U] & 0x08U) == 0x08U;
-  bool nxdnEnable   = (data[1U] & 0x10U) == 0x10U;
-  bool pocsagEnable = (data[1U] & 0x20U) == 0x20U;
-  bool fmEnable     = (data[1U] & 0x40U) == 0x40U;
+  bool dstarEnable = (data[1U] & 0x01U) == 0x01U;
+  bool dmrEnable   = (data[1U] & 0x02U) == 0x02U;
+  bool ysfEnable   = (data[1U] & 0x04U) == 0x04U;
+  bool p25Enable   = (data[1U] & 0x08U) == 0x08U;
 
   uint8_t txDelay = data[2U];
   if (txDelay > 50U)
@@ -298,7 +243,7 @@ uint8_t CSerialPort::setConfig(const uint8_t* data, uint8_t length)
 
   MMDVM_STATE modemState = MMDVM_STATE(data[3U]);
 
-  if (modemState != STATE_IDLE && modemState != STATE_DSTAR && modemState != STATE_DMR && modemState != STATE_YSF && modemState != STATE_P25 && modemState != STATE_NXDN && modemState != STATE_POCSAG && modemState != STATE_FM && modemState != STATE_DSTARCAL && modemState != STATE_DMRCAL && modemState != STATE_RSSICAL && modemState != STATE_LFCAL && modemState != STATE_DMRCAL1K && modemState != STATE_P25CAL1K && modemState != STATE_DMRDMO1K && modemState != STATE_NXDNCAL1K && modemState != STATE_POCSAGCAL && modemState != STATE_FMCAL10K && modemState != STATE_FMCAL12K && modemState != STATE_FMCAL15K && modemState != STATE_FMCAL20K && modemState != STATE_FMCAL25K && modemState != STATE_FMCAL30K)
+  if (modemState != STATE_IDLE && modemState != STATE_DSTAR && modemState != STATE_DMR && modemState != STATE_YSF && modemState != STATE_P25 && modemState != STATE_DSTARCAL && modemState != STATE_DMRCAL && modemState != STATE_RSSICAL && modemState != STATE_LFCAL && modemState != STATE_DMRCAL1K && modemState != STATE_P25CAL1K)
     return 4U;
   if (modemState == STATE_DSTAR && !dstarEnable)
     return 4U;
@@ -308,12 +253,6 @@ uint8_t CSerialPort::setConfig(const uint8_t* data, uint8_t length)
     return 4U;
   if (modemState == STATE_P25 && !p25Enable)
     return 4U;
-  if (modemState == STATE_NXDN && !nxdnEnable)
-    return 4U;
-  if (modemState == STATE_POCSAG && !pocsagEnable)
-    return 4U;
-  if (modemState == STATE_FM && !fmEnable)
-    return 4U;
 
   uint8_t rxLevel = data[4U];
 
@@ -332,35 +271,18 @@ uint8_t CSerialPort::setConfig(const uint8_t* data, uint8_t length)
   int16_t txDCOffset = int16_t(data[13U]) - 128;
   int16_t rxDCOffset = int16_t(data[14U]) - 128;
 
-  uint8_t nxdnTXLevel   = data[15U];
+  m_modemState  = modemState;
 
-  uint8_t ysfTXHang     = data[16U];
-
-  uint8_t pocsagTXLevel = data[17U];
-
-  uint8_t fmTXLevel     = data[18U];
-
-  uint8_t p25TXHang     = data[19U];
-
-  uint8_t nxdnTXHang    = data[20U];
-
-  setMode(modemState);
-
-  m_dstarEnable  = dstarEnable;
-  m_dmrEnable    = dmrEnable;
-  m_ysfEnable    = ysfEnable;
-  m_p25Enable    = p25Enable;
-  m_nxdnEnable   = nxdnEnable;
-  m_pocsagEnable = pocsagEnable;
-  m_fmEnable     = fmEnable;
-  m_duplex       = !simplex;
+  m_dstarEnable = dstarEnable;
+  m_dmrEnable   = dmrEnable;
+  m_ysfEnable   = ysfEnable;
+  m_p25Enable   = p25Enable;
+  m_duplex      = !simplex;
 
   dstarTX.setTXDelay(txDelay);
   ysfTX.setTXDelay(txDelay);
   p25TX.setTXDelay(txDelay);
   dmrDMOTX.setTXDelay(txDelay);
-  nxdnTX.setTXDelay(txDelay);
-  pocsagTX.setTXDelay(txDelay);
 
   dmrTX.setColorCode(colorCode);
   dmrRX.setColorCode(colorCode);
@@ -368,108 +290,15 @@ uint8_t CSerialPort::setConfig(const uint8_t* data, uint8_t length)
   dmrDMORX.setColorCode(colorCode);
   dmrIdleRX.setColorCode(colorCode);
 
-  ysfTX.setParams(ysfLoDev, ysfTXHang);
-  p25TX.setParams(p25TXHang);
-  nxdnTX.setParams(nxdnTXHang);
+  ysfTX.setLoDev(ysfLoDev);
 
-  io.setParameters(rxInvert, txInvert, pttInvert, rxLevel, cwIdTXLevel, dstarTXLevel, dmrTXLevel, ysfTXLevel, p25TXLevel, nxdnTXLevel, pocsagTXLevel, fmTXLevel, txDCOffset, rxDCOffset);
+  io.setParameters(rxInvert, txInvert, pttInvert, rxLevel, cwIdTXLevel, dstarTXLevel, dmrTXLevel, ysfTXLevel, p25TXLevel, txDCOffset, rxDCOffset);
 
   io.start();
 
   return 0U;
 }
 
-uint8_t CSerialPort::setFMParams1(const uint8_t* data, uint8_t length)
-{
-  if (length < 8U)
-    return 4U;
-
-  uint8_t  speed     = data[0U];;
-  uint16_t frequency = data[1U] * 10U;
-  uint8_t  time      = data[2U];
-  uint8_t  holdoff   = data[3U];
-  uint8_t  highLevel = data[4U];
-  uint8_t  lowLevel  = data[5U];
-
-  bool callAtStart = (data[6U] & 0x01U) == 0x01U;
-  bool callAtEnd   = (data[6U] & 0x02U) == 0x02U;
-  bool callAtLatch = (data[6U] & 0x04U) == 0x04U;
-
-  char callsign[50U];
-  uint8_t n = 0U;
-  for (uint8_t i = 7U; i < length; i++, n++)
-    callsign[n] = data[i];
-  callsign[n] = '\0';
-
-  return fm.setCallsign(callsign, speed, frequency, time, holdoff, highLevel, lowLevel, callAtStart, callAtEnd, callAtLatch);
-}
-
-uint8_t CSerialPort::setFMParams2(const uint8_t* data, uint8_t length)
-{
-  if (length < 6U)
-    return 4U;
-
-  uint8_t  speed     = data[0U];
-  uint16_t frequency = data[1U] * 10U;
-  uint8_t  minTime   = data[2U];
-  uint16_t delay     = data[3U] * 10U;
-  uint8_t  level     = data[4U];
-
-  char ack[50U];
-  uint8_t n = 0U;
-  for (uint8_t i = 5U; i < length; i++, n++)
-    ack[n] = data[i];
-  ack[n] = '\0';
-
-  return fm.setAck(ack, speed, frequency, minTime, delay, level);
-}
-
-uint8_t CSerialPort::setFMParams3(const uint8_t* data, uint8_t length)
-{
-  if (length < 12U)
-    return 4U;
-
-  uint16_t timeout        = data[0U] * 5U;
-  uint8_t  timeoutLevel   = data[1U];
-
-  uint8_t  ctcssFrequency     = data[2U];
-  uint8_t  ctcssHighThreshold = data[3U];
-  uint8_t  ctcssLowThreshold  = data[4U];
-  uint8_t  ctcssLevel         = data[5U];
-
-  uint8_t  kerchunkTime   = data[6U];
-  uint8_t  hangTime       = data[7U];
-
-  bool     useCOS         = (data[8U] & 0x01U) == 0x01U;
-  bool     cosInvert      = (data[8U] & 0x02U) == 0x02U;
-  bool     kerchunkTX     = (data[8U] & 0x04U) == 0x04U;
-
-  uint8_t  rfAudioBoost   = data[9U];
-  uint8_t  maxDev         = data[10U];
-  uint8_t  rxLevel        = data[11U];
-
-  return fm.setMisc(timeout, timeoutLevel, ctcssFrequency, ctcssHighThreshold, ctcssLowThreshold, ctcssLevel, kerchunkTime, kerchunkTX, hangTime, useCOS, cosInvert, rfAudioBoost, maxDev, rxLevel);
-}
-
-uint8_t CSerialPort::setFMParams4(const uint8_t* data, uint8_t length)
-{
-  if (length < 4U)
-    return 4U;
-
-  uint8_t  audioBoost = data[0U];
-  uint8_t  speed      = data[1U];
-  uint16_t frequency  = data[2U] * 10U;
-  uint8_t  level      = data[3U];
-
-  char ack[50U];
-  uint8_t n = 0U;
-  for (uint8_t i = 4U; i < length; i++, n++)
-    ack[n] = data[i];
-  ack[n] = '\0';
-
-  return fm.setExt(ack, audioBoost, speed, frequency, level);
-}
-
 uint8_t CSerialPort::setMode(const uint8_t* data, uint8_t length)
 {
   if (length < 1U)
@@ -480,7 +309,7 @@ uint8_t CSerialPort::setMode(const uint8_t* data, uint8_t length)
   if (modemState == m_modemState)
     return 0U;
 
-  if (modemState != STATE_IDLE && modemState != STATE_DSTAR && modemState != STATE_DMR && modemState != STATE_YSF && modemState != STATE_P25 && modemState != STATE_NXDN && modemState != STATE_POCSAG && modemState != STATE_FM && modemState != STATE_DSTARCAL && modemState != STATE_DMRCAL && modemState != STATE_RSSICAL && modemState != STATE_LFCAL && modemState != STATE_DMRCAL1K && modemState != STATE_P25CAL1K && modemState != STATE_DMRDMO1K && modemState != STATE_NXDNCAL1K && modemState != STATE_POCSAGCAL && modemState != STATE_FMCAL10K  && modemState != STATE_FMCAL12K && modemState != STATE_FMCAL15K && modemState != STATE_FMCAL20K && modemState != STATE_FMCAL25K && modemState != STATE_FMCAL30K)
+  if (modemState != STATE_IDLE && modemState != STATE_DSTAR && modemState != STATE_DMR && modemState != STATE_YSF && modemState != STATE_P25 && modemState != STATE_DSTARCAL && modemState != STATE_DMRCAL && modemState != STATE_RSSICAL && modemState != STATE_LFCAL && modemState != STATE_DMRCAL1K && modemState != STATE_P25CAL1K)
     return 4U;
   if (modemState == STATE_DSTAR && !m_dstarEnable)
     return 4U;
@@ -490,12 +319,6 @@ uint8_t CSerialPort::setMode(const uint8_t* data, uint8_t length)
     return 4U;
   if (modemState == STATE_P25 && !m_p25Enable)
     return 4U;
-  if (modemState == STATE_NXDN && !m_nxdnEnable)
-    return 4U;
-  if (modemState == STATE_POCSAG && !m_pocsagEnable)
-    return 4U;
-  if (modemState == STATE_FM && !m_fmEnable)
-    return 4U;
 
   setMode(modemState);
 
@@ -507,95 +330,104 @@ void CSerialPort::setMode(MMDVM_STATE modemState)
   switch (modemState) {
     case STATE_DMR:
       DEBUG1("Mode set to DMR");
+      dstarRX.reset();
+      ysfRX.reset();
+      p25RX.reset();
+      cwIdTX.reset();
       break;
     case STATE_DSTAR:
       DEBUG1("Mode set to D-Star");
+      dmrIdleRX.reset();
+      dmrDMORX.reset();
+      dmrRX.reset();
+      ysfRX.reset();
+      p25RX.reset();
+      cwIdTX.reset();
       break;
     case STATE_YSF:
       DEBUG1("Mode set to System Fusion");
+      dmrIdleRX.reset();
+      dmrDMORX.reset();
+      dmrRX.reset();
+      dstarRX.reset();
+      p25RX.reset();
+      cwIdTX.reset();
       break;
     case STATE_P25:
       DEBUG1("Mode set to P25");
-      break;
-    case STATE_NXDN:
-      DEBUG1("Mode set to NXDN");
-      break;
-    case STATE_POCSAG:
-      DEBUG1("Mode set to POCSAG");
-      break;
-    case STATE_FM:
-      DEBUG1("Mode set to FM");
+      dmrIdleRX.reset();
+      dmrDMORX.reset();
+      dmrRX.reset();
+      dstarRX.reset();
+      ysfRX.reset();
+      cwIdTX.reset();
       break;
     case STATE_DSTARCAL:
       DEBUG1("Mode set to D-Star Calibrate");
+      dmrIdleRX.reset();
+      dmrDMORX.reset();
+      dmrRX.reset();
+      dstarRX.reset();
+      ysfRX.reset();
+      p25RX.reset();
+      cwIdTX.reset();
       break;
     case STATE_DMRCAL:
       DEBUG1("Mode set to DMR Calibrate");
+      dmrIdleRX.reset();
+      dmrDMORX.reset();
+      dmrRX.reset();
+      dstarRX.reset();
+      ysfRX.reset();
+      p25RX.reset();
+      cwIdTX.reset();
       break;
     case STATE_RSSICAL:
       DEBUG1("Mode set to RSSI Calibrate");
+      dmrIdleRX.reset();
+      dmrDMORX.reset();
+      dmrRX.reset();
+      dstarRX.reset();
+      ysfRX.reset();
+      p25RX.reset();
+      cwIdTX.reset();
       break;
     case STATE_LFCAL:
       DEBUG1("Mode set to 80 Hz Calibrate");
+      dmrIdleRX.reset();
+      dmrDMORX.reset();
+      dmrRX.reset();
+      dstarRX.reset();
+      ysfRX.reset();
+      p25RX.reset();
+      cwIdTX.reset();
       break;
-    case STATE_FMCAL10K:
-      DEBUG1("Mode set to FM 10Khz Calibrate");
-      break;
-    case STATE_FMCAL12K:
-      DEBUG1("Mode set to FM 12.5Khz Calibrate");
-      break;
-    case STATE_FMCAL15K:
-      DEBUG1("Mode set to FM 15Khz Calibrate");
-      break;
-    case STATE_FMCAL20K:
-      DEBUG1("Mode set to FM 20Khz Calibrate");
-      break;
-    case STATE_FMCAL25K:
-      DEBUG1("Mode set to FM 10Khz Calibrate");
-      break;
-    case STATE_FMCAL30K:
-      DEBUG1("Mode set to FM 30Khz Calibrate");
+    case STATE_DMRCAL1K:
+      DEBUG1("Mode set to DMR 1031 Hz Calibrate");
+      dmrIdleRX.reset();
+      dmrDMORX.reset();
+      dmrRX.reset();
+      dstarRX.reset();
+      ysfRX.reset();
+      p25RX.reset();
+      cwIdTX.reset();
       break;
     case STATE_P25CAL1K:
       DEBUG1("Mode set to P25 1011 Hz Calibrate");
+      dmrIdleRX.reset();
+      dmrDMORX.reset();
+      dmrRX.reset();
+      dstarRX.reset();
+      ysfRX.reset();
+      p25RX.reset();
+      cwIdTX.reset();
       break;
-    case STATE_DMRDMO1K:
-      DEBUG1("Mode set to DMR MS 1031 Hz Calibrate");
-      break;
-    case STATE_NXDNCAL1K:
-      DEBUG1("Mode set to NXDN 1031 Hz Calibrate");
-      break;
-    case STATE_POCSAGCAL:
-      DEBUG1("Mode set to POCSAG Calibrate");
-      break;
-    default:        // STATE_IDLE
+    default:
       DEBUG1("Mode set to Idle");
+      // STATE_IDLE
       break;
   }
 
-  if (modemState != STATE_DSTAR)
-    dstarRX.reset();
-
-  if (modemState != STATE_DMR) {
-    dmrIdleRX.reset();
-    dmrDMORX.reset();
-    dmrRX.reset();
-  }
-
-  if (modemState != STATE_YSF)
-    ysfRX.reset();
-
-  if (modemState != STATE_P25)
-    p25RX.reset();
-
-  if (modemState != STATE_NXDN)
-    nxdnRX.reset();
-
-  if (modemState != STATE_FM)
-    fm.reset();
-
-  cwIdTX.reset();
-
   m_modemState = modemState;
 
   io.setMode();
@@ -603,7 +435,7 @@ void CSerialPort::setMode(MMDVM_STATE modemState)
 
 void CSerialPort::start()
 {
-  beginInt(1U, SERIAL_SPEED);
+  beginInt(1U, 115200);
 
 #if defined(SERIAL_REPEATER)
   beginInt(3U, 9600);
@@ -621,8 +453,7 @@ void CSerialPort::process()
         m_buffer[0U] = c;
         m_ptr = 1U;
         m_len = 0U;
-      }
-      else {
+      } else {
         m_ptr = 0U;
         m_len = 0U;
       }
@@ -668,59 +499,13 @@ void CSerialPort::process()
             sendACK();
             break;
 
-          case MMDVM_FM_PARAMS1:
-            err = setFMParams1(m_buffer + 3U, m_len - 3U);
-            if (err == 0U) {
-              sendACK();
-            } else {
-              DEBUG2("Received invalid FM params 1", err);
-              sendNAK(err);
-            }
-            break;
-
-          case MMDVM_FM_PARAMS2:
-            err = setFMParams2(m_buffer + 3U, m_len - 3U);
-            if (err == 0U) {
-              sendACK();
-            } else {
-              DEBUG2("Received invalid FM params 2", err);
-              sendNAK(err);
-            }
-            break;
-
-          case MMDVM_FM_PARAMS3:
-            err = setFMParams3(m_buffer + 3U, m_len - 3U);
-            if (err == 0U) {
-              sendACK();
-            } else {
-              DEBUG2("Received invalid FM params 3", err);
-              sendNAK(err);
-            }
-            break;
-
-          case MMDVM_FM_PARAMS4:
-            err = setFMParams4(m_buffer + 3U, m_len - 3U);
-            if (err == 0U) {
-              sendACK();
-            } else {
-              DEBUG2("Received invalid FM params 4", err);
-              sendNAK(err);
-            }
-            break;
-
           case MMDVM_CAL_DATA:
             if (m_modemState == STATE_DSTARCAL)
               err = calDStarTX.write(m_buffer + 3U, m_len - 3U);
-            if (m_modemState == STATE_DMRCAL || m_modemState == STATE_LFCAL || m_modemState == STATE_DMRCAL1K || m_modemState == STATE_DMRDMO1K)
+            if (m_modemState == STATE_DMRCAL || m_modemState == STATE_LFCAL || m_modemState == STATE_DMRCAL1K)
               err = calDMR.write(m_buffer + 3U, m_len - 3U);
-            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)
-              err = calFM.write(m_buffer + 3U, m_len - 3U);
             if (m_modemState == STATE_P25CAL1K)
               err = calP25.write(m_buffer + 3U, m_len - 3U);
-            if (m_modemState == STATE_NXDNCAL1K)
-              err = calNXDN.write(m_buffer + 3U, m_len - 3U);
-            if (m_modemState == STATE_POCSAGCAL)
-              err = calPOCSAG.write(m_buffer + 3U, m_len - 3U);
             if (err == 0U) {
               sendACK();
             } else {
@@ -896,53 +681,6 @@ void CSerialPort::process()
             }
             break;
 
-          case MMDVM_NXDN_DATA:
-            if (m_nxdnEnable) {
-              if (m_modemState == STATE_IDLE || m_modemState == STATE_NXDN)
-                err = nxdnTX.writeData(m_buffer + 3U, m_len - 3U);
-            }
-            if (err == 0U) {
-              if (m_modemState == STATE_IDLE)
-                setMode(STATE_NXDN);
-            } else {
-              DEBUG2("Received invalid NXDN data", err);
-              sendNAK(err);
-            }
-            break;
-
-          case MMDVM_POCSAG_DATA:
-            if (m_pocsagEnable) {
-              if (m_modemState == STATE_IDLE || m_modemState == STATE_POCSAG)
-                err = pocsagTX.writeData(m_buffer + 3U, m_len - 3U);
-            }
-            if (err == 0U) {
-              if (m_modemState == STATE_IDLE)
-                setMode(STATE_POCSAG);
-            } else {
-              DEBUG2("Received invalid POCSAG data", err);
-              sendNAK(err);
-            }
-            break;
-
-          case MMDVM_FM_DATA:
-            if (m_fmEnable) {
-              if (m_modemState == STATE_IDLE || m_modemState == STATE_FM)
-                err = fm.writeData(m_buffer + 3U, m_len - 3U);
-            }
-            if (err == 0U) {
-              if (m_modemState == STATE_IDLE)
-                setMode(STATE_FM);
-            } else {
-              DEBUG2("Received invalid FM data", err);
-              sendNAK(err);
-            }
-            break;
-
-          case MMDVM_TRANSPARENT:
-          case MMDVM_QSO_INFO:
-            // Do nothing on the MMDVM.
-            break;
-
 #if defined(SERIAL_REPEATER)
           case MMDVM_SERIAL: {
             for (uint8_t i = 3U; i < m_len; i++)
@@ -963,7 +701,7 @@ void CSerialPort::process()
     }
   }
 
-  if (io.getWatchdog() >= 48000U) {
+  if (io.getWatchdog() >= 96000U) {
     m_ptr = 0U;
     m_len = 0U;
   }
@@ -1210,104 +948,6 @@ void CSerialPort::writeP25Lost()
   writeInt(1U, reply, 3);
 }
 
-void CSerialPort::writeNXDNData(const uint8_t* data, uint8_t length)
-{
-  if (m_modemState != STATE_NXDN && m_modemState != STATE_IDLE)
-    return;
-
-  if (!m_nxdnEnable)
-    return;
-
-  uint8_t reply[130U];
-
-  reply[0U] = MMDVM_FRAME_START;
-  reply[1U] = 0U;
-  reply[2U] = MMDVM_NXDN_DATA;
-
-  uint8_t count = 3U;
-  for (uint8_t i = 0U; i < length; i++, count++)
-    reply[count] = data[i];
-
-  reply[1U] = count;
-
-  writeInt(1U, reply, count);
-}
-
-void CSerialPort::writeNXDNLost()
-{
-  if (m_modemState != STATE_NXDN && m_modemState != STATE_IDLE)
-    return;
-
-  if (!m_nxdnEnable)
-    return;
-
-  uint8_t reply[3U];
-
-  reply[0U] = MMDVM_FRAME_START;
-  reply[1U] = 3U;
-  reply[2U] = MMDVM_NXDN_LOST;
-
-  writeInt(1U, reply, 3);
-}
-
-void CSerialPort::writeFMData(const uint8_t* data, uint8_t length)
-{
-  if (m_modemState != STATE_FM && m_modemState != STATE_IDLE)
-    return;
-
-  if (!m_fmEnable)
-    return;
-
-  uint8_t reply[255U];
-
-  reply[0U] = MMDVM_FRAME_START;
-  reply[1U] = 0U;
-  reply[2U] = MMDVM_FM_DATA;
-
-  uint8_t count = 3U;
-  for (uint8_t i = 0U; i < length; i++, count++)
-    reply[count] = data[i];
-
-  reply[1U] = count;
-
-  writeInt(1U, reply, count);
-}
-
-void CSerialPort::writeFMStatus(uint8_t status)
-{
-  if (m_modemState != STATE_FM && m_modemState != STATE_IDLE)
-    return;
-
-  if (!m_fmEnable)
-    return;
-
-  uint8_t reply[10U];
-
-  reply[0U] = MMDVM_FRAME_START;
-  reply[1U] = 4U;
-  reply[2U] = MMDVM_FM_STATUS;
-  reply[3U] = status;
-
-  writeInt(1U, reply, 4U);
-}
-
-void CSerialPort::writeFMEOT()
-{
-  if (m_modemState != STATE_FM && m_modemState != STATE_IDLE)
-    return;
-
-  if (!m_fmEnable)
-    return;
-
-  uint8_t reply[10U];
-
-  reply[0U] = MMDVM_FRAME_START;
-  reply[1U] = 3U;
-  reply[2U] = MMDVM_FM_EOT;
-
-  writeInt(1U, reply, 3U);
-}
-
 void CSerialPort::writeCalData(const uint8_t* data, uint8_t length)
 {
   if (m_modemState != STATE_DSTARCAL)

SerialPort.h

@@ -1,5 +1,5 @@
 /*
- *   Copyright (C) 2015,2016,2017,2018,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
@@ -21,11 +21,7 @@
 
 #include "Config.h"
 #include "Globals.h"
-#include "RingBuffer.h"
-
-#if !defined(SERIAL_SPEED)
-#define SERIAL_SPEED 115200
-#endif
+#include "SerialRB.h"
 
 
 class CSerialPort {
@@ -51,13 +47,6 @@ public:
   void writeP25Ldu(const uint8_t* data, uint8_t length);
   void writeP25Lost();
 
-  void writeNXDNData(const uint8_t* data, uint8_t length);
-  void writeNXDNLost();
-
-  void writeFMData(const uint8_t* data, uint8_t length);
-  void writeFMStatus(uint8_t status);
-  void writeFMEOT();
-
   void writeCalData(const uint8_t* data, uint8_t length);
   void writeRSSIData(const uint8_t* data, uint8_t length);
 
@@ -72,7 +61,7 @@ private:
   uint8_t   m_ptr;
   uint8_t   m_len;
   bool      m_debug;
-  CRingBuffer<uint8_t> m_repeat;
+  CSerialRB m_repeat;
 
   void    sendACK();
   void    sendNAK(uint8_t err);
@@ -81,10 +70,6 @@ private:
   uint8_t setConfig(const uint8_t* data, uint8_t length);
   uint8_t setMode(const uint8_t* data, uint8_t length);
   void    setMode(MMDVM_STATE modemState);
-  uint8_t setFMParams1(const uint8_t* data, uint8_t length);
-  uint8_t setFMParams2(const uint8_t* data, uint8_t length);
-  uint8_t setFMParams3(const uint8_t* data, uint8_t length);
-  uint8_t setFMParams4(const uint8_t* data, uint8_t length);
 
   // Hardware versions
   void    beginInt(uint8_t n, int speed);

SerialRB.cpp

@@ -0,0 +1,101 @@
+/*
+Serial RB control - Copyright (C) KI6ZUM 2015
+Copyright (C) 2015,2016 by Jonathan Naylor G4KLX
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Library General Public
+License as published by the Free Software Foundation; either
+version 2 of the License, or (at your option) any later version.
+
+This library 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
+Library General Public License for more details.
+
+You should have received a copy of the GNU Library General Public
+License along with this library; if not, write to the
+Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+Boston, MA  02110-1301, USA.
+*/
+
+#include "SerialRB.h"
+
+CSerialRB::CSerialRB(uint16_t length) :
+m_length(length),
+m_buffer(NULL),
+m_head(0U),
+m_tail(0U),
+m_full(false)
+{
+  m_buffer = new uint8_t[length];
+}
+
+void CSerialRB::reset()
+{
+  m_head = 0U;
+  m_tail = 0U;
+  m_full = false;
+}
+
+uint16_t CSerialRB::getSpace() const
+{
+  uint16_t n = 0U;
+
+  if (m_tail == m_head)
+    n = m_full ? 0U : m_length;
+  else if (m_tail < m_head)
+    n = m_length - m_head + m_tail;
+  else
+    n = m_tail - m_head;
+
+  if (n > m_length)
+    n = 0U;
+
+  return n;
+}
+
+uint16_t CSerialRB::getData() const
+{
+  if (m_tail == m_head)
+    return m_full ? m_length : 0U;
+  else if (m_tail < m_head)
+    return m_head - m_tail;
+  else
+    return m_length - m_tail + m_head;
+}
+
+bool CSerialRB::put(uint8_t c)
+{
+  if (m_full)
+    return false;
+
+  m_buffer[m_head] = c;
+
+  m_head++;
+  if (m_head >= m_length)
+    m_head = 0U;
+
+  if (m_head == m_tail)
+    m_full = true;
+
+  return true;
+}
+
+uint8_t CSerialRB::peek() const
+{
+  return m_buffer[m_tail];
+}
+
+uint8_t CSerialRB::get()
+{
+  uint8_t value = m_buffer[m_tail];
+
+  m_full = false;
+
+  m_tail++;
+  if (m_tail >= m_length)
+    m_tail = 0U;
+
+  return value;
+}
+

SerialRB.h

@@ -0,0 +1,62 @@
+/*
+Serial fifo control - Copyright (C) KI6ZUM 2015
+Copyright (C) 2015,2016 by Jonathan Naylor G4KLX
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Library General Public
+License as published by the Free Software Foundation; either
+version 2 of the License, or (at your option) any later version.
+
+This library 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
+Library General Public License for more details.
+
+You should have received a copy of the GNU Library General Public
+License along with this library; if not, write to the
+Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+Boston, MA  02110-1301, USA.
+*/
+
+#if !defined(SERIALRB_H)
+#define  SERIALRB_H
+
+#if defined(STM32F4XX)
+#include "stm32f4xx.h"
+#elif defined(STM32F7XX)
+#include "stm32f7xx.h"
+#elif defined(STM32F105xC)
+#include "stm32f1xx.h"
+#include <cstddef>
+#else
+#include <Arduino.h>
+#endif
+
+const uint16_t SERIAL_RINGBUFFER_SIZE = 370U;
+
+class CSerialRB {
+public:
+  CSerialRB(uint16_t length = SERIAL_RINGBUFFER_SIZE);
+
+  uint16_t getSpace() const;
+
+  uint16_t getData() const;
+
+  void reset();
+
+  bool put(uint8_t c);
+
+  uint8_t peek() const;
+
+  uint8_t get();
+
+private:
+  uint16_t          m_length;
+  volatile uint8_t* m_buffer;
+  volatile uint16_t m_head;
+  volatile uint16_t m_tail;
+  volatile bool     m_full;
+};
+
+#endif
+

SerialSTM.cpp

@@ -1,6 +1,6 @@
 /*
  *   Copyright (C) 2016 by Jim McLaughlin KI6ZUM
- *   Copyright (C) 2016,2017,2018 by Andy Uribe CA6JAU
+ *   Copyright (C) 2016, 2017 by Andy Uribe CA6JAU
  *   Copyright (c) 2017 by Jonathan Naylor G4KLX
  *
  *   This program is free software; you can redistribute it and/or modify
@@ -27,19 +27,21 @@
 Pin definitions:
 
 - Host communication:
-USART1 - TXD PA9  - RXD PA10 (MMDVM-Pi board, MMDVM-Pi F722 board, MMDVM-F4M board, STM32F722-F7M board, STM32F4-DVM board)
-USART2 - TXD PA2  - RXD PA3  (Nucleo64 F446RE board, Morpho or Arduino header, MMDVM_RPT_Hat BG4TGO/BG5HHP board)
+USART1 - TXD PA9  - RXD PA10 (MMDVM-Pi board, MMDVM-Pi F722 board, MMDVM-F4M board)
+USART2 - TXD PA2  - RXD PA3  (Nucleo64 F446RE board, Morpho or Arduino header)
 USART3 - TXD PC10 - RXD PC11 (Discovery board)
 USART3 - TXD PD8  - RXD PD9  (Nucleo144 F767ZI board)
 
 - Serial repeater:
 USART1 - TXD PA9  - RXD PA10 (Nucleo with Arduino header)
-UART5  - TXD PC12 - RXD PD2 (Discovery, MMDVM-Pi, MMDVM-Pi F722 board, MMDVM-F4M board, STM32F722-F7M board, STM32F4-DVM board, Nucleo64 with Morpho header and Nucleo144 F767ZI, MMDVM_RPT_Hat BG4TGO/BG5HHP board)
+UART5  - TXD PC12 - RXD PD2 (Discovery, MMDVM-Pi, MMDVM-Pi F722 board, MMDVM-F4M board, Nucleo64 with Morpho header and Nucleo144 F767ZI)
 */
 
 #if defined(STM32F4XX) || defined(STM32F7XX)
 
-#include "STMUART.h"
+#define TX_SERIAL_FIFO_SIZE 512U
+#define RX_SERIAL_FIFO_SIZE 512U
+
 extern "C" {
    void USART1_IRQHandler();
    void USART2_IRQHandler();
@@ -48,14 +50,113 @@ extern "C" {
 }
 
 /* ************* USART1 ***************** */
-#if defined(STM32F4_PI) || defined(STM32F4_F4M) || defined(STM32F722_F7M) || defined(STM32F722_PI) || defined(STM32F722_RPT_HAT) || defined(STM32F4_DVM) || (defined(STM32F4_NUCLEO) && defined(STM32F4_NUCLEO_ARDUINO_HEADER)) || defined(DRCC_DVM)
+#if defined(STM32F4_PI) || defined(STM32F4_F4M) || defined(STM32F722_PI) || (defined(STM32F4_NUCLEO) && defined(STM32F4_NUCLEO_ARDUINO_HEADER))
 
+volatile uint8_t  TXSerialfifo1[TX_SERIAL_FIFO_SIZE];
+volatile uint8_t  RXSerialfifo1[RX_SERIAL_FIFO_SIZE];
+volatile uint16_t TXSerialfifohead1, TXSerialfifotail1;
+volatile uint16_t RXSerialfifohead1, RXSerialfifotail1;
 
-static CSTMUART m_USART1;
+// Init queues
+void TXSerialfifoinit1()
+{
+   TXSerialfifohead1 = 0U;
+   TXSerialfifotail1 = 0U;
+}
+
+void RXSerialfifoinit1()
+{
+   RXSerialfifohead1 = 0U;
+   RXSerialfifotail1 = 0U;
+}
+
+// How full is queue
+// TODO decide if how full or how empty is preferred info to return
+uint16_t TXSerialfifolevel1()
+{
+   uint32_t tail = TXSerialfifotail1;
+   uint32_t head = TXSerialfifohead1;
+
+   if (tail > head)
+      return TX_SERIAL_FIFO_SIZE + head - tail;
+   else
+      return head - tail;
+}
+
+uint16_t RXSerialfifolevel1()
+{
+   uint32_t tail = RXSerialfifotail1;
+   uint32_t head = RXSerialfifohead1;
+
+   if (tail > head)
+      return RX_SERIAL_FIFO_SIZE + head - tail;
+   else
+      return head - tail;
+}
+
+// Flushes the transmit shift register
+// warning: this call is blocking
+void TXSerialFlush1()
+{
+   // wait until the TXE shows the shift register is empty
+   while (USART_GetITStatus(USART1, USART_FLAG_TXE))
+      ;
+}
+
+uint8_t TXSerialfifoput1(uint8_t next)
+{
+   if (TXSerialfifolevel1() < TX_SERIAL_FIFO_SIZE) {
+      TXSerialfifo1[TXSerialfifohead1] = next;
+
+      TXSerialfifohead1++;
+      if (TXSerialfifohead1 >= TX_SERIAL_FIFO_SIZE)
+         TXSerialfifohead1 = 0U;
+
+      // make sure transmit interrupts are enabled as long as there is data to send
+      USART_ITConfig(USART1, USART_IT_TXE, ENABLE);
+      return 1U;
+   } else {
+      return 0U; // signal an overflow occurred by returning a zero count
+   }
+}
 
 void USART1_IRQHandler()
 {
-  m_USART1.handleIRQ();
+   uint8_t c;
+
+   if (USART_GetITStatus(USART1, USART_IT_RXNE)) {
+      c = (uint8_t) USART_ReceiveData(USART1);
+
+      if (RXSerialfifolevel1() < RX_SERIAL_FIFO_SIZE) {
+         RXSerialfifo1[RXSerialfifohead1] = c;
+
+         RXSerialfifohead1++;
+         if (RXSerialfifohead1 >= RX_SERIAL_FIFO_SIZE)
+            RXSerialfifohead1 = 0U;
+      } else {
+         // TODO - do something if rx fifo is full?
+      }
+
+      USART_ClearITPendingBit(USART1, USART_IT_RXNE);
+   }
+
+   if (USART_GetITStatus(USART1, USART_IT_TXE)) {
+      c = 0U;
+
+      if (TXSerialfifohead1 != TXSerialfifotail1) { // if the fifo is not empty
+         c = TXSerialfifo1[TXSerialfifotail1];
+
+         TXSerialfifotail1++;
+         if (TXSerialfifotail1 >= TX_SERIAL_FIFO_SIZE)
+            TXSerialfifotail1 = 0U;
+
+         USART_SendData(USART1, c);
+      } else { // if there's no more data to transmit then turn off TX interrupts
+         USART_ITConfig(USART1, USART_IT_TXE, DISABLE);
+      }
+
+      USART_ClearITPendingBit(USART1, USART_IT_TXE);
+   }
 }
 
 void InitUSART1(int speed)
@@ -100,20 +201,153 @@ void InitUSART1(int speed)
 
    USART_ITConfig(USART1, USART_IT_RXNE, ENABLE);
 
-   m_USART1.init(USART1);
+   // initialize the fifos
+   TXSerialfifoinit1();
+   RXSerialfifoinit1();
+}
+
+uint8_t AvailUSART1()
+{
+   if (RXSerialfifolevel1() > 0U)
+      return 1U;
+   else
+      return 0U;
+}
+
+int AvailForWriteUSART1()
+{
+   return TX_SERIAL_FIFO_SIZE - TXSerialfifolevel1();
+}
+
+uint8_t ReadUSART1()
+{
+   uint8_t data_c = RXSerialfifo1[RXSerialfifotail1];
+
+   RXSerialfifotail1++;
+   if (RXSerialfifotail1 >= RX_SERIAL_FIFO_SIZE)
+      RXSerialfifotail1 = 0U;
+
+   return data_c;
+}
+
+void WriteUSART1(const uint8_t* data, uint16_t length)
+{
+   for (uint16_t i = 0U; i < length; i++)
+      TXSerialfifoput1(data[i]);
+
+   USART_ITConfig(USART1, USART_IT_TXE, ENABLE);
 }
 
 #endif
 
 /* ************* USART2 ***************** */
-#if defined(STM32F4_NUCLEO) || defined(STM32F4_RPT_HAT_TGO) || defined(DRCC_DVM)
+#if defined(STM32F4_NUCLEO)
 
-static CSTMUART m_USART2;
+volatile uint8_t  TXSerialfifo2[TX_SERIAL_FIFO_SIZE];
+volatile uint8_t  RXSerialfifo2[RX_SERIAL_FIFO_SIZE];
+volatile uint16_t TXSerialfifohead2, TXSerialfifotail2;
+volatile uint16_t RXSerialfifohead2, RXSerialfifotail2;
 
+// Init queues
+void TXSerialfifoinit2()
+{
+   TXSerialfifohead2 = 0U;
+   TXSerialfifotail2 = 0U;
+}
+
+void RXSerialfifoinit2()
+{
+   RXSerialfifohead2 = 0U;
+   RXSerialfifotail2 = 0U;
+}
+
+// How full is queue
+// TODO decide if how full or how empty is preferred info to return
+uint16_t TXSerialfifolevel2()
+{
+   uint32_t tail = TXSerialfifotail2;
+   uint32_t head = TXSerialfifohead2;
+
+   if (tail > head)
+      return TX_SERIAL_FIFO_SIZE + head - tail;
+   else
+      return head - tail;
+}
+
+uint16_t RXSerialfifolevel2()
+{
+   uint32_t tail = RXSerialfifotail2;
+   uint32_t head = RXSerialfifohead2;
+
+   if (tail > head)
+      return RX_SERIAL_FIFO_SIZE + head - tail;
+   else
+      return head - tail;
+}
+
+// Flushes the transmit shift register
+// warning: this call is blocking
+void TXSerialFlush2()
+{
+   // wait until the TXE shows the shift register is empty
+   while (USART_GetITStatus(USART2, USART_FLAG_TXE))
+      ;
+}
+
+uint8_t TXSerialfifoput2(uint8_t next)
+{
+   if (TXSerialfifolevel2() < TX_SERIAL_FIFO_SIZE) {
+      TXSerialfifo2[TXSerialfifohead2] = next;
+
+      TXSerialfifohead2++;
+      if (TXSerialfifohead2 >= TX_SERIAL_FIFO_SIZE)
+         TXSerialfifohead2 = 0U;
+
+      // make sure transmit interrupts are enabled as long as there is data to send
+      USART_ITConfig(USART2, USART_IT_TXE, ENABLE);
+      return 1U;
+   } else {
+      return 0U; // signal an overflow occurred by returning a zero count
+   }
+}
 
 void USART2_IRQHandler()
 {
-   m_USART2.handleIRQ();
+   uint8_t c;
+
+   if (USART_GetITStatus(USART2, USART_IT_RXNE)) {
+      c = (uint8_t) USART_ReceiveData(USART2);
+
+      if (RXSerialfifolevel2() < RX_SERIAL_FIFO_SIZE) {
+         RXSerialfifo2[RXSerialfifohead2] = c;
+
+         RXSerialfifohead2++;
+         if (RXSerialfifohead2 >= RX_SERIAL_FIFO_SIZE)
+            RXSerialfifohead2 = 0U;
+      } else {
+         // TODO - do something if rx fifo is full?
+      }
+
+      USART_ClearITPendingBit(USART2, USART_IT_RXNE);
+   }
+
+   if (USART_GetITStatus(USART2, USART_IT_TXE)) {
+      c = 0U;
+
+      if (TXSerialfifohead2 != TXSerialfifotail2) { // if the fifo is not empty
+         c = TXSerialfifo2[TXSerialfifotail2];
+
+         TXSerialfifotail2++;
+         if (TXSerialfifotail2 >= TX_SERIAL_FIFO_SIZE)
+            TXSerialfifotail2 = 0U;
+
+         USART_SendData(USART2, c);
+      } else { // if there's no more data to transmit then turn off TX interrupts
+         USART_ITConfig(USART2, USART_IT_TXE, DISABLE);
+      }
+
+      USART_ClearITPendingBit(USART2, USART_IT_TXE);
+   }
 }
 
 void InitUSART2(int speed)
@@ -158,7 +392,41 @@ void InitUSART2(int speed)
 
    USART_ITConfig(USART2, USART_IT_RXNE, ENABLE);
 
-   m_USART2.init(USART2);
+   // initialize the fifos
+   TXSerialfifoinit2();
+   RXSerialfifoinit2();
+}
+
+uint8_t AvailUSART2()
+{
+   if (RXSerialfifolevel2() > 0U)
+      return 1U;
+   else
+      return 0U;
+}
+
+int AvailForWriteUSART2()
+{
+   return TX_SERIAL_FIFO_SIZE - TXSerialfifolevel2();
+}
+
+uint8_t ReadUSART2()
+{
+   uint8_t data_c = RXSerialfifo2[RXSerialfifotail2];
+
+   RXSerialfifotail2++;
+   if (RXSerialfifotail2 >= RX_SERIAL_FIFO_SIZE)
+      RXSerialfifotail2 = 0U;
+
+   return data_c;
+}
+
+void WriteUSART2(const uint8_t* data, uint16_t length)
+{
+   for (uint16_t i = 0U; i < length; i++)
+      TXSerialfifoput2(data[i]);
+
+   USART_ITConfig(USART2, USART_IT_TXE, ENABLE);
 }
 
 #endif
@@ -166,11 +434,111 @@ void InitUSART2(int speed)
 /* ************* USART3 ***************** */
 #if defined(STM32F4_DISCOVERY) || defined(STM32F7_NUCLEO)
 
-static CSTMUART m_USART3;
+volatile uint8_t  TXSerialfifo3[TX_SERIAL_FIFO_SIZE];
+volatile uint8_t  RXSerialfifo3[RX_SERIAL_FIFO_SIZE];
+volatile uint16_t TXSerialfifohead3, TXSerialfifotail3;
+volatile uint16_t RXSerialfifohead3, RXSerialfifotail3;
+
+// Init queues
+void TXSerialfifoinit3()
+{
+   TXSerialfifohead3 = 0U;
+   TXSerialfifotail3 = 0U;
+}
+
+void RXSerialfifoinit3()
+{
+   RXSerialfifohead3 = 0U;
+   RXSerialfifotail3 = 0U;
+}
+
+// How full is queue
+// TODO decide if how full or how empty is preferred info to return
+uint16_t TXSerialfifolevel3()
+{
+   uint32_t tail = TXSerialfifotail3;
+   uint32_t head = TXSerialfifohead3;
+
+   if (tail > head)
+      return TX_SERIAL_FIFO_SIZE + head - tail;
+   else
+      return head - tail;
+}
+
+uint16_t RXSerialfifolevel3()
+{
+   uint32_t tail = RXSerialfifotail3;
+   uint32_t head = RXSerialfifohead3;
+
+   if (tail > head)
+      return RX_SERIAL_FIFO_SIZE + head - tail;
+   else
+      return head - tail;
+}
+
+// Flushes the transmit shift register
+// warning: this call is blocking
+void TXSerialFlush3()
+{
+   // wait until the TXE shows the shift register is empty
+   while (USART_GetITStatus(USART3, USART_FLAG_TXE))
+      ;
+}
+
+uint8_t TXSerialfifoput3(uint8_t next)
+{
+   if (TXSerialfifolevel3() < TX_SERIAL_FIFO_SIZE) {
+      TXSerialfifo3[TXSerialfifohead3] = next;
+
+      TXSerialfifohead3++;
+      if (TXSerialfifohead3 >= TX_SERIAL_FIFO_SIZE)
+         TXSerialfifohead3 = 0U;
+
+      // make sure transmit interrupts are enabled as long as there is data to send
+      USART_ITConfig(USART3, USART_IT_TXE, ENABLE);
+      return 1U;
+   } else {
+      return 0U; // signal an overflow occurred by returning a zero count
+   }
+}
 
 void USART3_IRQHandler()
 {
-   m_USART3.handleIRQ();
+   uint8_t c;
+
+   if (USART_GetITStatus(USART3, USART_IT_RXNE)) {
+      c = (uint8_t) USART_ReceiveData(USART3);
+
+      if (RXSerialfifolevel3() < RX_SERIAL_FIFO_SIZE) {
+         RXSerialfifo3[RXSerialfifohead3] = c;
+
+         RXSerialfifohead3++;
+         if (RXSerialfifohead3 >= RX_SERIAL_FIFO_SIZE)
+            RXSerialfifohead3 = 0U;
+      } else {
+         // TODO - do something if rx fifo is full?
+      }
+
+      USART_ClearITPendingBit(USART3, USART_IT_RXNE);
+   }
+
+   if (USART_GetITStatus(USART3, USART_IT_TXE)) {
+      c = 0U;
+
+      if (TXSerialfifohead3 != TXSerialfifotail3) { // if the fifo is not empty
+         c = TXSerialfifo3[TXSerialfifotail3];
+
+         TXSerialfifotail3++;
+         if (TXSerialfifotail3 >= TX_SERIAL_FIFO_SIZE)
+            TXSerialfifotail3 = 0U;
+
+         USART_SendData(USART3, c);
+      } else { // if there's no more data to transmit then turn off TX interrupts
+         USART_ITConfig(USART3, USART_IT_TXE, DISABLE);
+      }
+
+      USART_ClearITPendingBit(USART3, USART_IT_TXE);
+   }
 }
 
 #if defined(STM32F7_NUCLEO)
@@ -232,7 +600,41 @@ void InitUSART3(int speed)
 
    USART_ITConfig(USART3, USART_IT_RXNE, ENABLE);
 
-   m_USART3.init(USART3);
+   // initialize the fifos
+   TXSerialfifoinit3();
+   RXSerialfifoinit3();
+}
+
+uint8_t AvailUSART3()
+{
+   if (RXSerialfifolevel3() > 0U)
+      return 1U;
+   else
+      return 0U;
+}
+
+int AvailForWriteUSART3()
+{
+   return TX_SERIAL_FIFO_SIZE - TXSerialfifolevel3();
+}
+
+uint8_t ReadUSART3()
+{
+   uint8_t data_c = RXSerialfifo3[RXSerialfifotail3];
+
+   RXSerialfifotail3++;
+   if (RXSerialfifotail3 >= RX_SERIAL_FIFO_SIZE)
+      RXSerialfifotail3 = 0U;
+
+   return data_c;
+}
+
+void WriteUSART3(const uint8_t* data, uint16_t length)
+{
+   for (uint16_t i = 0U; i < length; i++)
+      TXSerialfifoput3(data[i]);
+
+   USART_ITConfig(USART3, USART_IT_TXE, ENABLE);
 }
 
 #endif
@@ -240,11 +642,111 @@ void InitUSART3(int speed)
 /* ************* UART5 ***************** */
 #if !(defined(STM32F4_NUCLEO) && defined(STM32F4_NUCLEO_ARDUINO_HEADER))
 
-static CSTMUART m_UART5;
+volatile uint8_t  TXSerialfifo5[TX_SERIAL_FIFO_SIZE];
+volatile uint8_t  RXSerialfifo5[RX_SERIAL_FIFO_SIZE];
+volatile uint16_t TXSerialfifohead5, TXSerialfifotail5;
+volatile uint16_t RXSerialfifohead5, RXSerialfifotail5;
+
+// Init queues
+void TXSerialfifoinit5()
+{
+   TXSerialfifohead5 = 0U;
+   TXSerialfifotail5 = 0U;
+}
+
+void RXSerialfifoinit5()
+{
+   RXSerialfifohead5 = 0U;
+   RXSerialfifotail5 = 0U;
+}
+
+// How full is queue
+// TODO decide if how full or how empty is preferred info to return
+uint16_t TXSerialfifolevel5()
+{
+   uint32_t tail = TXSerialfifotail5;
+   uint32_t head = TXSerialfifohead5;
+
+   if (tail > head)
+      return TX_SERIAL_FIFO_SIZE + head - tail;
+   else
+      return head - tail;
+}
+
+uint16_t RXSerialfifolevel5()
+{
+   uint32_t tail = RXSerialfifotail5;
+   uint32_t head = RXSerialfifohead5;
+
+   if (tail > head)
+      return RX_SERIAL_FIFO_SIZE + head - tail;
+   else
+      return head - tail;
+}
+
+// Flushes the transmit shift register
+// warning: this call is blocking
+void TXSerialFlush5()
+{
+   // wait until the TXE shows the shift register is empty
+   while (USART_GetITStatus(UART5, USART_FLAG_TXE))
+      ;
+}
+
+uint8_t TXSerialfifoput5(uint8_t next)
+{
+   if (TXSerialfifolevel5() < TX_SERIAL_FIFO_SIZE) {
+      TXSerialfifo5[TXSerialfifohead5] = next;
+
+      TXSerialfifohead5++;
+      if (TXSerialfifohead5 >= TX_SERIAL_FIFO_SIZE)
+         TXSerialfifohead5 = 0U;
+
+      // make sure transmit interrupts are enabled as long as there is data to send
+      USART_ITConfig(UART5, USART_IT_TXE, ENABLE);
+      return 1U;
+   } else {
+      return 0U; // signal an overflow occurred by returning a zero count
+   }
+}
 
 void UART5_IRQHandler()
 {
-   m_UART5.handleIRQ();
+   uint8_t c;
+
+   if (USART_GetITStatus(UART5, USART_IT_RXNE)) {
+      c = (uint8_t) USART_ReceiveData(UART5);
+
+      if (RXSerialfifolevel5() < RX_SERIAL_FIFO_SIZE) {
+         RXSerialfifo5[RXSerialfifohead5] = c;
+
+         RXSerialfifohead5++;
+         if (RXSerialfifohead5 >= RX_SERIAL_FIFO_SIZE)
+            RXSerialfifohead5 = 0U;
+      } else {
+         // TODO - do something if rx fifo is full?
+      }
+
+      USART_ClearITPendingBit(UART5, USART_IT_RXNE);
+   }
+
+   if (USART_GetITStatus(UART5, USART_IT_TXE)) {
+      c = 0U;
+
+      if (TXSerialfifohead5 != TXSerialfifotail5) { // if the fifo is not empty
+         c = TXSerialfifo5[TXSerialfifotail5];
+
+         TXSerialfifotail5++;
+         if (TXSerialfifotail5 >= TX_SERIAL_FIFO_SIZE)
+            TXSerialfifotail5 = 0U;
+
+         USART_SendData(UART5, c);
+      } else { // if there's no more data to transmit then turn off TX interrupts
+      USART_ITConfig(UART5, USART_IT_TXE, DISABLE);
+      }
+
+      USART_ClearITPendingBit(UART5, USART_IT_TXE);
+   }
 }
 
 void InitUART5(int speed)
@@ -293,7 +795,41 @@ void InitUART5(int speed)
 
    USART_ITConfig(UART5, USART_IT_RXNE, ENABLE);
 
-   m_UART5.init(UART5);
+   // initialize the fifos
+   TXSerialfifoinit5();
+   RXSerialfifoinit5();
+}
+
+uint8_t AvailUART5()
+{
+   if (RXSerialfifolevel5() > 0U)
+      return 1U;
+   else
+      return 0U;
+}
+
+int AvailForWriteUART5()
+{
+   return TX_SERIAL_FIFO_SIZE - TXSerialfifolevel5();
+}
+
+uint8_t ReadUART5()
+{
+   uint8_t data_c = RXSerialfifo5[RXSerialfifotail5];
+
+   RXSerialfifotail5++;
+   if (RXSerialfifotail5 >= RX_SERIAL_FIFO_SIZE)
+      RXSerialfifotail5 = 0U;
+
+   return data_c;
+}
+
+void WriteUART5(const uint8_t* data, uint16_t length)
+{
+   for (uint16_t i = 0U; i < length; i++)
+      TXSerialfifoput5(data[i]);
+
+   USART_ITConfig(UART5, USART_IT_TXE, ENABLE);
 }
 
 #endif
@@ -305,19 +841,15 @@ void CSerialPort::beginInt(uint8_t n, int speed)
       case 1U:
          #if defined(STM32F4_DISCOVERY) || defined(STM32F7_NUCLEO)
          InitUSART3(speed);
-         #elif defined(STM32F4_PI) || defined(STM32F4_F4M) || defined(STM32F722_PI) || defined(STM32F722_F7M) || defined(STM32F722_RPT_HAT) || defined(STM32F4_DVM)
+         #elif defined(STM32F4_PI) || defined(STM32F4_F4M) || defined(STM32F722_PI)
          InitUSART1(speed);
-         #elif defined(STM32F4_NUCLEO) || defined(STM32F4_RPT_HAT_TGO)
+         #elif defined(STM32F4_NUCLEO)
          InitUSART2(speed);
-         #elif defined(DRCC_DVM)
-         InitUSART1(speed);
          #endif
          break;
       case 3U:
          #if defined(STM32F4_NUCLEO) && defined(STM32F4_NUCLEO_ARDUINO_HEADER)
          InitUSART1(speed);
-         #elif defined(DRCC_DVM)
-         InitUSART2(speed);
          #else
          InitUART5(speed);
          #endif
@@ -332,21 +864,17 @@ int CSerialPort::availableInt(uint8_t n)
    switch (n) {
       case 1U:
          #if defined(STM32F4_DISCOVERY) || defined(STM32F7_NUCLEO)
-         return m_USART3.availble();//AvailUSART3();
-         #elif defined(STM32F4_PI) || defined(STM32F4_F4M) || defined(STM32F722_PI) || defined(STM32F722_F7M) || defined(STM32F722_RPT_HAT) || defined(STM32F4_DVM)
-         return m_USART1.available();//AvailUSART1();
-         #elif defined(STM32F4_NUCLEO) || defined(STM32F4_RPT_HAT_TGO)
-         return m_USART2.available();//AvailUSART2();
-         #elif defined(DRCC_DVM)
-         return m_USART1.available();//AvailUSART1();
+         return AvailUSART3();
+         #elif defined(STM32F4_PI) || defined(STM32F4_F4M) || defined(STM32F722_PI)
+         return AvailUSART1();
+         #elif defined(STM32F4_NUCLEO)
+         return AvailUSART2();
          #endif
       case 3U:
          #if defined(STM32F4_NUCLEO) && defined(STM32F4_NUCLEO_ARDUINO_HEADER)
-         return m_USART1.available(); //AvailUSART1();
-         #elif defined(DRCC_DVM)
-         return m_USART2.available(); //AvailUSART2();
+         return AvailUSART1();
          #else
-         return m_UART5.available();//AvailUART5();
+         return AvailUART5();
          #endif
       default:
          return 0;
@@ -358,21 +886,17 @@ int CSerialPort::availableForWriteInt(uint8_t n)
    switch (n) {
       case 1U:
          #if defined(STM32F4_DISCOVERY) || defined(STM32F7_NUCLEO)
-         return m_USART3.availableForWrite(); //AvailForWriteUSART3();
-         #elif defined(STM32F4_PI) || defined(STM32F4_F4M) || defined(STM32F722_PI) || defined(STM32F722_F7M) || defined(STM32F722_RPT_HAT) || defined(STM32F4_DVM)
-         return m_USART1.availableForWrite(); //AvailForWriteUSART1();
-         #elif defined(STM32F4_NUCLEO) || defined(STM32F4_RPT_HAT_TGO)
-         return m_USART2.availableForWrite();//AvailForWriteUSART2();
-         #elif defined(DRCC_DVM)
-         return m_USART1.availableForWrite();//AvailForWriteUSART1();
+         return AvailForWriteUSART3();
+         #elif defined(STM32F4_PI) || defined(STM32F4_F4M) || defined(STM32F722_PI)
+         return AvailForWriteUSART1();
+         #elif defined(STM32F4_NUCLEO)
+         return AvailForWriteUSART2();
          #endif
       case 3U:
          #if defined(STM32F4_NUCLEO) && defined(STM32F4_NUCLEO_ARDUINO_HEADER)
-         return m_USART1.availableForWrite(); //AvailForWriteUSART1();
-         #elif defined(DRCC_DVM)
-         return m_USART2.availableForWrite();//AvailForWriteUSART2();
+         return AvailForWriteUSART1();
          #else
-         return m_UART5.availableForWrite();//AvailForWriteUART5();
+         return AvailForWriteUART5();
          #endif
       default:
          return 0;
@@ -384,21 +908,17 @@ uint8_t CSerialPort::readInt(uint8_t n)
    switch (n) {
       case 1U:
          #if defined(STM32F4_DISCOVERY) || defined(STM32F7_NUCLEO)
-         return m_USART3.read();//ReadUSART3();
-         #elif defined(STM32F4_PI) || defined(STM32F4_F4M) || defined(STM32F722_PI) || defined(STM32F722_F7M) || defined(STM32F722_RPT_HAT) || defined(STM32F4_DVM)
-         return m_USART1.read();//ReadUSART1();
-         #elif defined(STM32F4_NUCLEO) || defined(STM32F4_RPT_HAT_TGO)
-         return m_USART2.read();//ReadUSART2();
-         #elif defined(DRCC_DVM)
-         return m_USART1.read();//ReadUSART1();
+         return ReadUSART3();
+         #elif defined(STM32F4_PI) || defined(STM32F4_F4M) || defined(STM32F722_PI)
+         return ReadUSART1();
+         #elif defined(STM32F4_NUCLEO)
+         return ReadUSART2();
          #endif
       case 3U:
          #if defined(STM32F4_NUCLEO) && defined(STM32F4_NUCLEO_ARDUINO_HEADER)
-         return m_USART1.read();//ReadUSART1();
-         #elif defined(DRCC_DVM)
-         return m_USART2.read();//ReadUSART2();
+         return ReadUSART1();
          #else
-         return m_UART5.read();//ReadUART5();
+         return ReadUART5();
          #endif
       default:
          return 0U;
@@ -410,36 +930,28 @@ void CSerialPort::writeInt(uint8_t n, const uint8_t* data, uint16_t length, bool
    switch (n) {
       case 1U:
          #if defined(STM32F4_DISCOVERY) || defined(STM32F7_NUCLEO)
-         m_USART3.write(data, length); //WriteUSART3(data, length);
+         WriteUSART3(data, length);
          if (flush)
-            m_USART3.flush();//TXSerialFlush3();
-         #elif defined(STM32F4_PI) || defined(STM32F4_F4M) || defined(STM32F722_PI) || defined(STM32F722_F7M) || defined(STM32F722_RPT_HAT) || defined(STM32F4_DVM)
-         m_USART1.write(data, length);//WriteUSART1(data, length);
+            TXSerialFlush3();
+         #elif defined(STM32F4_PI) || defined(STM32F4_F4M) || defined(STM32F722_PI)
+         WriteUSART1(data, length);
          if (flush)
-            m_USART1.flush();//TXSerialFlush1();
-         #elif defined(STM32F4_NUCLEO) || defined(STM32F4_RPT_HAT_TGO)
-         m_USART2.write(data, length);//WriteUSART2(data, length);
+            TXSerialFlush1();
+         #elif defined(STM32F4_NUCLEO)
+         WriteUSART2(data, length);
          if (flush)
-            m_USART2.flush();//TXSerialFlush2();
-         #elif defined(DRCC_DVM)
-         m_USART1.write(data, length);//WriteUSART1(data, length);
-         if (flush)
-            m_USART1.flush();//TXSerialFlush1();
+            TXSerialFlush2();
          #endif
          break;
       case 3U:
          #if defined(STM32F4_NUCLEO) && defined(STM32F4_NUCLEO_ARDUINO_HEADER)
-         m_USART1.write(data, length); //WriteUSART1(data, length);
+         WriteUSART1(data, length);
          if (flush)
-            m_USART1.flush();
-         #elif defined(DRCC_DVM)
-         m_USART2.write(data, length);//WriteUSART2(data, length);
-         if (flush)
-            m_USART2.flush();//TXSerialFlush2();
+            TXSerialFlush1();
          #else
-         m_UART5.write(data, length);//WriteUART5(data, length);
+         WriteUART5(data, length);
          if (flush)
-            m_UART5.flush();//TXSerialFlush5();
+            TXSerialFlush5();
          #endif
          break;
       default:

TODO.txt

@@ -0,0 +1,41 @@
+Jobs To Do
+----------
+
+Jobs Done
+---------
+
+1.  Boxcar coefficients
+2.  Symbols lengths for:
+	 D-Star
+	 DMR
+	 YSF
+	 P25
+3.  Sample ring buffer sizing
+	 RX
+	 TX
+4.  Hardware sample rates:
+	 Due
+	 STM32
+	 Teensy
+5.  DC Offset coefficients
+6.  TX Filters:
+	 D-Star
+	 DMR
+	 YSF
+	 P25
+7.  TX Filter workspaces and clearing:
+	 D-Star
+	 DMR
+	 YSF
+	 P25
+8.  CW Id sine wave, silence and construction
+9.  RX Filters
+10. RX Filter workspaces and clearing:
+	 D-Star
+	 DMR
+	 YSF
+	 P25
+11. TX symbols.
+12. DC Offset workspace and clearing.
+13. DMR magic numbers.
+14. Watchdog values.

Tools/FMGenerateFilterCoefficients.py

@@ -1,46 +0,0 @@
-# based on https://github.com/berndporr/iir_fixed_point/blob/master/gen_coeff.py
-
-import numpy as np
-import scipy.signal as signal
-import pylab as pl
-
-# Calculate the coefficients for a pure fixed point
-# integer filter
-
-# sampling rate
-fs = 24000
-
-# cutoffs
-f1 = 300
-f2 = 2700
-# ripple
-rp = 0.2
-
-# scaling factor in bits, do not change !
-q = 15
-# scaling factor as facor...
-scaling_factor = 2**q
-
-# let's generate a sequence of 2nd order IIR filters
-sos = signal.cheby1(3,rp,[f1, f2],'bandpass', output='sos', fs=fs)
-#os = signal.cheby1(4, rp, f2, 'lowpass', output='sos', fs=fs) #deemphasis filter
-#sos = signal.cheby1(1, rp, 2122, 'highpass', output='sos', fs=fs) #deemphasis filter
-
-sosrounded = np.round((sos) * scaling_factor)
-
-# print coefficients
-for biquad in sosrounded:
-    for coeff in biquad:
-        print(int(coeff),",",sep="",end="")
-        #print((coeff),",",sep="",end="")
-    print("")
-
-# plot the frequency response
-b,a = signal.sos2tf(sos)
-w,h = signal.freqz(b,a, worN=2048)
-pl.plot(w/np.pi/2*fs,20*np.log(np.abs(h)))
-pl.xlabel('frequency/Hz');
-pl.ylabel('gain/dB');
-pl.ylim(top=1,bottom=-30);
-pl.xlim(left=250, right=12000);
-pl.show()

Tools/emphasis.txt

@@ -1,58 +0,0 @@
-% GNU Octave script to generate pre and deemphasis filters
-% https://dsp.stackexchange.com/questions/34605/biquad-cookbook-formula-for-broadcast-fm-de-emphasis
-% PACKAGES
-
-pkg load control
-pkg load signal
-
-clear all;
-clc;
-
-fs = 24000;
-samplingtime = 1/fs;
-
-% analog prototype
-A2 = [1];
-B2 = [0.000075 1];
-
-% Pre
-Ds = tf(B2, A2);
-% De
-% Ds = tf(A2, B2);
- 
-Ds = Ds/dcgain(Ds);
-
-% MZT
-T1 = 0.000075; % 75us
-z1 = -exp(-1.0/(fs*T1));
-p1 = 1+z1;
-
-a0 = 1.0;
-a1 = p1;
-a2 = 0;
-
-b0 = 1.0;
-b1 = z1;
-b2 = 0;
-
-% swap between a1, b1 to select pre- or de-emphasis
-
-# Pre
-Bmzt = [b0 a1 b2]
-Amzt = [a0 b1 a2]
-% De
-% Bmzt = [b0 b1 b2]
-% Amzt = [a0 a1 a2]
-
-DzMZT = tf(Amzt, Bmzt, samplingtime);
-DzMZT = DzMZT/dcgain(DzMZT);
-
-%% Plot
-wmin = 2 * pi * 20.0; % 20Hz
-wmax = 2 * pi * ((fs/2.0) - (fs/2 - 20000)); %20kHz
-
-figure(1);
-bode(Ds, 'b', DzMZT, 'c', {wmin, wmax});
-legend('Analog prototype', 'MZT 2nd order','location', 'northwest');
-grid on;
-pause();

YSFDefines.h

@@ -19,7 +19,7 @@
 #if !defined(YSFDEFINES_H)
 #define  YSFDEFINES_H
 
-const unsigned int YSF_RADIO_SYMBOL_LENGTH = 5U;      // At 24 kHz sample rate
+const unsigned int YSF_RADIO_SYMBOL_LENGTH = 10U;      // At 48 kHz sample rate
 
 const unsigned int YSF_FRAME_LENGTH_BYTES   = 120U;
 const unsigned int YSF_FRAME_LENGTH_BITS    = YSF_FRAME_LENGTH_BYTES * 8U;

YSFTX.cpp

@@ -1,5 +1,5 @@
 /*
- *   Copyright (C) 2009-2018 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
@@ -23,10 +23,16 @@
 
 #include "YSFDefines.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 YSF_LEVELA_HI =  1893;
@@ -41,19 +47,16 @@ const q15_t YSF_LEVELD_LO = -948;
 
 const uint8_t YSF_START_SYNC = 0x77U;
 const uint8_t YSF_END_SYNC   = 0xFFU;
-const uint8_t YSF_HANG       = 0x00U;
 
 CYSFTX::CYSFTX() :
-m_buffer(TX_BUFFER_LEN),
+m_buffer(1500U),
 m_modFilter(),
 m_modState(),
 m_poBuffer(),
 m_poLen(0U),
 m_poPtr(0U),
 m_txDelay(240U),      // 200ms
-m_loDev(false),
-m_txHang(4800U),      // 4s
-m_txCount(0U)
+m_loDev(false)
 {
   ::memset(m_modState, 0x00U, 16U * sizeof(q15_t));
 
@@ -63,18 +66,18 @@ m_txCount(0U)
   m_modFilter.pState      = m_modState;
 }
 
-
 void CYSFTX::process()
 {
-  // If we have YSF data to transmit, do so.
-  if (m_poLen == 0U && m_buffer.getData() > 0U) {
+  if (m_buffer.getData() == 0U && m_poLen == 0U)
+    return;
+
+  if (m_poLen == 0U) {
     if (!m_tx) {
       for (uint16_t i = 0U; i < m_txDelay; i++)
         m_poBuffer[m_poLen++] = YSF_START_SYNC;
     } else {
       for (uint8_t i = 0U; i < YSF_FRAME_LENGTH_BYTES; i++) {
-        uint8_t c = 0U;
-        m_buffer.get(c);
+        uint8_t c = m_buffer.get();
         m_poBuffer[m_poLen++] = c;
       }
     }
@@ -83,37 +86,20 @@ void CYSFTX::process()
   }
 
   if (m_poLen > 0U) {
-    // Transmit YSF data.
     uint16_t space = io.getSpace();
-
+    
     while (space > (4U * YSF_RADIO_SYMBOL_LENGTH)) {
       uint8_t c = m_poBuffer[m_poPtr++];
       writeByte(c);
 
-      // Reduce space and reset the hang timer.
       space -= 4U * YSF_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 * YSF_RADIO_SYMBOL_LENGTH)) {
-      writeSilence();
-
-      space -= 4U * YSF_RADIO_SYMBOL_LENGTH;
-      m_txCount--;
-
-      if (m_txCount == 0U)
-        return;
-    }
   }
 }
 
@@ -161,16 +147,6 @@ void CYSFTX::writeByte(uint8_t c)
   io.write(STATE_YSF, outBuffer, YSF_RADIO_SYMBOL_LENGTH * 4U);
 }
 
-void CYSFTX::writeSilence()
-{
-  q15_t inBuffer[4U] = {0x00U, 0x00U, 0x00U, 0x00U};
-  q15_t outBuffer[YSF_RADIO_SYMBOL_LENGTH * 4U];
-
-  ::arm_fir_interpolate_q15(&m_modFilter, inBuffer, outBuffer, 4U);
-
-  io.write(STATE_YSF, outBuffer, YSF_RADIO_SYMBOL_LENGTH * 4U);
-}
-
 void CYSFTX::setTXDelay(uint8_t delay)
 {
   m_txDelay = 600U + uint16_t(delay) * 12U;        // 500ms + tx delay
@@ -184,8 +160,8 @@ uint8_t CYSFTX::getSpace() const
   return m_buffer.getSpace() / YSF_FRAME_LENGTH_BYTES;
 }
 
-void CYSFTX::setParams(bool on, uint8_t txHang)
+void CYSFTX::setLoDev(bool on)
 {
-  m_loDev  = on;
-  m_txHang = txHang * 1200U;
+  m_loDev = on;
 }
+

YSFTX.h

@@ -21,7 +21,7 @@
 
 #include "Config.h"
 
-#include "RingBuffer.h"
+#include "SerialRB.h"
 
 class CYSFTX {
 public:
@@ -35,10 +35,10 @@ public:
 
   uint8_t getSpace() const;
 
-  void setParams(bool on, uint8_t txHang);
+  void setLoDev(bool on);
 
 private:
-  CRingBuffer<uint8_t>                        m_buffer;
+  CSerialRB                        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];
@@ -46,11 +46,8 @@ private:
   uint16_t                         m_poPtr;
   uint16_t                         m_txDelay;
   bool                             m_loDev;
-  uint32_t                         m_txHang;
-  uint32_t                         m_txCount;
 
   void writeByte(uint8_t c);
-  void writeSilence();
 };
 
 #endif

mmdvmmenu.sh

@@ -83,7 +83,7 @@ EOF
     "3")  sed -e 's/\/\/ #define EXTERNAL_OSC 14400000/#define EXTERNAL_OSC 14400000/'     $conf > $conf.tmp && mv -f $conf.tmp $conf && echo "14.400 MHz clock enabled";;
     "4")  sed -e 's/\/\/ #define EXTERNAL_OSC 19200000/#define EXTERNAL_OSC 19200000/'     $conf > $conf.tmp && mv -f $conf.tmp $conf && echo "19.200 MHz clock enabled";;
     "5")  sed -e 's/\/\/ #define USE_COS_AS_LOCKOUT /#define USE_COS_AS_LOCKOUT/'          $conf > $conf.tmp && mv -f $conf.tmp $conf && echo "COS as Lockout enabled";;
-    "6")  sed -e 's/\/\/ #define MODE_LEDS/#define MODE_LEDS/'             $conf > $conf.tmp && mv -f $conf.tmp $conf && echo "Mode pins enabled";;
+    "6")  sed -e 's/\/\/ #define ARDUINO_MODE_PINS/#define ARDUINO_MODE_PINS/'             $conf > $conf.tmp && mv -f $conf.tmp $conf && echo "Mode pins enabled";;
     "7")  sed -e 's/\/\/ #define ARDUINO_DUE_PAPA/#define ARDUINO_DUE_PAPA/'               $conf > $conf.tmp && mv -f $conf.tmp $conf && echo "Layout for the PAPA board enabled";;
     "8")  sed -e 's/\/\/ #define ARDUINO_DUE_ZUM_V10/#define ARDUINO_DUE_ZUM_V10/'         $conf > $conf.tmp && mv -f $conf.tmp $conf && echo "Layout for ZUM V1.0 and V1.0.1 boards enabled";;
     "9")  sed -e 's/\/\/ #define ARDUINO_DUE_NTH/#define ARDUINO_DUE_NTH/'                 $conf > $conf.tmp && mv -f $conf.tmp $conf && echo "Layout for SP8NTH board enabled";;

pins/pins_f4_discovery.h

@@ -1,96 +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 _PINS_F4_DISCOVERY_H
-#define _PINS_F4_DISCOVERY_H
-
-/*
-Pin definitions for STM32F4 Discovery Board:
-
-PTT      PB13   output           P1 Pin37
-COSLED   PA7    output           P1 Pin17
-LED      PD15   output           P1 Pin47
-COS      PA5    input            P1 Pin15
-
-DSTAR    PD12   output           P1 Pin44
-DMR      PD13   output           P1 Pin45
-YSF      PD14   output           P1 Pin46
-P25      PD11   output           P1 Pin43
-NXDN     PD10   output           P1 Pin42
-
-RX       PA0    analog input     P1 Pin12
-RSSI     PA1    analog input     P1 Pin11
-TX       PA4    analog output    P1 Pin16
-
-EXT_CLK  PA15   input            P2 Pin40
-*/
-
-#define PIN_COS           GPIO_Pin_5
-#define PORT_COS          GPIOA
-#define RCC_Per_COS       RCC_AHB1Periph_GPIOA
-
-#define PIN_PTT           GPIO_Pin_13
-#define PORT_PTT          GPIOB
-#define RCC_Per_PTT       RCC_AHB1Periph_GPIOB
-
-#define PIN_COSLED        GPIO_Pin_7
-#define PORT_COSLED       GPIOA
-#define RCC_Per_COSLED    RCC_AHB1Periph_GPIOA
-
-#define PIN_LED           GPIO_Pin_15
-#define PORT_LED          GPIOD
-#define RCC_Per_LED       RCC_AHB1Periph_GPIOD
-
-#define PIN_P25           GPIO_Pin_11
-#define PORT_P25          GPIOD
-#define RCC_Per_P25       RCC_AHB1Periph_GPIOD
-
-#define PIN_NXDN          GPIO_Pin_10
-#define PORT_NXDN         GPIOD
-#define RCC_Per_NXDN      RCC_AHB1Periph_GPIOD
-
-#define PIN_DSTAR         GPIO_Pin_12
-#define PORT_DSTAR        GPIOD
-#define RCC_Per_DSTAR     RCC_AHB1Periph_GPIOD
-
-#define PIN_DMR           GPIO_Pin_13
-#define PORT_DMR          GPIOD
-#define RCC_Per_DMR       RCC_AHB1Periph_GPIOD
-
-#define PIN_YSF           GPIO_Pin_14
-#define PORT_YSF          GPIOD
-#define RCC_Per_YSF       RCC_AHB1Periph_GPIOD
-
-#define PIN_EXT_CLK       GPIO_Pin_15
-#define SRC_EXT_CLK       GPIO_PinSource15
-#define PORT_EXT_CLK      GPIOA
-
-#define PIN_RX            GPIO_Pin_0
-#define PIN_RX_CH         ADC_Channel_0
-#define PORT_RX           GPIOA
-#define RCC_Per_RX        RCC_AHB1Periph_GPIOA
-
-#define PIN_RSSI          GPIO_Pin_1
-#define PIN_RSSI_CH       ADC_Channel_1
-#define PORT_RSSI         GPIOA
-#define RCC_Per_RSSI      RCC_AHB1Periph_GPIOA
-
-#define PIN_TX            GPIO_Pin_4
-#define PIN_TX_CH         DAC_Channel_1
-
-#endif

pins/pins_f4_drcc_nqf.h

@@ -1,140 +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 _PINS_F4_DRCC_NQF_H
-#define _PINS_F4_DRCC_NQF_H
-
-/*
-Pin definitions for DRCC_DVM BG7NQF  board rev1
-
-PTT      PB12   output
-LED_PTT  PB4    output
-LED_COS  PB5    output
-LED_SRV  PB10   output
-COS      PB13   input
-
-DSTAR    N/A
-DMR      N/A
-YSF      N/A
-P25      N/A
-NXDN     N/A
-POCSAG   N/A
-
-MDSTAR   PB14   output
-MDMR     PB8    output
-MYSF     PB9    output
-MP25     PB15   output
-MNXDN    N/A
-MPOCSAG  N/A
-
-RX       PB0    analog input
-RSSI     PB1    analog input
-TX       PA4    analog output
-
-EXT_CLK  PA15   input
-
-UART1_TX PA9    output
-UART1_RX PA10   output
-UART2_TX PA2    output
-UART2_RX PA3    output
-
-*/
-
-#define PIN_COS           GPIO_Pin_13
-#define PORT_COS          GPIOB
-#define RCC_Per_COS       RCC_AHB1Periph_GPIOB
-
-#define PIN_PTT           GPIO_Pin_12
-#define PORT_PTT          GPIOB
-#define RCC_Per_PTT       RCC_AHB1Periph_GPIOB
-
-#define PIN_COSLED        GPIO_Pin_5
-#define PORT_COSLED       GPIOB
-#define RCC_Per_COSLED    RCC_AHB1Periph_GPIOB
-
-#define PIN_LED           GPIO_Pin_10
-#define PORT_LED          GPIOB
-#define RCC_Per_LED       RCC_AHB1Periph_GPIOB
-
-#define PIN_TXLED         GPIO_Pin_4
-#define PORT_TXLED        GPIOB
-#define RCC_Per_TXLED     RCC_AHB1Periph_GPIOB
-
-// #define PIN_P25           GPIO_Pin_3
-// #define PORT_P25          GPIOB
-// #define RCC_Per_P25       RCC_AHB1Periph_GPIOB
-
-// #define PIN_NXDN          GPIO_Pin_10
-// #define PORT_NXDN         GPIOA
-// #define RCC_Per_NXDN      RCC_AHB1Periph_GPIOA
-
-// #define PIN_POCSAG        GPIO_Pin_12
-// #define PORT_POCSAG       GPIOB
-// #define RCC_Per_POCSAG    RCC_AHB1Periph_GPIOB
-
-// #define PIN_DSTAR         GPIO_Pin_10
-// #define PORT_DSTAR        GPIOB
-// #define RCC_Per_DSTAR     RCC_AHB1Periph_GPIOB
-
-// #define PIN_DMR           GPIO_Pin_4
-// #define PORT_DMR          GPIOB
-// #define RCC_Per_DMR       RCC_AHB1Periph_GPIOB
-
-// #define PIN_YSF           GPIO_Pin_5
-// #define PORT_YSF          GPIOB
-// #define RCC_Per_YSF       RCC_AHB1Periph_GPIOB
-
-#if defined(MODE_PINS)
-#define PIN_MP25          GPIO_Pin_15
-#define PORT_MP25         GPIOB
-#define RCC_Per_MP25      RCC_AHB1Periph_GPIOB
-
-#define PIN_MDSTAR        GPIO_Pin_9
-#define PORT_MDSTAR       GPIOB
-#define RCC_Per_MDSTAR    RCC_AHB1Periph_GPIOB
-
-#define PIN_MDMR          GPIO_Pin_8
-#define PORT_MDMR         GPIOB
-#define RCC_Per_MDMR      RCC_AHB1Periph_GPIOB
-
-#define PIN_MYSF          GPIO_Pin_14
-#define PORT_MYSF         GPIOB
-#define RCC_Per_MYSF      RCC_AHB1Periph_GPIOB
-
-#endif
-
-#define PIN_EXT_CLK       GPIO_Pin_15
-#define SRC_EXT_CLK       GPIO_PinSource15
-#define PORT_EXT_CLK      GPIOA
-
-#define PIN_RX            GPIO_Pin_0
-#define PIN_RX_CH         ADC_Channel_0
-#define PORT_RX           GPIOB
-#define RCC_Per_RX        RCC_AHB1Periph_GPIOB
-
-#define PIN_RSSI          GPIO_Pin_1
-#define PIN_RSSI_CH       ADC_Channel_1
-#define PORT_RSSI         GPIOB
-#define RCC_Per_RSSI      RCC_AHB1Periph_GPIOB
-
-#define PIN_TX            GPIO_Pin_4
-#define PIN_TX_CH         DAC_Channel_1
-#define PORT_TX           GPIOA
-#define RCC_Per_TX        RCC_AHB1Periph_GPIOA
-
-#endif