Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-05 07:28:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

AP_BatteryMonitor: Analog: check valid pin

Browse Source
This commit is contained in:
Iampete1 2021-09-22 20:46:06 +01:00 committed by Andrew Tridgell
parent 0731af751a
commit 19f66803ff
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libraries/AP_BattMonitor/AP_BattMonitor_Analog.cpp
View File

@ -58,8 +58,6 @@ AP_BattMonitor_Analog::AP_BattMonitor_Analog(AP_BattMonitor &mon,
_volt_pin_analog_source = hal.analogin->channel(_volt_pin); _volt_pin_analog_source = hal.analogin->channel(_volt_pin);
_curr_pin_analog_source = hal.analogin->channel(_curr_pin); _curr_pin_analog_source = hal.analogin->channel(_curr_pin);
// always healthy
_state.healthy = true;
} }
// read - read the voltage and current // read - read the voltage and current
@ -67,7 +65,7 @@ void
AP_BattMonitor_Analog::read() AP_BattMonitor_Analog::read()
{ {
// this copes with changing the pin at runtime // this copes with changing the pin at runtime
_volt_pin_analog_source->set_pin(_volt_pin); _state.healthy = _volt_pin_analog_source->set_pin(_volt_pin);
// get voltage // get voltage
_state.voltage = _volt_pin_analog_source->voltage_average() * _volt_multiplier; _state.voltage = _volt_pin_analog_source->voltage_average() * _volt_multiplier;
@ -79,7 +77,7 @@ AP_BattMonitor_Analog::read()
float dt = tnow - _state.last_time_micros; float dt = tnow - _state.last_time_micros;
// this copes with changing the pin at runtime // this copes with changing the pin at runtime
_curr_pin_analog_source->set_pin(_curr_pin); _state.healthy &= _curr_pin_analog_source->set_pin(_curr_pin);
// read current // read current
_state.current_amps = (_curr_pin_analog_source->voltage_average() - _curr_amp_offset) * _curr_amp_per_volt; _state.current_amps = (_curr_pin_analog_source->voltage_average() - _curr_amp_offset) * _curr_amp_per_volt;