minor corrections for messages; fix incorrect variable for deep debug; fix incorrect queue size for NXDN;

3.0-rcon_maint
Bryan Biedenkapp 3 years ago
parent 0f237c7435
commit e75c9f49aa

@ -244,7 +244,7 @@ protocols:
# BER/Error threshold for silencing voice packets. (0 or 144 disables) # BER/Error threshold for silencing voice packets. (0 or 144 disables)
silenceThreshold: 14 silenceThreshold: 14
# Internal data queue size (in NXDN packets). # Internal data queue size (in NXDN packets).
queueSize: 12 queueSize: 31
# Flag indicating whether or not verbose logging is enabled. # Flag indicating whether or not verbose logging is enabled.
verbose: true verbose: true
# Flag indicating whether or not debug logging is enabled. # Flag indicating whether or not debug logging is enabled.

@ -1301,7 +1301,7 @@ int Host::run()
bool ret = nxdn->processFrame(data, len); bool ret = nxdn->processFrame(data, len);
if (ret) { if (ret) {
m_modeTimer.start(); m_modeTimer.start();
INTERRUPT_NXDN_CONTROL; //INTERRUPT_NXDN_CONTROL;
} }
} }
else if (m_state != HOST_STATE_LOCKOUT) { else if (m_state != HOST_STATE_LOCKOUT) {

@ -1603,7 +1603,7 @@ void HostCal::displayHelp()
LogMessage(LOG_CAL, " [/] Inc/Dec P25 +/- 3 Symbol Level"); LogMessage(LOG_CAL, " [/] Inc/Dec P25 +/- 3 Symbol Level");
LogMessage(LOG_CAL, " {/} Inc/Dec P25 +/- 1 Symbol Level"); LogMessage(LOG_CAL, " {/} Inc/Dec P25 +/- 1 Symbol Level");
LogMessage(LOG_CAL, " ;/' Inc/Dec NXDN +/- 3 Symbol Level"); LogMessage(LOG_CAL, " ;/' Inc/Dec NXDN +/- 3 Symbol Level");
LogMessage(LOG_CAL, " :/\" Inc/Dec NXDN +/- 1 Symbol Level"); LogMessage(LOG_CAL, " :/\" Inc/Dec NXDN +/- 1 Symbol Level");
} }
else { else {
LogMessage(LOG_CAL, " 1 Set DMR Disc. Bandwidth Offset"); LogMessage(LOG_CAL, " 1 Set DMR Disc. Bandwidth Offset");

@ -1272,7 +1272,7 @@ bool Modem::writeDMRData1(const uint8_t* data, uint32_t length)
if (m_debug) if (m_debug)
LogDebug(LOG_MODEM, "Modem::writeDMRData1(); immediate write (len %u)", length); LogDebug(LOG_MODEM, "Modem::writeDMRData1(); immediate write (len %u)", length);
//if (m_trace) //if (m_trace)
// Utils::dump(1U, "Immediate TX DMR Data 1", m_buffer, len); // Utils::dump(1U, "Immediate TX DMR Data 1", buffer, len);
int ret = write(buffer, len); int ret = write(buffer, len);
if (ret != int(len)) { if (ret != int(len)) {
@ -1329,7 +1329,7 @@ bool Modem::writeDMRData2(const uint8_t* data, uint32_t length)
if (m_debug) if (m_debug)
LogDebug(LOG_MODEM, "Modem::writeDMRData2(); immediate write (len %u)", length); LogDebug(LOG_MODEM, "Modem::writeDMRData2(); immediate write (len %u)", length);
//if (m_trace) //if (m_trace)
// Utils::dump(1U, "Immediate TX DMR Data 2", m_buffer, len); // Utils::dump(1U, "Immediate TX DMR Data 2", buffer, len);
int ret = write(buffer, len); int ret = write(buffer, len);
if (ret != int(len)) { if (ret != int(len)) {
@ -1386,7 +1386,7 @@ bool Modem::writeP25Data(const uint8_t* data, uint32_t length)
if (m_debug) if (m_debug)
LogDebug(LOG_MODEM, "Modem::writeP25Data(); immediate write (len %u)", length); LogDebug(LOG_MODEM, "Modem::writeP25Data(); immediate write (len %u)", length);
//if (m_trace) //if (m_trace)
// Utils::dump(1U, "Immediate TX P25 Data", m_buffer, len); // Utils::dump(1U, "Immediate TX P25 Data", buffer, len);
int ret = write(buffer, len); int ret = write(buffer, len);
if (ret != int(len)) { if (ret != int(len)) {
@ -1443,7 +1443,7 @@ bool Modem::writeNXDNData(const uint8_t* data, uint32_t length)
if (m_debug) if (m_debug)
LogDebug(LOG_MODEM, "Modem::writeNXDNData(); immediate write (len %u)", length); LogDebug(LOG_MODEM, "Modem::writeNXDNData(); immediate write (len %u)", length);
//if (m_trace) //if (m_trace)
// Utils::dump(1U, "Immediate TX NXDN Data", m_buffer, len); // Utils::dump(1U, "Immediate TX NXDN Data", buffer, len);
int ret = write(buffer, len); int ret = write(buffer, len);
if (ret != int(len)) { if (ret != int(len)) {

@ -525,7 +525,7 @@ bool Voice::process(uint8_t fct, uint8_t option, uint8_t* data, uint32_t len)
m_rfBits += 188U; m_rfBits += 188U;
if (m_verbose) { if (m_verbose) {
LogMessage(LOG_RF, "NXDN, " NXDN_RTCH_MSG_TYPE_VCALL ", audio, errs = %u/141 (%.1f%%)", errors, float(errors) / 1.88F); LogMessage(LOG_RF, "NXDN, " NXDN_RTCH_MSG_TYPE_VCALL ", audio, errs = %u/188 (%.1f%%)", errors, float(errors) / 1.88F);
} }
} else if (option == NXDN_LICH_STEAL_FACCH1_1) { } else if (option == NXDN_LICH_STEAL_FACCH1_1) {
channel::FACCH1 facch11; channel::FACCH1 facch11;

Loading…
Cancel
Save

Powered by TurnKey Linux.