Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-15 04:15:44 +03:00
Code Issues Wiki Activity

Fix compilation when USE_DSHOT and USE_PWM_OUTPUT are not defined.

Browse source 
Fix compilation when USE_DMA and USE_DMA_SPEC are not defined.

Cleanup calling code of `isMotorProtocolDshot`.

Fix 'unused' warning when USE_PWM_OUTPUT is not defined.

Undo isMotoroProtocolDshot change.

Disable USE_SERIAL_4WAY_BLHELI_INTERFACE when USE_PWM_OUTPUT is not
enabled.

Style cleanup.
This commit is contained in:
Dominic Clifton 2019-06-11 18:35:59 +02:00 • committed by Michael Keller
parent 1631831147
commit 1f2ef98042
7 changed files with 46 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/main/cli/cli.c
View file

@ -4868,6 +4868,7 @@ static bool strToPin(char *pch, ioTag_t *tag)
return false;
}
#ifdef USE_DMA
static void printDma(void)
{
cliPrintLinefeed();
@ -4891,6 +4892,7 @@ static void printDma(void)
}
}
}
#endif
#ifdef USE_DMA_SPEC
@ -5274,6 +5276,7 @@ static void cliDmaopt(char *cmdline)
}
#endif // USE_DMA_SPEC
#ifdef USE_DMA
static void cliDma(char* cmdline)
{
int len = strlen(cmdline);
@ -5289,6 +5292,8 @@ static void cliDma(char* cmdline)
cliShowParseError();
#endif
}
#endif
static void cliResource(char *cmdline)
{
@ -5318,10 +5323,12 @@ static void cliResource(char *cmdline)
cliPrintLinefeed();
}
#if defined(USE_DMA)
pch = strtok_r(NULL, " ", &saveptr);
if (strcasecmp(pch, "all") == 0) {
cliDma("show");
}
#endif
return;
}
@ -5972,11 +5979,15 @@ const clicmd_t cmdTable[] = {
CLI_COMMAND_DEF("defaults", "reset to defaults and reboot", "[nosave]", cliDefaults),
CLI_COMMAND_DEF("diff", "list configuration changes from default", "[master|profile|rates|hardware|all] {defaults|bare}", cliDiff),
#ifdef USE_RESOURCE_MGMT
#ifdef USE_DMA
#ifdef USE_DMA_SPEC
CLI_COMMAND_DEF("dma", "show/set DMA assignments", "<> | <device> <index> list | <device> <index> [<option>|none] | list | show", cliDma),
#else
CLI_COMMAND_DEF("dma", "show DMA assignments", "show", cliDma),
#endif
#endif
#endif
#ifdef USE_DSHOT_TELEMETRY
CLI_COMMAND_DEF("dshot_telemetry_info", "disply dshot telemetry info and stats", NULL, cliDshotTelemetryInfo),