From f1dda251c345da46cb4de3f4b2efbe5ba839df5f Mon Sep 17 00:00:00 2001 From: Jonathan Naylor Date: Tue, 10 Nov 2020 09:40:54 +0000 Subject: [PATCH] Display the modes in the log more nicely. --- SerialModem.cpp | 30 +++++++++++++++++++++--------- Version.h | 2 +- 2 files changed, 22 insertions(+), 10 deletions(-) diff --git a/SerialModem.cpp b/SerialModem.cpp index 4255284..3f91e97 100644 --- a/SerialModem.cpp +++ b/SerialModem.cpp @@ -1922,15 +1922,27 @@ bool CSerialModem::readVersion() LogInfo("Unknown CPU type: %u", m_buffer[6U]); break; } - LogInfo("D-Star: %s", (m_buffer[4U] & 0x01U) == 0x01U ? "yes" : "no"); - LogInfo("DMR: %s", (m_buffer[4U] & 0x02U) == 0x02U ? "yes" : "no"); - LogInfo("YSF: %s", (m_buffer[4U] & 0x04U) == 0x04U ? "yes" : "no"); - LogInfo("P25: %s", (m_buffer[4U] & 0x08U) == 0x08U ? "yes" : "no"); - LogInfo("NXDN: %s", (m_buffer[4U] & 0x10U) == 0x10U ? "yes" : "no"); - LogInfo("M17: %s", (m_buffer[4U] & 0x20U) == 0x20U ? "yes" : "no"); - LogInfo("FM: %s", (m_buffer[4U] & 0x40U) == 0x40U ? "yes" : "no"); - LogInfo("POCSAG: %s", (m_buffer[5U] & 0x01U) == 0x01U ? "yes" : "no"); - LogInfo("AX.25: %s", (m_buffer[5U] & 0x02U) == 0x02U ? "yes" : "no"); + char modeText[10U]; + ::strcpy(modeText, "Modes:"); + if ((m_buffer[4U] & 0x01U) == 0x01U) + ::strcat(modeText, " D-Star"); + if ((m_buffer[4U] & 0x02U) == 0x02U) + ::strcat(modeText, " DMR"); + if ((m_buffer[4U] & 0x04U) == 0x04U) + ::strcat(modeText, " YSF"); + if ((m_buffer[4U] & 0x08U) == 0x08U) + ::strcat(modeText, " P25"); + if ((m_buffer[4U] & 0x10U) == 0x10U) + ::strcat(modeText, " NXDN"); + if ((m_buffer[4U] & 0x20U) == 0x20U) + ::strcat(modeText, " M17"); + if ((m_buffer[4U] & 0x40U) == 0x40U) + ::strcat(modeText, " FM"); + if ((m_buffer[5U] & 0x01U) == 0x01U) + ::strcat(modeText, " POCSAG"); + if ((m_buffer[5U] & 0x02U) == 0x02U) + ::strcat(modeText, " AX.25"); + LogInfo(modeText); return true; default: diff --git a/Version.h b/Version.h index 1331f35..5fe7f6f 100644 --- a/Version.h +++ b/Version.h @@ -19,6 +19,6 @@ #if !defined(VERSION_H) #define VERSION_H -const char* VERSION = "20201109"; +const char* VERSION = "20201110"; #endif