g4klx/MMDVMHost
1
0
Fork 0
mirror of https://github.com/g4klx/MMDVMHost.git synced 2025-12-06 05:32:00 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Convert TXTwist to TXDelay.

Browse source
This commit is contained in:
Jonathan Naylor 2020-06-27 22:47:54 +01:00
parent d1a809808b
commit 97f1ebb25f
8 changed files with 24 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Conf.cpp
View file

@ -214,7 +214,7 @@ m_fmExtAudioBoost(1U),
m_fmModeHang(10U), m_fmModeHang(10U),
m_ax25Enabled(false), m_ax25Enabled(false),
m_ax25RXTwist(6), m_ax25RXTwist(6),
m_ax25TXTwist(6), m_ax25TXDelay(300U),
m_ax25Trace(false), m_ax25Trace(false),
m_dstarNetworkEnabled(false), m_dstarNetworkEnabled(false),
m_dstarGatewayAddress(), m_dstarGatewayAddress(),
@ -508,7 +508,7 @@ bool CConf::read()
else if (::strcmp(key, "PTTInvert") == 0) else if (::strcmp(key, "PTTInvert") == 0)
m_modemPTTInvert = ::atoi(value) == 1; m_modemPTTInvert = ::atoi(value) == 1;
else if (::strcmp(key, "TXDelay") == 0) else if (::strcmp(key, "TXDelay") == 0)
m_modemTXDelay = (unsigned int)::atoi(value); m_ax25TXDelay = m_modemTXDelay = (unsigned int)::atoi(value);
else if (::strcmp(key, "DMRDelay") == 0) else if (::strcmp(key, "DMRDelay") == 0)
m_modemDMRDelay = (unsigned int)::atoi(value); m_modemDMRDelay = (unsigned int)::atoi(value);
else if (::strcmp(key, "RXOffset") == 0) else if (::strcmp(key, "RXOffset") == 0)
@ -817,8 +817,8 @@ bool CConf::read()
m_ax25Enabled = ::atoi(value) == 1; m_ax25Enabled = ::atoi(value) == 1;
else if (::strcmp(key, "RXTwist") == 0) else if (::strcmp(key, "RXTwist") == 0)
m_ax25RXTwist = ::atoi(value); m_ax25RXTwist = ::atoi(value);
else if (::strcmp(key, "TXTwist") == 0) else if (::strcmp(key, "TXDelay") == 0)
m_ax25TXTwist = ::atoi(value); m_ax25TXDelay = (unsigned int)::atoi(value);
else if (::strcmp(key, "Trace") == 0) else if (::strcmp(key, "Trace") == 0)
m_ax25Trace = ::atoi(value) == 1; m_ax25Trace = ::atoi(value) == 1;
} else if (section == SECTION_DSTAR_NETWORK) { } else if (section == SECTION_DSTAR_NETWORK) {
@ -1777,9 +1777,9 @@ int CConf::getAX25RXTwist() const
return m_ax25RXTwist; return m_ax25RXTwist;
} }
int CConf::getAX25TXTwist() const unsigned int CConf::getAX25TXDelay() const
{ {
return m_ax25TXTwist; return m_ax25TXDelay;
} }
bool CConf::getAX25Trace() const bool CConf::getAX25Trace() const

4
Conf.h
View file

@ -176,7 +176,7 @@ public:
// The AX.25 section // The AX.25 section
bool getAX25Enabled() const; bool getAX25Enabled() const;
int getAX25RXTwist() const; int getAX25RXTwist() const;
int getAX25TXTwist() const; unsigned int getAX25TXDelay() const;
bool getAX25Trace() const; bool getAX25Trace() const;
// The FM Section // The FM Section
@ -506,7 +506,7 @@ private:
bool m_ax25Enabled; bool m_ax25Enabled;
int m_ax25RXTwist; int m_ax25RXTwist;
int m_ax25TXTwist; unsigned int m_ax25TXDelay;
bool m_ax25Trace; bool m_ax25Trace;
bool m_dstarNetworkEnabled; bool m_dstarNetworkEnabled;

2
MMDVM.ini
View file

@ -181,7 +181,7 @@ ExtAudioBoost=1
[AX.25] [AX.25]
Enable=1 Enable=1
TXTwist=6 TXDelay=300
RXTwist=6 RXTwist=6
Trace=1 Trace=1

14
MMDVMHost.cpp
View file

@ -636,13 +636,13 @@ int CMMDVMHost::run()
} }
if (m_ax25Enabled) { if (m_ax25Enabled) {
int rxTwist = m_conf.getAX25RXTwist(); int rxTwist = m_conf.getAX25RXTwist();
int txTwist = m_conf.getAX25TXTwist(); unsigned int txDelay = m_conf.getAX25TXDelay();
bool trace = m_conf.getAX25Trace(); bool trace = m_conf.getAX25Trace();
LogInfo("AX.25 RF Parameters"); LogInfo("AX.25 RF Parameters");
LogInfo(" RXTwist: %d", rxTwist); LogInfo(" RX Twist: %d", rxTwist);
LogInfo(" TXTwist: %d", txTwist); LogInfo(" TX Delay: %ums", txDelay);
LogInfo(" Trace: %s", trace ? "yes" : "no"); LogInfo(" Trace: %s", trace ? "yes" : "no");
m_ax25 = new CAX25Control(m_ax25Network, trace); m_ax25 = new CAX25Control(m_ax25Network, trace);
@ -1293,7 +1293,7 @@ bool CMMDVMHost::createModem()
int txDCOffset = m_conf.getModemTXDCOffset(); int txDCOffset = m_conf.getModemTXDCOffset();
float rfLevel = m_conf.getModemRFLevel(); float rfLevel = m_conf.getModemRFLevel();
int rxTwist = m_conf.getAX25RXTwist(); int rxTwist = m_conf.getAX25RXTwist();
int txTwist = m_conf.getAX25TXTwist(); unsigned int ax25TXDelay = m_conf.getAX25TXDelay();
LogInfo("Modem Parameters"); LogInfo("Modem Parameters");
LogInfo(" Port: %s", port.c_str()); LogInfo(" Port: %s", port.c_str());
@ -1335,7 +1335,7 @@ bool CMMDVMHost::createModem()
m_modem->setYSFParams(lowDeviation, ysfTXHang); m_modem->setYSFParams(lowDeviation, ysfTXHang);
m_modem->setP25Params(p25TXHang); m_modem->setP25Params(p25TXHang);
m_modem->setNXDNParams(nxdnTXHang); m_modem->setNXDNParams(nxdnTXHang);
m_modem->setAX25Params(rxTwist, txTwist); m_modem->setAX25Params(rxTwist, ax25TXDelay);
if (m_fmEnabled) { if (m_fmEnabled) {
std::string callsign = m_conf.getFMCallsign(); std::string callsign = m_conf.getFMCallsign();

8
Modem.cpp
View file

@ -193,7 +193,7 @@ m_error(false),
m_mode(MODE_IDLE), m_mode(MODE_IDLE),
m_hwType(HWT_UNKNOWN), m_hwType(HWT_UNKNOWN),
m_ax25RXTwist(0), m_ax25RXTwist(0),
m_ax25TXTwist(0), m_ax25TXDelay(300U),
m_fmCallsign(), m_fmCallsign(),
m_fmCallsignSpeed(20U), m_fmCallsignSpeed(20U),
m_fmCallsignFrequency(1000U), m_fmCallsignFrequency(1000U),
@ -308,10 +308,10 @@ void CModem::setNXDNParams(unsigned int txHang)
m_nxdnTXHang = txHang; m_nxdnTXHang = txHang;
} }
void CModem::setAX25Params(int rxTwist, int txTwist) void CModem::setAX25Params(int rxTwist, unsigned int txDelay)
{ {
m_ax25RXTwist = rxTwist; m_ax25RXTwist = rxTwist;
m_ax25TXTwist = txTwist; m_ax25TXDelay = txDelay;
} }
void CModem::setTransparentDataParams(unsigned int sendFrameType) void CModem::setTransparentDataParams(unsigned int sendFrameType)
@ -1831,7 +1831,7 @@ bool CModem::setConfig()
buffer[25U] = (unsigned char)(m_ax25RXTwist + 128); buffer[25U] = (unsigned char)(m_ax25RXTwist + 128);
buffer[26U] = (unsigned char)(m_ax25TXTwist + 128); buffer[26U] = m_ax25TXDelay / 10U; // In 10ms units
// CUtils::dump(1U, "Written", buffer, 27U); // CUtils::dump(1U, "Written", buffer, 27U);

4
Modem.h
View file

@ -53,7 +53,7 @@ public:
virtual void setYSFParams(bool loDev, unsigned int txHang); virtual void setYSFParams(bool loDev, unsigned int txHang);
virtual void setP25Params(unsigned int txHang); virtual void setP25Params(unsigned int txHang);
virtual void setNXDNParams(unsigned int txHang); virtual void setNXDNParams(unsigned int txHang);
virtual void setAX25Params(int rxTwist, int txTwist); virtual void setAX25Params(int rxTwist, unsigned int txDelay);
virtual void setTransparentDataParams(unsigned int sendFrameType); virtual void setTransparentDataParams(unsigned int sendFrameType);
virtual 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); virtual 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);
@ -215,7 +215,7 @@ private:
unsigned char m_mode; unsigned char m_mode;
HW_TYPE m_hwType; HW_TYPE m_hwType;
int m_ax25RXTwist; int m_ax25RXTwist;
int m_ax25TXTwist; unsigned int m_ax25TXDelay;
std::string m_fmCallsign; std::string m_fmCallsign;
unsigned int m_fmCallsignSpeed; unsigned int m_fmCallsignSpeed;

1
NullModem.h
View file

@ -36,6 +36,7 @@ public:
virtual void setLevels(float rxLevel, float cwIdTXLevel, float dstarTXLevel, float dmrTXLevel, float ysfTXLevel, float p25TXLevel, float nxdnTXLevel, float pocsagLevel, float fmTXLevel){}; virtual void setLevels(float rxLevel, float cwIdTXLevel, float dstarTXLevel, float dmrTXLevel, float ysfTXLevel, float p25TXLevel, float nxdnTXLevel, float pocsagLevel, float fmTXLevel){};
virtual void setDMRParams(unsigned int colorCode){}; virtual void setDMRParams(unsigned int colorCode){};
virtual void setYSFParams(bool loDev, unsigned int txHang){}; virtual void setYSFParams(bool loDev, unsigned int txHang){};
virtual void setAX25Params(int rxTwist, unsigned int txDelay){};
virtual void setTransparentDataParams(unsigned int sendFrameType){}; virtual void setTransparentDataParams(unsigned int sendFrameType){};
virtual bool open(); virtual bool open();

2
Version.h
View file

@ -19,6 +19,6 @@
#if !defined(VERSION_H) #if !defined(VERSION_H)
#define VERSION_H #define VERSION_H
const char* VERSION = "20200625"; const char* VERSION = "20200627";
#endif #endif