From 3875da80e70c9ae981c5b550a8d9e6f852a016c5 Mon Sep 17 00:00:00 2001
From: phl0 <florian@florian-wolters.de>
Date: Fri, 2 Nov 2018 15:02:34 +0100
Subject: [PATCH 01/12] Make MODE_PINS available on MMDVM_RPT_Hat

---
 IOSTM.cpp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/IOSTM.cpp b/IOSTM.cpp
index 6800863..9139953 100644
--- a/IOSTM.cpp
+++ b/IOSTM.cpp
@@ -1125,7 +1125,7 @@ void CIO::initInt()
 #endif
 #endif
 
-#if defined(MODE_PINS) && defined(STM32F4_NUCLEO_MORPHO_HEADER) && defined(STM32F4_NUCLEO)
+#if defined(MODE_PINS) && defined(STM32F4_NUCLEO_MORPHO_HEADER) && (defined(STM32F4_NUCLEO) || defined(STM32F722_RPT_HAT))
    // DSTAR mode pin
    RCC_AHB1PeriphClockCmd(RCC_Per_MDSTAR, ENABLE);
    GPIO_InitStruct.GPIO_Pin   = PIN_MDSTAR;
@@ -1375,7 +1375,7 @@ void CIO::setCOSInt(bool on)
 void CIO::setDStarInt(bool on)
 {
    GPIO_WriteBit(PORT_DSTAR, PIN_DSTAR, on ? Bit_SET : Bit_RESET);
-#if defined(MODE_PINS) && defined(STM32F4_NUCLEO_MORPHO_HEADER) && defined(STM32F4_NUCLEO)
+#if defined(MODE_PINS) && defined(STM32F4_NUCLEO_MORPHO_HEADER) && (defined(STM32F4_NUCLEO) || defined(STM32F722_RPT_HAT))
    GPIO_WriteBit(PORT_MDSTAR, PIN_MDSTAR, on ? Bit_SET : Bit_RESET);
 #endif
 }
@@ -1383,7 +1383,7 @@ void CIO::setDStarInt(bool on)
 void CIO::setDMRInt(bool on)
 {
    GPIO_WriteBit(PORT_DMR, PIN_DMR, on ? Bit_SET : Bit_RESET);
-#if defined(MODE_PINS) && defined(STM32F4_NUCLEO_MORPHO_HEADER) && defined(STM32F4_NUCLEO)
+#if defined(MODE_PINS) && defined(STM32F4_NUCLEO_MORPHO_HEADER) && (defined(STM32F4_NUCLEO) || defined(STM32F722_RPT_HAT))
    GPIO_WriteBit(PORT_MDMR, PIN_MDMR, on ? Bit_SET : Bit_RESET);
 #endif
 }
@@ -1391,7 +1391,7 @@ void CIO::setDMRInt(bool on)
 void CIO::setYSFInt(bool on)
 {
    GPIO_WriteBit(PORT_YSF, PIN_YSF, on ? Bit_SET : Bit_RESET);
-#if defined(MODE_PINS) && defined(STM32F4_NUCLEO_MORPHO_HEADER) && defined(STM32F4_NUCLEO)
+#if defined(MODE_PINS) && defined(STM32F4_NUCLEO_MORPHO_HEADER) && (defined(STM32F4_NUCLEO) || defined(STM32F722_RPT_HAT))
    GPIO_WriteBit(PORT_MYSF, PIN_MYSF, on ? Bit_SET : Bit_RESET);
 #endif
 }
@@ -1399,7 +1399,7 @@ void CIO::setYSFInt(bool on)
 void CIO::setP25Int(bool on)
 {
    GPIO_WriteBit(PORT_P25, PIN_P25, on ? Bit_SET : Bit_RESET);
-#if defined(MODE_PINS) && defined(STM32F4_NUCLEO_MORPHO_HEADER) && defined(STM32F4_NUCLEO)
+#if defined(MODE_PINS) && defined(STM32F4_NUCLEO_MORPHO_HEADER) && (defined(STM32F4_NUCLEO) || defined(STM32F722_RPT_HAT))
    GPIO_WriteBit(PORT_MP25, PIN_MP25, on ? Bit_SET : Bit_RESET);
 #endif
 }
@@ -1409,13 +1409,13 @@ void CIO::setNXDNInt(bool on)
 #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);
-#if defined(MODE_PINS) && defined(STM32F4_NUCLEO_MORPHO_HEADER) && defined(STM32F4_NUCLEO)
+#if defined(MODE_PINS) && defined(STM32F4_NUCLEO_MORPHO_HEADER) && (defined(STM32F4_NUCLEO) || defined(STM32F722_RPT_HAT))
    GPIO_WriteBit(PORT_MYSF, PIN_MYSF, on ? Bit_SET : Bit_RESET);
    GPIO_WriteBit(PORT_MP25, PIN_MP25, on ? Bit_SET : Bit_RESET);
 #endif
 #else
    GPIO_WriteBit(PORT_NXDN, PIN_NXDN, on ? Bit_SET : Bit_RESET);
-#if defined(MODE_PINS) && defined(STM32F4_NUCLEO_MORPHO_HEADER) && defined(STM32F4_NUCLEO)
+#if defined(MODE_PINS) && defined(STM32F4_NUCLEO_MORPHO_HEADER) && (defined(STM32F4_NUCLEO) || defined(STM32F722_RPT_HAT))
    GPIO_WriteBit(PORT_MNXDN, PIN_MNXDN, on ? Bit_SET : Bit_RESET);
 #endif
 #endif
@@ -1426,13 +1426,13 @@ void CIO::setPOCSAGInt(bool on)
 #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);
-#if defined(MODE_PINS) && defined(STM32F4_NUCLEO_MORPHO_HEADER) && defined(STM32F4_NUCLEO)
+#if defined(MODE_PINS) && defined(STM32F4_NUCLEO_MORPHO_HEADER) && (defined(STM32F4_NUCLEO) || defined(STM32F722_RPT_HAT))
    GPIO_WriteBit(PORT_MDSTAR, PIN_MDSTAR, on ? Bit_SET : Bit_RESET);
    GPIO_WriteBit(PORT_MDMR,   PIN_MDMR,   on ? Bit_SET : Bit_RESET);
 #endif
 #else
    GPIO_WriteBit(PORT_POCSAG,  PIN_POCSAG, on ? Bit_SET : Bit_RESET);
-#if defined(MODE_PINS) && defined(STM32F4_NUCLEO_MORPHO_HEADER) && defined(STM32F4_NUCLEO)
+#if defined(MODE_PINS) && defined(STM32F4_NUCLEO_MORPHO_HEADER) && (defined(STM32F4_NUCLEO) || defined(STM32F722_RPT_HAT))
    GPIO_WriteBit(PORT_MPOCSAG, PIN_MPOCSAG, on ? Bit_SET : Bit_RESET);
 #endif
 #endif

From 5e3c4c91bbe9de81403a49d732464de185a5b79d Mon Sep 17 00:00:00 2001
From: phl0 <florian@florian-wolters.de>
Date: Tue, 22 Jan 2019 22:21:40 +0100
Subject: [PATCH 02/12] Add basics for a POCSAG Cal mode

---
 CalPOCSAG.cpp | 66 +++++++++++++++++++++++++++++++++++++++++++++++++++
 CalPOCSAG.h   | 44 ++++++++++++++++++++++++++++++++++
 Globals.h     |  5 +++-
 MMDVM.cpp     |  4 ++++
 MMDVM.ino     |  4 ++++
 5 files changed, 122 insertions(+), 1 deletion(-)
 create mode 100644 CalPOCSAG.cpp
 create mode 100644 CalPOCSAG.h

diff --git a/CalPOCSAG.cpp b/CalPOCSAG.cpp
new file mode 100644
index 0000000..a449232
--- /dev/null
+++ b/CalPOCSAG.cpp
@@ -0,0 +1,66 @@
+/*
+ *   Copyright (C) 2018 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"
+
+// POCSAG 600 Hz Test Pattern
+
+CCalPOCSAG::CCalPOCSAG() :
+m_transmit(false),
+m_state(POCSAGCAL_IDLE),
+m_audioSeq(0U)
+{
+}
+
+void CCalPOCSAG::process()
+{
+  pocsagTX.process();
+
+  uint16_t space = pocsagTX.getSpace();
+  if (space < 1U)
+    return;
+
+  switch (m_state) {
+    case POCSAGCAL_TX:
+      //pocsagTX.writeData(POCSAG_CAL[m_audioSeq], POCSAG_FRAME_LENGTH_BYTES + 1U);
+      m_audioSeq = (m_audioSeq + 1U) % 4U;
+      if(!m_transmit)
+        m_state = POCSAGCAL_IDLE;
+      break;
+    default:
+        m_state = POCSAGCAL_IDLE;
+        m_audioSeq = 0U;
+      break;
+  }
+}
+
+uint8_t CCalPOCSAG::write(const uint8_t* data, uint8_t length)
+{
+  if (length != 1U)
+    return 4U;
+
+  m_transmit = data[0U] == 1U;
+
+  if(m_transmit && m_state == POCSAGCAL_IDLE)
+    m_state = POCSAGCAL_TX;
+
+  return 0U;
+}
+
diff --git a/CalPOCSAG.h b/CalPOCSAG.h
new file mode 100644
index 0000000..7d4abab
--- /dev/null
+++ b/CalPOCSAG.h
@@ -0,0 +1,44 @@
+/*
+ *   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:
+  bool      m_transmit;
+  POCSAGCAL m_state;
+  uint8_t   m_audioSeq;
+};
+
+#endif
+
diff --git a/Globals.h b/Globals.h
index c082d60..b52074f 100644
--- a/Globals.h
+++ b/Globals.h
@@ -60,7 +60,9 @@ enum MMDVM_STATE {
   STATE_RSSICAL   = 96,
   STATE_CWID      = 97,
   STATE_DMRCAL    = 98,
-  STATE_DSTARCAL  = 99
+  STATE_DSTARCAL  = 99,
+  STATE_INTCAL    = 100,
+  STATE_POCSAGCAL = 101
 };
 
 #include "SerialPort.h"
@@ -83,6 +85,7 @@ enum MMDVM_STATE {
 #include "CalDMR.h"
 #include "CalP25.h"
 #include "CalNXDN.h"
+#include "CalPOCSAG.h"
 #include "CalRSSI.h"
 #include "CWIdTX.h"
 #include "Debug.h"
diff --git a/MMDVM.cpp b/MMDVM.cpp
index 6fd894c..306cdcd 100644
--- a/MMDVM.cpp
+++ b/MMDVM.cpp
@@ -64,6 +64,7 @@ CCalDStarTX calDStarTX;
 CCalDMR     calDMR;
 CCalP25     calP25;
 CCalNXDN    calNXDN;
+CCalPOCSAG  calPOCSAG;
 CCalRSSI    calRSSI;
 
 CCWIdTX cwIdTX;
@@ -117,6 +118,9 @@ void loop()
   if (m_modemState == STATE_NXDNCAL1K)
     calNXDN.process();
 
+  if (m_modemState == STATE_POCSAGCAL)
+    calPOCSAG.process();
+
   if (m_modemState == STATE_IDLE)
     cwIdTX.process();
 }
diff --git a/MMDVM.ino b/MMDVM.ino
index ff392e1..dcb1fcf 100644
--- a/MMDVM.ino
+++ b/MMDVM.ino
@@ -61,6 +61,7 @@ CCalDStarTX calDStarTX;
 CCalDMR     calDMR;
 CCalP25     calP25;
 CCalNXDN    calNXDN;
+CCalPOCSAG  calPOCSAG;
 CCalRSSI    calRSSI;
 
 CCWIdTX cwIdTX;
@@ -114,6 +115,9 @@ void loop()
   if (m_modemState == STATE_NXDNCAL1K)
     calNXDN.process();
 
+  if (m_modemState == STATE_POCSAGCAL)
+    calPOCSAG.process();
+
   if (m_modemState == STATE_IDLE)
     cwIdTX.process();
 }

From 580ba0b536a2b6aede5c2fd4afa161b34355de8e Mon Sep 17 00:00:00 2001
From: phl0 <florian@florian-wolters.de>
Date: Wed, 23 Jan 2019 14:58:01 +0100
Subject: [PATCH 03/12] Add synthetic 600Hz sine wave and some more POCSAGCal
 states

---
 CalPOCSAG.cpp  | 6 ++++++
 Globals.h      | 1 +
 SerialPort.cpp | 4 ++--
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/CalPOCSAG.cpp b/CalPOCSAG.cpp
index a449232..9472bdd 100644
--- a/CalPOCSAG.cpp
+++ b/CalPOCSAG.cpp
@@ -21,6 +21,12 @@
 #include "CalPOCSAG.h"
 
 // POCSAG 600 Hz Test Pattern
+const q15_t sine600Hz[] = {
+              0,   5125,  10125,  14875,  19259,  23169,  26509,  29195,  31163,  32363,
+          32767,  32363,  31163,  29195,  26509,  23169,  19259,  14875,  10125,   5125,
+              0,  -5126, -10126, -14876, -19260, -23170, -26510, -29196, -31164, -32364,
+         -32767, -32364, -31164, -29196, -26510, -23170, -19260, -14876, -10126,  -5126,
+         };
 
 CCalPOCSAG::CCalPOCSAG() :
 m_transmit(false),
diff --git a/Globals.h b/Globals.h
index b52074f..149cb25 100644
--- a/Globals.h
+++ b/Globals.h
@@ -149,6 +149,7 @@ extern CCalDStarTX calDStarTX;
 extern CCalDMR     calDMR;
 extern CCalP25     calP25;
 extern CCalNXDN    calNXDN;
+extern CCalPOCSAG  calPOCSAG;
 extern CCalRSSI    calRSSI;
 
 extern CCWIdTX cwIdTX;
diff --git a/SerialPort.cpp b/SerialPort.cpp
index f12e6bb..1cc0e45 100644
--- a/SerialPort.cpp
+++ b/SerialPort.cpp
@@ -280,7 +280,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_DSTARCAL && modemState != STATE_DMRCAL && modemState != STATE_RSSICAL && modemState != STATE_LFCAL && modemState != STATE_DMRCAL1K && modemState != STATE_P25CAL1K && modemState != STATE_DMRDMO1K && modemState != STATE_NXDNCAL1K)
+  if (modemState != STATE_IDLE && modemState != STATE_DSTAR && modemState != STATE_DMR && modemState != STATE_YSF && modemState != STATE_P25 && modemState != STATE_NXDN && modemState != STATE_POCSAG && 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)
     return 4U;
   if (modemState == STATE_DSTAR && !dstarEnable)
     return 4U;
@@ -360,7 +360,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_DSTARCAL && modemState != STATE_DMRCAL && modemState != STATE_RSSICAL && modemState != STATE_LFCAL && modemState != STATE_DMRCAL1K && modemState != STATE_P25CAL1K && modemState != STATE_DMRDMO1K && modemState != STATE_NXDNCAL1K)
+  if (modemState != STATE_IDLE && modemState != STATE_DSTAR && modemState != STATE_DMR && modemState != STATE_YSF && modemState != STATE_P25 && modemState != STATE_NXDN && modemState != STATE_POCSAG && 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)
     return 4U;
   if (modemState == STATE_DSTAR && !m_dstarEnable)
     return 4U;

From 461182bf605bdfe53ecbf0623b027ee450489760 Mon Sep 17 00:00:00 2001
From: phl0 <florian@florian-wolters.de>
Date: Wed, 23 Jan 2019 16:23:45 +0100
Subject: [PATCH 04/12] 1st attempt to send 600Hz sine wave

---
 CalPOCSAG.cpp  | 4 ++--
 SerialPort.cpp | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CalPOCSAG.cpp b/CalPOCSAG.cpp
index 9472bdd..4232cc1 100644
--- a/CalPOCSAG.cpp
+++ b/CalPOCSAG.cpp
@@ -45,8 +45,8 @@ void CCalPOCSAG::process()
 
   switch (m_state) {
     case POCSAGCAL_TX:
-      //pocsagTX.writeData(POCSAG_CAL[m_audioSeq], POCSAG_FRAME_LENGTH_BYTES + 1U);
-      m_audioSeq = (m_audioSeq + 1U) % 4U;
+      pocsagTX.writeData((uint8_t) &sine600Hz[m_audioSeq], 40U);
+      m_audioSeq++;
       if(!m_transmit)
         m_state = POCSAGCAL_IDLE;
       break;
diff --git a/SerialPort.cpp b/SerialPort.cpp
index 1cc0e45..35a35de 100644
--- a/SerialPort.cpp
+++ b/SerialPort.cpp
@@ -617,6 +617,8 @@ void CSerialPort::process()
               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 {

From 5456f403a1ee1a166a24e38a7c6fcf828cb70320 Mon Sep 17 00:00:00 2001
From: phl0 <florian@florian-wolters.de>
Date: Wed, 30 Jan 2019 09:25:33 +0100
Subject: [PATCH 05/12] Add changes by G4KLX

---
 CalPOCSAG.cpp | 42 +++++++++++++++++++++++-------------------
 CalPOCSAG.h   |  2 --
 2 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/CalPOCSAG.cpp b/CalPOCSAG.cpp
index 4232cc1..55feb9d 100644
--- a/CalPOCSAG.cpp
+++ b/CalPOCSAG.cpp
@@ -1,5 +1,5 @@
 /*
- *   Copyright (C) 2018 by Florian Wolters DF2ET
+ *   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
@@ -29,7 +29,6 @@ const q15_t sine600Hz[] = {
          };
 
 CCalPOCSAG::CCalPOCSAG() :
-m_transmit(false),
 m_state(POCSAGCAL_IDLE),
 m_audioSeq(0U)
 {
@@ -37,24 +36,26 @@ m_audioSeq(0U)
 
 void CCalPOCSAG::process()
 {
-  pocsagTX.process();
-
-  uint16_t space = pocsagTX.getSpace();
-  if (space < 1U)
+  if (m_state == POCSAGCAL_IDLE)
     return;
 
-  switch (m_state) {
-    case POCSAGCAL_TX:
-      pocsagTX.writeData((uint8_t) &sine600Hz[m_audioSeq], 40U);
-      m_audioSeq++;
-      if(!m_transmit)
-        m_state = POCSAGCAL_IDLE;
-      break;
-    default:
-        m_state = POCSAGCAL_IDLE;
+  uint16_t space = io.getSpace();
+  if (space == 0U)
+    return;
+
+  q15_t samples[200U];
+  unt16_t length = 0U;
+
+  if (space > 200U)
+    space = 200U;
+
+  for (uint16_t i = 0U; i < space; i++, length++)
+      samples[i] = sine600Hz[m_audioSeq++];
+      if (m_audioSeq >= 40U)
         m_audioSeq = 0U;
-      break;
   }
+
+  io.write(MODE_POCSAG, samples, length);
 }
 
 uint8_t CCalPOCSAG::write(const uint8_t* data, uint8_t length)
@@ -62,11 +63,14 @@ uint8_t CCalPOCSAG::write(const uint8_t* data, uint8_t length)
   if (length != 1U)
     return 4U;
 
-  m_transmit = data[0U] == 1U;
+  bool on = data[0U] == 1U;
 
-  if(m_transmit && m_state == POCSAGCAL_IDLE)
+  if (on && m_state == POCSAGCAL_IDLE) {
     m_state = POCSAGCAL_TX;
+    m_audioSeq = 0U;
+  } else if (!on && m_state == POCSAGCAL_TX) {
+    m_state = POCSAGCAL_IDLE;
+  }
 
   return 0U;
 }
-
diff --git a/CalPOCSAG.h b/CalPOCSAG.h
index 7d4abab..2e60a72 100644
--- a/CalPOCSAG.h
+++ b/CalPOCSAG.h
@@ -35,10 +35,8 @@ public:
   uint8_t write(const uint8_t* data, uint8_t length);
 
 private:
-  bool      m_transmit;
   POCSAGCAL m_state;
   uint8_t   m_audioSeq;
 };
 
 #endif
-

From 0a634b1223ac4545a50caf0c242e853fab2e15c4 Mon Sep 17 00:00:00 2001
From: phl0 <florian@florian-wolters.de>
Date: Wed, 30 Jan 2019 09:40:09 +0100
Subject: [PATCH 06/12] Fix some minor bugs :)

---
 CalPOCSAG.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/CalPOCSAG.cpp b/CalPOCSAG.cpp
index 55feb9d..0bd753d 100644
--- a/CalPOCSAG.cpp
+++ b/CalPOCSAG.cpp
@@ -44,18 +44,18 @@ void CCalPOCSAG::process()
     return;
 
   q15_t samples[200U];
-  unt16_t length = 0U;
+  uint16_t length = 0U;
 
   if (space > 200U)
     space = 200U;
 
-  for (uint16_t i = 0U; i < space; i++, length++)
+  for (uint16_t i = 0U; i < space; i++, length++) {
       samples[i] = sine600Hz[m_audioSeq++];
       if (m_audioSeq >= 40U)
         m_audioSeq = 0U;
   }
 
-  io.write(MODE_POCSAG, samples, length);
+  io.write(STATE_POCSAG, samples, length);
 }
 
 uint8_t CCalPOCSAG::write(const uint8_t* data, uint8_t length)

From 000da1889f6e43dbadd7110693a6156338a1ca73 Mon Sep 17 00:00:00 2001
From: Jonathan Naylor <jonathan.naylor@igence.com>
Date: Wed, 30 Jan 2019 11:18:16 +0000
Subject: [PATCH 07/12] Simplify the POCSAG calibration code.

---
 CalPOCSAG.cpp | 32 ++++++++------------------------
 CalPOCSAG.h   |  1 -
 2 files changed, 8 insertions(+), 25 deletions(-)

diff --git a/CalPOCSAG.cpp b/CalPOCSAG.cpp
index 0bd753d..0234a50 100644
--- a/CalPOCSAG.cpp
+++ b/CalPOCSAG.cpp
@@ -29,8 +29,7 @@ const q15_t sine600Hz[] = {
          };
 
 CCalPOCSAG::CCalPOCSAG() :
-m_state(POCSAGCAL_IDLE),
-m_audioSeq(0U)
+m_state(POCSAGCAL_IDLE)
 {
 }
 
@@ -40,22 +39,14 @@ void CCalPOCSAG::process()
     return;
 
   uint16_t space = io.getSpace();
-  if (space == 0U)
+  if (space <= 205U)
     return;
 
-  q15_t samples[200U];
-  uint16_t length = 0U;
-
-  if (space > 200U)
-    space = 200U;
-
-  for (uint16_t i = 0U; i < space; i++, length++) {
-      samples[i] = sine600Hz[m_audioSeq++];
-      if (m_audioSeq >= 40U)
-        m_audioSeq = 0U;
-  }
-
-  io.write(STATE_POCSAG, samples, length);
+  io.write(STATE_POCSAG, sine600Hz, 40U);
+  io.write(STATE_POCSAG, sine600Hz, 40U);
+  io.write(STATE_POCSAG, sine600Hz, 40U);
+  io.write(STATE_POCSAG, sine600Hz, 40U);
+  io.write(STATE_POCSAG, sine600Hz, 40U);
 }
 
 uint8_t CCalPOCSAG::write(const uint8_t* data, uint8_t length)
@@ -63,14 +54,7 @@ uint8_t CCalPOCSAG::write(const uint8_t* data, uint8_t length)
   if (length != 1U)
     return 4U;
 
-  bool on = data[0U] == 1U;
-
-  if (on && m_state == POCSAGCAL_IDLE) {
-    m_state = POCSAGCAL_TX;
-    m_audioSeq = 0U;
-  } else if (!on && m_state == POCSAGCAL_TX) {
-    m_state = POCSAGCAL_IDLE;
-  }
+  m_state = data[0U] == 1U ? POCSAGCAL_TX : POCSAGCAL_IDLE;
 
   return 0U;
 }
diff --git a/CalPOCSAG.h b/CalPOCSAG.h
index 2e60a72..291e360 100644
--- a/CalPOCSAG.h
+++ b/CalPOCSAG.h
@@ -36,7 +36,6 @@ public:
 
 private:
   POCSAGCAL m_state;
-  uint8_t   m_audioSeq;
 };
 
 #endif

From 98fffb9b77125349a8728ae10e7b29f9b00665fd Mon Sep 17 00:00:00 2001
From: phl0 <florian@florian-wolters.de>
Date: Wed, 30 Jan 2019 13:02:55 +0100
Subject: [PATCH 08/12] Fix const compiler issue

---
 CalPOCSAG.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CalPOCSAG.cpp b/CalPOCSAG.cpp
index 0234a50..d3d4ace 100644
--- a/CalPOCSAG.cpp
+++ b/CalPOCSAG.cpp
@@ -21,7 +21,7 @@
 #include "CalPOCSAG.h"
 
 // POCSAG 600 Hz Test Pattern
-const q15_t sine600Hz[] = {
+q15_t sine600Hz[] = {
               0,   5125,  10125,  14875,  19259,  23169,  26509,  29195,  31163,  32363,
           32767,  32363,  31163,  29195,  26509,  23169,  19259,  14875,  10125,   5125,
               0,  -5126, -10126, -14876, -19260, -23170, -26510, -29196, -31164, -32364,

From 6b00f7d27a0096c49318ae362981f1e049fcbf39 Mon Sep 17 00:00:00 2001
From: phl0 <florian@florian-wolters.de>
Date: Wed, 30 Jan 2019 14:42:17 +0100
Subject: [PATCH 09/12] Change to square wave and align amplitude

---
 CalPOCSAG.cpp | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/CalPOCSAG.cpp b/CalPOCSAG.cpp
index d3d4ace..1e8ce32 100644
--- a/CalPOCSAG.cpp
+++ b/CalPOCSAG.cpp
@@ -21,11 +21,11 @@
 #include "CalPOCSAG.h"
 
 // POCSAG 600 Hz Test Pattern
-q15_t sine600Hz[] = {
-              0,   5125,  10125,  14875,  19259,  23169,  26509,  29195,  31163,  32363,
-          32767,  32363,  31163,  29195,  26509,  23169,  19259,  14875,  10125,   5125,
-              0,  -5126, -10126, -14876, -19260, -23170, -26510, -29196, -31164, -32364,
-         -32767, -32364, -31164, -29196, -26510, -23170, -19260, -14876, -10126,  -5126,
+q15_t squreHz[] = {
+          950,  950,  950,  950,  950,  950,  950,  950,  950,
+          950,  950,  950,  950,  950,  950,  950,  950,  950,
+         -950, -950, -950, -950, -950, -950, -950, -950, -950,
+         -950, -950, -950, -950, -950, -950, -950, -950, -950,
          };
 
 CCalPOCSAG::CCalPOCSAG() :
@@ -42,11 +42,11 @@ void CCalPOCSAG::process()
   if (space <= 205U)
     return;
 
-  io.write(STATE_POCSAG, sine600Hz, 40U);
-  io.write(STATE_POCSAG, sine600Hz, 40U);
-  io.write(STATE_POCSAG, sine600Hz, 40U);
-  io.write(STATE_POCSAG, sine600Hz, 40U);
-  io.write(STATE_POCSAG, sine600Hz, 40U);
+  io.write(STATE_POCSAG, squreHz, 40U);
+  io.write(STATE_POCSAG, squreHz, 40U);
+  io.write(STATE_POCSAG, squreHz, 40U);
+  io.write(STATE_POCSAG, squreHz, 40U);
+  io.write(STATE_POCSAG, squreHz, 40U);
 }
 
 uint8_t CCalPOCSAG::write(const uint8_t* data, uint8_t length)

From 9987140790a93dfa8463021031d3e33c3a2ec28f Mon Sep 17 00:00:00 2001
From: phl0 <florian@florian-wolters.de>
Date: Wed, 30 Jan 2019 14:49:21 +0100
Subject: [PATCH 10/12] Fix damn typo

---
 CalPOCSAG.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/CalPOCSAG.cpp b/CalPOCSAG.cpp
index 1e8ce32..2629d41 100644
--- a/CalPOCSAG.cpp
+++ b/CalPOCSAG.cpp
@@ -20,8 +20,8 @@
 #include "Globals.h"
 #include "CalPOCSAG.h"
 
-// POCSAG 600 Hz Test Pattern
-q15_t squreHz[] = {
+// POCSAG 600 Hz Square Wave Test Pattern
+q15_t square600Hz[] = {
           950,  950,  950,  950,  950,  950,  950,  950,  950,
           950,  950,  950,  950,  950,  950,  950,  950,  950,
          -950, -950, -950, -950, -950, -950, -950, -950, -950,
@@ -42,11 +42,11 @@ void CCalPOCSAG::process()
   if (space <= 205U)
     return;
 
-  io.write(STATE_POCSAG, squreHz, 40U);
-  io.write(STATE_POCSAG, squreHz, 40U);
-  io.write(STATE_POCSAG, squreHz, 40U);
-  io.write(STATE_POCSAG, squreHz, 40U);
-  io.write(STATE_POCSAG, squreHz, 40U);
+  io.write(STATE_POCSAG, square600Hz, 40U);
+  io.write(STATE_POCSAG, square600Hz, 40U);
+  io.write(STATE_POCSAG, square600Hz, 40U);
+  io.write(STATE_POCSAG, square600Hz, 40U);
+  io.write(STATE_POCSAG, square600Hz, 40U);
 }
 
 uint8_t CCalPOCSAG::write(const uint8_t* data, uint8_t length)

From 03716daca0279bd908a2c74e7643a56e1e7d9b36 Mon Sep 17 00:00:00 2001
From: Jonathan Naylor <jonathan.naylor@igence.com>
Date: Wed, 30 Jan 2019 13:51:05 +0000
Subject: [PATCH 11/12] Bump the version date.

---
 SerialPort.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/SerialPort.cpp b/SerialPort.cpp
index 35a35de..19301d7 100644
--- a/SerialPort.cpp
+++ b/SerialPort.cpp
@@ -1,5 +1,5 @@
 /*
- *   Copyright (C) 2013,2015,2016,2017,2018 by Jonathan Naylor G4KLX
+ *   Copyright (C) 2013,2015-2019 by Jonathan Naylor G4KLX
  *   Copyright (C) 2016 by Colin Durbridge G4EML
  *
  *   This program is free software; you can redistribute it and/or modify
@@ -97,7 +97,7 @@ const uint8_t MMDVM_DEBUG5       = 0xF5U;
 #define HW_TYPE "MMDVM"
 #endif
 
-#define DESCRIPTION "20180723 (D-Star/DMR/System Fusion/P25/NXDN/POCSAG)"
+#define DESCRIPTION "20190130 (D-Star/DMR/System Fusion/P25/NXDN/POCSAG)"
 
 #if defined(GITVERSION)
 #define concat(h, a, b, c) h " " a " " b " GitID #" c ""

From 73d3bd5778ce408891d46adfbfdc2a7b37efe454 Mon Sep 17 00:00:00 2001
From: Jonathan Naylor <jonathan.naylor@igence.com>
Date: Wed, 30 Jan 2019 14:31:15 +0000
Subject: [PATCH 12/12] Do the POCSAG calibration in a different way.

---
 CalPOCSAG.cpp | 15 ++-------------
 POCSAGTX.h    |  6 +++---
 2 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/CalPOCSAG.cpp b/CalPOCSAG.cpp
index 1e8ce32..bf88a51 100644
--- a/CalPOCSAG.cpp
+++ b/CalPOCSAG.cpp
@@ -20,13 +20,6 @@
 #include "Globals.h"
 #include "CalPOCSAG.h"
 
-// POCSAG 600 Hz Test Pattern
-q15_t squreHz[] = {
-          950,  950,  950,  950,  950,  950,  950,  950,  950,
-          950,  950,  950,  950,  950,  950,  950,  950,  950,
-         -950, -950, -950, -950, -950, -950, -950, -950, -950,
-         -950, -950, -950, -950, -950, -950, -950, -950, -950,
-         };
 
 CCalPOCSAG::CCalPOCSAG() :
 m_state(POCSAGCAL_IDLE)
@@ -39,14 +32,10 @@ void CCalPOCSAG::process()
     return;
 
   uint16_t space = io.getSpace();
-  if (space <= 205U)
+  if (space <= 165U)
     return;
 
-  io.write(STATE_POCSAG, squreHz, 40U);
-  io.write(STATE_POCSAG, squreHz, 40U);
-  io.write(STATE_POCSAG, squreHz, 40U);
-  io.write(STATE_POCSAG, squreHz, 40U);
-  io.write(STATE_POCSAG, squreHz, 40U);
+  pocsagTX.writeByte(0xAAU);
 }
 
 uint8_t CCalPOCSAG::write(const uint8_t* data, uint8_t length)
diff --git a/POCSAGTX.h b/POCSAGTX.h
index 8cd75f7..d640862 100644
--- a/POCSAGTX.h
+++ b/POCSAGTX.h
@@ -1,5 +1,5 @@
 /*
- *   Copyright (C) 2015,2016,2017,2018 by Jonathan Naylor G4KLX
+ *   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
@@ -29,6 +29,8 @@ public:
 
   uint8_t writeData(const uint8_t* data, uint8_t length);
 
+  void writeByte(uint8_t c);
+
   void process();
 
   void setTXDelay(uint8_t delay);
@@ -45,8 +47,6 @@ private:
   uint16_t             m_poLen;
   uint16_t             m_poPtr;
   uint16_t             m_txDelay;
-
-  void writeByte(uint8_t c);
 };
 
 #endif