From bfb198dfd850369e263f3d2f9a6fe1956f306964 Mon Sep 17 00:00:00 2001
From: Jonathan Naylor <naylorjs@yahoo.com>
Date: Thu, 31 Mar 2016 11:34:47 +0100
Subject: [PATCH] Rescale for the increased sample rate.

---
 DMRSlotRX.cpp | 8 ++++----
 DMRSlotRX.h   | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/DMRSlotRX.cpp b/DMRSlotRX.cpp
index c95b0aa..acd4765 100644
--- a/DMRSlotRX.cpp
+++ b/DMRSlotRX.cpp
@@ -94,7 +94,7 @@ bool CDMRSlotRX::processSample(q15_t sample)
     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;
@@ -104,7 +104,7 @@ bool CDMRSlotRX::processSample(q15_t sample)
     m_bitBuffer[m_bitPtr] |= 0x01U;
 
   if (m_state == DMRRXS_NONE) {
-    if (m_dataPtr >= 420U && m_dataPtr <= 500U)
+    if (m_dataPtr >= 840U && m_dataPtr <= 1000U)
       correlateSync();
   } else {
     uint16_t min = m_syncPtr - 2U;
@@ -128,7 +128,7 @@ bool CDMRSlotRX::processSample(q15_t sample)
       slotType.decode(frame + 1U, colorCode, dataType);
 
       if (colorCode == m_colorCode) {
-        DEBUG5("DMRSlotRX: data sync found slot/pos/centre/threshold", m_slot ? 2U : 1U, int16_t(m_dataPtr) - 420, m_centre, m_threshold);
+        DEBUG5("DMRSlotRX: data sync found slot/pos/centre/threshold", m_slot ? 2U : 1U, int16_t(m_dataPtr) - 840, m_centre, m_threshold);
 
         m_syncCount = 0U;
         m_n         = 0U;
@@ -174,7 +174,7 @@ bool CDMRSlotRX::processSample(q15_t sample)
       }
     } else if (m_control == CONTROL_VOICE) {
       // Voice sync
-      DEBUG5("DMRSlotRX: voice sync found slot/pos/centre/threshold", m_slot ? 2U : 1U, int16_t(m_dataPtr) - 420, m_centre, m_threshold);
+      DEBUG5("DMRSlotRX: voice sync found slot/pos/centre/threshold", m_slot ? 2U : 1U, int16_t(m_dataPtr) - 840, m_centre, m_threshold);
       serial.writeDMRData(m_slot, frame, DMR_FRAME_LENGTH_BYTES + 1U);
       m_state     = DMRRXS_VOICE;
       m_syncCount = 0U;
diff --git a/DMRSlotRX.h b/DMRSlotRX.h
index d924e40..a77e2a5 100644
--- a/DMRSlotRX.h
+++ b/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;