Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-03-12 01:23:56 -03:00
Code Issues Packages Projects Releases Wiki Activity

Dataflash: fix shadowing of logstructure in SITL

Browse Source
This commit is contained in:
Pierre Kancir 2017-06-14 12:22:18 +02:00 committed by Francisco Ferreira
parent af6eb4e41d
commit 914bc53100
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
libraries/DataFlash/DataFlash.cpp
View File

@ -133,29 +133,29 @@ static uint8_t count_commas(const char *string)
}
/// pretty-print field information from a log structure
void DataFlash_Class::dump_structure_field(const struct LogStructure *structure, const char *label, const uint8_t fieldnum)
void DataFlash_Class::dump_structure_field(const struct LogStructure *logstructure, const char *label, const uint8_t fieldnum)
{
::fprintf(stderr, " %s\n", label);
}
/// pretty-print log structures
/// @note structures MUST be well-formed
void DataFlash_Class::dump_structures(const struct LogStructure *structures, const uint8_t num_types)
void DataFlash_Class::dump_structures(const struct LogStructure *logstructures, const uint8_t num_types)
{
#if DEBUG_LOG_STRUCTURES
for (uint16_t i=0; i<num_types; i++) {
const struct LogStructure *structure = &structures[i];
::fprintf(stderr, "%s\n", structure->name);
const struct LogStructure *logstructure = &logstructures[i];
::fprintf(stderr, "%s\n", logstructure->name);
char label[32] = { };
uint8_t labeloffset = 0;
int8_t fieldnum = 0;
for (uint8_t j=0; j<strlen(structure->labels); j++) {
char labelchar = structure->labels[j];
for (uint8_t j=0; j<strlen(logstructure->labels); j++) {
char labelchar = logstructure->labels[j];
if (labelchar == '\0') {
break;
}
if (labelchar == ',') {
dump_structure_field(structure, label, fieldnum);
dump_structure_field(logstructure, label, fieldnum);
fieldnum++;
labeloffset = 0;
memset(label, '\0', 32);
@ -163,20 +163,20 @@ void DataFlash_Class::dump_structures(const struct LogStructure *structures, con
label[labeloffset++] = labelchar;
}
}
dump_structure_field(structure, label, fieldnum);
dump_structure_field(logstructure, label, fieldnum);
::fprintf(stderr, "\n"); // just add a CR to the output
}
#endif
}
void DataFlash_Class::validate_structures(const struct LogStructure *structures, const uint8_t num_types)
void DataFlash_Class::validate_structures(const struct LogStructure *logstructures, const uint8_t num_types)
{
Debug("Validating structures");
bool passed = true;
bool seen_ids[256] = { };
for (uint16_t i=0; i<num_types; i++) {
const struct LogStructure *logstructure = &structures[i];
const struct LogStructure *logstructure = &logstructures[i];
#if DEBUG_LOG_STRUCTURES
Debug("offset=%d ID=%d NAME=%s\n", i, logstructure->msg_type, logstructure->name);
@ -219,15 +219,15 @@ void DataFlash_Class::validate_structures(const struct LogStructure *structures,
#else
void DataFlash_Class::dump_structure_field(const struct LogStructure *_structure, const char *label, const uint8_t fieldnum)
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 *structures, const uint8_t num_types)
void DataFlash_Class::dump_structures(const struct LogStructure *logstructures, const uint8_t num_types)
{
}
void DataFlash_Class::validate_structures(const struct LogStructure *structures, const uint8_t num_types)
void DataFlash_Class::validate_structures(const struct LogStructure *logstructures, const uint8_t num_types)
{
return;
}

6
libraries/DataFlash/DataFlash.h
View File

@ -277,9 +277,9 @@ private:
private:
static DataFlash_Class *_instance;
void validate_structures(const struct LogStructure *structures, const uint8_t num_types);
void dump_structure_field(const struct LogStructure *structure, const char *label, const uint8_t fieldnum);
void dump_structures(const struct LogStructure *structures, const uint8_t num_types);
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);
void dump_structures(const struct LogStructure *logstructures, const uint8_t num_types);
void Log_Write_EKF_Timing(const char *name, uint64_t time_us, const struct ekf_timing &timing);