sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-10-31 07:03:55 +00:00
Code Issues Releases Wiki Activity

tidy

Browse Source
This commit is contained in:
J. Nick Koston
2025-08-01 15:25:10 -10:00
parent 7351fb374f
commit 8bf3d52fb0
2 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
esphome/core/application.h
View File

@@ -493,68 +493,68 @@ class Application {
std::vector<Area *> areas_{}; std::vector<Area *> areas_{};
#endif #endif
#ifdef USE_BINARY_SENSOR #ifdef USE_BINARY_SENSOR
static_vector<binary_sensor::BinarySensor *, ESPHOME_ENTITY_BINARY_SENSOR_COUNT> binary_sensors_{}; StaticVector<binary_sensor::BinarySensor *, ESPHOME_ENTITY_BINARY_SENSOR_COUNT> binary_sensors_{};
#endif #endif
#ifdef USE_SWITCH #ifdef USE_SWITCH
static_vector<switch_::Switch *, ESPHOME_ENTITY_SWITCH_COUNT> switches_{}; StaticVector<switch_::Switch *, ESPHOME_ENTITY_SWITCH_COUNT> switches_{};
#endif #endif
#ifdef USE_BUTTON #ifdef USE_BUTTON
static_vector<button::Button *, ESPHOME_ENTITY_BUTTON_COUNT> buttons_{}; StaticVector<button::Button *, ESPHOME_ENTITY_BUTTON_COUNT> buttons_{};
#endif #endif
#ifdef USE_EVENT #ifdef USE_EVENT
static_vector<event::Event *, ESPHOME_ENTITY_EVENT_COUNT> events_{}; StaticVector<event::Event *, ESPHOME_ENTITY_EVENT_COUNT> events_{};
#endif #endif
#ifdef USE_SENSOR #ifdef USE_SENSOR
static_vector<sensor::Sensor *, ESPHOME_ENTITY_SENSOR_COUNT> sensors_{}; StaticVector<sensor::Sensor *, ESPHOME_ENTITY_SENSOR_COUNT> sensors_{};
#endif #endif
#ifdef USE_TEXT_SENSOR #ifdef USE_TEXT_SENSOR
static_vector<text_sensor::TextSensor *, ESPHOME_ENTITY_TEXT_SENSOR_COUNT> text_sensors_{}; StaticVector<text_sensor::TextSensor *, ESPHOME_ENTITY_TEXT_SENSOR_COUNT> text_sensors_{};
#endif #endif
#ifdef USE_FAN #ifdef USE_FAN
static_vector<fan::Fan *, ESPHOME_ENTITY_FAN_COUNT> fans_{}; StaticVector<fan::Fan *, ESPHOME_ENTITY_FAN_COUNT> fans_{};
#endif #endif
#ifdef USE_COVER #ifdef USE_COVER
static_vector<cover::Cover *, ESPHOME_ENTITY_COVER_COUNT> covers_{}; StaticVector<cover::Cover *, ESPHOME_ENTITY_COVER_COUNT> covers_{};
#endif #endif
#ifdef USE_CLIMATE #ifdef USE_CLIMATE
static_vector<climate::Climate *, ESPHOME_ENTITY_CLIMATE_COUNT> climates_{}; StaticVector<climate::Climate *, ESPHOME_ENTITY_CLIMATE_COUNT> climates_{};
#endif #endif
#ifdef USE_LIGHT #ifdef USE_LIGHT
static_vector<light::LightState *, ESPHOME_ENTITY_LIGHT_COUNT> lights_{}; StaticVector<light::LightState *, ESPHOME_ENTITY_LIGHT_COUNT> lights_{};
#endif #endif
#ifdef USE_NUMBER #ifdef USE_NUMBER
static_vector<number::Number *, ESPHOME_ENTITY_NUMBER_COUNT> numbers_{}; StaticVector<number::Number *, ESPHOME_ENTITY_NUMBER_COUNT> numbers_{};
#endif #endif
#ifdef USE_DATETIME_DATE #ifdef USE_DATETIME_DATE
static_vector<datetime::DateEntity *, ESPHOME_ENTITY_DATE_COUNT> dates_{}; StaticVector<datetime::DateEntity *, ESPHOME_ENTITY_DATE_COUNT> dates_{};
#endif #endif
#ifdef USE_DATETIME_TIME #ifdef USE_DATETIME_TIME
static_vector<datetime::TimeEntity *, ESPHOME_ENTITY_TIME_COUNT> times_{}; StaticVector<datetime::TimeEntity *, ESPHOME_ENTITY_TIME_COUNT> times_{};
#endif #endif
#ifdef USE_DATETIME_DATETIME #ifdef USE_DATETIME_DATETIME
static_vector<datetime::DateTimeEntity *, ESPHOME_ENTITY_DATETIME_COUNT> datetimes_{}; StaticVector<datetime::DateTimeEntity *, ESPHOME_ENTITY_DATETIME_COUNT> datetimes_{};
#endif #endif
#ifdef USE_SELECT #ifdef USE_SELECT
static_vector<select::Select *, ESPHOME_ENTITY_SELECT_COUNT> selects_{}; StaticVector<select::Select *, ESPHOME_ENTITY_SELECT_COUNT> selects_{};
#endif #endif
#ifdef USE_TEXT #ifdef USE_TEXT
static_vector<text::Text *, ESPHOME_ENTITY_TEXT_COUNT> texts_{}; StaticVector<text::Text *, ESPHOME_ENTITY_TEXT_COUNT> texts_{};
#endif #endif
#ifdef USE_LOCK #ifdef USE_LOCK
static_vector<lock::Lock *, ESPHOME_ENTITY_LOCK_COUNT> locks_{}; StaticVector<lock::Lock *, ESPHOME_ENTITY_LOCK_COUNT> locks_{};
#endif #endif
#ifdef USE_VALVE #ifdef USE_VALVE
static_vector<valve::Valve *, ESPHOME_ENTITY_VALVE_COUNT> valves_{}; StaticVector<valve::Valve *, ESPHOME_ENTITY_VALVE_COUNT> valves_{};
#endif #endif
#ifdef USE_MEDIA_PLAYER #ifdef USE_MEDIA_PLAYER
static_vector<media_player::MediaPlayer *, ESPHOME_ENTITY_MEDIA_PLAYER_COUNT> media_players_{}; StaticVector<media_player::MediaPlayer *, ESPHOME_ENTITY_MEDIA_PLAYER_COUNT> media_players_{};
#endif #endif
#ifdef USE_ALARM_CONTROL_PANEL #ifdef USE_ALARM_CONTROL_PANEL
static_vector<alarm_control_panel::AlarmControlPanel *, ESPHOME_ENTITY_ALARM_CONTROL_PANEL_COUNT> StaticVector<alarm_control_panel::AlarmControlPanel *, ESPHOME_ENTITY_ALARM_CONTROL_PANEL_COUNT>
alarm_control_panels_{}; alarm_control_panels_{};
#endif #endif
#ifdef USE_UPDATE #ifdef USE_UPDATE
static_vector<update::UpdateEntity *, ESPHOME_ENTITY_UPDATE_COUNT> updates_{}; StaticVector<update::UpdateEntity *, ESPHOME_ENTITY_UPDATE_COUNT> updates_{};
#endif #endif
#ifdef USE_SOCKET_SELECT_SUPPORT #ifdef USE_SOCKET_SELECT_SUPPORT

2
esphome/core/helpers.h
View File

@@ -95,7 +95,7 @@ template<> constexpr int64_t byteswap(int64_t n) { return __builtin_bswap64(n);
///@{ ///@{
/// Minimal static vector - saves memory by avoiding std::vector overhead /// Minimal static vector - saves memory by avoiding std::vector overhead
template<typename T, size_t N> class static_vector { template<typename T, size_t N> class StaticVector {
public: public:
using value_type = T; using value_type = T;
using iterator = typename std::array<T, N>::iterator; using iterator = typename std::array<T, N>::iterator;