Sub: Update to match recent upstream changes

8 years ago · 93022a8a5e
2 changed files with 3 additions and 2 deletions
--- a/ArduSub/Log.cpp
+++ b/ArduSub/Log.cpp
@ -377,9 +377,9 @@ void Sub::Log_Write_Attitude()
				@@ -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
--- a/ArduSub/make.inc
+++ b/ArduSub/make.inc
@ -63,3 +63,4 @@ LIBRARIES += AP_ADSB
				@@ -63,3 +63,4 @@ LIBRARIES += AP_ADSB
 LIBRARIES += AP_JSButton
 LIBRARIES += AP_LeakDetector
 LIBRARIES += AP_Gripper
+LIBRARIES += AP_Beacon