From c11ff6bf20355c18800c9a433acddc40276d335b Mon Sep 17 00:00:00 2001 From: Andy CA6JAU Date: Mon, 14 May 2018 22:41:26 -0400 Subject: [PATCH 1/3] Increasing ring buffer lengths --- NXDNTX.cpp | 2 +- P25TX.cpp | 2 +- SerialRB.h | 2 +- YSFTX.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/NXDNTX.cpp b/NXDNTX.cpp index 905c502..2601101 100644 --- a/NXDNTX.cpp +++ b/NXDNTX.cpp @@ -45,7 +45,7 @@ const uint8_t NXDN_PREAMBLE[] = {0x57U, 0x75U, 0xFDU}; const uint8_t NXDN_SYNC = 0x5FU; CNXDNTX::CNXDNTX() : -m_buffer(2000U), +m_buffer(4000U), m_modFilter(), m_sincFilter(), m_modState(), diff --git a/P25TX.cpp b/P25TX.cpp index 57a8db0..7cc75d9 100644 --- a/P25TX.cpp +++ b/P25TX.cpp @@ -43,7 +43,7 @@ const q15_t P25_LEVELD = -1260; const uint8_t P25_START_SYNC = 0x77U; CP25TX::CP25TX() : -m_buffer(1500U), +m_buffer(4000U), m_modFilter(), m_lpFilter(), m_modState(), diff --git a/SerialRB.h b/SerialRB.h index 7b6b7b9..4378cc9 100644 --- a/SerialRB.h +++ b/SerialRB.h @@ -32,7 +32,7 @@ Boston, MA 02110-1301, USA. #include #endif -const uint16_t SERIAL_RINGBUFFER_SIZE = 370U; +const uint16_t SERIAL_RINGBUFFER_SIZE = 2000U; class CSerialRB { public: diff --git a/YSFTX.cpp b/YSFTX.cpp index c0361c6..65ee21a 100644 --- a/YSFTX.cpp +++ b/YSFTX.cpp @@ -43,7 +43,7 @@ const uint8_t YSF_START_SYNC = 0x77U; const uint8_t YSF_END_SYNC = 0xFFU; CYSFTX::CYSFTX() : -m_buffer(1500U), +m_buffer(4000U), m_modFilter(), m_modState(), m_poBuffer(), From b0ca829cf6401305b17e42de08c674ae88c7073a Mon Sep 17 00:00:00 2001 From: Steve N4IRS Date: Tue, 15 May 2018 07:54:39 -0400 Subject: [PATCH 2/3] Fix comments for STM32-DVM Rev 3 --- IOSTM.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/IOSTM.cpp b/IOSTM.cpp index 2b60744..6647ab0 100644 --- a/IOSTM.cpp +++ b/IOSTM.cpp @@ -692,14 +692,14 @@ Pin definitions for STM32F4 STM32-DVM rev 3 Board: COS PB13 input PTT PB12 output -COSLED PB5 output -LED PB4 output +COSLED PB4 output +LED PB3 output -P25 PB9 output -NXDN PB10 output -DSTAR PB7 output -DMR PB6 output -YSF PB8 output +P25 PB8 output +NXDN PB9 output +DSTAR PB6 output +DMR PB5 output +YSF PB7 output RX PB0 analog input RSSI PB1 analog input From 4ae2999e95a1ff07febd6e49cbbdd2c046762e69 Mon Sep 17 00:00:00 2001 From: Bryan Biedenkapp Date: Tue, 15 May 2018 12:23:49 -0400 Subject: [PATCH 3/3] Correctly use the CORRELATION_COUNTDOWN constant vs magic number of 5U. --- P25RX.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/P25RX.cpp b/P25RX.cpp index c4070d5..54d4237 100644 --- a/P25RX.cpp +++ b/P25RX.cpp @@ -143,7 +143,7 @@ void CP25RX::processNone(q15_t sample) m_averagePtr = NOAVEPTR; - m_countdown = 5U; + m_countdown = CORRELATION_COUNTDOWN; } }