Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DataFlash: added #ifdefs for VRBRAIN board

This commit is contained in:
Emile Castelnuovo 2014-03-31 19:50:58 +02:00 committed by Andrew Tridgell
parent 06744ea7d2
commit ab9a320187
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libraries/DataFlash/DataFlash_File.cpp
View File

@ -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");

4
libraries/DataFlash/DataFlash_File.h
View File

@ -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 <systemlib/perf_counter.h>
#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;