From 43972f8e566f8e102eb8617ef263d39aa1ca3983 Mon Sep 17 00:00:00 2001
From: Michael du Breuil <wicked.shell.scripts@gmail.com>
Date: Tue, 16 Jan 2018 12:10:10 -0700
Subject: [PATCH] Plane: Move battery logging code to AP_BattMonitor

---
 ArduPlane/Log.cpp     | 9 ---------
 ArduPlane/Plane.h     | 3 +--
 ArduPlane/sensors.cpp | 7 -------
 3 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/ArduPlane/Log.cpp b/ArduPlane/Log.cpp
index 15c9d53ed1..63e81c613f 100644
--- a/ArduPlane/Log.cpp
+++ b/ArduPlane/Log.cpp
@@ -263,14 +263,6 @@ struct PACKED log_Arm_Disarm {
     uint16_t arm_checks;
 };
 
-void Plane::Log_Write_Current()
-{
-    DataFlash.Log_Write_Current(battery);
-
-    // also write power status
-    DataFlash.Log_Write_Power();
-}
-
 void Plane::Log_Arm_Disarm() {
     struct log_Arm_Disarm pkt = {
         LOG_PACKET_HEADER_INIT(LOG_ARM_DISARM_MSG),
@@ -439,7 +431,6 @@ void Plane::Log_Write_Sonar() {}
 void Plane::Log_Write_Optflow() {}
  #endif
 
-void Plane::Log_Write_Current() {}
 void Plane::Log_Arm_Disarm() {}
 void Plane::Log_Write_GPS(uint8_t instance) {}
 void Plane::Log_Write_IMU() {}
diff --git a/ArduPlane/Plane.h b/ArduPlane/Plane.h
index 5698e6087b..f2878d47bf 100644
--- a/ArduPlane/Plane.h
+++ b/ArduPlane/Plane.h
@@ -391,7 +391,7 @@ private:
     int32_t altitude_error_cm;
 
     // Battery Sensors
-    AP_BattMonitor battery;
+    AP_BattMonitor battery{MASK_LOG_CURRENT};
 
 #if FRSKY_TELEM_ENABLED == ENABLED
     // FrSky telemetry support
@@ -834,7 +834,6 @@ private:
     void Log_Write_Status();
     void Log_Write_Sonar();
     void Log_Write_Optflow();
-    void Log_Write_Current();
     void Log_Arm_Disarm();
     void Log_Write_GPS(uint8_t instance);
     void Log_Write_IMU();
diff --git a/ArduPlane/sensors.cpp b/ArduPlane/sensors.cpp
index 193c79ae9a..8d6cd3f4d8 100644
--- a/ArduPlane/sensors.cpp
+++ b/ArduPlane/sensors.cpp
@@ -127,13 +127,6 @@ void Plane::read_battery(void)
         battery.exhausted(g.fs_batt_voltage, g.fs_batt_mah)) {
         low_battery_event();
     }
-    if (battery.get_type() != AP_BattMonitor_Params::BattMonitor_TYPE_NONE) {
-        AP_Notify::flags.battery_voltage = battery.voltage();
-    }
-    
-    if (should_log(MASK_LOG_CURRENT)) {
-        Log_Write_Current();
-    }
 }
 
 // read the receiver RSSI as an 8 bit number for MAVLink