Skip to content

Commit 894e602

Browse files
committed
Merged branch master into develop
2 parents 38bbd63 + 73cd839 commit 894e602

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

Conf.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -88,11 +88,11 @@ m_modemOscOffset(0),
8888
m_modemRSSIMultiplier(0),
8989
m_modemRSSIOffset(0),
9090
m_modemDebug(false),
91-
m_dstarEnabled(true),
91+
m_dstarEnabled(false),
9292
m_dstarModule("C"),
9393
m_dstarSelfOnly(false),
9494
m_dstarBlackList(),
95-
m_dmrEnabled(true),
95+
m_dmrEnabled(false),
9696
m_dmrBeacons(false),
9797
m_dmrId(0U),
9898
m_dmrColorCode(2U),
@@ -114,9 +114,9 @@ m_dmrDstIdWhitelistSlot2NET(),
114114
m_dmrLookupFile(),
115115
m_dmrCallHang(3U),
116116
m_dmrTXHang(4U),
117-
m_fusionEnabled(true),
117+
m_fusionEnabled(false),
118118
m_fusionRemoteGateway(false),
119-
m_p25Enabled(true),
119+
m_p25Enabled(false),
120120
m_p25NAC(0x293U),
121121
m_dstarNetworkEnabled(false),
122122
m_dstarGatewayAddress(),

0 commit comments

Comments
 (0)