From 9d1ebc0f8f1f80283223a0be9e6062c0add925b0 Mon Sep 17 00:00:00 2001 From: Jonathan Naylor Date: Mon, 10 Jul 2017 19:41:01 +0100 Subject: [PATCH] Small refactor. --- Config.h | 2 +- DMRDMORX.cpp | 2 +- DMRSlotRX.cpp | 2 +- DStarRX.cpp | 2 +- Globals.h | 4 ++-- IO.cpp | 8 ++++---- MMDVM.cpp | 2 +- MMDVM.ino | 2 +- P25RX.cpp | 2 +- YSFRX.cpp | 2 +- 10 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Config.h b/Config.h index c7fb2b8..b201991 100644 --- a/Config.h +++ b/Config.h @@ -27,7 +27,7 @@ // Frequencies such as 10.0 Mhz (48000 * 208.333) or 20 Mhz (48000 * 416.666) are not suitable. // // For 12 MHz -// #define EXTERNAL_OSC 12000000 +#define EXTERNAL_OSC 12000000 // For 12.288 MHz // #define EXTERNAL_OSC 12288000 // For 14.4 MHz diff --git a/DMRDMORX.cpp b/DMRDMORX.cpp index 69956b2..d11957e 100644 --- a/DMRDMORX.cpp +++ b/DMRDMORX.cpp @@ -88,7 +88,7 @@ bool CDMRDMORX::processSample(q15_t sample, uint16_t rssi) m_rssi[m_dataPtr] = rssi; m_bitBuffer[m_bitPtr] <<= 1; - if (sample < m_dc_level) + if (sample < m_dcLevel) m_bitBuffer[m_bitPtr] |= 0x01U; if (m_state == DMORXS_NONE) { diff --git a/DMRSlotRX.cpp b/DMRSlotRX.cpp index 86c273c..377aa41 100644 --- a/DMRSlotRX.cpp +++ b/DMRSlotRX.cpp @@ -104,7 +104,7 @@ bool CDMRSlotRX::processSample(q15_t sample, uint16_t rssi) m_rssi[m_dataPtr] = rssi; m_bitBuffer[m_bitPtr] <<= 1; - if (sample < m_dc_level) + if (sample < m_dcLevel) m_bitBuffer[m_bitPtr] |= 0x01U; if (m_state == DMRRXS_NONE) { diff --git a/DStarRX.cpp b/DStarRX.cpp index 60ede7f..4159c0d 100644 --- a/DStarRX.cpp +++ b/DStarRX.cpp @@ -279,7 +279,7 @@ void CDStarRX::samples(const q15_t* samples, const uint16_t* rssi, uint8_t lengt m_rssiAccum += rssi[i]; m_rssiCount++; - bool bit = samples[i] < m_dc_level; + bool bit = samples[i] < m_dcLevel; if (bit != m_prev) { if (m_pll < (PLLMAX / 2U)) diff --git a/Globals.h b/Globals.h index 27f62e4..e99022f 100644 --- a/Globals.h +++ b/Globals.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015,2016 by Jonathan Naylor G4KLX + * Copyright (C) 2015,2016,2017 by Jonathan Naylor G4KLX * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -93,7 +93,7 @@ extern bool m_duplex; extern bool m_tx; extern bool m_dcd; -extern q15_t m_dc_level; +extern q15_t m_dcLevel; extern CSerialPort serial; extern CIO io; diff --git a/IO.cpp b/IO.cpp index 222b876..f47542d 100644 --- a/IO.cpp +++ b/IO.cpp @@ -169,7 +169,7 @@ void CIO::process() if (m_lockout) return; - q31_t dc_level = 0; + q31_t dcLevel = 0; q31_t dcVals[20]; q31_t intSamp[20]; @@ -177,11 +177,11 @@ void CIO::process() ::arm_biquad_cascade_df1_q31(&m_dcFilter, intSamp, dcVals, RX_BLOCK_SIZE); for (uint8_t i = 0U; i < RX_BLOCK_SIZE; i++) - dc_level += dcVals[i]; + dcLevel += dcVals[i]; - dc_level /= RX_BLOCK_SIZE; + dcLevel /= RX_BLOCK_SIZE; - m_dc_level = (q15_t) (dc_level >> 16); + m_dcLevel = q15_t(dcLevel >> 16); if (m_modemState == STATE_IDLE) { if (m_dstarEnable) { diff --git a/MMDVM.cpp b/MMDVM.cpp index 91cf1f3..4fda95c 100644 --- a/MMDVM.cpp +++ b/MMDVM.cpp @@ -36,7 +36,7 @@ bool m_duplex = true; bool m_tx = false; bool m_dcd = false; -q15_t m_dc_level = 0; +q15_t m_dcLevel = 0; CDStarRX dstarRX; CDStarTX dstarTX; diff --git a/MMDVM.ino b/MMDVM.ino index 7f83abd..a7d694e 100644 --- a/MMDVM.ino +++ b/MMDVM.ino @@ -33,7 +33,7 @@ bool m_duplex = true; bool m_tx = false; bool m_dcd = false; -q15_t m_dc_level = 0; +q15_t m_dcLevel = 0; CDStarRX dstarRX; CDStarTX dstarTX; diff --git a/P25RX.cpp b/P25RX.cpp index 479b25c..f77bb7d 100644 --- a/P25RX.cpp +++ b/P25RX.cpp @@ -95,7 +95,7 @@ void CP25RX::samples(const q15_t* samples, uint16_t* rssi, uint8_t length) m_rssiCount++; m_bitBuffer[m_bitPtr] <<= 1; - if (sample < m_dc_level) + if (sample < m_dcLevel) m_bitBuffer[m_bitPtr] |= 0x01U; m_buffer[m_dataPtr] = sample; diff --git a/YSFRX.cpp b/YSFRX.cpp index 91af557..e405634 100644 --- a/YSFRX.cpp +++ b/YSFRX.cpp @@ -91,7 +91,7 @@ void CYSFRX::samples(const q15_t* samples, uint16_t* rssi, uint8_t length) m_rssiCount++; m_bitBuffer[m_bitPtr] <<= 1; - if (sample < m_dc_level) + if (sample < m_dcLevel) m_bitBuffer[m_bitPtr] |= 0x01U; m_buffer[m_dataPtr] = sample;