fix: automations play() method fixed

This commit is contained in:
GrKoR
2025-11-27 17:57:13 -08:00
parent 2e0c421c9f
commit efa0991dd0

View File

@@ -4,27 +4,37 @@
#include "esphome/core/automation.h" #include "esphome/core/automation.h"
#include "esphome/core/component.h" #include "esphome/core/component.h"
namespace esphome { namespace esphome
namespace aux_ac { {
namespace aux_ac
{
// **************************************** DISPLAY ACTIONS **************************************** // **************************************** DISPLAY ACTIONS ****************************************
template <typename... Ts> template <typename... Ts>
class AirConDisplayOffAction : public Action<Ts...> { class AirConDisplayOffAction : public Action<Ts...>
{
public: public:
explicit AirConDisplayOffAction(AirCon *ac) : ac_(ac) {} explicit AirConDisplayOffAction(AirCon *ac) : ac_(ac) {}
void play(Ts... x) override { this->ac_->displayOffSequence(); } void play(const Ts &...x) override
{
this->ac_->displayOffSequence();
}
protected: protected:
AirCon *ac_; AirCon *ac_;
}; };
template <typename... Ts> template <typename... Ts>
class AirConDisplayOnAction : public Action<Ts...> { class AirConDisplayOnAction : public Action<Ts...>
{
public: public:
explicit AirConDisplayOnAction(AirCon *ac) : ac_(ac) {} explicit AirConDisplayOnAction(AirCon *ac) : ac_(ac) {}
void play(Ts... x) override { this->ac_->displayOnSequence(); } void play(const Ts &...x) override
{
this->ac_->displayOnSequence();
}
protected: protected:
AirCon *ac_; AirCon *ac_;
@@ -32,92 +42,123 @@ class AirConDisplayOnAction : public Action<Ts...> {
// **************************************** VERTICAL LOUVER ACTIONS **************************************** // **************************************** VERTICAL LOUVER ACTIONS ****************************************
template <typename... Ts> template <typename... Ts>
class AirConVLouverSwingAction : public Action<Ts...> { class AirConVLouverSwingAction : public Action<Ts...>
{
public: public:
explicit AirConVLouverSwingAction(AirCon *ac) : ac_(ac) {} explicit AirConVLouverSwingAction(AirCon *ac) : ac_(ac) {}
void play(Ts... x) override { this->ac_->setVLouverSwingSequence(); } void play(const Ts &...x) override
{
this->ac_->setVLouverSwingSequence();
}
protected: protected:
AirCon *ac_; AirCon *ac_;
}; };
template <typename... Ts> template <typename... Ts>
class AirConVLouverStopAction : public Action<Ts...> { class AirConVLouverStopAction : public Action<Ts...>
{
public: public:
explicit AirConVLouverStopAction(AirCon *ac) : ac_(ac) {} explicit AirConVLouverStopAction(AirCon *ac) : ac_(ac) {}
void play(Ts... x) override { this->ac_->setVLouverStopSequence(); } void play(const Ts &...x) override
{
this->ac_->setVLouverStopSequence();
}
protected: protected:
AirCon *ac_; AirCon *ac_;
}; };
template <typename... Ts> template <typename... Ts>
class AirConVLouverTopAction : public Action<Ts...> { class AirConVLouverTopAction : public Action<Ts...>
{
public: public:
explicit AirConVLouverTopAction(AirCon *ac) : ac_(ac) {} explicit AirConVLouverTopAction(AirCon *ac) : ac_(ac) {}
void play(Ts... x) override { this->ac_->setVLouverTopSequence(); } void play(const Ts &...x) override
{
this->ac_->setVLouverTopSequence();
}
protected: protected:
AirCon *ac_; AirCon *ac_;
}; };
template <typename... Ts> template <typename... Ts>
class AirConVLouverMiddleAboveAction : public Action<Ts...> { class AirConVLouverMiddleAboveAction : public Action<Ts...>
{
public: public:
explicit AirConVLouverMiddleAboveAction(AirCon *ac) : ac_(ac) {} explicit AirConVLouverMiddleAboveAction(AirCon *ac) : ac_(ac) {}
void play(Ts... x) override { this->ac_->setVLouverMiddleAboveSequence(); } void play(const Ts &...x) override
{
this->ac_->setVLouverMiddleAboveSequence();
}
protected: protected:
AirCon *ac_; AirCon *ac_;
}; };
template <typename... Ts> template <typename... Ts>
class AirConVLouverMiddleAction : public Action<Ts...> { class AirConVLouverMiddleAction : public Action<Ts...>
{
public: public:
explicit AirConVLouverMiddleAction(AirCon *ac) : ac_(ac) {} explicit AirConVLouverMiddleAction(AirCon *ac) : ac_(ac) {}
void play(Ts... x) override { this->ac_->setVLouverMiddleSequence(); } void play(const Ts &...x) override
{
this->ac_->setVLouverMiddleSequence();
}
protected: protected:
AirCon *ac_; AirCon *ac_;
}; };
template <typename... Ts> template <typename... Ts>
class AirConVLouverMiddleBelowAction : public Action<Ts...> { class AirConVLouverMiddleBelowAction : public Action<Ts...>
{
public: public:
explicit AirConVLouverMiddleBelowAction(AirCon *ac) : ac_(ac) {} explicit AirConVLouverMiddleBelowAction(AirCon *ac) : ac_(ac) {}
void play(Ts... x) override { this->ac_->setVLouverMiddleBelowSequence(); } void play(const Ts &...x) override
{
this->ac_->setVLouverMiddleBelowSequence();
}
protected: protected:
AirCon *ac_; AirCon *ac_;
}; };
template <typename... Ts> template <typename... Ts>
class AirConVLouverBottomAction : public Action<Ts...> { class AirConVLouverBottomAction : public Action<Ts...>
{
public: public:
explicit AirConVLouverBottomAction(AirCon *ac) : ac_(ac) {} explicit AirConVLouverBottomAction(AirCon *ac) : ac_(ac) {}
void play(Ts... x) override { this->ac_->setVLouverBottomSequence(); } void play(const Ts &...x) override
{
this->ac_->setVLouverBottomSequence();
}
protected: protected:
AirCon *ac_; AirCon *ac_;
}; };
template <typename... Ts> template <typename... Ts>
class AirConVLouverSetAction : public Action<Ts...> { class AirConVLouverSetAction : public Action<Ts...>
{
public: public:
AirConVLouverSetAction(AirCon *ac) : ac_(ac) {}
TEMPLATABLE_VALUE(uint8_t, value); TEMPLATABLE_VALUE(uint8_t, value);
void play(Ts... x) { AirConVLouverSetAction(AirCon *ac) : ac_(ac) {};
void play(const Ts &...x) override
{
vlpos_ = this->value_.value(x...); vlpos_ = this->value_.value(x...);
this->ac_->setVLouverFrontendSequence((ac_vlouver_frontend)vlpos_); this->ac_->setVLouverFrontendSequence((ac_vlouver_frontend)vlpos_);
} };
protected: protected:
AirCon *ac_; AirCon *ac_;
@@ -126,22 +167,29 @@ class AirConVLouverSetAction : public Action<Ts...> {
// **************************************** SEND TEST PACKET ACTION **************************************** // **************************************** SEND TEST PACKET ACTION ****************************************
template <typename... Ts> template <typename... Ts>
class AirConSendTestPacketAction : public Action<Ts...> { class AirConSendTestPacketAction : public Action<Ts...>
{
public: public:
explicit AirConSendTestPacketAction(AirCon *ac) : ac_(ac) {} explicit AirConSendTestPacketAction(AirCon *ac) : ac_(ac) {}
void set_data_template(std::function<std::vector<uint8_t>(Ts...)> func) { void set_data_template(std::function<std::vector<uint8_t>(Ts...)> func)
{
this->data_func_ = func; this->data_func_ = func;
this->static_ = false; this->static_ = false;
} }
void set_data_static(const std::vector<uint8_t> &data) { void set_data_static(const std::vector<uint8_t> &data)
{
this->data_static_ = data; this->data_static_ = data;
this->static_ = true; this->static_ = true;
} }
void play(Ts... x) override { void play(const Ts &...x) override
if (this->static_) { {
if (this->static_)
{
this->ac_->sendTestPacket(this->data_static_); this->ac_->sendTestPacket(this->data_static_);
} else { }
else
{
auto val = this->data_func_(x...); auto val = this->data_func_(x...);
this->ac_->sendTestPacket(val); this->ac_->sendTestPacket(val);
} }
@@ -156,23 +204,30 @@ class AirConSendTestPacketAction : public Action<Ts...> {
// **************************************** POWER LIMITATION ACTIONS **************************************** // **************************************** POWER LIMITATION ACTIONS ****************************************
template <typename... Ts> template <typename... Ts>
class AirConPowerLimitationOffAction : public Action<Ts...> { class AirConPowerLimitationOffAction : public Action<Ts...>
{
public: public:
explicit AirConPowerLimitationOffAction(AirCon *ac) : ac_(ac) {} explicit AirConPowerLimitationOffAction(AirCon *ac) : ac_(ac) {}
void play(Ts... x) override { this->ac_->powerLimitationOffSequence(); } void play(const Ts &...x) override
{
this->ac_->powerLimitationOffSequence();
}
protected: protected:
AirCon *ac_; AirCon *ac_;
}; };
template <typename... Ts> template <typename... Ts>
class AirConPowerLimitationOnAction : public Action<Ts...> { class AirConPowerLimitationOnAction : public Action<Ts...>
{
public: public:
AirConPowerLimitationOnAction(AirCon *ac) : ac_(ac) {}
TEMPLATABLE_VALUE(uint8_t, value); TEMPLATABLE_VALUE(uint8_t, value);
void play(Ts... x) { AirConPowerLimitationOnAction(AirCon *ac) : ac_(ac) {};
void play(const Ts &...x) override
{
this->pwr_lim_ = this->value_.value(x...); this->pwr_lim_ = this->value_.value(x...);
this->ac_->powerLimitationOnSequence(this->pwr_lim_); this->ac_->powerLimitationOnSequence(this->pwr_lim_);
} }