Merged branch master into develop
This commit is contained in:
commit
894e602175
1 changed files with 4 additions and 4 deletions
8
Conf.cpp
8
Conf.cpp
|
@ -88,11 +88,11 @@ m_modemOscOffset(0),
|
|||
m_modemRSSIMultiplier(0),
|
||||
m_modemRSSIOffset(0),
|
||||
m_modemDebug(false),
|
||||
m_dstarEnabled(true),
|
||||
m_dstarEnabled(false),
|
||||
m_dstarModule("C"),
|
||||
m_dstarSelfOnly(false),
|
||||
m_dstarBlackList(),
|
||||
m_dmrEnabled(true),
|
||||
m_dmrEnabled(false),
|
||||
m_dmrBeacons(false),
|
||||
m_dmrId(0U),
|
||||
m_dmrColorCode(2U),
|
||||
|
@ -114,9 +114,9 @@ m_dmrDstIdWhitelistSlot2NET(),
|
|||
m_dmrLookupFile(),
|
||||
m_dmrCallHang(3U),
|
||||
m_dmrTXHang(4U),
|
||||
m_fusionEnabled(true),
|
||||
m_fusionEnabled(false),
|
||||
m_fusionRemoteGateway(false),
|
||||
m_p25Enabled(true),
|
||||
m_p25Enabled(false),
|
||||
m_p25NAC(0x293U),
|
||||
m_dstarNetworkEnabled(false),
|
||||
m_dstarGatewayAddress(),
|
||||
|
|
Loading…
Reference in a new issue