From 4cfb1b04adf424a4724c376ed9a0b0457ac1fa1a Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Fri, 16 Nov 2018 12:06:08 +1100 Subject: [PATCH] AP_HAL: define HAL_BOARD_STORAGE_DIRECTORY for sitl, px4 and chibios --- libraries/AP_HAL/board/chibios.h | 4 ++++ libraries/AP_HAL/board/px4.h | 11 ++++++++--- libraries/AP_HAL/board/sitl.h | 4 ++++ 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/libraries/AP_HAL/board/chibios.h b/libraries/AP_HAL/board/chibios.h index 468842a506..ab6cbce84c 100644 --- a/libraries/AP_HAL/board/chibios.h +++ b/libraries/AP_HAL/board/chibios.h @@ -96,3 +96,7 @@ #define HAL_I2C_INTERNAL_MASK 1 #endif +// put all storage of files under /APM directory +#ifndef HAL_BOARD_STORAGE_DIRECTORY +#define HAL_BOARD_STORAGE_DIRECTORY "/APM" +#endif diff --git a/libraries/AP_HAL/board/px4.h b/libraries/AP_HAL/board/px4.h index d0ea1ca808..eef3f2a1fc 100644 --- a/libraries/AP_HAL/board/px4.h +++ b/libraries/AP_HAL/board/px4.h @@ -3,8 +3,14 @@ #define HAL_BOARD_NAME "PX4" #define HAL_CPU_CLASS HAL_CPU_CLASS_150 #define HAL_OS_POSIX_IO 1 -#define HAL_BOARD_LOG_DIRECTORY "/fs/microsd/APM/LOGS" -#define HAL_BOARD_TERRAIN_DIRECTORY "/fs/microsd/APM/TERRAIN" + +// put all storage of files under /fs/microsd/APM directory +#ifndef HAL_BOARD_STORAGE_DIRECTORY +#define HAL_BOARD_STORAGE_DIRECTORY "/fs/microsd/APM" +#endif + +#define HAL_BOARD_LOG_DIRECTORY HAL_BOARD_STORAGE_DIRECTORY "/LOGS" +#define HAL_BOARD_TERRAIN_DIRECTORY HAL_BOARD_STORAGE_DIRECTORY "/TERRAIN" #define HAL_PARAM_DEFAULTS_PATH "/etc/defaults.parm" #define HAL_INS_DEFAULT HAL_INS_PX4 #define HAL_BARO_DEFAULT HAL_BARO_PX4 @@ -153,4 +159,3 @@ #include #define HAL_Semaphore PX4::Semaphore #define HAL_Semaphore_Recursive PX4::Semaphore_Recursive - diff --git a/libraries/AP_HAL/board/sitl.h b/libraries/AP_HAL/board/sitl.h index d8d031008a..04014851e9 100644 --- a/libraries/AP_HAL/board/sitl.h +++ b/libraries/AP_HAL/board/sitl.h @@ -27,3 +27,7 @@ #define HAL_Semaphore HALSITL::Semaphore #define HAL_Semaphore_Recursive HALSITL::Semaphore_Recursive +#ifndef HAL_BOARD_STORAGE_DIRECTORY +#define HAL_BOARD_STORAGE_DIRECTORY "." +#endif +