sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-10-05 11:23:47 +01:00
Code Issues Releases Wiki Activity

Merge branch 'reorder_app_reduce_padding' into integration

Browse Source
This commit is contained in:
J. Nick Koston
2025-06-14 18:16:39 -05:00
parent 53a578a46f 82c39580df
commit 0121f799f0
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
esphome/core/application.h
View File

@@ -649,21 +649,27 @@ class Application {
const char *area_{nullptr}; const char *area_{nullptr};
const char *comment_{nullptr}; const char *comment_{nullptr};
const char *compilation_time_{nullptr}; const char *compilation_time_{nullptr};
bool name_add_mac_suffix_; Component *current_component_{nullptr};
uint32_t last_loop_{0}; uint32_t last_loop_{0};
uint32_t loop_interval_{16}; uint32_t loop_interval_{16};
<<<<<<< Updated upstream
size_t dump_config_at_{SIZE_MAX}; size_t dump_config_at_{SIZE_MAX};
uint8_t app_state_{0}; uint8_t app_state_{0};
Component *current_component_{nullptr}; Component *current_component_{nullptr};
=======
>>>>>>> Stashed changes
uint32_t loop_component_start_time_{0}; uint32_t loop_component_start_time_{0};
size_t dump_config_at_{SIZE_MAX};
bool name_add_mac_suffix_;
uint8_t app_state_{0};
#ifdef USE_SOCKET_SELECT_SUPPORT #ifdef USE_SOCKET_SELECT_SUPPORT
// Socket select management // Socket select management
std::vector<int> socket_fds_; // Vector of all monitored socket file descriptors std::vector<int> socket_fds_; // Vector of all monitored socket file descriptors
bool socket_fds_changed_{false}; // Flag to rebuild base_read_fds_ when socket_fds_ changes
int max_fd_{-1}; // Highest file descriptor number for select()
fd_set base_read_fds_{}; // Cached fd_set rebuilt only when socket_fds_ changes fd_set base_read_fds_{}; // Cached fd_set rebuilt only when socket_fds_ changes
fd_set read_fds_{}; // Working fd_set for select(), copied from base_read_fds_ fd_set read_fds_{}; // Working fd_set for select(), copied from base_read_fds_
int max_fd_{-1}; // Highest file descriptor number for select()
bool socket_fds_changed_{false}; // Flag to rebuild base_read_fds_ when socket_fds_ changes
#endif #endif
}; };

2
esphome/core/component.h
View File

@@ -63,7 +63,7 @@ extern const uint8_t STATUS_LED_OK;
extern const uint8_t STATUS_LED_WARNING; extern const uint8_t STATUS_LED_WARNING;
extern const uint8_t STATUS_LED_ERROR; extern const uint8_t STATUS_LED_ERROR;
enum class RetryResult { DONE, RETRY }; enum class RetryResult : uint8_t { DONE, RETRY };
extern const uint16_t WARN_IF_BLOCKING_OVER_MS; extern const uint16_t WARN_IF_BLOCKING_OVER_MS;