Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-02-22 07:44:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

DataFlash: Log_Write() fills unknown units with '?'

Browse Source
This commit is contained in:
Peter Barker 2017-11-08 14:32:45 +11:00 committed by Peter Barker
parent 2e94673e4f
commit 9896e23c36
2 changed files with 49 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
libraries/DataFlash/DataFlash.cpp
View File

@ -557,7 +557,23 @@ void DataFlash_Class::Log_Write(const char *name, const char *labels, const char
{
va_list arg_list;
struct log_write_fmt *f = msg_fmt_for_name(name, labels, fmt);
va_start(arg_list, fmt);
Log_WriteV(name, labels, nullptr, nullptr, fmt, arg_list);
va_end(arg_list);
}
void DataFlash_Class::Log_Write(const char *name, const char *labels, const char *units, const char *mults, const char *fmt, ...)
{
va_list arg_list;
va_start(arg_list, fmt);
Log_WriteV(name, labels, units, mults, fmt, arg_list);
va_end(arg_list);
}
void DataFlash_Class::Log_WriteV(const char *name, const char *labels, const char *units, const char *mults, const char *fmt, va_list arg_list)
{
struct log_write_fmt *f = msg_fmt_for_name(name, labels, units, mults, fmt);
if (f == nullptr) {
// unable to map name to a messagetype; could be out of
// msgtypes, could be out of slots, ...
@ -572,14 +588,15 @@ void DataFlash_Class::Log_Write(const char *name, const char *labels, const char
}
f->sent_mask |= (1U<<i);
}
va_start(arg_list, fmt);
backends[i]->Log_Write(f->msg_type, arg_list);
va_end(arg_list);
va_list arg_copy;
va_copy(arg_copy, arg_list);
backends[i]->Log_Write(f->msg_type, arg_copy);
va_end(arg_copy);
}
}
DataFlash_Class::log_write_fmt *DataFlash_Class::msg_fmt_for_name(const char *name, const char *labels, const char *fmt)
DataFlash_Class::log_write_fmt *DataFlash_Class::msg_fmt_for_name(const char *name, const char *labels, const char *units, const char *mults, const char *fmt)
{
struct log_write_fmt *f;
for (f = log_write_fmts; f; f=f->next) {
@ -603,6 +620,8 @@ DataFlash_Class::log_write_fmt *DataFlash_Class::msg_fmt_for_name(const char *na
f->name = name;
f->fmt = fmt;
f->labels = labels;
f->units = units;
f->mults = mults;
int16_t tmp = Log_Write_calc_msg_len(fmt);
if (tmp == -1) {
@ -670,6 +689,24 @@ bool DataFlash_Class::fill_log_write_logstructure(struct LogStructure &logstruct
strncpy((char*)logstruct.name, f->name, sizeof(logstruct.name)); /* cast away the "const" (*gulp*) */
strncpy((char*)logstruct.format, f->fmt, sizeof(logstruct.format));
strncpy((char*)logstruct.labels, f->labels, sizeof(logstruct.labels));
if (f->units != nullptr) {
strncpy((char*)logstruct.units, f->units, sizeof(logstruct.units));
} else {
memset((char*)logstruct.units, '\0', sizeof(logstruct.units));
memset((char*)logstruct.units, '?', strlen(logstruct.format));
}
if (f->mults != nullptr) {
strncpy((char*)logstruct.multipliers, f->mults, sizeof(logstruct.multipliers));
} else {
memset((char*)logstruct.multipliers, '\0', sizeof(logstruct.multipliers));
memset((char*)logstruct.multipliers, '?', strlen(logstruct.format));
// special magic to set units/mults for TimeUS, by far and
// away the most common first field
if (!strncmp(logstruct.labels, "TimeUS,", MIN(strlen(logstruct.labels), strlen("TimeUS,")))) {
((char*)(logstruct.units))[0] = 's';
((char*)(logstruct.multipliers))[0] = 'F';
}
}
logstruct.msg_len = f->msg_len;
return true;
}

6
libraries/DataFlash/DataFlash.h
View File

@ -163,6 +163,8 @@ public:
void Log_Write_SRTL(bool active, uint16_t num_points, uint16_t max_points, uint8_t action, const Vector3f& point);
void Log_Write(const char *name, const char *labels, const char *fmt, ...);
void Log_Write(const char *name, const char *labels, const char *units, const char *mults, const char *fmt, ...);
void Log_WriteV(const char *name, const char *labels, const char *units, const char *mults, const char *fmt, va_list arg_list);
// This structure provides information on the internal member data of a PID for logging purposes
struct PID_Info {
@ -271,10 +273,12 @@ private:
const char *name;
const char *fmt;
const char *labels;
const char *units;
const char *mults;
} *log_write_fmts;
// return (possibly allocating) a log_write_fmt for a name
struct log_write_fmt *msg_fmt_for_name(const char *name, const char *labels, const char *fmt);
struct log_write_fmt *msg_fmt_for_name(const char *name, const char *labels, const char *units, const char *mults, const char *fmt);
// returns true if msg_type is associated with a message
bool msg_type_in_use(uint8_t msg_type) const;