From a7f81c838fc6caab8b86bc4af4281483dbd8a9f6 Mon Sep 17 00:00:00 2001 From: Tom Pittenger Date: Thu, 22 Apr 2021 13:04:45 -0700 Subject: [PATCH] AP_BattMonitor: make virtual Backend.init() optional to fix CANDriver.init(uint8, uint8) ambiguitiy --- libraries/AP_BattMonitor/AP_BattMonitor_Backend.h | 2 +- libraries/AP_BattMonitor/AP_BattMonitor_MPPT_PacketDigital.h | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/libraries/AP_BattMonitor/AP_BattMonitor_Backend.h b/libraries/AP_BattMonitor/AP_BattMonitor_Backend.h index 3d02bce2e8..6e28e4c7fc 100644 --- a/libraries/AP_BattMonitor/AP_BattMonitor_Backend.h +++ b/libraries/AP_BattMonitor/AP_BattMonitor_Backend.h @@ -29,7 +29,7 @@ public: virtual ~AP_BattMonitor_Backend(void) {} // initialise - virtual void init() = 0; + virtual void init() {}; // read the latest battery voltage virtual void read() = 0; diff --git a/libraries/AP_BattMonitor/AP_BattMonitor_MPPT_PacketDigital.h b/libraries/AP_BattMonitor/AP_BattMonitor_MPPT_PacketDigital.h index b13446fab7..f8e6090078 100644 --- a/libraries/AP_BattMonitor/AP_BattMonitor_MPPT_PacketDigital.h +++ b/libraries/AP_BattMonitor/AP_BattMonitor_MPPT_PacketDigital.h @@ -29,9 +29,6 @@ public: /// returns true if battery monitor provides current info bool has_current() const override { return true; } - void init(void) override {} - - protected: // handler for incoming frames void handle_frame(AP_HAL::CANFrame &frame) override;