github/esphome
2
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2026-09-18 10:38:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move ThrottleWithPriorityFilter::new_value to non-template helper preserving exact dev behavior

Browse Source
This commit is contained in:
J. Nick Koston
2026-03-28 08:41:13 -10:00
parent 8fc08ad52d
commit f2663928c7
2 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
esphome/components/sensor/filter.cpp
+6 -4
View File
@@ -246,13 +246,15 @@ bool value_list_matches_any(Sensor *parent, float sensor_value, const Templatabl
return false;
}
bool throttle_check_with_priority(uint32_t &last_input, uint32_t min_time_between_inputs, bool is_prioritized) {
optional<float> throttle_with_priority_new_value(Sensor *parent, float value, const TemplatableValue<float> *values,
size_t count, uint32_t &last_input, uint32_t min_time_between_inputs) {
const uint32_t now = App.get_loop_component_start_time();
if (last_input == 0 || now - last_input >= min_time_between_inputs || is_prioritized) {
if (last_input == 0 || now - last_input >= min_time_between_inputs ||
value_list_matches_any(parent, value, values, count)) {
last_input = now;
return true;
return value;
}
return false;
return {};
}
// ThrottleFilter
esphome/components/sensor/filter.h
+5 -8
View File
@@ -378,9 +378,9 @@ class ThrottleFilter : public Filter {
uint32_t min_time_between_inputs_;
};
/// Check throttle and optionally allow prioritized values through.
/// Always updates last_input when returning true. Implementation in filter.cpp.
bool throttle_check_with_priority(uint32_t &last_input, uint32_t min_time_between_inputs, bool is_prioritized);
/// Non-template helper for ThrottleWithPriorityFilter (implementation in filter.cpp)
optional<float> throttle_with_priority_new_value(Sensor *parent, float value, const TemplatableValue<float> *values,
size_t count, uint32_t &last_input, uint32_t min_time_between_inputs);
/// Same as 'throttle' but will immediately publish values contained in `value_to_prioritize`.
template<size_t N> class ThrottleWithPriorityFilter : public ValueListFilter<N> {
@@ -390,11 +390,8 @@ template<size_t N> class ThrottleWithPriorityFilter : public ValueListFilter<N>
: ValueListFilter<N>(prioritized_values), min_time_between_inputs_(min_time_between_inputs) {}
optional<float> new_value(float value) override {
if (throttle_check_with_priority(this->last_input_, this->min_time_between_inputs_,
this->value_matches_any_(value))) {
return value;
}
return {};
return throttle_with_priority_new_value(this->parent_, value, this->values_.data(), N, this->last_input_,
this->min_time_between_inputs_);
}
protected: