From 3fa9cda505c388b1d04fad0eb255673c5ed44109 Mon Sep 17 00:00:00 2001 From: David Sidrane Date: Thu, 11 Apr 2024 03:29:52 -0700 Subject: [PATCH] platforms/common:Use CONFIG_BOARD_ROOT_PATH instead of string constant --- platforms/common/include/px4_platform_common/board_common.h | 2 +- platforms/common/include/px4_platform_common/defines.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/platforms/common/include/px4_platform_common/board_common.h b/platforms/common/include/px4_platform_common/board_common.h index 970c47ec9e..4dff12c1b2 100644 --- a/platforms/common/include/px4_platform_common/board_common.h +++ b/platforms/common/include/px4_platform_common/board_common.h @@ -239,7 +239,7 @@ # else /* Use PX4IO FW search paths defaults based on version */ # if BOARD_USES_PX4IO_VERSION == 2 -# define PX4IO_FW_SEARCH_PATHS {"/etc/extras/px4_io-v2_default.bin","/fs/microsd/px4_io-v2_default.bin", "/fs/microsd/px4io2.bin", nullptr } +# define PX4IO_FW_SEARCH_PATHS {"/etc/extras/px4_io-v2_default.bin",CONFIG_BOARD_ROOT_PATH "/px4_io-v2_default.bin", CONFIG_BOARD_ROOT_PATH "/px4io2.bin", nullptr } # endif # endif #endif diff --git a/platforms/common/include/px4_platform_common/defines.h b/platforms/common/include/px4_platform_common/defines.h index 38d7b4201f..3b420f95f1 100644 --- a/platforms/common/include/px4_platform_common/defines.h +++ b/platforms/common/include/px4_platform_common/defines.h @@ -64,7 +64,7 @@ static inline constexpr bool PX4_ISFINITE(double x) { return __builtin_isfinite( ****************************************************************************/ #define PX4_ROOTFSDIR "" -#define PX4_STORAGEDIR PX4_ROOTFSDIR "/fs/microsd" +#define PX4_STORAGEDIR PX4_ROOTFSDIR CONFIG_BOARD_ROOT_PATH #define _PX4_IOC(x,y) _IOC(x,y) // mode for open with O_CREAT