mirror of https://github.com/g4klx/MMDVM.git
Make m_dcd global variable and save extra function
This commit is contained in:
parent
e3f35e0875
commit
230fab308c
|
@ -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;
|
||||||
|
|
6
IO.cpp
6
IO.cpp
|
@ -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),
|
||||||
|
@ -312,11 +311,6 @@ void CIO::setDecode(bool dcd)
|
||||||
m_dcd = dcd;
|
m_dcd = dcd;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool CIO::getDecode()
|
|
||||||
{
|
|
||||||
return m_dcd;
|
|
||||||
}
|
|
||||||
|
|
||||||
void CIO::setADCDetection(bool detect)
|
void CIO::setADCDetection(bool detect)
|
||||||
{
|
{
|
||||||
m_detect = detect;
|
m_detect = detect;
|
||||||
|
|
1
IO.h
1
IO.h
|
@ -78,7 +78,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;
|
||||||
|
|
|
@ -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;
|
||||||
|
|
|
@ -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;
|
||||||
|
|
|
@ -180,7 +180,7 @@ void CSerialPort::getStatus()
|
||||||
else
|
else
|
||||||
reply[10U] = 0U;
|
reply[10U] = 0U;
|
||||||
|
|
||||||
if (io.getDecode())
|
if (m_dcd)
|
||||||
reply[11U] = 1U;
|
reply[11U] = 1U;
|
||||||
else
|
else
|
||||||
reply[11U] = 0U;
|
reply[11U] = 0U;
|
||||||
|
|
Loading…
Reference in New Issue