From c55002534e15a94cfad7a6c62da9ad46cb714bb2 Mon Sep 17 00:00:00 2001
From: Jonathan Naylor <naylorjs@yahoo.com>
Date: Sat, 18 Apr 2020 13:55:34 +0100
Subject: [PATCH] Rename the Goertzel class to CTCSSRX.

---
 FM.cpp                          | 14 ++++++++------
 FM.h                            |  6 +++---
 FMGoertzel.cpp => FMCTCSSRX.cpp | 10 ++++++----
 FMGoertzel.h => FMCTCSSRX.h     | 10 +++++-----
 4 files changed, 22 insertions(+), 18 deletions(-)
 rename FMGoertzel.cpp => FMCTCSSRX.cpp (80%)
 rename FMGoertzel.h => FMCTCSSRX.h (86%)

diff --git a/FM.cpp b/FM.cpp
index 4ff0a6a..69af344 100644
--- a/FM.cpp
+++ b/FM.cpp
@@ -44,8 +44,8 @@ m_filter(),
 m_filterState(),
 m_callsign(),
 m_rfAck(),
-m_goertzel(),
-m_ctcss(),
+m_ctcssRX(),
+m_ctcssTX(),
 m_timeoutTone(),
 m_state(FS_LISTENING),
 m_callsignAtStart(false),
@@ -67,7 +67,7 @@ m_hangTimer()
 
 void CFM::samples(q15_t* samples, uint8_t length)
 {
-  bool validSignal = m_goertzel.process(samples, length);
+  bool validSignal = m_ctcssRX.process(samples, length);
 
   stateMachine(validSignal, length);
 
@@ -92,7 +92,7 @@ void CFM::samples(q15_t* samples, uint8_t length)
   q15_t output[RX_BLOCK_SIZE];
   ::arm_fir_fast_q15(&m_filter, samples, output, length);
 
-  m_ctcss.getAudio(output, length);
+  m_ctcssTX.getAudio(output, length);
 
   io.write(STATE_FM, output, length);
 }
@@ -137,9 +137,11 @@ uint8_t CFM::setMisc(uint16_t timeout, uint8_t timeoutLevel, uint8_t ctcssFreque
 
   m_timeoutTone.setParams(timeoutLevel);
 
-  m_goertzel.setParams(ctcssFrequency, ctcssThreshold);
+  uint8_t ret = m_ctcssRX.setParams(ctcssFrequency, ctcssThreshold);
+  if (ret != 0U)
+    return ret;
 
-  return m_ctcss.setParams(ctcssFrequency, ctcssLevel);
+  return m_ctcssTX.setParams(ctcssFrequency, ctcssLevel);
 }
 
 void CFM::stateMachine(bool validSignal, uint8_t length)
diff --git a/FM.h b/FM.h
index b96ccc8..c788904 100644
--- a/FM.h
+++ b/FM.h
@@ -21,7 +21,7 @@
 
 #include "Config.h"
 
-#include "FMGoertzel.h"
+#include "FMCTCSSRX.h"
 #include "FMCTCSSTX.h"
 #include "FMTimeout.h"
 #include "FMKeyer.h"
@@ -56,8 +56,8 @@ private:
   q15_t                m_filterState[230U];           // NoTaps + BlockSize - 1, 201 + 20 - 1 plus some spare
   CFMKeyer             m_callsign;
   CFMKeyer             m_rfAck;
-  CFMGoertzel          m_goertzel;
-  CFMCTCSSTX           m_ctcss;
+  CFMCTCSSRX           m_ctcssRX;
+  CFMCTCSSTX           m_ctcssTX;
   CFMTimeout           m_timeoutTone;
   FM_STATE             m_state;
   bool                 m_callsignAtStart;
diff --git a/FMGoertzel.cpp b/FMCTCSSRX.cpp
similarity index 80%
rename from FMGoertzel.cpp
rename to FMCTCSSRX.cpp
index 787047a..b945ea4 100644
--- a/FMGoertzel.cpp
+++ b/FMCTCSSRX.cpp
@@ -18,16 +18,18 @@
 
 #include "Config.h"
 #include "Globals.h"
-#include "FMGoertzel.h"
+#include "FMCTCSSRX.h"
 
-CFMGoertzel::CFMGoertzel()
+CFMCTCSSRX::CFMCTCSSRX()
 {
 }
 
-void CFMGoertzel::setParams(uint8_t frequency, uint8_t threshold)
+uint8_t CFMCTCSSRX::setParams(uint8_t frequency, uint8_t threshold)
 {
+  return 0U;
 }
 
-bool CFMGoertzel::process(const q15_t* samples, uint8_t length)
+bool CFMCTCSSRX::process(const q15_t* samples, uint8_t length)
 {
+  return false;
 }
diff --git a/FMGoertzel.h b/FMCTCSSRX.h
similarity index 86%
rename from FMGoertzel.h
rename to FMCTCSSRX.h
index 5d0330e..34c6e3c 100644
--- a/FMGoertzel.h
+++ b/FMCTCSSRX.h
@@ -16,16 +16,16 @@
  *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#if !defined(FMGoertzel_H)
-#define  FMGoertzel_H
+#if !defined(FMCTCSSRX_H)
+#define  FMCTCSSRX_H
 
 #include "Config.h"
 
-class CFMGoertzel {
+class CFMCTCSSRX {
 public:
-  CFMGoertzel();
+  CFMCTCSSRX();
 
-  void setParams(uint8_t frequency, uint8_t threshold);
+  uint8_t setParams(uint8_t frequency, uint8_t threshold);
 
   bool process(const q15_t* samples, uint8_t length);