From 83057cdb42fb8575bce61f501b4ec0a8ed174567 Mon Sep 17 00:00:00 2001 From: f4exb Date: Mon, 12 Sep 2016 06:19:31 +0200 Subject: [PATCH] DSD demod plugin: put all numbers in dPMR status in decimal --- doc/img/DSDdemod_plugin_dpmr_status.png | Bin 4998 -> 5820 bytes plugins/channel/demoddsd/dsddemodgui.cpp | 2 +- plugins/channel/demoddsd/readme.md | 6 +++--- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/img/DSDdemod_plugin_dpmr_status.png b/doc/img/DSDdemod_plugin_dpmr_status.png index 02d8b39b58305af88c82826f9182153c52a5e709..ec063da39233fbf82ac0f9c1d211cf1352d5d4b9 100644 GIT binary patch literal 5820 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 te;59LxYNJ&{?FX$zpMCr7%7fHZ;7B$1XF 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 diff --git a/plugins/channel/demoddsd/dsddemodgui.cpp b/plugins/channel/demoddsd/dsddemodgui.cpp index ae07ba8eb..f40908fdd 100644 --- a/plugins/channel/demoddsd/dsddemodgui.cpp +++ b/plugins/channel/demoddsd/dsddemodgui.cpp @@ -503,7 +503,7 @@ void DSDDemodGUI::formatStatusText() m_signalFormat = signalFormatDStar; break; case DSDcc::DSDDecoder::DSDSyncDPMR: - sprintf(m_formatStatusText, "%s CC: %04d OI: %06X CI: %06X", + sprintf(m_formatStatusText, "%s CC: %04d OI: %08d CI: %08d", m_dpmrFrameTypes[(int) m_dsdDemod->getDecoder().getDPMRDecoder().getFrameType()], m_dsdDemod->getDecoder().getDPMRDecoder().getColorCode(), m_dsdDemod->getDecoder().getDPMRDecoder().getOwnId(), diff --git a/plugins/channel/demoddsd/readme.md b/plugins/channel/demoddsd/readme.md index d070d8199..58d63b761 100644 --- a/plugins/channel/demoddsd/readme.md +++ b/plugins/channel/demoddsd/readme.md @@ -252,15 +252,15 @@ String is in the form: `02223297>G00000222`
19.3.2: Colour code
-Colour code in hexadecimal (12 bits) +Colour code in decimal (12 bits)
19.3.3: Own ID
-Sender's identification code in hexadecimal (24 bits) +Sender's identification code in decimal (24 bits)
19.3.4: Called ID
-Called party's identification code in hexadecimal (24 bits) +Called party's identification code in decimal (24 bits)

20: Discriminator output scope display