Superminaren
/
MMDVM
mirror of https://github.com/g4klx/MMDVM.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Small refactor.

This commit is contained in:
Jonathan Naylor 2017-07-10 19:41:01 +01:00
parent 902b079de2
commit 9d1ebc0f8f
10 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Config.h
View File

@ -27,7 +27,7 @@
// Frequencies such as 10.0 Mhz (48000 * 208.333) or 20 Mhz (48000 * 416.666) are not suitable. // Frequencies such as 10.0 Mhz (48000 * 208.333) or 20 Mhz (48000 * 416.666) are not suitable.
// //
// For 12 MHz // For 12 MHz
// #define EXTERNAL_OSC 12000000 #define EXTERNAL_OSC 12000000
// For 12.288 MHz // For 12.288 MHz
// #define EXTERNAL_OSC 12288000 // #define EXTERNAL_OSC 12288000
// For 14.4 MHz // For 14.4 MHz

2
DMRDMORX.cpp
View File

@ -88,7 +88,7 @@ bool CDMRDMORX::processSample(q15_t sample, uint16_t rssi)
m_rssi[m_dataPtr] = rssi; m_rssi[m_dataPtr] = rssi;
m_bitBuffer[m_bitPtr] <<= 1; m_bitBuffer[m_bitPtr] <<= 1;
if (sample < m_dc_level) if (sample < m_dcLevel)
m_bitBuffer[m_bitPtr] |= 0x01U; m_bitBuffer[m_bitPtr] |= 0x01U;
if (m_state == DMORXS_NONE) { if (m_state == DMORXS_NONE) {

2
DMRSlotRX.cpp
View File

@ -104,7 +104,7 @@ bool CDMRSlotRX::processSample(q15_t sample, uint16_t rssi)
m_rssi[m_dataPtr] = rssi; m_rssi[m_dataPtr] = rssi;
m_bitBuffer[m_bitPtr] <<= 1; m_bitBuffer[m_bitPtr] <<= 1;
if (sample < m_dc_level) if (sample < m_dcLevel)
m_bitBuffer[m_bitPtr] |= 0x01U; m_bitBuffer[m_bitPtr] |= 0x01U;
if (m_state == DMRRXS_NONE) { if (m_state == DMRRXS_NONE) {

2
DStarRX.cpp
View File

@ -279,7 +279,7 @@ void CDStarRX::samples(const q15_t* samples, const uint16_t* rssi, uint8_t lengt
m_rssiAccum += rssi[i]; m_rssiAccum += rssi[i];
m_rssiCount++; m_rssiCount++;
bool bit = samples[i] < m_dc_level; bool bit = samples[i] < m_dcLevel;
if (bit != m_prev) { if (bit != m_prev) {
if (m_pll < (PLLMAX / 2U)) if (m_pll < (PLLMAX / 2U))

4
Globals.h
View File

@ -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 * 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 * 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_tx;
extern bool m_dcd; extern bool m_dcd;
extern q15_t m_dc_level; extern q15_t m_dcLevel;
extern CSerialPort serial; extern CSerialPort serial;
extern CIO io; extern CIO io;

8
IO.cpp
View File

@ -169,7 +169,7 @@ void CIO::process()
if (m_lockout) if (m_lockout)
return; return;
q31_t dc_level = 0; q31_t dcLevel = 0;
q31_t dcVals[20]; q31_t dcVals[20];
q31_t intSamp[20]; q31_t intSamp[20];
@ -177,11 +177,11 @@ void CIO::process()
::arm_biquad_cascade_df1_q31(&m_dcFilter, intSamp, dcVals, RX_BLOCK_SIZE); ::arm_biquad_cascade_df1_q31(&m_dcFilter, intSamp, dcVals, RX_BLOCK_SIZE);
for (uint8_t i = 0U; i < RX_BLOCK_SIZE; i++) 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_modemState == STATE_IDLE) {
if (m_dstarEnable) { if (m_dstarEnable) {

2
MMDVM.cpp
View File

@ -36,7 +36,7 @@ bool m_duplex = true;
bool m_tx = false; bool m_tx = false;
bool m_dcd = false; bool m_dcd = false;
q15_t m_dc_level = 0; q15_t m_dcLevel = 0;
CDStarRX dstarRX; CDStarRX dstarRX;
CDStarTX dstarTX; CDStarTX dstarTX;

2
MMDVM.ino
View File

@ -33,7 +33,7 @@ bool m_duplex = true;
bool m_tx = false; bool m_tx = false;
bool m_dcd = false; bool m_dcd = false;
q15_t m_dc_level = 0; q15_t m_dcLevel = 0;
CDStarRX dstarRX; CDStarRX dstarRX;
CDStarTX dstarTX; CDStarTX dstarTX;

2
P25RX.cpp
View File

@ -95,7 +95,7 @@ void CP25RX::samples(const q15_t* samples, uint16_t* rssi, uint8_t length)
m_rssiCount++; m_rssiCount++;
m_bitBuffer[m_bitPtr] <<= 1; m_bitBuffer[m_bitPtr] <<= 1;
if (sample < m_dc_level) if (sample < m_dcLevel)
m_bitBuffer[m_bitPtr] |= 0x01U; m_bitBuffer[m_bitPtr] |= 0x01U;
m_buffer[m_dataPtr] = sample; m_buffer[m_dataPtr] = sample;

2
YSFRX.cpp
View File

@ -91,7 +91,7 @@ void CYSFRX::samples(const q15_t* samples, uint16_t* rssi, uint8_t length)
m_rssiCount++; m_rssiCount++;
m_bitBuffer[m_bitPtr] <<= 1; m_bitBuffer[m_bitPtr] <<= 1;
if (sample < m_dc_level) if (sample < m_dcLevel)
m_bitBuffer[m_bitPtr] |= 0x01U; m_bitBuffer[m_bitPtr] |= 0x01U;
m_buffer[m_dataPtr] = sample; m_buffer[m_dataPtr] = sample;