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

Alignment with iNav

This commit is contained in:
Martin Budden 2017-02-19 17:46:07 +00:00
parent 743b3e37e3
commit 3d28436724
1 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/main/fc/cli.c
View File

@ -1508,21 +1508,21 @@ static bool isEmpty(const char *string)
return (string == NULL || *string == '\0') ? true : false; return (string == NULL || *string == '\0') ? true : false;
} }
static void printRxFailsafe(uint8_t dumpMask, const rxFailsafeChannelConfig_t *failsafeChannelConfig, const rxFailsafeChannelConfig_t *failsafeChannelConfigDefault) static void printRxFailsafe(uint8_t dumpMask, const rxFailsafeChannelConfig_t *rxFailsafeChannelConfigs, const rxFailsafeChannelConfig_t *defaultRxFailsafeChannelConfigs)
{ {
// print out rxConfig failsafe settings // print out rxConfig failsafe settings
for (uint32_t channel = 0; channel < MAX_SUPPORTED_RC_CHANNEL_COUNT; channel++) { for (uint32_t channel = 0; channel < MAX_SUPPORTED_RC_CHANNEL_COUNT; channel++) {
const rxFailsafeChannelConfig_t *channelFailsafeConfig = &failsafeChannelConfig[channel]; const rxFailsafeChannelConfig_t *channelFailsafeConfig = &rxFailsafeChannelConfigs[channel];
const rxFailsafeChannelConfig_t *channelFailsafeConfigDefault = &failsafeChannelConfigDefault[channel]; const rxFailsafeChannelConfig_t *defaultChannelFailsafeConfig = &defaultRxFailsafeChannelConfigs[channel];
const bool equalsDefault = channelFailsafeConfig->mode == channelFailsafeConfigDefault->mode const bool equalsDefault = channelFailsafeConfig->mode == defaultChannelFailsafeConfig->mode
&& channelFailsafeConfig->step == channelFailsafeConfigDefault->step; && channelFailsafeConfig->step == defaultChannelFailsafeConfig->step;
const bool requireValue = channelFailsafeConfig->mode == RX_FAILSAFE_MODE_SET; const bool requireValue = channelFailsafeConfig->mode == RX_FAILSAFE_MODE_SET;
if (requireValue) { if (requireValue) {
const char *format = "rxfail %u %c %d\r\n"; const char *format = "rxfail %u %c %d\r\n";
cliDefaultPrintf(dumpMask, equalsDefault, format, cliDefaultPrintf(dumpMask, equalsDefault, format,
channel, channel,
rxFailsafeModeCharacters[channelFailsafeConfigDefault->mode], rxFailsafeModeCharacters[defaultChannelFailsafeConfig->mode],
RXFAIL_STEP_TO_CHANNEL_VALUE(channelFailsafeConfigDefault->step) RXFAIL_STEP_TO_CHANNEL_VALUE(defaultChannelFailsafeConfig->step)
); );
cliDumpPrintf(dumpMask, equalsDefault, format, cliDumpPrintf(dumpMask, equalsDefault, format,
channel, channel,
@ -1533,7 +1533,7 @@ static void printRxFailsafe(uint8_t dumpMask, const rxFailsafeChannelConfig_t *f
const char *format = "rxfail %u %c\r\n"; const char *format = "rxfail %u %c\r\n";
cliDefaultPrintf(dumpMask, equalsDefault, format, cliDefaultPrintf(dumpMask, equalsDefault, format,
channel, channel,
rxFailsafeModeCharacters[channelFailsafeConfigDefault->mode] rxFailsafeModeCharacters[defaultChannelFailsafeConfig->mode]
); );
cliDumpPrintf(dumpMask, equalsDefault, format, cliDumpPrintf(dumpMask, equalsDefault, format,
channel, channel,
@ -2304,30 +2304,30 @@ static void cliModeColor(char *cmdline)
#endif #endif
#ifdef USE_SERVOS #ifdef USE_SERVOS
static void printServo(uint8_t dumpMask, const servoParam_t *servoParams, const servoParam_t *servoParamsDefault) static void printServo(uint8_t dumpMask, const servoParam_t *servoParams, const servoParam_t *defaultServoParams)
{ {
// print out servo settings // print out servo settings
const char *format = "servo %u %d %d %d %d %d %d %d\r\n"; const char *format = "servo %u %d %d %d %d %d %d %d\r\n";
for (uint32_t i = 0; i < MAX_SUPPORTED_SERVOS; i++) { for (uint32_t i = 0; i < MAX_SUPPORTED_SERVOS; i++) {
const servoParam_t *servoConf = &servoParams[i]; const servoParam_t *servoConf = &servoParams[i];
bool equalsDefault = false; bool equalsDefault = false;
if (servoParamsDefault) { if (defaultServoParams) {
const servoParam_t *servoConfDefault = &servoParamsDefault[i]; const servoParam_t *defaultServoConf = &defaultServoParams[i];
equalsDefault = servoConf->min == servoConfDefault->min equalsDefault = servoConf->min == defaultServoConf->min
&& servoConf->max == servoConfDefault->max && servoConf->max == defaultServoConf->max
&& servoConf->middle == servoConfDefault->middle && servoConf->middle == defaultServoConf->middle
&& servoConf->angleAtMin == servoConfDefault->angleAtMax && servoConf->angleAtMin == defaultServoConf->angleAtMax
&& servoConf->rate == servoConfDefault->rate && servoConf->rate == defaultServoConf->rate
&& servoConf->forwardFromChannel == servoConfDefault->forwardFromChannel; && servoConf->forwardFromChannel == defaultServoConf->forwardFromChannel;
cliDefaultPrintf(dumpMask, equalsDefault, format, cliDefaultPrintf(dumpMask, equalsDefault, format,
i, i,
servoConfDefault->min, defaultServoConf->min,
servoConfDefault->max, defaultServoConf->max,
servoConfDefault->middle, defaultServoConf->middle,
servoConfDefault->angleAtMin, defaultServoConf->angleAtMin,
servoConfDefault->angleAtMax, defaultServoConf->angleAtMax,
servoConfDefault->rate, defaultServoConf->rate,
servoConfDefault->forwardFromChannel defaultServoConf->forwardFromChannel
); );
} }
cliDumpPrintf(dumpMask, equalsDefault, format, cliDumpPrintf(dumpMask, equalsDefault, format,