From ab9a320187d5be9f6eb51896fa74cb7451de2dc9 Mon Sep 17 00:00:00 2001 From: Emile Castelnuovo Date: Mon, 31 Mar 2014 19:50:58 +0200 Subject: [PATCH] DataFlash: added #ifdefs for VRBRAIN board --- libraries/DataFlash/DataFlash_File.cpp | 12 +++++++++--- libraries/DataFlash/DataFlash_File.h | 4 ++-- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/libraries/DataFlash/DataFlash_File.cpp b/libraries/DataFlash/DataFlash_File.cpp index 74665d882e..dc2ff115dc 100644 --- a/libraries/DataFlash/DataFlash_File.cpp +++ b/libraries/DataFlash/DataFlash_File.cpp @@ -42,16 +42,22 @@ DataFlash_File::DataFlash_File(const char *log_directory) : _log_directory(log_directory), _writebuf(NULL), _writebuf_size(16*1024), -#ifdef CONFIG_ARCH_BOARD_PX4FMU_V1 +#if defined(CONFIG_ARCH_BOARD_PX4FMU_V1) // V1 gets IO errors with larger than 512 byte writes _writebuf_chunk(512), +#elif defined(CONFIG_ARCH_BOARD_VRBRAIN_V4) + _writebuf_chunk(512), +#elif defined(CONFIG_ARCH_BOARD_VRBRAIN_V5) + _writebuf_chunk(512), +#elif defined(CONFIG_ARCH_BOARD_VRHERO_V1) + _writebuf_chunk(512), #else _writebuf_chunk(4096), #endif _writebuf_head(0), _writebuf_tail(0), _last_write_time(0) -#if CONFIG_HAL_BOARD == HAL_BOARD_PX4 +#if CONFIG_HAL_BOARD == HAL_BOARD_PX4 || CONFIG_HAL_BOARD == HAL_BOARD_VRBRAIN ,_perf_write(perf_alloc(PC_ELAPSED, "DF_write")), _perf_fsync(perf_alloc(PC_ELAPSED, "DF_fsync")), _perf_errors(perf_alloc(PC_COUNT, "DF_errors")) @@ -67,7 +73,7 @@ void DataFlash_File::Init(const struct LogStructure *structure, uint8_t num_type int ret; struct stat st; -#if CONFIG_HAL_BOARD == HAL_BOARD_PX4 +#if CONFIG_HAL_BOARD == HAL_BOARD_PX4 || CONFIG_HAL_BOARD == HAL_BOARD_VRBRAIN // try to cope with an existing lowercase log directory // name. NuttX does not handle case insensitive VFAT well DIR *d = opendir("/fs/microsd/APM"); diff --git a/libraries/DataFlash/DataFlash_File.h b/libraries/DataFlash/DataFlash_File.h index bef8405d2e..0eda11f598 100644 --- a/libraries/DataFlash/DataFlash_File.h +++ b/libraries/DataFlash/DataFlash_File.h @@ -10,7 +10,7 @@ #ifndef DataFlash_File_h #define DataFlash_File_h -#if CONFIG_HAL_BOARD == HAL_BOARD_PX4 +#if CONFIG_HAL_BOARD == HAL_BOARD_PX4 || CONFIG_HAL_BOARD == HAL_BOARD_VRBRAIN #include #else #define perf_begin(x) @@ -83,7 +83,7 @@ private: void _io_timer(void); -#if CONFIG_HAL_BOARD == HAL_BOARD_PX4 +#if CONFIG_HAL_BOARD == HAL_BOARD_PX4 || CONFIG_HAL_BOARD == HAL_BOARD_VRBRAIN // performance counters perf_counter_t _perf_write; perf_counter_t _perf_fsync;