From 9f26bd0a6759dea38ab88e9b9c873b4f90103f70 Mon Sep 17 00:00:00 2001 From: Randy Mackay Date: Wed, 3 Jun 2020 13:14:42 +0900 Subject: [PATCH] AP_BattMonitor: TYPE param swap for SMBus-Maxell and SMBus-Generic Generic becomes type "7" which was previously Maxell. Maxell becomes type 16 --- libraries/AP_BattMonitor/AP_BattMonitor.cpp | 16 ++++++++-------- .../AP_BattMonitor/AP_BattMonitor_Params.cpp | 2 +- libraries/AP_BattMonitor/AP_BattMonitor_Params.h | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/libraries/AP_BattMonitor/AP_BattMonitor.cpp b/libraries/AP_BattMonitor/AP_BattMonitor.cpp index 37ed0e38de..96037b4e06 100644 --- a/libraries/AP_BattMonitor/AP_BattMonitor.cpp +++ b/libraries/AP_BattMonitor/AP_BattMonitor.cpp @@ -124,11 +124,11 @@ 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: + case AP_BattMonitor_Params::BattMonitor_TYPE_SMBus_Generic: _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)); + drivers[instance] = new AP_BattMonitor_SMBus_Generic(*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), @@ -142,11 +142,11 @@ AP_BattMonitor::init() hal.i2c_mgr->get_device(_params[instance]._i2c_bus, AP_BATTMONITOR_SMBUS_I2C_ADDR, 100000, true, 20), 6); break; - case AP_BattMonitor_Params::BattMonitor_TYPE_SMBus_Generic: + case AP_BattMonitor_Params::BattMonitor_TYPE_MAXELL: _params[instance]._i2c_bus.set_default(AP_BATTMONITOR_SMBUS_BUS_EXTERNAL); - drivers[instance] = new AP_BattMonitor_SMBus_Generic(*this, state[instance], _params[instance], - hal.i2c_mgr->get_device(_params[instance]._i2c_bus, AP_BATTMONITOR_SMBUS_I2C_ADDR, - 100000, true, 20)); + 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; #endif // HAL_BATTMON_SMBUS_ENABLE case AP_BattMonitor_Params::BattMonitor_TYPE_BEBOP: diff --git a/libraries/AP_BattMonitor/AP_BattMonitor_Params.cpp b/libraries/AP_BattMonitor/AP_BattMonitor_Params.cpp index 1d35cf948c..6054da6263 100644 --- a/libraries/AP_BattMonitor/AP_BattMonitor_Params.cpp +++ b/libraries/AP_BattMonitor/AP_BattMonitor_Params.cpp @@ -13,7 +13,7 @@ const AP_Param::GroupInfo AP_BattMonitor_Params::var_info[] = { // @Param: MONITOR // @DisplayName: Battery monitoring // @Description: Controls enabling monitoring of the battery's voltage and current - // @Values: 0:Disabled,3:Analog Voltage Only,4:Analog Voltage and Current,5:Solo,6:Bebop,7:SMBus-Maxell,8:UAVCAN-BatteryInfo,9:BLHeli ESC,10:SumOfFollowing,11:FuelFlow,12:FuelLevelPWM,13:SMBUS-SUI3,14:SMBUS-SUI6,15:NeoDesign,16:SMBus-Generic + // @Values: 0:Disabled,3:Analog Voltage Only,4:Analog Voltage and Current,5:Solo,6:Bebop,7:SMBus-Generic,8:UAVCAN-BatteryInfo,9:BLHeli ESC,10:SumOfFollowing,11:FuelFlow,12:FuelLevelPWM,13:SMBUS-SUI3,14:SMBUS-SUI6,15:NeoDesign,16:SMBus-Maxell // @User: Standard // @RebootRequired: True AP_GROUPINFO_FLAGS("MONITOR", 1, AP_BattMonitor_Params, _type, BattMonitor_TYPE_NONE, AP_PARAM_FLAG_ENABLE), diff --git a/libraries/AP_BattMonitor/AP_BattMonitor_Params.h b/libraries/AP_BattMonitor/AP_BattMonitor_Params.h index 2157453997..aa08333be3 100644 --- a/libraries/AP_BattMonitor/AP_BattMonitor_Params.h +++ b/libraries/AP_BattMonitor/AP_BattMonitor_Params.h @@ -19,7 +19,7 @@ public: BattMonitor_TYPE_ANALOG_VOLTAGE_AND_CURRENT = 4, BattMonitor_TYPE_SOLO = 5, BattMonitor_TYPE_BEBOP = 6, - BattMonitor_TYPE_MAXELL = 7, + BattMonitor_TYPE_SMBus_Generic = 7, BattMonitor_TYPE_UAVCAN_BatteryInfo = 8, BattMonitor_TYPE_BLHeliESC = 9, BattMonitor_TYPE_Sum = 10, @@ -28,7 +28,7 @@ public: BattMonitor_TYPE_SUI3 = 13, BattMonitor_TYPE_SUI6 = 14, BattMonitor_TYPE_NeoDesign = 15, - BattMonitor_TYPE_SMBus_Generic = 16, + BattMonitor_TYPE_MAXELL = 16, }; // low voltage sources (used for BATT_LOW_TYPE parameter)