From 638d63aa90bc30aef39342658f27bea7ba4bd7f3 Mon Sep 17 00:00:00 2001 From: priseborough Date: Mon, 6 Oct 2014 20:04:55 +1100 Subject: [PATCH] DataFlash : Change to more descriptive EKF logging names --- libraries/DataFlash/DataFlash.h | 8 ++++---- libraries/DataFlash/LogFile.cpp | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/libraries/DataFlash/DataFlash.h b/libraries/DataFlash/DataFlash.h index 1687c9abf4..be1ad80552 100644 --- a/libraries/DataFlash/DataFlash.h +++ b/libraries/DataFlash/DataFlash.h @@ -297,9 +297,9 @@ struct PACKED log_EKF1 { struct PACKED log_EKF2 { LOG_PACKET_HEADER; uint32_t time_ms; - int8_t accX; - int8_t accY; - int8_t accZ; + int8_t Ratio; + int8_t AZ1bias; + int8_t AZ2bias; int16_t windN; int16_t windE; int16_t magN; @@ -462,7 +462,7 @@ struct PACKED log_Ubx2 { { LOG_EKF1_MSG, sizeof(log_EKF1), \ "EKF1","IccCffffffccc","TimeMS,Roll,Pitch,Yaw,VN,VE,VD,PN,PE,PD,GX,GY,GZ" }, \ { 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), \ "EKF3","Icccccchhhc","TimeMS,IVN,IVE,IVD,IPN,IPE,IPD,IMX,IMY,IMZ,IVT" }, \ { LOG_EKF4_MSG, sizeof(log_EKF4), \ diff --git a/libraries/DataFlash/LogFile.cpp b/libraries/DataFlash/LogFile.cpp index 2428d8c90c..ddae852984 100644 --- a/libraries/DataFlash/LogFile.cpp +++ b/libraries/DataFlash/LogFile.cpp @@ -927,9 +927,9 @@ void DataFlash_Class::Log_Write_EKF(AP_AHRS_NavEKF &ahrs) struct log_EKF2 pkt2 = { LOG_PACKET_HEADER_INIT(LOG_EKF2_MSG), time_ms : hal.scheduler->millis(), - accX : (int8_t)(100*accelBias.x), - accY : (int8_t)(100*accelBias.y), - accZ : (int8_t)(100*accelBias.z), + Ratio : (int8_t)(100*accelBias.x), + AZ1bias : (int8_t)(100*accelBias.z), + AZ2bias : (int8_t)(100*accelBias.y), windN : (int16_t)(100*wind.x), windE : (int16_t)(100*wind.y), magN : (int16_t)(magNED.x),