Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-03 14:38:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

DataFlash: log health and primary for airspeed

Browse Source
This commit is contained in:
Andrew Tridgell 2017-11-03 21:28:20 +11:00
parent 31d7d9f909
commit b6f3db44d8
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libraries/DataFlash/LogFile.cpp
View File

@ -1721,7 +1721,9 @@ void DataFlash_Class::Log_Write_Airspeed(AP_Airspeed &airspeed)
temperature : (int16_t)(temperature * 100.0f),
rawpressure : airspeed.get_corrected_pressure(i),
offset : airspeed.get_offset(i),
use : airspeed.use(i)
use : airspeed.use(i),
healthy : airspeed.healthy(i),
primary : airspeed.get_primary()
};
WriteBlock(&pkt, sizeof(pkt));
}

13
libraries/DataFlash/LogStructure.h
View File

@ -828,6 +828,8 @@ struct PACKED log_AIRSPEED {
float rawpressure;
float offset;
bool use;
bool healthy;
uint8_t primary;
};
struct PACKED log_ACCEL {
@ -1116,6 +1118,11 @@ struct PACKED log_DSTL {
#define CURR_CELL_UNITS "svvvvvvvvvvv"
#define CURR_CELL_MULTS "F00000000000"
#define ARSP_LABELS "TimeUS,Airspeed,DiffPress,Temp,RawPress,Offset,U,Health,Primary"
#define ARSP_FMT "QffcffBBB"
#define ARSP_UNITS "snPOPP---"
#define ARSP_MULTS "F00B00---"
/*
Format characters in the format string for binary log messages
a : int16_t[32]
@ -1186,10 +1193,8 @@ Format characters in the format string for binary log messages
"CAM", "QIHLLeeeccC","TimeUS,GPSTime,GPSWeek,Lat,Lng,Alt,RelAlt,GPSAlt,Roll,Pitch,Yaw", "s--DUmmmddd", "F--GGBBBBBB" }, \
{ LOG_TRIGGER_MSG, sizeof(log_Camera), \
"TRIG", "QIHLLeeeccC","TimeUS,GPSTime,GPSWeek,Lat,Lng,Alt,RelAlt,GPSAlt,Roll,Pitch,Yaw", "s--DUmmmddd", "F--GGBBBBBB" }, \
{ LOG_ARSP_MSG, sizeof(log_AIRSPEED), \
"ARSP", "QffcffB", "TimeUS,Airspeed,DiffPress,Temp,RawPress,Offset,U", "snPOPP-", "F00B00-" }, \
{ LOG_ASP2_MSG, sizeof(log_AIRSPEED), \
"ASP2", "QffcffB", "TimeUS,Airspeed,DiffPress,Temp,RawPress,Offset,U", "snPOPP-", "F00B00-" }, \
{ LOG_ARSP_MSG, sizeof(log_AIRSPEED), "ARSP", ARSP_FMT, ARSP_LABELS, ARSP_UNITS, ARSP_MULTS }, \
{ LOG_ASP2_MSG, sizeof(log_AIRSPEED), "ASP2", ARSP_FMT, ARSP_LABELS, ARSP_UNITS, ARSP_MULTS }, \
{ LOG_CURRENT_MSG, sizeof(log_Current), \
"BAT", CURR_FMT,CURR_LABELS,CURR_UNITS,CURR_MULTS }, \
{ LOG_CURRENT2_MSG, sizeof(log_Current), \