Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 28 additions & 0 deletions src/modules/battery_status/analog_battery.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -91,10 +91,20 @@ AnalogBattery::updateBatteryStatusADC(hrt_abstime timestamp, float voltage_raw,
_last_timestamp = timestamp;

if (_analog_params.v_filt > FLT_EPSILON) {
if (!_voltage_filter_seeded) {
_voltage_filter.reset(fmaxf(voltage_v, 0.f));
_voltage_filter_seeded = true;
}

voltage_v = _voltage_filter.update(fmaxf(voltage_v, 0.f), dt);
}

if (_analog_params.i_filt > FLT_EPSILON) {
if (!_current_filter_seeded) {
_current_filter.reset(fmaxf(current_a, 0.f));
_current_filter_seeded = true;
}

current_a = _current_filter.update(fmaxf(current_a, 0.f), dt);
}
}
Expand Down Expand Up @@ -146,11 +156,29 @@ AnalogBattery::updateParams()
param_get(_analog_param_handles.i_filt, &_analog_params.i_filt);

if (_analog_params.v_filt > FLT_EPSILON) {
const float voltage_state = _voltage_filter.getState();
_voltage_filter = AlphaFilter<float>(_analog_params.v_filt);

if (_voltage_filter_seeded) {
_voltage_filter.reset(voltage_state);
}

} else {
// reseed from the next sample if the filter is enabled again
_voltage_filter_seeded = false;
}

if (_analog_params.i_filt > FLT_EPSILON) {
const float current_state = _current_filter.getState();
_current_filter = AlphaFilter<float>(_analog_params.i_filt);

if (_current_filter_seeded) {
_current_filter.reset(current_state);
}

} else {
// reseed from the next sample if the filter is enabled again
_current_filter_seeded = false;
}

Battery::updateParams();
Expand Down
2 changes: 2 additions & 0 deletions src/modules/battery_status/analog_battery.h
Original file line number Diff line number Diff line change
Expand Up @@ -98,4 +98,6 @@ class AnalogBattery : public Battery
hrt_abstime _last_timestamp{0};
AlphaFilter<float> _voltage_filter{};
AlphaFilter<float> _current_filter{};
bool _voltage_filter_seeded{false};
bool _current_filter_seeded{false};
};
Loading