Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-19 22:35:23 +03:00
Code Issues Wiki Activity

BF - Fix incorrectly merge conflict resolution.

Browse source
This commit is contained in:
Dominic Clifton 2017-04-21 19:27:55 +01:00
parent df4b09e874
commit c997e634da
2 changed files with 5 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main/fc/cli.c
View file

@ -1320,7 +1320,7 @@ static void cliModeColor(char *cmdline)
static void printServo(uint8_t dumpMask, const servoParam_t *servoParams, const servoParam_t *defaultServoParams)
{
// print out servo settings
const char *format = "servo %u %d %d %d %d %d %d %d";
const char *format = "servo %u %d %d %d %d %d";
for (uint32_t i = 0; i < MAX_SUPPORTED_SERVOS; i++) {
const servoParam_t *servoConf = &servoParams[i];
bool equalsDefault = false;