MMDVM/MMDVMHost
1
0
Fork 0
mirror of https://github.com/g4klx/MMDVMHost synced 2025-12-23 08:45:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add RSSI reporting to FM and AX.25.

Browse Source
This commit is contained in:
Jonathan Naylor
2023-08-04 16:12:38 +01:00
parent 0b69928256
commit fdc917518b
9 changed files with 224 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
MMDVMHost.cpp
View File

@@ -352,7 +352,6 @@ int CMMDVMHost::run()
}
#endif
#endif
::LogInitialise(m_conf.getLogDisplayLevel(), m_conf.getLogMQTTLevel());
std::vector<std::pair<std::string, void (*)(const unsigned char*, unsigned int)>> subscriptions;
@@ -878,7 +877,7 @@ int CMMDVMHost::run()
LogInfo(" P-Persist: %u", pPersist);
LogInfo(" Trace: %s", trace ? "yes" : "no");
m_ax25 = new CAX25Control(m_ax25Network, trace);
m_ax25 = new CAX25Control(m_ax25Network, trace, rssi);
}
#endif
@@ -890,7 +889,7 @@ int CMMDVMHost::run()
float rxAudioGain = m_conf.getFMRXAudioGain();
m_fmRFModeHang = m_conf.getFMModeHang();
m_fm = new CFMControl(m_fmNetwork, txAudioGain, rxAudioGain, preEmphasis, deEmphasis);
m_fm = new CFMControl(m_fmNetwork, txAudioGain, rxAudioGain, preEmphasis, deEmphasis, rssi);
}
#endif
@@ -1119,7 +1118,7 @@ int CMMDVMHost::run()
if (m_mode == MODE_IDLE || m_mode == MODE_FM) {
m_ax25->writeModem(data, len);
} else if (m_mode != MODE_LOCKOUT) {
LogWarning("NXDN modem data received when in mode %u", m_mode);
LogWarning("AX.25 modem data received when in mode %u", m_mode);
}
}
#endif