Merge branch 'warn_if_blocking_over_' into integration

This commit is contained in:
J. Nick Koston
2025-06-14 16:43:26 -05:00
2 changed files with 12 additions and 5 deletions
+2 -2
View File
@@ -65,7 +65,7 @@ extern const uint32_t STATUS_LED_ERROR;
enum class RetryResult { DONE, RETRY };
extern const uint32_t WARN_IF_BLOCKING_OVER_MS;
extern const uint16_t WARN_IF_BLOCKING_OVER_MS;
class Component {
public:
@@ -301,7 +301,7 @@ class Component {
uint32_t component_state_{0x0000}; ///< State of this component.
float setup_priority_override_{NAN};
const char *component_source_{nullptr};
uint32_t warn_if_blocking_over_{WARN_IF_BLOCKING_OVER_MS};
uint16_t warn_if_blocking_over_{WARN_IF_BLOCKING_OVER_MS}; ///< Warn if blocked for this many ms (max 65.5s)
const char *error_message_{nullptr};
};