From e177db7dcdfcce96752bbe4d3d0257718bc6b786 Mon Sep 17 00:00:00 2001 From: Michael du Breuil Date: Sat, 20 Apr 2019 14:53:39 -0700 Subject: [PATCH] AP_BattMonitor: Remove unused method, make some public functions private --- libraries/AP_BattMonitor/AP_BattMonitor.h | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/libraries/AP_BattMonitor/AP_BattMonitor.h b/libraries/AP_BattMonitor/AP_BattMonitor.h index ae25e29fea..1100b519ea 100644 --- a/libraries/AP_BattMonitor/AP_BattMonitor.h +++ b/libraries/AP_BattMonitor/AP_BattMonitor.h @@ -133,10 +133,6 @@ public: int32_t pack_capacity_mah(uint8_t instance) const; int32_t pack_capacity_mah() const { return pack_capacity_mah(AP_BATT_PRIMARY_INSTANCE); } - /// returns the failsafe state of the battery - BatteryFailsafe check_failsafe(const uint8_t instance); - void check_failsafes(void); // checks all batteries failsafes - /// returns true if a battery failsafe has ever been triggered bool has_failsafed(void) const { return _has_triggered_failsafe; }; @@ -147,9 +143,6 @@ public: enum AP_BattMonitor_Params::BattMonitor_Type get_type() const { return get_type(AP_BATT_PRIMARY_INSTANCE); } enum AP_BattMonitor_Params::BattMonitor_Type get_type(uint8_t instance) const { return _params[instance].type(); } - /// set_monitoring - sets the monitor type (used for example sketch only) - void set_monitoring(uint8_t instance, uint8_t mon) { _params[instance]._type.set(mon); } - /// true when (voltage * current) > watt_max bool overpower_detected() const; bool overpower_detected(uint8_t instance) const; @@ -191,6 +184,10 @@ private: void convert_params(void); + /// returns the failsafe state of the battery + BatteryFailsafe check_failsafe(const uint8_t instance); + void check_failsafes(void); // checks all batteries failsafes + battery_failsafe_handler_fn_t _battery_failsafe_handler_fn; const int8_t *_failsafe_priorities; // array of failsafe priorities, sorted highest to lowest priority, -1 indicates no more entries