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

Merge remote-tracking branch 'upstream/inline-get-component-log-str' into integration

Browse Source
This commit is contained in:
J. Nick Koston
2026-03-21 12:12:21 -10:00
parent 8978ea7479 30b4508320
commit f6c0e28db8
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
esphome/components/analog_threshold/analog_threshold_binary_sensor.h
+1
View File
@@ -1,5 +1,6 @@
#pragma once
#include "esphome/core/automation.h"
#include "esphome/core/component.h"
#include "esphome/components/binary_sensor/binary_sensor.h"
#include "esphome/components/sensor/sensor.h"
esphome/core/component.cpp
-3
View File
@@ -285,9 +285,6 @@ void Component::call() {
break;
}
}
const LogString *Component::get_component_log_str() const {
return this->component_source_ == nullptr ? LOG_STR("<unknown>") : this->component_source_;
}
bool Component::should_warn_of_blocking(uint32_t blocking_time) {
if (blocking_time > this->warn_if_blocking_over_) {
// Prevent overflow when adding increment - if we're about to overflow, just max out
esphome/core/component.h
+3 -1
View File
@@ -294,7 +294,9 @@ class Component {
*
* Returns LOG_STR("<unknown>") if source not set
*/
const LogString *get_component_log_str() const;
const LogString *get_component_log_str() const {
return this->component_source_ == nullptr ? LOG_STR("<unknown>") : this->component_source_;
}
bool should_warn_of_blocking(uint32_t blocking_time);