Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-23 16:25:31 +03:00
Code Issues Wiki Activity

Fix compile errors if USE_FLASHFS is defined but USE_FLASH_CHIP… (#9253)

Browse source 
Fix compile errors if USE_FLASHFS is defined but USE_FLASH_CHIP is not
This commit is contained in:
Michael Keller 2019-12-03 13:57:47 +13:00 • committed by GitHub
commit 4ed9382b93
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/main/target/common_post.h
View file

@ -169,20 +169,6 @@
#undef USE_ADC_INTERNAL
#endif
#if (!defined(USE_SDCARD) && !defined(USE_FLASHFS)) || !defined(USE_BLACKBOX)
#undef USE_USB_MSC
#endif
#if !defined(USE_VCP)
#undef USE_USB_CDC_HID
#undef USE_USB_MSC
#endif
#if defined(USE_USB_CDC_HID) || defined(USE_USB_MSC)
#define USE_USB_ADVANCED_PROFILES
#endif
#if defined(USE_FLASH_W25M512)
#define USE_FLASH_W25M
#define USE_FLASH_M25P16
@ -198,6 +184,23 @@
#define USE_FLASH_CHIP
#endif
#ifndef USE_FLASH_CHIP
#undef USE_FLASHFS
#endif
#if (!defined(USE_SDCARD) && !defined(USE_FLASHFS)) || !defined(USE_BLACKBOX)
#undef USE_USB_MSC
#endif
#if !defined(USE_VCP)
#undef USE_USB_CDC_HID
#undef USE_USB_MSC
#endif
#if defined(USE_USB_CDC_HID) || defined(USE_USB_MSC)
#define USE_USB_ADVANCED_PROFILES
#endif
#if defined(USE_MAX7456)
#define USE_OSD
#endif