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

Merge pull request #273 from KiteAnton/dump_changes 

Output all profiles and rateprofiles in cli dump
This commit is contained in:
borisbstyle 2016-03-14 09:42:34 +01:00
parent d584bc2769 ee57ba387a
commit 097431c685
1 changed files with 45 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -109,6 +109,8 @@ static void cliAdjustmentRange(char *cmdline);
static void cliMotorMix(char *cmdline); static void cliMotorMix(char *cmdline);
static void cliDefaults(char *cmdline); static void cliDefaults(char *cmdline);
static void cliDump(char *cmdLine); static void cliDump(char *cmdLine);
void cliDumpProfile(uint8_t profileIndex);
void cliDumpRateProfile(uint8_t rateProfileIndex) ;
static void cliExit(char *cmdline); static void cliExit(char *cmdline);
static void cliFeature(char *cmdline); static void cliFeature(char *cmdline);
static void cliMotor(char *cmdline); static void cliMotor(char *cmdline);
@ -1789,8 +1791,6 @@ typedef enum {
DUMP_RATES = (1 << 2), DUMP_RATES = (1 << 2),
} dumpFlags_e; } dumpFlags_e;
#define DUMP_ALL (DUMP_MASTER | DUMP_PROFILE | DUMP_RATES)
static const char* const sectionBreak = "\r\n"; static const char* const sectionBreak = "\r\n";
@ -1806,7 +1806,7 @@ static void cliDump(char *cmdline)
float thr, roll, pitch, yaw; float thr, roll, pitch, yaw;
#endif #endif
uint8_t dumpMask = DUMP_ALL; uint8_t dumpMask = DUMP_MASTER;
if (strcasecmp(cmdline, "master") == 0) { if (strcasecmp(cmdline, "master") == 0) {
dumpMask = DUMP_MASTER; // only dumpMask = DUMP_MASTER; // only
} }
@ -1958,38 +1958,56 @@ static void cliDump(char *cmdline)
cliPrint("\r\n# rxfail\r\n"); cliPrint("\r\n# rxfail\r\n");
cliRxFail(""); cliRxFail("");
uint8_t activeProfile = masterConfig.current_profile_index;
uint8_t i;
for (i=0; i<MAX_PROFILE_COUNT;i++)
cliDumpProfile(i);
changeProfile(activeProfile);
} }
if (dumpMask & DUMP_PROFILE) { if (dumpMask & DUMP_PROFILE) {
cliPrint("\r\n# dump profile\r\n"); cliDumpProfile(masterConfig.current_profile_index);
cliPrint("\r\n# profile\r\n");
cliProfile("");
printSectionBreak();
dumpValues(PROFILE_VALUE);
cliPrint("\r\n# rateprofile\r\n");
cliRateProfile("");
printSectionBreak();
dumpValues(PROFILE_RATE_VALUE);
} }
if (dumpMask & DUMP_RATES) { if (dumpMask & DUMP_RATES) {
cliPrint("\r\n# dump rates\r\n"); cliDumpRateProfile(currentProfile->activeRateProfile);
cliPrint("\r\n# rateprofile\r\n");
cliRateProfile("");
printSectionBreak();
dumpValues(PROFILE_RATE_VALUE);
} }
} }
void cliDumpProfile(uint8_t profileIndex) {
if (profileIndex >= MAX_PROFILE_COUNT) // Faulty values
return;
changeProfile(profileIndex);
cliPrint("\r\n# profile\r\n");
cliProfile("");
printSectionBreak();
dumpValues(PROFILE_VALUE);
uint8_t currentRateIndex = currentProfile->activeRateProfile;
uint8_t i;
for (i=0; i<MAX_RATEPROFILES; i++)
cliDumpRateProfile(i);
changeControlRateProfile(currentRateIndex);
cliPrintf("\r\n# Active rateprofile for profile %d, \r\n", profileIndex); // output rateprofile again to mark "active rateprofile"
cliRateProfile("");
}
void cliDumpRateProfile(uint8_t rateProfileIndex) {
if (rateProfileIndex >= MAX_RATEPROFILES) // Faulty values
return;
changeControlRateProfile(rateProfileIndex);
cliPrint("\r\n# rateprofile\r\n");
cliRateProfile("");
printSectionBreak();
dumpValues(PROFILE_RATE_VALUE);
}
void cliEnter(serialPort_t *serialPort) void cliEnter(serialPort_t *serialPort)
{ {
cliMode = 1; cliMode = 1;