rusefi
/
atbetaflight
mirror of https://github.com/rusefi/atbetaflight.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added cliPrintHashLine function. Improved cliPrint buffering.

This commit is contained in:
Martin Budden 2016-12-25 08:34:45 +00:00
parent 84059a78ff
commit 1bbb754502
1 changed files with 55 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

135
src/main/io/serial_cli.c
View File

@ -111,7 +111,7 @@ void gpsEnablePassthrough(serialPort_t *gpsPassthroughPort);
static serialPort_t *cliPort; static serialPort_t *cliPort;
static bufWriter_t *cliWriter; static bufWriter_t *cliWriter;
static uint8_t cliWriteBuffer[sizeof(*cliWriter) + 16]; static uint8_t cliWriteBuffer[sizeof(*cliWriter) + 128];
static void cliAux(char *cmdline); static void cliAux(char *cmdline);
static void cliRxFail(char *cmdline); static void cliRxFail(char *cmdline);
@ -1016,6 +1016,11 @@ static void cliPrintVar(const clivalue_t *var, uint32_t full);
static void cliPrintVarDefault(const clivalue_t *var, uint32_t full, const master_t *defaultConfig); static void cliPrintVarDefault(const clivalue_t *var, uint32_t full, const master_t *defaultConfig);
static void cliPrintVarRange(const clivalue_t *var); static void cliPrintVarRange(const clivalue_t *var);
static void cliPrint(const char *str); static void cliPrint(const char *str);
#ifdef CLI_MINIMAL_VERBOSITY
#define cliPrintHashLine(str)
#else
static void cliPrintHashLine(const char *str);
#endif
static void cliPrintf(const char *fmt, ...); static void cliPrintf(const char *fmt, ...);
static void cliWrite(uint8_t ch); static void cliWrite(uint8_t ch);
@ -1023,10 +1028,10 @@ static bool cliDumpPrintf(uint8_t dumpMask, bool equalsDefault, const char *form
static bool cliDefaultPrintf(uint8_t dumpMask, bool equalsDefault, const char *format, ...); static bool cliDefaultPrintf(uint8_t dumpMask, bool equalsDefault, const char *format, ...);
#ifndef CLI_MINIMAL_VERBOSITY #ifndef CLI_MINIMAL_VERBOSITY
static void cliRepeat(const char *str, uint8_t len) static void cliRepeat(char ch, uint8_t len)
{ {
for (int i = 0; i < len; i++) { for (int i = 0; i < len; i++) {
cliPrint(str); bufWriterAppend(cliWriter, ch);
} }
cliPrint("\r\n"); cliPrint("\r\n");
} }
@ -1035,7 +1040,6 @@ static void cliRepeat(const char *str, uint8_t len)
static void cliPrompt(void) static void cliPrompt(void)
{ {
cliPrint("\r\n# "); cliPrint("\r\n# ");
bufWriterFlush(cliWriter);
} }
static void cliShowParseError(void) static void cliShowParseError(void)
@ -2268,11 +2272,11 @@ static void cliFlashErase(char *cmdline)
#ifndef CLI_MINIMAL_VERBOSITY #ifndef CLI_MINIMAL_VERBOSITY
cliPrintf("."); cliPrintf(".");
if (i++ > 120) { if (i++ > 120) {
i=0; i=0;
cliPrintf("\r\n"); cliPrintf("\r\n");
} }
bufWriterFlush(cliWriter); bufWriterFlush(cliWriter);
#endif #endif
delay(100); delay(100);
} }
@ -2783,29 +2787,23 @@ static void printConfig(char *cmdline, bool doDiff)
} }
if ((dumpMask & DUMP_MASTER) || (dumpMask & DUMP_ALL)) { if ((dumpMask & DUMP_MASTER) || (dumpMask & DUMP_ALL)) {
#ifndef CLI_MINIMAL_VERBOSITY cliPrintHashLine("version");
cliPrint("\r\n# version\r\n");
#endif
cliVersion(NULL); cliVersion(NULL);
#ifndef CLI_MINIMAL_VERBOSITY #ifndef CLI_MINIMAL_VERBOSITY
if ((dumpMask & (DUMP_ALL | DO_DIFF)) == (DUMP_ALL | DO_DIFF)) { if ((dumpMask & (DUMP_ALL | DO_DIFF)) == (DUMP_ALL | DO_DIFF)) {
cliPrint("\r\n# reset configuration to default settings\r\ndefaults\r\n"); cliPrintHashLine("reset configuration to default settings\r\ndefaults");
} }
cliPrint("\r\n# name\r\n"); cliPrintHashLine("name");
#endif #endif
printName(dumpMask); printName(dumpMask);
#ifndef CLI_MINIMAL_VERBOSITY cliPrintHashLine("resources");
cliPrint("\r\n# resources\r\n");
#endif
printResource(dumpMask, &defaultConfig); printResource(dumpMask, &defaultConfig);
#ifndef USE_QUAD_MIXER_ONLY #ifndef USE_QUAD_MIXER_ONLY
#ifndef CLI_MINIMAL_VERBOSITY cliPrintHashLine("mixer");
cliPrint("\r\n# mixer\r\n");
#endif
const bool equalsDefault = mixerConfig()->mixerMode == defaultConfig.mixerConfig.mixerMode; const bool equalsDefault = mixerConfig()->mixerMode == defaultConfig.mixerConfig.mixerMode;
const char *formatMixer = "mixer %s\r\n"; const char *formatMixer = "mixer %s\r\n";
cliDefaultPrintf(dumpMask, equalsDefault, formatMixer, mixerNames[defaultConfig.mixerConfig.mixerMode - 1]); cliDefaultPrintf(dumpMask, equalsDefault, formatMixer, mixerNames[defaultConfig.mixerConfig.mixerMode - 1]);
@ -2816,89 +2814,59 @@ static void printConfig(char *cmdline, bool doDiff)
printMotorMix(dumpMask, defaultConfig.customMotorMixer); printMotorMix(dumpMask, defaultConfig.customMotorMixer);
#ifdef USE_SERVOS #ifdef USE_SERVOS
#ifndef CLI_MINIMAL_VERBOSITY cliPrintHashLine("servo");
cliPrint("\r\n# servo\r\n");
#endif
printServo(dumpMask, &defaultConfig.servoProfile); printServo(dumpMask, &defaultConfig.servoProfile);
#ifndef CLI_MINIMAL_VERBOSITY cliPrintHashLine("servo mix");
cliPrint("\r\n# servo mix\r\n");
#endif
// print custom servo mixer if exists // print custom servo mixer if exists
cliDumpPrintf(dumpMask, masterConfig.customServoMixer[0].rate == 0, "smix reset\r\n\r\n"); cliDumpPrintf(dumpMask, masterConfig.customServoMixer[0].rate == 0, "smix reset\r\n\r\n");
printServoMix(dumpMask, &defaultConfig); printServoMix(dumpMask, &defaultConfig);
#endif #endif
#endif #endif
#ifndef CLI_MINIMAL_VERBOSITY cliPrintHashLine("feature");
cliPrint("\r\n# feature\r\n");
#endif
printFeature(dumpMask, &defaultConfig); printFeature(dumpMask, &defaultConfig);
#ifdef BEEPER #ifdef BEEPER
#ifndef CLI_MINIMAL_VERBOSITY cliPrintHashLine("beeper");
cliPrint("\r\n# beeper\r\n");
#endif
printBeeper(dumpMask, &defaultConfig); printBeeper(dumpMask, &defaultConfig);
#endif #endif
#ifndef CLI_MINIMAL_VERBOSITY cliPrintHashLine("map");
cliPrint("\r\n# map\r\n");
#endif
printMap(dumpMask, &defaultConfig.rxConfig); printMap(dumpMask, &defaultConfig.rxConfig);
#ifndef CLI_MINIMAL_VERBOSITY cliPrintHashLine("serial");
cliPrint("\r\n# serial\r\n");
#endif
printSerial(dumpMask, &defaultConfig.serialConfig); printSerial(dumpMask, &defaultConfig.serialConfig);
#ifdef LED_STRIP #ifdef LED_STRIP
#ifndef CLI_MINIMAL_VERBOSITY cliPrintHashLine("led");
cliPrint("\r\n# led\r\n");
#endif
printLed(dumpMask, &defaultConfig.ledStripConfig); printLed(dumpMask, &defaultConfig.ledStripConfig);
#ifndef CLI_MINIMAL_VERBOSITY cliPrintHashLine("color");
cliPrint("\r\n# color\r\n");
#endif
printColor(dumpMask, &defaultConfig.ledStripConfig); printColor(dumpMask, &defaultConfig.ledStripConfig);
#ifndef CLI_MINIMAL_VERBOSITY cliPrintHashLine("mode_color");
cliPrint("\r\n# mode_color\r\n");
#endif
printModeColor(dumpMask, &defaultConfig.ledStripConfig); printModeColor(dumpMask, &defaultConfig.ledStripConfig);
#endif #endif
#ifndef CLI_MINIMAL_VERBOSITY cliPrintHashLine("aux");
cliPrint("\r\n# aux\r\n");
#endif
printAux(dumpMask, &defaultConfig.modeActivationProfile); printAux(dumpMask, &defaultConfig.modeActivationProfile);
#ifndef CLI_MINIMAL_VERBOSITY cliPrintHashLine("adjrange");
cliPrint("\r\n# adjrange\r\n");
#endif
printAdjustmentRange(dumpMask, &defaultConfig.adjustmentProfile); printAdjustmentRange(dumpMask, &defaultConfig.adjustmentProfile);
#ifndef CLI_MINIMAL_VERBOSITY cliPrintHashLine("rxrange");
cliPrint("\r\n# rxrange\r\n");
#endif
printRxRange(dumpMask, &defaultConfig.rxConfig); printRxRange(dumpMask, &defaultConfig.rxConfig);
#ifdef VTX #ifdef VTX
#ifndef CLI_MINIMAL_VERBOSITY cliPrintHashLine("vtx");
cliPrint("\r\n# vtx\r\n");
#endif
printVtx(dumpMask, &defaultConfig); printVtx(dumpMask, &defaultConfig);
#endif #endif
#ifndef CLI_MINIMAL_VERBOSITY cliPrintHashLine("rxfail");
cliPrint("\r\n# rxfail\r\n");
#endif
printRxFail(dumpMask, &defaultConfig.rxConfig); printRxFail(dumpMask, &defaultConfig.rxConfig);
#ifndef CLI_MINIMAL_VERBOSITY cliPrintHashLine("master");
cliPrint("\r\n# master\r\n");
#endif
dumpValues(MASTER_VALUE, dumpMask, &defaultConfig); dumpValues(MASTER_VALUE, dumpMask, &defaultConfig);
if (dumpMask & DUMP_ALL) { if (dumpMask & DUMP_ALL) {
@ -2913,17 +2881,17 @@ static void printConfig(char *cmdline, bool doDiff)
changeControlRateProfile(currentRateIndex); changeControlRateProfile(currentRateIndex);
#ifndef CLI_MINIMAL_VERBOSITY #ifndef CLI_MINIMAL_VERBOSITY
cliPrint("\r\n# restore original rateprofile selection\r\n"); cliPrintHashLine("restore original rateprofile selection");
cliRateProfile(""); cliRateProfile("");
#endif #endif
} }
changeProfile(activeProfile); changeProfile(activeProfile);
#ifndef CLI_MINIMAL_VERBOSITY #ifndef CLI_MINIMAL_VERBOSITY
cliPrint("\r\n# restore original profile selection\r\n"); cliPrintHashLine("restore original profile selection");
cliProfile(""); cliProfile("");
cliPrint("\r\n# save configuration\r\nsave\r\n"); cliPrintHashLine("save configuration\r\nsave");
#endif #endif
} else { } else {
cliDumpProfile(masterConfig.current_profile_index, dumpMask, &defaultConfig); cliDumpProfile(masterConfig.current_profile_index, dumpMask, &defaultConfig);
@ -2947,9 +2915,7 @@ static void cliDumpProfile(uint8_t profileIndex, uint8_t dumpMask, const master_
return; return;
} }
changeProfile(profileIndex); changeProfile(profileIndex);
#ifndef CLI_MINIMAL_VERBOSITY cliPrintHashLine("profile");
cliPrint("\r\n# profile\r\n");
#endif
cliProfile(""); cliProfile("");
cliPrint("\r\n"); cliPrint("\r\n");
dumpValues(PROFILE_VALUE, dumpMask, defaultConfig); dumpValues(PROFILE_VALUE, dumpMask, defaultConfig);
@ -2963,9 +2929,7 @@ static void cliDumpRateProfile(uint8_t rateProfileIndex, uint8_t dumpMask, const
return; return;
} }
changeControlRateProfile(rateProfileIndex); changeControlRateProfile(rateProfileIndex);
#ifndef CLI_MINIMAL_VERBOSITY cliPrintHashLine("rateprofile");
cliPrint("\r\n# rateprofile\r\n");
#endif
cliRateProfile(""); cliRateProfile("");
cliPrint("\r\n"); cliPrint("\r\n");
dumpValues(PROFILE_RATE_VALUE, dumpMask, defaultConfig); dumpValues(PROFILE_RATE_VALUE, dumpMask, defaultConfig);
@ -3289,8 +3253,18 @@ static void cliPrint(const char *str)
while (*str) { while (*str) {
bufWriterAppend(cliWriter, *str++); bufWriterAppend(cliWriter, *str++);
} }
bufWriterFlush(cliWriter);
} }
#ifndef CLI_MINIMAL_VERBOSITY
static void cliPrintHashLine(const char *str)
{
cliPrint("\r\n# ");
cliPrint(str);
cliPrint("\r\n");
}
#endif
static void cliPutp(void *p, char ch) static void cliPutp(void *p, char ch)
{ {
bufWriterAppend(p, ch); bufWriterAppend(p, ch);
@ -3303,7 +3277,7 @@ static bool cliDumpPrintf(uint8_t dumpMask, bool equalsDefault, const char *form
va_start(va, format); va_start(va, format);
tfp_format(cliWriter, cliPutp, format, va); tfp_format(cliWriter, cliPutp, format, va);
va_end(va); va_end(va);
bufWriterFlush(cliWriter);
return true; return true;
} else { } else {
return false; return false;
@ -3319,19 +3293,20 @@ static bool cliDefaultPrintf(uint8_t dumpMask, bool equalsDefault, const char *f
va_start(va, format); va_start(va, format);
tfp_format(cliWriter, cliPutp, format, va); tfp_format(cliWriter, cliPutp, format, va);
va_end(va); va_end(va);
bufWriterFlush(cliWriter);
return true; return true;
} else { } else {
return false; return false;
} }
} }
static void cliPrintf(const char *fmt, ...) static void cliPrintf(const char *format, ...)
{ {
va_list va; va_list va;
va_start(va, fmt); va_start(va, format);
tfp_format(cliWriter, cliPutp, fmt, va); tfp_format(cliWriter, cliPutp, format, va);
va_end(va); va_end(va);
bufWriterFlush(cliWriter);
} }
static void cliWrite(uint8_t ch) static void cliWrite(uint8_t ch)
@ -3923,7 +3898,7 @@ static void cliResource(char *cmdline)
} else if (strncasecmp(cmdline, "list", len) == 0) { } else if (strncasecmp(cmdline, "list", len) == 0) {
#ifndef CLI_MINIMAL_VERBOSITY #ifndef CLI_MINIMAL_VERBOSITY
cliPrintf("Currently active IO resource assignments:\r\n(reboot to update)\r\n"); cliPrintf("Currently active IO resource assignments:\r\n(reboot to update)\r\n");
cliRepeat("-", 20); cliRepeat('-', 20);
#endif #endif
for (int i = 0; i < DEFIO_IO_USED_COUNT; i++) { for (int i = 0; i < DEFIO_IO_USED_COUNT; i++) {
const char* owner; const char* owner;
@ -3938,7 +3913,7 @@ static void cliResource(char *cmdline)
cliPrintf("\r\n\r\nCurrently active DMA:\r\n"); cliPrintf("\r\n\r\nCurrently active DMA:\r\n");
#ifndef CLI_MINIMAL_VERBOSITY #ifndef CLI_MINIMAL_VERBOSITY
cliRepeat("-", 20); cliRepeat('-', 20);
#endif #endif
for (int i = 0; i < DMA_MAX_DESCRIPTORS; i++) { for (int i = 0; i < DMA_MAX_DESCRIPTORS; i++) {
const char* owner; const char* owner;