Browse Source

AP_BattMonitor: Maxell driver inherits from SMBus_Generic

zr-v5.1
Randy Mackay 5 years ago committed by WickedShell
parent
commit
4ea565e4ed
  1. 6
      libraries/AP_BattMonitor/AP_BattMonitor.cpp
  2. 2
      libraries/AP_BattMonitor/AP_BattMonitor.h
  3. 1
      libraries/AP_BattMonitor/AP_BattMonitor_SMBus.h
  4. 9
      libraries/AP_BattMonitor/AP_BattMonitor_SMBus_Maxell.h

6
libraries/AP_BattMonitor/AP_BattMonitor.cpp

@ -121,6 +121,12 @@ AP_BattMonitor::init() @@ -121,6 +121,12 @@ AP_BattMonitor::init()
hal.i2c_mgr->get_device(_params[instance]._i2c_bus, AP_BATTMONITOR_SMBUS_I2C_ADDR,
100000, true, 20));
break;
case AP_BattMonitor_Params::BattMonitor_TYPE_MAXELL:
_params[instance]._i2c_bus.set_default(AP_BATTMONITOR_SMBUS_BUS_EXTERNAL);
drivers[instance] = new AP_BattMonitor_SMBus_Maxell(*this, state[instance], _params[instance],
hal.i2c_mgr->get_device(_params[instance]._i2c_bus, AP_BATTMONITOR_SMBUS_I2C_ADDR,
100000, true, 20));
break;
case AP_BattMonitor_Params::BattMonitor_TYPE_SUI3:
_params[instance]._i2c_bus.set_default(AP_BATTMONITOR_SMBUS_BUS_INTERNAL),
drivers[instance] = new AP_BattMonitor_SMBus_SUI(*this, state[instance], _params[instance],

2
libraries/AP_BattMonitor/AP_BattMonitor.h

@ -33,6 +33,7 @@ class AP_BattMonitor_Analog; @@ -33,6 +33,7 @@ class AP_BattMonitor_Analog;
class AP_BattMonitor_SMBus;
class AP_BattMonitor_SMBus_Solo;
class AP_BattMonitor_SMBus_Generic;
class AP_BattMonitor_SMBus_Maxell;
class AP_BattMonitor_UAVCAN;
class AP_BattMonitor
@ -42,6 +43,7 @@ class AP_BattMonitor @@ -42,6 +43,7 @@ class AP_BattMonitor
friend class AP_BattMonitor_SMBus;
friend class AP_BattMonitor_SMBus_Solo;
friend class AP_BattMonitor_SMBus_Generic;
friend class AP_BattMonitor_SMBus_Maxell;
friend class AP_BattMonitor_UAVCAN;
friend class AP_BattMonitor_Sum;
friend class AP_BattMonitor_FuelFlow;

1
libraries/AP_BattMonitor/AP_BattMonitor_SMBus.h

@ -100,3 +100,4 @@ protected: @@ -100,3 +100,4 @@ protected:
// include specific implementations
#include "AP_BattMonitor_SMBus_Solo.h"
#include "AP_BattMonitor_SMBus_Generic.h"
#include "AP_BattMonitor_SMBus_Maxell.h"

9
libraries/AP_BattMonitor/AP_BattMonitor_SMBus_Maxell.h

@ -0,0 +1,9 @@ @@ -0,0 +1,9 @@
#pragma once
#include "AP_BattMonitor_SMBus_Generic.h"
class AP_BattMonitor_SMBus_Maxell : public AP_BattMonitor_SMBus_Generic
{
using AP_BattMonitor_SMBus_Generic::AP_BattMonitor_SMBus_Generic;
};
Loading…
Cancel
Save