sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-10-19 10:13:49 +01:00
Code Issues Releases Wiki Activity

Merge branch 'fixed_vectors_for_automations' into integration

Browse Source
This commit is contained in:
J. Nick Koston
2025-10-14 09:38:54 -10:00
parent 577f9a39f4 793e75a093
commit 07fd35a7a0
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
esphome/core/base_automation.h
View File

@@ -7,6 +7,7 @@
#include "esphome/core/preferences.h" #include "esphome/core/preferences.h"
#include "esphome/core/scheduler.h" #include "esphome/core/scheduler.h"
#include "esphome/core/application.h" #include "esphome/core/application.h"
#include "esphome/core/helpers.h"
#include <vector> #include <vector>
@@ -14,7 +15,7 @@ namespace esphome {
template<typename... Ts> class AndCondition : public Condition<Ts...> { template<typename... Ts> class AndCondition : public Condition<Ts...> {
public: public:
explicit AndCondition(const std::vector<Condition<Ts...> *> &conditions) : conditions_(conditions) {} explicit AndCondition(std::initializer_list<Condition<Ts...> *> conditions) : conditions_(conditions) {}
bool check(Ts... x) override { bool check(Ts... x) override {
for (auto *condition : this->conditions_) { for (auto *condition : this->conditions_) {
if (!condition->check(x...)) if (!condition->check(x...))
@@ -25,12 +26,12 @@ template<typename... Ts> class AndCondition : public Condition<Ts...> {
} }
protected: protected:
std::vector<Condition<Ts...> *> conditions_; FixedVector<Condition<Ts...> *> conditions_;
}; };
template<typename... Ts> class OrCondition : public Condition<Ts...> { template<typename... Ts> class OrCondition : public Condition<Ts...> {
public: public:
explicit OrCondition(const std::vector<Condition<Ts...> *> &conditions) : conditions_(conditions) {} explicit OrCondition(std::initializer_list<Condition<Ts...> *> conditions) : conditions_(conditions) {}
bool check(Ts... x) override { bool check(Ts... x) override {
for (auto *condition : this->conditions_) { for (auto *condition : this->conditions_) {
if (condition->check(x...)) if (condition->check(x...))
@@ -41,7 +42,7 @@ template<typename... Ts> class OrCondition : public Condition<Ts...> {
} }
protected: protected:
std::vector<Condition<Ts...> *> conditions_; FixedVector<Condition<Ts...> *> conditions_;
}; };
template<typename... Ts> class NotCondition : public Condition<Ts...> { template<typename... Ts> class NotCondition : public Condition<Ts...> {
@@ -55,7 +56,7 @@ template<typename... Ts> class NotCondition : public Condition<Ts...> {
template<typename... Ts> class XorCondition : public Condition<Ts...> { template<typename... Ts> class XorCondition : public Condition<Ts...> {
public: public:
explicit XorCondition(const std::vector<Condition<Ts...> *> &conditions) : conditions_(conditions) {} explicit XorCondition(std::initializer_list<Condition<Ts...> *> conditions) : conditions_(conditions) {}
bool check(Ts... x) override { bool check(Ts... x) override {
size_t result = 0; size_t result = 0;
for (auto *condition : this->conditions_) { for (auto *condition : this->conditions_) {
@@ -66,7 +67,7 @@ template<typename... Ts> class XorCondition : public Condition<Ts...> {
} }
protected: protected:
std::vector<Condition<Ts...> *> conditions_; FixedVector<Condition<Ts...> *> conditions_;
}; };
template<typename... Ts> class LambdaCondition : public Condition<Ts...> { template<typename... Ts> class LambdaCondition : public Condition<Ts...> {