alter when processData() is called when we are transitioned into a P25RXS_DATA state (for the purposes of efficiency this skips multiple instructions); slightly narrower boxcar 5 window for symbol detection;

Author: gatekeep

IO.cpp

@@ -29,7 +29,7 @@ const uint16_t RRC_0_2_FILTER_LEN = 42U;
 static q15_t BOXCAR_5_FILTER[] = { 12000, 12000, 12000, 12000, 12000, 0 };
 #endif
 #if defined(P25_RX_NARROW_BOXCAR)
-static q15_t BOXCAR_5_FILTER[] = { 9600, 9600, 9600, 9600, 9600, 0 };
+static q15_t BOXCAR_5_FILTER[] = { 8000, 8000, 8000, 8000, 8000, 0 };
 #endif
 const uint16_t BOXCAR_5_FILTER_LEN = 6U;
 

p25/P25RX.cpp

@@ -328,6 +328,11 @@ void P25RX::processSample(q15_t sample)
             }
         }
 
+        if (m_state == P25RXS_DATA) {
+            processData(sample);
+            return;
+        }
+
         // late entry?
         if (!m_lduSyncPos) {
             m_minSyncPtr = m_syncPtr + P25_LDU_FRAME_LENGTH_SAMPLES - 1U;
@@ -349,10 +354,6 @@ void P25RX::processSample(q15_t sample)
         if (m_state == P25RXS_VOICE) {
             processVoice(sample);
         }
-
-        if (m_state == P25RXS_DATA) {
-            processData(sample);
-        }
     }
 }
 
@@ -512,7 +513,7 @@ void P25RX::processData(q15_t sample)
                 reset();
             }
             else {
-                // calculateLevels(m_lduStartPtr, P25_PDU_FRAME_LENGTH_SYMBOLS);
+                // calculateLevels(m_startPtr, P25_PDU_FRAME_LENGTH_SYMBOLS);
 
                 DEBUG4("P25RX::processData() sync found in PDU pos/centre/threshold", m_syncPtr, m_centreVal, m_thresholdVal);
 

p25/P25RX.h

@@ -124,15 +124,15 @@ namespace p25
          */
         void processVoice(q15_t sample);
         /**
-         * @brief Helper to process PDU P25 samples.
-         * @param sample 
+         * @brief Helper to write a LDU data frame.
          */
-        void processData(q15_t sample);
+        void writeLDUFrame();
 
         /**
-         * @brief Helper to write a LDU data frame.
+         * @brief Helper to process PDU P25 samples.
+         * @param sample 
          */
-        void writeLDUFrame();
+        void processData(q15_t sample);
 
         /**
          * @brief Frame synchronization correlator.