Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-26 09:45:37 +03:00
Code Issues Wiki Activity

fixed bricked #beeper and #beacon enrty

Browse source 
changes after comment

changes after comment

dependency added

conditionals removed

conditionals removed

conditionals removed
This commit is contained in:
TheIsotopes 2020-01-21 12:36:03 +01:00 • committed by mikeller
parent e5046e4089
commit b82d7230b3
1 changed files with 0 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/main/io/beeper.c
View file

@ -71,10 +71,6 @@
#define BEEPER_PWM_HZ 0 #define BEEPER_PWM_HZ 0
#endif #endif
#if FLASH_SIZE > 64
#define BEEPER_NAMES
#endif
#define MAX_MULTI_BEEPS 64 //size limit for 'beep_multiBeeps[]' #define MAX_MULTI_BEEPS 64 //size limit for 'beep_multiBeeps[]'
#define BEEPER_COMMAND_REPEAT 0xFE #define BEEPER_COMMAND_REPEAT 0xFE
@ -197,16 +193,10 @@ typedef struct beeperTableEntry_s {
uint8_t mode; uint8_t mode;
uint8_t priority; // 0 = Highest uint8_t priority; // 0 = Highest
const uint8_t *sequence; const uint8_t *sequence;
#ifdef BEEPER_NAMES
const char *name; const char *name;
#endif
} beeperTableEntry_t; } beeperTableEntry_t;
#ifdef BEEPER_NAMES
#define BEEPER_ENTRY(a,b,c,d) a,b,c,d #define BEEPER_ENTRY(a,b,c,d) a,b,c,d
#else
#define BEEPER_ENTRY(a,b,c,d) a,b,c
#endif
// IMPORTANT: these are in priority order, 0 = Highest // IMPORTANT: these are in priority order, 0 = Highest
static const beeperTableEntry_t beeperTable[] = { static const beeperTableEntry_t beeperTable[] = {
@ -496,12 +486,7 @@ uint32_t beeperModeMaskForTableIndex(int idx)
*/ */
const char *beeperNameForTableIndex(int idx) const char *beeperNameForTableIndex(int idx)
{ {
#ifndef BEEPER_NAMES
UNUSED(idx);
return NULL;
#else
return (idx >= 0 && idx < (int)BEEPER_TABLE_ENTRY_COUNT) ? beeperTable[idx].name : NULL; return (idx >= 0 && idx < (int)BEEPER_TABLE_ENTRY_COUNT) ? beeperTable[idx].name : NULL;
#endif
} }
/* /*