From edddbedd4bb93a0a68c3005a0fb0f080881614e0 Mon Sep 17 00:00:00 2001
From: Jonathan Naylor <naylorjs@yahoo.com>
Date: Sat, 2 May 2020 15:46:36 +0100
Subject: [PATCH] Fix compilation issues.

---
 FM.cpp        |  2 +-
 FMCTCSSRX.cpp |  7 +------
 FMCTCSSRX.h   | 27 +++++++++++----------------
 3 files changed, 13 insertions(+), 23 deletions(-)

diff --git a/FM.cpp b/FM.cpp
index 3056a94..e843996 100644
--- a/FM.cpp
+++ b/FM.cpp
@@ -57,7 +57,7 @@ void CFM::samples(bool cos, q15_t* samples, uint8_t length)
   for (; i < length; i++) {
     q15_t currentSample = samples[i];//save to a local variable to avoid indirection on every access
 
-    CTCSSState ctcssState = m_ctcssRX.process(currentSample);
+    uint8_t ctcssState = m_ctcssRX.process(currentSample);
 
     if (CTCSS_NOT_READY(ctcssState) && m_modemState != STATE_FM) {
       //Not enough samples to determine if you have CTCSS, just carry on
diff --git a/FMCTCSSRX.cpp b/FMCTCSSRX.cpp
index 0c0c916..ba0c03f 100644
--- a/FMCTCSSRX.cpp
+++ b/FMCTCSSRX.cpp
@@ -112,7 +112,7 @@ uint8_t CFMCTCSSRX::setParams(uint8_t frequency, uint8_t threshold, uint8_t leve
   return 0U;
 }
 
-CTCSSState CFMCTCSSRX::process(q15_t sample)
+uint8_t CFMCTCSSRX::process(q15_t sample)
 {
   q31_t sample31 = q31_t(sample) * m_rxLevelInverse;
 
@@ -167,11 +167,6 @@ CTCSSState CFMCTCSSRX::process(q15_t sample)
   return m_result;
 }
 
-CTCSSState CFMCTCSSRX::getState()
-{
-  return m_result;
-}
-
 void CFMCTCSSRX::reset()
 {
   m_q0 = 0;
diff --git a/FMCTCSSRX.h b/FMCTCSSRX.h
index d78bceb..2caa9e6 100644
--- a/FMCTCSSRX.h
+++ b/FMCTCSSRX.h
@@ -21,12 +21,9 @@
 
 #include "Config.h"
 
-enum CTCSSState
-{
-  CTS_NONE,
-  CTS_READY,
-  CTS_VALID
-};
+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)
@@ -39,20 +36,18 @@ public:
 
   uint8_t setParams(uint8_t frequency, uint8_t threshold, uint8_t level);
   
-  CTCSSState process(q15_t sample);
-
-  CTCSSState getState();
+  uint8_t process(q15_t sample);
 
   void reset();
 
 private:
-  q63_t      m_coeffDivTwo;
-  q31_t      m_threshold;
-  uint16_t   m_count;
-  q31_t      m_q0;
-  q31_t      m_q1;
-  CTCSSState m_result;
-  q15_t      m_rxLevelInverse;
+  q63_t    m_coeffDivTwo;
+  q31_t    m_threshold;
+  uint16_t m_count;
+  q31_t    m_q0;
+  q31_t    m_q1;
+  uint8_t  m_result;
+  q15_t    m_rxLevelInverse;
 
   q15_t q15Division(q15_t a, q15_t divisor);
 };