From cab60b65945b6c277a82d83772009fd321c3b869 Mon Sep 17 00:00:00 2001 From: Mark Haslinghuis Date: Fri, 20 Dec 2024 22:34:01 +0100 Subject: [PATCH] Add RANGEFINDER and OPTICALFLOW MT build option (#14042) --- src/main/target/common_post.h | 20 +++++++++++++------- src/main/target/common_pre.h | 3 ++- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/src/main/target/common_post.h b/src/main/target/common_post.h index 37a55e77231..508453ab7ec 100644 --- a/src/main/target/common_post.h +++ b/src/main/target/common_post.h @@ -555,14 +555,20 @@ #undef USED_TIMERS #endif -#if !defined(USE_RANGEFINDER) -#undef USE_RANGEFINDER_HCSR04 -#undef USE_RANGEFINDER_SRF10 -#undef USE_RANGEFINDER_HCSR04_I2C -#undef USE_RANGEFINDER_VL53L0X -#undef USE_RANGEFINDER_UIB -#undef USE_RANGEFINDER_TF +#if defined(USE_OPTICALFLOW_MT) +#ifndef USE_RANGEFINDER_MT +#define USE_RANGEFINDER_MT #endif +#ifndef USE_OPTICALFLOW +#define USE_OPTICALFLOW +#endif +#endif // USE_OPTICALFLOW_MT + +#if defined(USE_RANGEFINDER_HCSR04) || defined(USE_RANGEFINDER_SRF10) || defined(USE_RANGEFINDER_HCSR04_I2C) || defined(USE_RANGEFINDER_VL53L0X) || defined(USE_RANGEFINDER_UIB) || defined(USE_RANGEFINDER_TF) || defined(USE_RANGEFINDER_MT) +#ifndef USE_RANGEFINDER +#define USE_RANGEFINDER +#endif +#endif // USE_RANGEFINDER_XXX #ifndef USE_GPS_RESCUE #undef USE_CMS_GPS_RESCUE_MENU diff --git a/src/main/target/common_pre.h b/src/main/target/common_pre.h index 0e7e6545d32..505e48656c7 100644 --- a/src/main/target/common_pre.h +++ b/src/main/target/common_pre.h @@ -270,8 +270,9 @@ #define USE_RANGEFINDER #define USE_RANGEFINDER_HCSR04 #define USE_RANGEFINDER_TF +#define USE_OPTICALFLOW_MT -#endif // TARGET_FLASH_SIZE > 512 +#endif // TARGET_FLASH_SIZE >= 1024 #endif // !defined(CLOUD_BUILD)