From 5f120fb2cbb96cf80b1b4759a4998bbee62374f8 Mon Sep 17 00:00:00 2001 From: f4exb Date: Mon, 25 Jun 2018 01:05:13 +0200 Subject: [PATCH] DSD decoder: NXDN: support for EFR vocoder only with DV serial --- plugins/channelrx/demoddsd/dsddemod.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/plugins/channelrx/demoddsd/dsddemod.cpp b/plugins/channelrx/demoddsd/dsddemod.cpp index 117eeb09c..edce8becd 100644 --- a/plugins/channelrx/demoddsd/dsddemod.cpp +++ b/plugins/channelrx/demoddsd/dsddemod.cpp @@ -666,8 +666,9 @@ void DSDDemod::formatStatusText() { // 1 1 2 2 3 3 4 4 5 5 6 6 7 7 8 // 0....5....0....5....0....5....0....5....0....5....0....5....0....5....0....5....0.. - // RC cc mm llllll ssss - snprintf(m_formatStatusText, 82, "RC %02d %02X %06X %02X", + // RC r cc mm llllll ssss + snprintf(m_formatStatusText, 82, "RC %s %02d %02X %06X %02X", + getDecoder().getNXDNDecoder().isFullRate() ? "F" : "H", getDecoder().getNXDNDecoder().getRAN(), getDecoder().getNXDNDecoder().getMessageType(), getDecoder().getNXDNDecoder().getLocationId(), @@ -683,9 +684,10 @@ void DSDDemod::formatStatusText() { // 1 1 2 2 3 3 4 4 5 5 6 6 7 7 8 // 0....5....0....5....0....5....0....5....0....5....0....5....0....5....0....5....0.. - // Rx cc mm sssss>gddddd - snprintf(m_formatStatusText, 82, "%s %02d %02X %05d>%c%05d", + // Rx r cc mm sssss>gddddd + snprintf(m_formatStatusText, 82, "%s %s %02d %02X %05d>%c%05d", getDecoder().getNXDNDecoder().getRFChannelStr(), + getDecoder().getNXDNDecoder().isFullRate() ? "F" : "H", getDecoder().getNXDNDecoder().getRAN(), getDecoder().getNXDNDecoder().getMessageType(), getDecoder().getNXDNDecoder().getSourceId(),