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

Merge pull request #7747 from etracer65/fix_beacon_dump

Browse source 
Fix CLI beacon dump output
This commit is contained in:
Michael Keller 2019-03-11 13:25:17 +13:00 • committed by GitHub
commit b1a63a0253
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -165,7 +165,6 @@ extern uint8_t __config_end;
#include "cli.h" #include "cli.h"
static serialPort_t *cliPort; static serialPort_t *cliPort;
#ifdef STM32F1 #ifdef STM32F1
@ -2969,16 +2968,18 @@ static void cliFeature(char *cmdline)
} }
#if defined(USE_BEEPER) #if defined(USE_BEEPER)
static void printBeeper(uint8_t dumpMask, const uint32_t offFlags, const uint32_t offFlagsDefault, const char *name) static void printBeeper(uint8_t dumpMask, const uint32_t offFlags, const uint32_t offFlagsDefault, const char *name, const uint32_t allowedFlags)
{ {
const uint8_t beeperCount = beeperTableEntryCount(); const uint8_t beeperCount = beeperTableEntryCount();
for (int32_t i = 0; i < beeperCount - 1; i++) { for (int32_t i = 0; i < beeperCount - 1; i++) {
if (beeperModeMaskForTableIndex(i) & allowedFlags) {
const char *formatOff = "%s -%s"; const char *formatOff = "%s -%s";
const char *formatOn = "%s %s"; const char *formatOn = "%s %s";
const uint32_t beeperModeMask = beeperModeMaskForTableIndex(i); const uint32_t beeperModeMask = beeperModeMaskForTableIndex(i);
cliDefaultPrintLinef(dumpMask, ~(offFlags ^ offFlagsDefault) & beeperModeMask, offFlags & beeperModeMask ? formatOn : formatOff, name, beeperNameForTableIndex(i)); cliDefaultPrintLinef(dumpMask, ~(offFlags ^ offFlagsDefault) & beeperModeMask, offFlags & beeperModeMask ? formatOn : formatOff, name, beeperNameForTableIndex(i));
cliDumpPrintLinef(dumpMask, ~(offFlags ^ offFlagsDefault) & beeperModeMask, offFlags & beeperModeMask ? formatOff : formatOn, name, beeperNameForTableIndex(i)); cliDumpPrintLinef(dumpMask, ~(offFlags ^ offFlagsDefault) & beeperModeMask, offFlags & beeperModeMask ? formatOff : formatOn, name, beeperNameForTableIndex(i));
} }
}
} }
static void processBeeperCommand(char *cmdline, uint32_t *offFlags, const uint32_t allowedFlags) static void processBeeperCommand(char *cmdline, uint32_t *offFlags, const uint32_t allowedFlags)
@ -5351,11 +5352,11 @@ static void printConfig(char *cmdline, bool doDiff)
#if defined(USE_BEEPER) #if defined(USE_BEEPER)
cliPrintHashLine("beeper"); cliPrintHashLine("beeper");
printBeeper(dumpMask, beeperConfig_Copy.beeper_off_flags, beeperConfig()->beeper_off_flags, "beeper"); printBeeper(dumpMask, beeperConfig_Copy.beeper_off_flags, beeperConfig()->beeper_off_flags, "beeper", BEEPER_ALLOWED_MODES);
#if defined(USE_DSHOT) #if defined(USE_DSHOT)
cliPrintHashLine("beacon"); cliPrintHashLine("beacon");
printBeeper(dumpMask, beeperConfig_Copy.dshotBeaconOffFlags, beeperConfig()->dshotBeaconOffFlags, "beacon"); printBeeper(dumpMask, beeperConfig_Copy.dshotBeaconOffFlags, beeperConfig()->dshotBeaconOffFlags, "beacon", DSHOT_BEACON_ALLOWED_MODES);
#endif #endif
#endif // USE_BEEPER #endif // USE_BEEPER