Merge pull request #9401 from TheIsotopes/patch-1
fixed bricked #beeper and #beacon enrty
This commit is contained in:
commit
597b41ec6e
|
@ -71,10 +71,6 @@
|
|||
#define BEEPER_PWM_HZ 0
|
||||
#endif
|
||||
|
||||
#if FLASH_SIZE > 64
|
||||
#define BEEPER_NAMES
|
||||
#endif
|
||||
|
||||
#define MAX_MULTI_BEEPS 64 //size limit for 'beep_multiBeeps[]'
|
||||
|
||||
#define BEEPER_COMMAND_REPEAT 0xFE
|
||||
|
@ -197,16 +193,10 @@ typedef struct beeperTableEntry_s {
|
|||
uint8_t mode;
|
||||
uint8_t priority; // 0 = Highest
|
||||
const uint8_t *sequence;
|
||||
#ifdef BEEPER_NAMES
|
||||
const char *name;
|
||||
#endif
|
||||
} beeperTableEntry_t;
|
||||
|
||||
#ifdef BEEPER_NAMES
|
||||
#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
|
||||
static const beeperTableEntry_t beeperTable[] = {
|
||||
|
@ -496,12 +486,7 @@ uint32_t beeperModeMaskForTableIndex(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;
|
||||
#endif
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
Loading…
Reference in New Issue