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

DataFlash: avoid declarations of SITL-only functions

This commit is contained in:
Peter Barker 2017-11-15 11:24:54 +11:00 committed by Francisco Ferreira
parent fd0aa3c659
commit 404e395880
2 changed files with 1 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libraries/DataFlash/DataFlash.cpp
View File

@ -314,21 +314,6 @@ void DataFlash_Class::validate_structures(const struct LogStructure *logstructur
}
}
#else
void DataFlash_Class::dump_structure_field(const struct LogStructure *logstructure, const char *label, const uint8_t fieldnum)
{
}
void DataFlash_Class::dump_structures(const struct LogStructure *logstructures, const uint8_t num_types)
{
}
void DataFlash_Class::validate_structures(const struct LogStructure *logstructures, const uint8_t num_types)
{
return;
}
#endif // CONFIG_HAL_BOARD == HAL_BOARD_SITL
const struct LogStructure *DataFlash_Class::structure(uint16_t num) const

2
libraries/DataFlash/DataFlash.h
View File

@ -319,6 +319,7 @@ private:
private:
static DataFlash_Class *_instance;
#if CONFIG_HAL_BOARD == HAL_BOARD_SITL
bool validate_structure(const struct LogStructure *logstructure, int16_t offset);
void validate_structures(const struct LogStructure *logstructures, const uint8_t num_types);
void dump_structure_field(const struct LogStructure *logstructure, const char *label, const uint8_t fieldnum);
@ -331,7 +332,6 @@ private:
const char *fmt) const;
const char* unit_name(const uint8_t unit_id);
double multiplier_name(const uint8_t multiplier_id);
#if CONFIG_HAL_BOARD == HAL_BOARD_SITL
bool seen_ids[256] = { };
#endif