g4klx/MMDVMHost
1
0
Fork 0
mirror of https://github.com/g4klx/MMDVMHost.git synced 2026-04-04 14:07:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed M17 to be compatible with the latest protocol speciication.

Browse source
This commit is contained in:
Jonathan Naylor 2021-03-25 21:07:44 +00:00
parent 69a4fdd23c
commit dbf771d80c
25 changed files with 481 additions and 390 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Conf.cpp
View file

@ -182,7 +182,7 @@ m_nxdnRemoteGateway(false),
m_nxdnTXHang(5U),
m_nxdnModeHang(10U),
m_m17Enabled(false),
m_m17ColorCode(1U),
m_m17CAN(0U),
m_m17SelfOnly(false),
m_m17AllowEncryption(false),
m_m17TXHang(5U),
@ -779,8 +779,8 @@ bool CConf::read()
} else if (section == SECTION_M17) {
if (::strcmp(key, "Enable") == 0)
m_m17Enabled = ::atoi(value) == 1;
else if (::strcmp(key, "ColorCode") == 0)
m_m17ColorCode = (unsigned int)::atoi(value);
else if (::strcmp(key, "CAN") == 0)
m_m17CAN = (unsigned int)::atoi(value);
else if (::strcmp(key, "SelfOnly") == 0)
m_m17SelfOnly = ::atoi(value) == 1;
else if (::strcmp(key, "AllowEncryption") == 0)
@ -1707,9 +1707,9 @@ bool CConf::getM17Enabled() const
return m_m17Enabled;
}
unsigned int CConf::getM17ColorCode() const
unsigned int CConf::getM17CAN() const
{
return m_m17ColorCode;
return m_m17CAN;
}
bool CConf::getM17SelfOnly() const