Merge pull request #38 from phl0/LEDforCD

Add carrier detect LED to MMDVM firmware
48kHz
Jonathan Naylor 2016-11-17 16:00:53 +00:00 committed by GitHub
commit ec871cd3db
6 changed files with 12 additions and 6 deletions

View File

@ -86,6 +86,7 @@ extern bool m_p25Enable;
extern bool m_duplex; extern bool m_duplex;
extern bool m_tx; extern bool m_tx;
extern bool m_dcd;
extern uint32_t m_sampleCount; extern uint32_t m_sampleCount;
extern bool m_sampleInsert; extern bool m_sampleInsert;

1
IO.cpp
View File

@ -61,7 +61,6 @@ m_ysfTXLevel(128 * 128),
m_p25TXLevel(128 * 128), m_p25TXLevel(128 * 128),
m_ledCount(0U), m_ledCount(0U),
m_ledValue(true), m_ledValue(true),
m_dcd(false),
m_detect(false), m_detect(false),
m_adcOverflow(0U), m_adcOverflow(0U),
m_dacOverflow(0U), m_dacOverflow(0U),

1
IO.h
View File

@ -76,7 +76,6 @@ private:
uint32_t m_ledCount; uint32_t m_ledCount;
bool m_ledValue; bool m_ledValue;
bool m_dcd;
bool m_detect; bool m_detect;
uint16_t m_adcOverflow; uint16_t m_adcOverflow;

View File

@ -33,7 +33,8 @@ bool m_p25Enable = true;
bool m_duplex = true; bool m_duplex = true;
bool m_tx = false; bool m_tx = false;
bool m_dcd = false;
uint32_t m_sampleCount = 0U; uint32_t m_sampleCount = 0U;
bool m_sampleInsert = false; bool m_sampleInsert = false;

View File

@ -30,7 +30,8 @@ bool m_p25Enable = true;
bool m_duplex = true; bool m_duplex = true;
bool m_tx = false; bool m_tx = false;
bool m_dcd = false;
uint32_t m_sampleCount = 0U; uint32_t m_sampleCount = 0U;
bool m_sampleInsert = false; bool m_sampleInsert = false;

View File

@ -116,7 +116,7 @@ void CSerialPort::getStatus()
// Send all sorts of interesting internal values // Send all sorts of interesting internal values
reply[0U] = MMDVM_FRAME_START; reply[0U] = MMDVM_FRAME_START;
reply[1U] = 11U; reply[1U] = 12U;
reply[2U] = MMDVM_GET_STATUS; reply[2U] = MMDVM_GET_STATUS;
reply[3U] = 0x00U; reply[3U] = 0x00U;
@ -180,7 +180,12 @@ void CSerialPort::getStatus()
else else
reply[10U] = 0U; reply[10U] = 0U;
writeInt(1U, reply, 11); if (m_dcd)
reply[11U] = 1U;
else
reply[11U] = 0U;
writeInt(1U, reply, 12);
} }
void CSerialPort::getVersion() void CSerialPort::getVersion()