Browse Source

DataFlash : Change to more descriptive EKF logging names

mission-4.1.18
priseborough 10 years ago committed by Andrew Tridgell
parent
commit
638d63aa90
  1. 8
      libraries/DataFlash/DataFlash.h
  2. 6
      libraries/DataFlash/LogFile.cpp

8
libraries/DataFlash/DataFlash.h

@ -297,9 +297,9 @@ struct PACKED log_EKF1 {
struct PACKED log_EKF2 { struct PACKED log_EKF2 {
LOG_PACKET_HEADER; LOG_PACKET_HEADER;
uint32_t time_ms; uint32_t time_ms;
int8_t accX; int8_t Ratio;
int8_t accY; int8_t AZ1bias;
int8_t accZ; int8_t AZ2bias;
int16_t windN; int16_t windN;
int16_t windE; int16_t windE;
int16_t magN; int16_t magN;
@ -462,7 +462,7 @@ struct PACKED log_Ubx2 {
{ LOG_EKF1_MSG, sizeof(log_EKF1), \ { LOG_EKF1_MSG, sizeof(log_EKF1), \
"EKF1","IccCffffffccc","TimeMS,Roll,Pitch,Yaw,VN,VE,VD,PN,PE,PD,GX,GY,GZ" }, \ "EKF1","IccCffffffccc","TimeMS,Roll,Pitch,Yaw,VN,VE,VD,PN,PE,PD,GX,GY,GZ" }, \
{ LOG_EKF2_MSG, sizeof(log_EKF2), \ { LOG_EKF2_MSG, sizeof(log_EKF2), \
"EKF2","Ibbbcchhhhhh","TimeMS,AX,AY,AZ,VWN,VWE,MN,ME,MD,MX,MY,MZ" }, \ "EKF2","Ibbbcchhhhhh","TimeMS,Ratio,AZ1bias,AZ2bias,VWN,VWE,MN,ME,MD,MX,MY,MZ" }, \
{ LOG_EKF3_MSG, sizeof(log_EKF3), \ { LOG_EKF3_MSG, sizeof(log_EKF3), \
"EKF3","Icccccchhhc","TimeMS,IVN,IVE,IVD,IPN,IPE,IPD,IMX,IMY,IMZ,IVT" }, \ "EKF3","Icccccchhhc","TimeMS,IVN,IVE,IVD,IPN,IPE,IPD,IMX,IMY,IMZ,IVT" }, \
{ LOG_EKF4_MSG, sizeof(log_EKF4), \ { LOG_EKF4_MSG, sizeof(log_EKF4), \

6
libraries/DataFlash/LogFile.cpp

@ -927,9 +927,9 @@ void DataFlash_Class::Log_Write_EKF(AP_AHRS_NavEKF &ahrs)
struct log_EKF2 pkt2 = { struct log_EKF2 pkt2 = {
LOG_PACKET_HEADER_INIT(LOG_EKF2_MSG), LOG_PACKET_HEADER_INIT(LOG_EKF2_MSG),
time_ms : hal.scheduler->millis(), time_ms : hal.scheduler->millis(),
accX : (int8_t)(100*accelBias.x), Ratio : (int8_t)(100*accelBias.x),
accY : (int8_t)(100*accelBias.y), AZ1bias : (int8_t)(100*accelBias.z),
accZ : (int8_t)(100*accelBias.z), AZ2bias : (int8_t)(100*accelBias.y),
windN : (int16_t)(100*wind.x), windN : (int16_t)(100*wind.x),
windE : (int16_t)(100*wind.y), windE : (int16_t)(100*wind.y),
magN : (int16_t)(magNED.x), magN : (int16_t)(magNED.x),

Loading…
Cancel
Save