mirror of
https://github.com/betaflight/betaflight.git
synced 2025-07-24 00:35:39 +03:00
Merge pull request #2494 from blckmn/bb_enum_dedupe
Removing duplicate bb device enum
This commit is contained in:
commit
b8317f53c6
5 changed files with 22 additions and 25 deletions
|
@ -1657,8 +1657,12 @@ void handleBlackbox(timeUs_t currentTimeUs)
|
|||
|
||||
static bool canUseBlackboxWithCurrentConfiguration(void)
|
||||
{
|
||||
#ifdef USE_SDCARD
|
||||
return feature(FEATURE_BLACKBOX) &&
|
||||
(blackboxConfig()->device != BLACKBOX_SDCARD || feature(FEATURE_SDCARD));
|
||||
!(blackboxConfig()->device == BLACKBOX_DEVICE_SDCARD && !feature(FEATURE_SDCARD));
|
||||
#else
|
||||
return feature(FEATURE_BLACKBOX);
|
||||
#endif
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -23,11 +23,16 @@
|
|||
|
||||
#include "config/parameter_group.h"
|
||||
|
||||
typedef enum {
|
||||
BLACKBOX_SERIAL = 0,
|
||||
BLACKBOX_SPIFLASH,
|
||||
BLACKBOX_SDCARD
|
||||
} blackBoxDevice_e;
|
||||
typedef enum BlackboxDevice {
|
||||
BLACKBOX_DEVICE_SERIAL = 0,
|
||||
#ifdef USE_FLASHFS
|
||||
BLACKBOX_DEVICE_FLASH = 1,
|
||||
#endif
|
||||
#ifdef USE_SDCARD
|
||||
BLACKBOX_DEVICE_SDCARD = 2,
|
||||
#endif
|
||||
|
||||
} BlackboxDevice_e;
|
||||
|
||||
typedef struct blackboxConfig_s {
|
||||
uint8_t rate_num;
|
||||
|
|
|
@ -17,18 +17,6 @@
|
|||
|
||||
#pragma once
|
||||
|
||||
typedef enum BlackboxDevice {
|
||||
BLACKBOX_DEVICE_SERIAL = 0,
|
||||
|
||||
#ifdef USE_FLASHFS
|
||||
BLACKBOX_DEVICE_FLASH = 1,
|
||||
#endif
|
||||
#ifdef USE_SDCARD
|
||||
BLACKBOX_DEVICE_SDCARD = 2,
|
||||
#endif
|
||||
|
||||
} BlackboxDevice;
|
||||
|
||||
typedef enum {
|
||||
BLACKBOX_RESERVE_SUCCESS,
|
||||
BLACKBOX_RESERVE_TEMPORARY_FAILURE,
|
||||
|
|
|
@ -501,7 +501,7 @@ void init(void)
|
|||
#endif
|
||||
|
||||
#ifdef USE_FLASHFS
|
||||
if (blackboxConfig()->device == BLACKBOX_SPIFLASH) {
|
||||
if (blackboxConfig()->device == BLACKBOX_DEVICE_FLASH) {
|
||||
#if defined(USE_FLASH_M25P16)
|
||||
m25p16_init(flashConfig());
|
||||
#endif
|
||||
|
@ -510,7 +510,7 @@ void init(void)
|
|||
#endif
|
||||
|
||||
#ifdef USE_SDCARD
|
||||
if (feature(FEATURE_SDCARD) && blackboxConfig()->device == BLACKBOX_SDCARD) {
|
||||
if (feature(FEATURE_SDCARD) && blackboxConfig()->device == BLACKBOX_DEVICE_SDCARD) {
|
||||
sdcardInsertionDetectInit();
|
||||
sdcard_init(sdcardConfig()->useDma);
|
||||
afatfs_init();
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue