Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

BattMon: correct typo in monitor type enum

This commit is contained in:
Randy Mackay 2014-12-15 22:49:28 +09:00
parent 4521d8169b
commit aecc8aac1f
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libraries/AP_BattMonitor/AP_BattMonitor.cpp
View File

@ -143,7 +143,7 @@ AP_BattMonitor::init()
_num_instances++;
// check for SMBus
} else if (monitor_type == RangeFinder_TYPE_SMBUS) {
} else if (monitor_type == BattMonitor_TYPE_SMBUS) {
state[instance].instance = instance;
#if CONFIG_HAL_BOARD == HAL_BOARD_PX4
drivers[instance] = new AP_BattMonitor_SMBus_PX4(*this, instance, state[instance]);
@ -182,7 +182,7 @@ bool AP_BattMonitor::has_current(uint8_t instance) const
// check for analog voltage and current monitor or smbus monitor
if (instance < AP_BATT_MONITOR_MAX_INSTANCES) {
if (drivers[instance] != NULL) {
return (_monitoring[instance] == BattMonitor_TYPE_ANALOG_VOLTAGE_AND_CURRENT || _monitoring[instance] == RangeFinder_TYPE_SMBUS);
return (_monitoring[instance] == BattMonitor_TYPE_ANALOG_VOLTAGE_AND_CURRENT || _monitoring[instance] == BattMonitor_TYPE_SMBUS);
}
}

2
libraries/AP_BattMonitor/AP_BattMonitor.h
View File

@ -40,7 +40,7 @@ public:
BattMonitor_TYPE_NONE = 0,
BattMonitor_TYPE_ANALOG_VOLTAGE_ONLY = 3,
BattMonitor_TYPE_ANALOG_VOLTAGE_AND_CURRENT = 4,
RangeFinder_TYPE_SMBUS = 5
BattMonitor_TYPE_SMBUS = 5
};
// The BattMonitor_State structure is filled in by the backend driver