From a396ba0c119c6008b985730c742b18c7f9d7c36b Mon Sep 17 00:00:00 2001 From: TheAngularity Date: Tue, 9 Aug 2016 19:53:18 +0200 Subject: [PATCH] cleanup cli commands outputs and over - deleted printSectionBreak and his #define (not more used) - cleaned cli commads output (dump, sd_info, version) --- src/main/io/serial_cli.c | 25 +++++-------------------- 1 file changed, 5 insertions(+), 20 deletions(-) diff --git a/src/main/io/serial_cli.c b/src/main/io/serial_cli.c index 3ebafa4ec..185047279 100644 --- a/src/main/io/serial_cli.c +++ b/src/main/io/serial_cli.c @@ -927,7 +927,6 @@ const clivalue_t valueTable[] = { #define VALUE_COUNT (sizeof(valueTable) / sizeof(clivalue_t)) - typedef union { int32_t int_value; float float_value; @@ -940,8 +939,6 @@ static void cliPrint(const char *str); static void cliPrintf(const char *fmt, ...); static void cliWrite(uint8_t ch); -#define printSectionBreak() cliPrintf((char *)sectionBreak) - #define COMPARE_CONFIG(value) (masterConfig.value == defaultConfig.value) static bool cliDumpPrintf(uint8_t dumpMask, bool equalsDefault, const char *format, ...); @@ -1731,8 +1728,6 @@ static void printServo(uint8_t dumpMask, master_t *defaultConfig) ); } - printSectionBreak(); - // print servo directions unsigned int channel; for (i = 0; i < MAX_SUPPORTED_SERVOS; i++) { @@ -2022,10 +2017,9 @@ static void cliSdInfo(char *cmdline) { ; // Nothing more detailed to print break; } - - cliPrint("\r\n"); break; } + cliPrint("\r\n"); } #endif @@ -2326,14 +2320,12 @@ static void printConfig(char *cmdline, bool doDiff) if ((dumpMask & DUMP_MASTER) || (dumpMask & DUMP_ALL)) { cliPrint("\r\n# version\r\n"); cliVersion(NULL); - cliPrint("\r\n"); if ((dumpMask & (DUMP_ALL | DO_DIFF)) == (DUMP_ALL | DO_DIFF)) { cliPrint("\r\n# reset configuration to default settings\r\ndefaults\r\n"); } - printSectionBreak(); - cliPrint("# name\r\n"); + cliPrint("\r\n# name\r\n"); printName(dumpMask); cliPrint("\r\n# mixer\r\n"); @@ -2460,7 +2452,7 @@ static void printConfig(char *cmdline, bool doDiff) cliPrint("\r\n# adjrange\r\n"); printAdjustmentRange(dumpMask, &defaultConfig); - cliPrintf("\r\n# rxrange\r\n"); + cliPrint("\r\n# rxrange\r\n"); printRxRange(dumpMask, &defaultConfig); #ifdef USE_SERVOS @@ -2519,26 +2511,19 @@ static void cliDumpProfile(uint8_t profileIndex, uint8_t dumpMask, master_t *def { if (profileIndex >= MAX_PROFILE_COUNT) // Faulty values return; - changeProfile(profileIndex); cliPrint("\r\n# profile\r\n"); cliProfile(""); - - printSectionBreak(); dumpValues(PROFILE_VALUE, dumpMask, defaultConfig); - - cliRateProfile(""); } static void cliDumpRateProfile(uint8_t rateProfileIndex, uint8_t dumpMask, master_t *defaultConfig) { if (rateProfileIndex >= MAX_RATEPROFILES) // Faulty values - return; + return; changeControlRateProfile(rateProfileIndex); cliPrint("\r\n# rateprofile\r\n"); cliRateProfile(""); - printSectionBreak(); - dumpValues(PROFILE_RATE_VALUE, dumpMask, defaultConfig); } @@ -3338,7 +3323,7 @@ static void cliVersion(char *cmdline) { UNUSED(cmdline); - cliPrintf("# BetaFlight/%s %s %s / %s (%s)", + cliPrintf("# BetaFlight/%s %s %s / %s (%s)\r\n", targetName, FC_VERSION_STRING, buildDate,