From 93022a8a5e82acb5d6f77abee47f175b1665ed76 Mon Sep 17 00:00:00 2001
From: Jacob Walser <jwalser90@gmail.com>
Date: Fri, 2 Dec 2016 14:05:59 -0500
Subject: [PATCH] Sub: Update to match recent upstream changes

---
 ArduSub/Log.cpp  | 4 ++--
 ArduSub/make.inc | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ArduSub/Log.cpp b/ArduSub/Log.cpp
index 65db7d38cd..392820aea7 100644
--- a/ArduSub/Log.cpp
+++ b/ArduSub/Log.cpp
@@ -377,9 +377,9 @@ void Sub::Log_Write_Attitude()
     DataFlash.Log_Write_Attitude(ahrs, targets);
 
  #if OPTFLOW == ENABLED
-    DataFlash.Log_Write_EKF(ahrs,optflow.enabled());
+    DataFlash.Log_Write_EKF2(ahrs,optflow.enabled());
  #else
-    DataFlash.Log_Write_EKF(ahrs,false);
+    DataFlash.Log_Write_EKF2(ahrs,false);
  #endif
     DataFlash.Log_Write_AHRS2(ahrs);
 #if CONFIG_HAL_BOARD == HAL_BOARD_SITL
diff --git a/ArduSub/make.inc b/ArduSub/make.inc
index 1570909aad..eb74b3ce39 100644
--- a/ArduSub/make.inc
+++ b/ArduSub/make.inc
@@ -63,3 +63,4 @@ LIBRARIES += AP_ADSB
 LIBRARIES += AP_JSButton
 LIBRARIES += AP_LeakDetector
 LIBRARIES += AP_Gripper
+LIBRARIES += AP_Beacon