From 547f161d27ae789f55f937e3f490064184a4b3fb Mon Sep 17 00:00:00 2001 From: mikeller Date: Sun, 12 Apr 2020 01:20:15 +1200 Subject: [PATCH] Added missing linefeed after version in CLI. --- src/main/cli/cli.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/src/main/cli/cli.c b/src/main/cli/cli.c index 7d2fa32093..23965039a9 100644 --- a/src/main/cli/cli.c +++ b/src/main/cli/cli.c @@ -4850,14 +4850,13 @@ static void cliTasks(const char *cmdName, char *cmdline) } #endif -static void cliVersion(const char *cmdName, char *cmdline) +static void printVersion(const char *cmdName, bool printBoardInfo) { - UNUSED(cmdline); #if !(defined(USE_CUSTOM_DEFAULTS) && defined(USE_UNIFIED_TARGET)) UNUSED(cmdName); + UNUSED(printBoardInfo); #endif - cliPrintf("# %s / %s (%s) %s %s / %s (%s) MSP API: %s", FC_FIRMWARE_NAME, targetName, @@ -4897,12 +4896,19 @@ static void cliVersion(const char *cmdName, char *cmdline) #endif // USE_CUSTOM_DEFAULTS #if defined(USE_UNIFIED_TARGET) && defined(USE_BOARD_INFO) - if (strlen(getManufacturerId()) && strlen(getBoardName())) { - cliPrintf("# board: manufacturer_id: %s, board_name: %s", getManufacturerId(), getBoardName()); + if (printBoardInfo && strlen(getManufacturerId()) && strlen(getBoardName())) { + cliPrintLinef("# board: manufacturer_id: %s, board_name: %s", getManufacturerId(), getBoardName()); } #endif } +static void cliVersion(const char *cmdName, char *cmdline) +{ + UNUSED(cmdline); + + printVersion(cmdName, true); +} + #ifdef USE_RC_SMOOTHING_FILTER static void cliRcSmoothing(const char *cmdName, char *cmdline) { @@ -6107,7 +6113,7 @@ static void printConfig(const char *cmdName, char *cmdline, bool doDiff) #endif if ((dumpMask & DUMP_MASTER) || (dumpMask & DUMP_ALL)) { cliPrintHashLine("version"); - cliVersion(cmdName, ""); + printVersion(cmdName, false); if (!(dumpMask & BARE)) { #ifdef USE_CLI_BATCH