Skip to content

Commit

Permalink
Merge branch 'master' into M17_AX25_FM
Browse files Browse the repository at this point in the history
  • Loading branch information
@g4klx
g4klx committed Apr 25, 2021
2 parents 609f1e3 + db1eef6 commit 8b45e04
Show file tree
Hide file tree
Showing 27 changed files with 170 additions and 170 deletions.
92 changes: 46 additions & 46 deletions Conf.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -535,9 +535,9 @@ bool CConf::read()
else if (::strcmp(key, "ModemAddress") == 0)
m_modemModemAddress = value;
else if (::strcmp(key, "ModemPort") == 0)
m_modemModemPort = (unsigned int)::atoi(value);
m_modemModemPort = (unsigned short)::atoi(value);
else if (::strcmp(key, "LocalPort") == 0)
m_modemLocalPort = (unsigned int)::atoi(value);
m_modemLocalPort = (unsigned short)::atoi(value);
else if (::strcmp(key, "RXInvert") == 0)
m_modemRXInvert = ::atoi(value) == 1;
else if (::strcmp(key, "TXInvert") == 0)
Expand Down Expand Up @@ -594,9 +594,9 @@ bool CConf::read()
else if (::strcmp(key, "RemoteAddress") == 0)
m_transparentRemoteAddress = value;
else if (::strcmp(key, "RemotePort") == 0)
m_transparentRemotePort = (unsigned int)::atoi(value);
m_transparentRemotePort = (unsigned short)::atoi(value);
else if (::strcmp(key, "LocalPort") == 0)
m_transparentLocalPort = (unsigned int)::atoi(value);
m_transparentLocalPort = (unsigned short)::atoi(value);
else if (::strcmp(key, "SendFrameType") == 0)
m_transparentSendFrameType = (unsigned int)::atoi(value);
} else if (section == SECTION_DSTAR) {
Expand Down Expand Up @@ -896,9 +896,9 @@ bool CConf::read()
else if (::strcmp(key, "GatewayAddress") == 0)
m_dstarGatewayAddress = value;
else if (::strcmp(key, "GatewayPort") == 0)
m_dstarGatewayPort = (unsigned int)::atoi(value);
m_dstarGatewayPort = (unsigned short)::atoi(value);
else if (::strcmp(key, "LocalPort") == 0)
m_dstarLocalPort = (unsigned int)::atoi(value);
m_dstarLocalPort = (unsigned short)::atoi(value);
else if (::strcmp(key, "ModeHang") == 0)
m_dstarNetworkModeHang = (unsigned int)::atoi(value);
else if (::strcmp(key, "Debug") == 0)
Expand All @@ -911,9 +911,9 @@ bool CConf::read()
else if (::strcmp(key, "Address") == 0)
m_dmrNetworkAddress = value;
else if (::strcmp(key, "Port") == 0)
m_dmrNetworkPort = (unsigned int)::atoi(value);
m_dmrNetworkPort = (unsigned short)::atoi(value);
else if (::strcmp(key, "Local") == 0)
m_dmrNetworkLocal = (unsigned int)::atoi(value);
m_dmrNetworkLocal = (unsigned short)::atoi(value);
else if (::strcmp(key, "Password") == 0)
m_dmrNetworkPassword = value;
else if (::strcmp(key, "Options") == 0)
Expand All @@ -934,11 +934,11 @@ bool CConf::read()
else if (::strcmp(key, "LocalAddress") == 0)
m_fusionNetworkMyAddress = value;
else if (::strcmp(key, "LocalPort") == 0)
m_fusionNetworkMyPort = (unsigned int)::atoi(value);
m_fusionNetworkMyPort = (unsigned short)::atoi(value);
else if (::strcmp(key, "GatewayAddress") == 0)
m_fusionNetworkGatewayAddress = value;
else if (::strcmp(key, "GatewayPort") == 0)
m_fusionNetworkGatewayPort = (unsigned int)::atoi(value);
m_fusionNetworkGatewayPort = (unsigned short)::atoi(value);
else if (::strcmp(key, "ModeHang") == 0)
m_fusionNetworkModeHang = (unsigned int)::atoi(value);
else if (::strcmp(key, "Debug") == 0)
Expand All @@ -949,9 +949,9 @@ bool CConf::read()
else if (::strcmp(key, "GatewayAddress") == 0)
m_p25GatewayAddress = value;
else if (::strcmp(key, "GatewayPort") == 0)
m_p25GatewayPort = (unsigned int)::atoi(value);
m_p25GatewayPort = (unsigned short)::atoi(value);
else if (::strcmp(key, "LocalPort") == 0)
m_p25LocalPort = (unsigned int)::atoi(value);
m_p25LocalPort = (unsigned short)::atoi(value);
else if (::strcmp(key, "ModeHang") == 0)
m_p25NetworkModeHang = (unsigned int)::atoi(value);
else if (::strcmp(key, "Debug") == 0)
Expand All @@ -962,11 +962,11 @@ bool CConf::read()
else if (::strcmp(key, "LocalAddress") == 0)
m_nxdnLocalAddress = value;
else if (::strcmp(key, "LocalPort") == 0)
m_nxdnLocalPort = (unsigned int)::atoi(value);
m_nxdnLocalPort = (unsigned short)::atoi(value);
else if (::strcmp(key, "GatewayAddress") == 0)
m_nxdnGatewayAddress = value;
else if (::strcmp(key, "GatewayPort") == 0)
m_nxdnGatewayPort = (unsigned int)::atoi(value);
m_nxdnGatewayPort = (unsigned short)::atoi(value);
else if (::strcmp(key, "ModeHang") == 0)
m_nxdnNetworkModeHang = (unsigned int)::atoi(value);
else if (::strcmp(key, "Debug") == 0)
Expand All @@ -975,11 +975,11 @@ bool CConf::read()
if (::strcmp(key, "Enable") == 0)
m_m17NetworkEnabled = ::atoi(value) == 1;
else if (::strcmp(key, "LocalPort") == 0)
m_m17LocalPort = (unsigned int)::atoi(value);
m_m17LocalPort = (unsigned short)::atoi(value);
else if (::strcmp(key, "GatewayAddress") == 0)
m_m17GatewayAddress = value;
else if (::strcmp(key, "GatewayPort") == 0)
m_m17GatewayPort = (unsigned int)::atoi(value);
m_m17GatewayPort = (unsigned short)::atoi(value);
else if (::strcmp(key, "ModeHang") == 0)
m_m17NetworkModeHang = (unsigned int)::atoi(value);
else if (::strcmp(key, "Debug") == 0)
Expand All @@ -990,11 +990,11 @@ bool CConf::read()
else if (::strcmp(key, "LocalAddress") == 0)
m_pocsagLocalAddress = value;
else if (::strcmp(key, "LocalPort") == 0)
m_pocsagLocalPort = (unsigned int)::atoi(value);
m_pocsagLocalPort = (unsigned short)::atoi(value);
else if (::strcmp(key, "GatewayAddress") == 0)
m_pocsagGatewayAddress = value;
else if (::strcmp(key, "GatewayPort") == 0)
m_pocsagGatewayPort = (unsigned int)::atoi(value);
m_pocsagGatewayPort = (unsigned short)::atoi(value);
else if (::strcmp(key, "ModeHang") == 0)
m_pocsagNetworkModeHang = (unsigned int)::atoi(value);
else if (::strcmp(key, "Debug") == 0)
Expand All @@ -1007,11 +1007,11 @@ bool CConf::read()
else if (::strcmp(key, "LocalAddress") == 0)
m_fmLocalAddress = value;
else if (::strcmp(key, "LocalPort") == 0)
m_fmLocalPort = (unsigned int)::atoi(value);
m_fmLocalPort = (unsigned short)::atoi(value);
else if (::strcmp(key, "GatewayAddress") == 0)
m_fmGatewayAddress = value;
else if (::strcmp(key, "GatewayPort") == 0)
m_fmGatewayPort = (unsigned int)::atoi(value);
m_fmGatewayPort = (unsigned short)::atoi(value);
else if (::strcmp(key, "PreEmphasis") == 0)
m_fmPreEmphasis = ::atoi(value) == 1;
else if (::strcmp(key, "DeEmphasis") == 0)
Expand Down Expand Up @@ -1097,9 +1097,9 @@ bool CConf::read()
if (::strcmp(key, "Address") == 0)
m_lcdprocAddress = value;
else if (::strcmp(key, "Port") == 0)
m_lcdprocPort = (unsigned int)::atoi(value);
m_lcdprocPort = (unsigned short)::atoi(value);
else if (::strcmp(key, "LocalPort") == 0)
m_lcdprocLocalPort = (unsigned int)::atoi(value);
m_lcdprocLocalPort = (unsigned short)::atoi(value);
else if (::strcmp(key, "DisplayClock") == 0)
m_lcdprocDisplayClock = ::atoi(value) == 1;
else if (::strcmp(key, "UTC") == 0)
Expand All @@ -1115,7 +1115,7 @@ bool CConf::read()
if (::strcmp(key, "Enable") == 0)
m_remoteControlEnabled = ::atoi(value) == 1;
else if (::strcmp(key, "Port") == 0)
m_remoteControlPort = (unsigned int)::atoi(value);
m_remoteControlPort = (unsigned short)::atoi(value);
}
}

Expand Down Expand Up @@ -1289,12 +1289,12 @@ std::string CConf::getModemModemAddress() const
return m_modemModemAddress;
}

unsigned int CConf::getModemModemPort() const
unsigned short CConf::getModemModemPort() const
{
return m_modemModemPort;
}

unsigned int CConf::getModemLocalPort() const
unsigned short CConf::getModemLocalPort() const
{
return m_modemLocalPort;
}
Expand Down Expand Up @@ -1434,12 +1434,12 @@ std::string CConf::getTransparentRemoteAddress() const
return m_transparentRemoteAddress;
}

unsigned int CConf::getTransparentRemotePort() const
unsigned short CConf::getTransparentRemotePort() const
{
return m_transparentRemotePort;
}

unsigned int CConf::getTransparentLocalPort() const
unsigned short CConf::getTransparentLocalPort() const
{
return m_transparentLocalPort;
}
Expand Down Expand Up @@ -1954,12 +1954,12 @@ std::string CConf::getDStarGatewayAddress() const
return m_dstarGatewayAddress;
}

unsigned int CConf::getDStarGatewayPort() const
unsigned short CConf::getDStarGatewayPort() const
{
return m_dstarGatewayPort;
}

unsigned int CConf::getDStarLocalPort() const
unsigned short CConf::getDStarLocalPort() const
{
return m_dstarLocalPort;
}
Expand Down Expand Up @@ -1989,12 +1989,12 @@ std::string CConf::getDMRNetworkAddress() const
return m_dmrNetworkAddress;
}

unsigned int CConf::getDMRNetworkPort() const
unsigned short CConf::getDMRNetworkPort() const
{
return m_dmrNetworkPort;
}

unsigned int CConf::getDMRNetworkLocal() const
unsigned short CConf::getDMRNetworkLocal() const
{
return m_dmrNetworkLocal;
}
Expand Down Expand Up @@ -2044,7 +2044,7 @@ std::string CConf::getFusionNetworkMyAddress() const
return m_fusionNetworkMyAddress;
}

unsigned int CConf::getFusionNetworkMyPort() const
unsigned short CConf::getFusionNetworkMyPort() const
{
return m_fusionNetworkMyPort;
}
Expand All @@ -2054,7 +2054,7 @@ std::string CConf::getFusionNetworkGatewayAddress() const
return m_fusionNetworkGatewayAddress;
}

unsigned int CConf::getFusionNetworkGatewayPort() const
unsigned short CConf::getFusionNetworkGatewayPort() const
{
return m_fusionNetworkGatewayPort;
}
Expand All @@ -2079,12 +2079,12 @@ std::string CConf::getP25GatewayAddress() const
return m_p25GatewayAddress;
}

unsigned int CConf::getP25GatewayPort() const
unsigned short CConf::getP25GatewayPort() const
{
return m_p25GatewayPort;
}

unsigned int CConf::getP25LocalPort() const
unsigned short CConf::getP25LocalPort() const
{
return m_p25LocalPort;
}
Expand Down Expand Up @@ -2114,7 +2114,7 @@ std::string CConf::getNXDNGatewayAddress() const
return m_nxdnGatewayAddress;
}

unsigned int CConf::getNXDNGatewayPort() const
unsigned short CConf::getNXDNGatewayPort() const
{
return m_nxdnGatewayPort;
}
Expand All @@ -2124,7 +2124,7 @@ std::string CConf::getNXDNLocalAddress() const
return m_nxdnLocalAddress;
}

unsigned int CConf::getNXDNLocalPort() const
unsigned short CConf::getNXDNLocalPort() const
{
return m_nxdnLocalPort;
}
Expand All @@ -2149,12 +2149,12 @@ std::string CConf::getM17GatewayAddress() const
return m_m17GatewayAddress;
}

unsigned int CConf::getM17GatewayPort() const
unsigned short CConf::getM17GatewayPort() const
{
return m_m17GatewayPort;
}

unsigned int CConf::getM17LocalPort() const
unsigned short CConf::getM17LocalPort() const
{
return m_m17LocalPort;
}
Expand All @@ -2179,7 +2179,7 @@ std::string CConf::getPOCSAGGatewayAddress() const
return m_pocsagGatewayAddress;
}

unsigned int CConf::getPOCSAGGatewayPort() const
unsigned short CConf::getPOCSAGGatewayPort() const
{
return m_pocsagGatewayPort;
}
Expand All @@ -2189,7 +2189,7 @@ std::string CConf::getPOCSAGLocalAddress() const
return m_pocsagLocalAddress;
}

unsigned int CConf::getPOCSAGLocalPort() const
unsigned short CConf::getPOCSAGLocalPort() const
{
return m_pocsagLocalPort;
}
Expand Down Expand Up @@ -2219,7 +2219,7 @@ std::string CConf::getFMGatewayAddress() const
return m_fmGatewayAddress;
}

unsigned int CConf::getFMGatewayPort() const
unsigned short CConf::getFMGatewayPort() const
{
return m_fmGatewayPort;
}
Expand All @@ -2229,7 +2229,7 @@ std::string CConf::getFMLocalAddress() const
return m_fmLocalAddress;
}

unsigned int CConf::getFMLocalPort() const
unsigned short CConf::getFMLocalPort() const
{
return m_fmLocalPort;
}
Expand Down Expand Up @@ -2409,12 +2409,12 @@ std::string CConf::getLCDprocAddress() const
return m_lcdprocAddress;
}

unsigned int CConf::getLCDprocPort() const
unsigned short CConf::getLCDprocPort() const
{
return m_lcdprocPort;
}

unsigned int CConf::getLCDprocLocalPort() const
unsigned short CConf::getLCDprocLocalPort() const
{
return m_lcdprocLocalPort;
}
Expand Down Expand Up @@ -2459,7 +2459,7 @@ std::string CConf::getRemoteControlAddress() const
return m_remoteControlAddress;
}

unsigned int CConf::getRemoteControlPort() const
unsigned short CConf::getRemoteControlPort() const
{
return m_remoteControlPort;
}
Loading

0 comments on commit 8b45e04

Please sign in to comment.