From fbecda7eeb59b03e37fc19896f2aa25e6f450364 Mon Sep 17 00:00:00 2001
From: Randy Mackay <rmackay9@yahoo.com>
Date: Mon, 28 Nov 2016 16:23:13 +0900
Subject: [PATCH] AP_NavEKF2: change order of variable initialisation

No functional change, this modifies the init order to match the declaration order.
---
 libraries/AP_NavEKF2/AP_NavEKF2_core.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/libraries/AP_NavEKF2/AP_NavEKF2_core.cpp b/libraries/AP_NavEKF2/AP_NavEKF2_core.cpp
index 890d96b1e2..061f6cccf4 100644
--- a/libraries/AP_NavEKF2/AP_NavEKF2_core.cpp
+++ b/libraries/AP_NavEKF2/AP_NavEKF2_core.cpp
@@ -294,19 +294,17 @@ void NavEKF2_core::InitialiseVariables()
     rngBcnLast3DmeasTime_ms = 0;
     rngBcnGoodToAlign = false;
     lastRngBcnChecked = 0;
-    memset(&receiverPosCov, 0, sizeof(receiverPosCov));
     receiverPos.zero();
+    memset(&receiverPosCov, 0, sizeof(receiverPosCov));
     rngBcnAlignmentStarted =  false;
     rngBcnAlignmentCompleted = false;
     lastBeaconIndex = 0;
     rngBcnPosSum.zero();
     numBcnMeas = 0;
     rngSum = 0.0f;
-    memset(&rngBcnFusionReport, 0, sizeof(rngBcnFusionReport));
-    rngBcnFuseDataReportIndex = 0;
     N_beacons = 0;
-    minBcnPosD = 0.0f;
     maxBcnPosD = 0.0f;
+    minBcnPosD = 0.0f;
     bcnPosOffset = 0.0f;
     bcnPosOffsetMax = 0.0f;
     bcnPosOffsetMaxVar = 0.0f;
@@ -314,6 +312,8 @@ void NavEKF2_core::InitialiseVariables()
     bcnPosOffsetMin = 0.0f;
     bcnPosOffsetMinVar = 0.0f;
     OffsetMinInnovFilt = 0.0f;
+    rngBcnFuseDataReportIndex = 0;
+    memset(&rngBcnFusionReport, 0, sizeof(rngBcnFusionReport));
 
     // zero data buffers
     storedIMU.reset();