Rename SimpleMode to LinkMode.
This commit is contained in:
parent
ded46ebb60
commit
cb89b34a39
10
Conf.cpp
10
Conf.cpp
|
@ -217,7 +217,7 @@ m_fmCTCSSLevel(2.0F),
|
||||||
m_fmKerchunkTime(0U),
|
m_fmKerchunkTime(0U),
|
||||||
m_fmHangTime(7U),
|
m_fmHangTime(7U),
|
||||||
m_fmAccessMode(1U),
|
m_fmAccessMode(1U),
|
||||||
m_fmSimpleMode(false),
|
m_fmLinkMode(false),
|
||||||
m_fmCOSInvert(false),
|
m_fmCOSInvert(false),
|
||||||
m_fmNoiseSquelch(false),
|
m_fmNoiseSquelch(false),
|
||||||
m_fmSquelchHighThreshold(30U),
|
m_fmSquelchHighThreshold(30U),
|
||||||
|
@ -869,8 +869,8 @@ bool CConf::read()
|
||||||
m_fmHangTime = (unsigned int)::atoi(value);
|
m_fmHangTime = (unsigned int)::atoi(value);
|
||||||
else if (::strcmp(key, "AccessMode") == 0)
|
else if (::strcmp(key, "AccessMode") == 0)
|
||||||
m_fmAccessMode = ::atoi(value);
|
m_fmAccessMode = ::atoi(value);
|
||||||
else if (::strcmp(key, "SimpleMode") == 0)
|
else if (::strcmp(key, "LinkMode") == 0)
|
||||||
m_fmSimpleMode = ::atoi(value) == 1;
|
m_fmLinkMode = ::atoi(value) == 1;
|
||||||
else if (::strcmp(key, "COSInvert") == 0)
|
else if (::strcmp(key, "COSInvert") == 0)
|
||||||
m_fmCOSInvert = ::atoi(value) == 1;
|
m_fmCOSInvert = ::atoi(value) == 1;
|
||||||
else if (::strcmp(key, "NoiseSquelch") == 0)
|
else if (::strcmp(key, "NoiseSquelch") == 0)
|
||||||
|
@ -1899,9 +1899,9 @@ unsigned int CConf::getFMAccessMode() const
|
||||||
return m_fmAccessMode;
|
return m_fmAccessMode;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool CConf::getFMSimpleMode() const
|
bool CConf::getFMLinkMode() const
|
||||||
{
|
{
|
||||||
return m_fmSimpleMode;
|
return m_fmLinkMode;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool CConf::getFMCOSInvert() const
|
bool CConf::getFMCOSInvert() const
|
||||||
|
|
4
Conf.h
4
Conf.h
|
@ -220,7 +220,7 @@ public:
|
||||||
unsigned int getFMKerchunkTime() const;
|
unsigned int getFMKerchunkTime() const;
|
||||||
unsigned int getFMHangTime() const;
|
unsigned int getFMHangTime() const;
|
||||||
unsigned int getFMAccessMode() const;
|
unsigned int getFMAccessMode() const;
|
||||||
bool getFMSimpleMode() const;
|
bool getFMLinkMode() const;
|
||||||
bool getFMCOSInvert() const;
|
bool getFMCOSInvert() const;
|
||||||
bool getFMNoiseSquelch() const;
|
bool getFMNoiseSquelch() const;
|
||||||
unsigned int getFMSquelchHighThreshold() const;
|
unsigned int getFMSquelchHighThreshold() const;
|
||||||
|
@ -538,7 +538,7 @@ private:
|
||||||
unsigned int m_fmKerchunkTime;
|
unsigned int m_fmKerchunkTime;
|
||||||
unsigned int m_fmHangTime;
|
unsigned int m_fmHangTime;
|
||||||
unsigned int m_fmAccessMode;
|
unsigned int m_fmAccessMode;
|
||||||
bool m_fmSimpleMode;
|
bool m_fmLinkMode;
|
||||||
bool m_fmCOSInvert;
|
bool m_fmCOSInvert;
|
||||||
bool m_fmNoiseSquelch;
|
bool m_fmNoiseSquelch;
|
||||||
unsigned int m_fmSquelchHighThreshold;
|
unsigned int m_fmSquelchHighThreshold;
|
||||||
|
|
|
@ -193,8 +193,8 @@ HangTime=7
|
||||||
# 2 - CTCSS only access with COS
|
# 2 - CTCSS only access with COS
|
||||||
# 3 - CTCSS only access with COS to start, then carrier access with COS
|
# 3 - CTCSS only access with COS to start, then carrier access with COS
|
||||||
AccessMode=1
|
AccessMode=1
|
||||||
# SimpleMode=1 to remove almost all of the logic control
|
# LinkMode=1 to remove almost all of the logic control
|
||||||
SimpleMode=0
|
LinkMode=0
|
||||||
COSInvert=0
|
COSInvert=0
|
||||||
NoiseSquelch=0
|
NoiseSquelch=0
|
||||||
SquelchThreshold=30
|
SquelchThreshold=30
|
||||||
|
|
|
@ -1518,7 +1518,7 @@ bool CMMDVMHost::createModem()
|
||||||
unsigned int kerchunkTime = m_conf.getFMKerchunkTime();
|
unsigned int kerchunkTime = m_conf.getFMKerchunkTime();
|
||||||
unsigned int hangTime = m_conf.getFMHangTime();
|
unsigned int hangTime = m_conf.getFMHangTime();
|
||||||
unsigned int accessMode = m_conf.getFMAccessMode();
|
unsigned int accessMode = m_conf.getFMAccessMode();
|
||||||
bool simpleMode = m_conf.getFMSimpleMode();
|
bool linkMode = m_conf.getFMLinkMode();
|
||||||
bool cosInvert = m_conf.getFMCOSInvert();
|
bool cosInvert = m_conf.getFMCOSInvert();
|
||||||
bool noiseSquelch = m_conf.getFMNoiseSquelch();
|
bool noiseSquelch = m_conf.getFMNoiseSquelch();
|
||||||
unsigned int squelchHighThreshold = m_conf.getFMSquelchHighThreshold();
|
unsigned int squelchHighThreshold = m_conf.getFMSquelchHighThreshold();
|
||||||
|
@ -1553,7 +1553,7 @@ bool CMMDVMHost::createModem()
|
||||||
LogInfo(" Kerchunk Time: %us", kerchunkTime);
|
LogInfo(" Kerchunk Time: %us", kerchunkTime);
|
||||||
LogInfo(" Hang Time: %us", hangTime);
|
LogInfo(" Hang Time: %us", hangTime);
|
||||||
LogInfo(" Access Mode: %u", accessMode);
|
LogInfo(" Access Mode: %u", accessMode);
|
||||||
LogInfo(" Simple Mode: %s", simpleMode ? "yes" : "no");
|
LogInfo(" Link Mode: %s", linkMode ? "yes" : "no");
|
||||||
LogInfo(" COS Invert: %s", cosInvert ? "yes" : "no");
|
LogInfo(" COS Invert: %s", cosInvert ? "yes" : "no");
|
||||||
|
|
||||||
LogInfo(" Noise Squelch: %s", noiseSquelch ? "yes" : "no");
|
LogInfo(" Noise Squelch: %s", noiseSquelch ? "yes" : "no");
|
||||||
|
@ -1568,7 +1568,7 @@ bool CMMDVMHost::createModem()
|
||||||
|
|
||||||
m_modem->setFMCallsignParams(callsign, callsignSpeed, callsignFrequency, callsignTime, callsignHoldoff, callsignHighLevel, callsignLowLevel, callsignAtStart, callsignAtEnd, callsignAtLatch);
|
m_modem->setFMCallsignParams(callsign, callsignSpeed, callsignFrequency, callsignTime, callsignHoldoff, callsignHighLevel, callsignLowLevel, callsignAtStart, callsignAtEnd, callsignAtLatch);
|
||||||
m_modem->setFMAckParams(rfAck, ackSpeed, ackFrequency, ackMinTime, ackDelay, ackLevel);
|
m_modem->setFMAckParams(rfAck, ackSpeed, ackFrequency, ackMinTime, ackDelay, ackLevel);
|
||||||
m_modem->setFMMiscParams(timeout, timeoutLevel, ctcssFrequency, ctcssHighThreshold, ctcssLowThreshold, ctcssLevel, kerchunkTime, hangTime, accessMode, simpleMode, cosInvert, noiseSquelch, squelchHighThreshold, squelchLowThreshold, rfAudioBoost, maxDevLevel);
|
m_modem->setFMMiscParams(timeout, timeoutLevel, ctcssFrequency, ctcssHighThreshold, ctcssLowThreshold, ctcssLevel, kerchunkTime, hangTime, accessMode, linkMode, cosInvert, noiseSquelch, squelchHighThreshold, squelchLowThreshold, rfAudioBoost, maxDevLevel);
|
||||||
|
|
||||||
if (m_conf.getFMNetworkEnabled()) {
|
if (m_conf.getFMNetworkEnabled()) {
|
||||||
std::string extAck = m_conf.getFMExtAck();
|
std::string extAck = m_conf.getFMExtAck();
|
||||||
|
|
12
Modem.cpp
12
Modem.cpp
|
@ -244,7 +244,7 @@ m_fmCtcssLevel(10.0F),
|
||||||
m_fmKerchunkTime(0U),
|
m_fmKerchunkTime(0U),
|
||||||
m_fmHangTime(5U),
|
m_fmHangTime(5U),
|
||||||
m_fmAccessMode(1U),
|
m_fmAccessMode(1U),
|
||||||
m_fmSimpleMode(false),
|
m_fmLinkMode(false),
|
||||||
m_fmCOSInvert(false),
|
m_fmCOSInvert(false),
|
||||||
m_fmNoiseSquelch(false),
|
m_fmNoiseSquelch(false),
|
||||||
m_fmSquelchHighThreshold(30U),
|
m_fmSquelchHighThreshold(30U),
|
||||||
|
@ -2668,7 +2668,7 @@ void CModem::setFMAckParams(const std::string& rfAck, unsigned int ackSpeed, uns
|
||||||
m_fmAckLevel = ackLevel;
|
m_fmAckLevel = ackLevel;
|
||||||
}
|
}
|
||||||
|
|
||||||
void CModem::setFMMiscParams(unsigned int timeout, float timeoutLevel, float ctcssFrequency, unsigned int ctcssHighThreshold, unsigned int ctcssLowThreshold, float ctcssLevel, unsigned int kerchunkTime, unsigned int hangTime, unsigned int accessMode, bool simpleMode, bool cosInvert, bool noiseSquelch, unsigned int squelchHighThreshold, unsigned int squelchLowThreshold, unsigned int rfAudioBoost, float maxDevLevel)
|
void CModem::setFMMiscParams(unsigned int timeout, float timeoutLevel, float ctcssFrequency, unsigned int ctcssHighThreshold, unsigned int ctcssLowThreshold, float ctcssLevel, unsigned int kerchunkTime, unsigned int hangTime, unsigned int accessMode, bool linkMode, bool cosInvert, bool noiseSquelch, unsigned int squelchHighThreshold, unsigned int squelchLowThreshold, unsigned int rfAudioBoost, float maxDevLevel)
|
||||||
{
|
{
|
||||||
m_fmTimeout = timeout;
|
m_fmTimeout = timeout;
|
||||||
m_fmTimeoutLevel = timeoutLevel;
|
m_fmTimeoutLevel = timeoutLevel;
|
||||||
|
@ -2682,9 +2682,9 @@ void CModem::setFMMiscParams(unsigned int timeout, float timeoutLevel, float ctc
|
||||||
|
|
||||||
m_fmHangTime = hangTime;
|
m_fmHangTime = hangTime;
|
||||||
|
|
||||||
m_fmAccessMode = accessMode;
|
m_fmAccessMode = accessMode;
|
||||||
m_fmSimpleMode = simpleMode;
|
m_fmLinkMode = linkMode;
|
||||||
m_fmCOSInvert = cosInvert;
|
m_fmCOSInvert = cosInvert;
|
||||||
|
|
||||||
m_fmNoiseSquelch = noiseSquelch;
|
m_fmNoiseSquelch = noiseSquelch;
|
||||||
m_fmSquelchHighThreshold = squelchHighThreshold;
|
m_fmSquelchHighThreshold = squelchHighThreshold;
|
||||||
|
@ -2836,7 +2836,7 @@ bool CModem::setFMMiscParams()
|
||||||
buffer[10U] = m_fmHangTime;
|
buffer[10U] = m_fmHangTime;
|
||||||
|
|
||||||
buffer[11U] = m_fmAccessMode & 0x0FU;
|
buffer[11U] = m_fmAccessMode & 0x0FU;
|
||||||
if (m_fmSimpleMode)
|
if (m_fmLinkMode)
|
||||||
buffer[11U] |= 0x20U;
|
buffer[11U] |= 0x20U;
|
||||||
if (m_fmNoiseSquelch)
|
if (m_fmNoiseSquelch)
|
||||||
buffer[11U] |= 0x40U;
|
buffer[11U] |= 0x40U;
|
||||||
|
|
4
Modem.h
4
Modem.h
|
@ -59,7 +59,7 @@ public:
|
||||||
|
|
||||||
void setFMCallsignParams(const std::string& callsign, unsigned int callsignSpeed, unsigned int callsignFrequency, unsigned int callsignTime, unsigned int callsignHoldoff, float callsignHighLevel, float callsignLowLevel, bool callsignAtStart, bool callsignAtEnd, bool callsignAtLatch);
|
void setFMCallsignParams(const std::string& callsign, unsigned int callsignSpeed, unsigned int callsignFrequency, unsigned int callsignTime, unsigned int callsignHoldoff, float callsignHighLevel, float callsignLowLevel, bool callsignAtStart, bool callsignAtEnd, bool callsignAtLatch);
|
||||||
void setFMAckParams(const std::string& rfAck, unsigned int ackSpeed, unsigned int ackFrequency, unsigned int ackMinTime, unsigned int ackDelay, float ackLevel);
|
void setFMAckParams(const std::string& rfAck, unsigned int ackSpeed, unsigned int ackFrequency, unsigned int ackMinTime, unsigned int ackDelay, float ackLevel);
|
||||||
void setFMMiscParams(unsigned int timeout, float timeoutLevel, float ctcssFrequency, unsigned int ctcssHighThreshold, unsigned int ctcssLowThreshold, float ctcssLevel, unsigned int kerchunkTime, unsigned int hangTime, unsigned int accessMode, bool simpleMode, bool cosInvert, bool noiseSquelch, unsigned int squelchHighThreshold, unsigned int squelchLowThreshold, unsigned int rfAudioBoost, float maxDevLevel);
|
void setFMMiscParams(unsigned int timeout, float timeoutLevel, float ctcssFrequency, unsigned int ctcssHighThreshold, unsigned int ctcssLowThreshold, float ctcssLevel, unsigned int kerchunkTime, unsigned int hangTime, unsigned int accessMode, bool linkMode, bool cosInvert, bool noiseSquelch, unsigned int squelchHighThreshold, unsigned int squelchLowThreshold, unsigned int rfAudioBoost, float maxDevLevel);
|
||||||
void setFMExtParams(const std::string& ack, unsigned int audioBoost);
|
void setFMExtParams(const std::string& ack, unsigned int audioBoost);
|
||||||
|
|
||||||
bool open();
|
bool open();
|
||||||
|
@ -268,7 +268,7 @@ private:
|
||||||
unsigned int m_fmKerchunkTime;
|
unsigned int m_fmKerchunkTime;
|
||||||
unsigned int m_fmHangTime;
|
unsigned int m_fmHangTime;
|
||||||
unsigned int m_fmAccessMode;
|
unsigned int m_fmAccessMode;
|
||||||
bool m_fmSimpleMode;
|
bool m_fmLinkMode;
|
||||||
bool m_fmCOSInvert;
|
bool m_fmCOSInvert;
|
||||||
bool m_fmNoiseSquelch;
|
bool m_fmNoiseSquelch;
|
||||||
unsigned int m_fmSquelchHighThreshold;
|
unsigned int m_fmSquelchHighThreshold;
|
||||||
|
|
Loading…
Reference in a new issue