mirror of https://github.com/g4klx/MMDVM.git
Merge branch 'dstar_correlator' into boxcar_dstar_correlator
This commit is contained in:
commit
d31b71fab1
14
IOSTM.cpp
14
IOSTM.cpp
|
@ -692,14 +692,14 @@ Pin definitions for STM32F4 STM32-DVM rev 3 Board:
|
||||||
|
|
||||||
COS PB13 input
|
COS PB13 input
|
||||||
PTT PB12 output
|
PTT PB12 output
|
||||||
COSLED PB5 output
|
COSLED PB4 output
|
||||||
LED PB4 output
|
LED PB3 output
|
||||||
|
|
||||||
P25 PB9 output
|
P25 PB8 output
|
||||||
NXDN PB10 output
|
NXDN PB9 output
|
||||||
DSTAR PB7 output
|
DSTAR PB6 output
|
||||||
DMR PB6 output
|
DMR PB5 output
|
||||||
YSF PB8 output
|
YSF PB7 output
|
||||||
|
|
||||||
RX PB0 analog input
|
RX PB0 analog input
|
||||||
RSSI PB1 analog input
|
RSSI PB1 analog input
|
||||||
|
|
|
@ -45,7 +45,7 @@ const uint8_t NXDN_PREAMBLE[] = {0x57U, 0x75U, 0xFDU};
|
||||||
const uint8_t NXDN_SYNC = 0x5FU;
|
const uint8_t NXDN_SYNC = 0x5FU;
|
||||||
|
|
||||||
CNXDNTX::CNXDNTX() :
|
CNXDNTX::CNXDNTX() :
|
||||||
m_buffer(2000U),
|
m_buffer(4000U),
|
||||||
m_modFilter(),
|
m_modFilter(),
|
||||||
m_sincFilter(),
|
m_sincFilter(),
|
||||||
m_modState(),
|
m_modState(),
|
||||||
|
|
|
@ -143,7 +143,7 @@ void CP25RX::processNone(q15_t sample)
|
||||||
|
|
||||||
m_averagePtr = NOAVEPTR;
|
m_averagePtr = NOAVEPTR;
|
||||||
|
|
||||||
m_countdown = 5U;
|
m_countdown = CORRELATION_COUNTDOWN;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -43,7 +43,7 @@ const q15_t P25_LEVELD = -1260;
|
||||||
const uint8_t P25_START_SYNC = 0x77U;
|
const uint8_t P25_START_SYNC = 0x77U;
|
||||||
|
|
||||||
CP25TX::CP25TX() :
|
CP25TX::CP25TX() :
|
||||||
m_buffer(1500U),
|
m_buffer(4000U),
|
||||||
m_modFilter(),
|
m_modFilter(),
|
||||||
m_lpFilter(),
|
m_lpFilter(),
|
||||||
m_modState(),
|
m_modState(),
|
||||||
|
|
|
@ -32,7 +32,7 @@ Boston, MA 02110-1301, USA.
|
||||||
#include <Arduino.h>
|
#include <Arduino.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
const uint16_t SERIAL_RINGBUFFER_SIZE = 370U;
|
const uint16_t SERIAL_RINGBUFFER_SIZE = 2000U;
|
||||||
|
|
||||||
class CSerialRB {
|
class CSerialRB {
|
||||||
public:
|
public:
|
||||||
|
|
|
@ -43,7 +43,7 @@ const uint8_t YSF_START_SYNC = 0x77U;
|
||||||
const uint8_t YSF_END_SYNC = 0xFFU;
|
const uint8_t YSF_END_SYNC = 0xFFU;
|
||||||
|
|
||||||
CYSFTX::CYSFTX() :
|
CYSFTX::CYSFTX() :
|
||||||
m_buffer(1500U),
|
m_buffer(4000U),
|
||||||
m_modFilter(),
|
m_modFilter(),
|
||||||
m_modState(),
|
m_modState(),
|
||||||
m_poBuffer(),
|
m_poBuffer(),
|
||||||
|
|
Loading…
Reference in New Issue