fix: automations play() method fixed

fix: removed module dependency"
fix: python code generator fix for custom presets & custom fan modes
2025-12-30 19:38:24 +03:00 · 2025-11-27 17:57:13 -08:00 · 2025-11-26 23:28:20 -08:00 · 2025-11-26 21:14:46 -08:00
2 changed files with 216 additions and 144 deletions
--- a/components/aux_ac/automation.h
+++ b/components/aux_ac/automation.h
@@ -4,183 +4,238 @@
 #include "esphome/core/automation.h"
 #include "esphome/core/component.h"

-namespace esphome {
-namespace aux_ac {
+namespace esphome
+{
+    namespace aux_ac
+    {

-// **************************************** DISPLAY ACTIONS ****************************************
-template <typename... Ts>
-class AirConDisplayOffAction : public Action<Ts...> {
-   public:
-    explicit AirConDisplayOffAction(AirCon *ac) : ac_(ac) {}
+        // **************************************** DISPLAY ACTIONS ****************************************
+        template <typename... Ts>
+        class AirConDisplayOffAction : public Action<Ts...>
+        {
+        public:
+            explicit AirConDisplayOffAction(AirCon *ac) : ac_(ac) {}

-    void play(Ts... x) override { this->ac_->displayOffSequence(); }
+            void play(const Ts &...x) override
+            {
+                this->ac_->displayOffSequence();
+            }

-   protected:
-    AirCon *ac_;
-};
+        protected:
+            AirCon *ac_;
+        };

-template <typename... Ts>
-class AirConDisplayOnAction : public Action<Ts...> {
-   public:
-    explicit AirConDisplayOnAction(AirCon *ac) : ac_(ac) {}
+        template <typename... Ts>
+        class AirConDisplayOnAction : public Action<Ts...>
+        {
+        public:
+            explicit AirConDisplayOnAction(AirCon *ac) : ac_(ac) {}

-    void play(Ts... x) override { this->ac_->displayOnSequence(); }
+            void play(const Ts &...x) override
+            {
+                this->ac_->displayOnSequence();
+            }

-   protected:
-    AirCon *ac_;
-};
+        protected:
+            AirCon *ac_;
+        };

-// **************************************** VERTICAL LOUVER ACTIONS ****************************************
-template <typename... Ts>
-class AirConVLouverSwingAction : public Action<Ts...> {
-   public:
-    explicit AirConVLouverSwingAction(AirCon *ac) : ac_(ac) {}
+        // **************************************** VERTICAL LOUVER ACTIONS ****************************************
+        template <typename... Ts>
+        class AirConVLouverSwingAction : public Action<Ts...>
+        {
+        public:
+            explicit AirConVLouverSwingAction(AirCon *ac) : ac_(ac) {}

-    void play(Ts... x) override { this->ac_->setVLouverSwingSequence(); }
+            void play(const Ts &...x) override
+            {
+                this->ac_->setVLouverSwingSequence();
+            }

-   protected:
-    AirCon *ac_;
-};
+        protected:
+            AirCon *ac_;
+        };

-template <typename... Ts>
-class AirConVLouverStopAction : public Action<Ts...> {
-   public:
-    explicit AirConVLouverStopAction(AirCon *ac) : ac_(ac) {}
+        template <typename... Ts>
+        class AirConVLouverStopAction : public Action<Ts...>
+        {
+        public:
+            explicit AirConVLouverStopAction(AirCon *ac) : ac_(ac) {}

-    void play(Ts... x) override { this->ac_->setVLouverStopSequence(); }
+            void play(const Ts &...x) override
+            {
+                this->ac_->setVLouverStopSequence();
+            }

-   protected:
-    AirCon *ac_;
-};
+        protected:
+            AirCon *ac_;
+        };

-template <typename... Ts>
-class AirConVLouverTopAction : public Action<Ts...> {
-   public:
-    explicit AirConVLouverTopAction(AirCon *ac) : ac_(ac) {}
+        template <typename... Ts>
+        class AirConVLouverTopAction : public Action<Ts...>
+        {
+        public:
+            explicit AirConVLouverTopAction(AirCon *ac) : ac_(ac) {}

-    void play(Ts... x) override { this->ac_->setVLouverTopSequence(); }
+            void play(const Ts &...x) override
+            {
+                this->ac_->setVLouverTopSequence();
+            }

-   protected:
-    AirCon *ac_;
-};
+        protected:
+            AirCon *ac_;
+        };

-template <typename... Ts>
-class AirConVLouverMiddleAboveAction : public Action<Ts...> {
-   public:
-    explicit AirConVLouverMiddleAboveAction(AirCon *ac) : ac_(ac) {}
+        template <typename... Ts>
+        class AirConVLouverMiddleAboveAction : public Action<Ts...>
+        {
+        public:
+            explicit AirConVLouverMiddleAboveAction(AirCon *ac) : ac_(ac) {}

-    void play(Ts... x) override { this->ac_->setVLouverMiddleAboveSequence(); }
+            void play(const Ts &...x) override
+            {
+                this->ac_->setVLouverMiddleAboveSequence();
+            }

-   protected:
-    AirCon *ac_;
-};
+        protected:
+            AirCon *ac_;
+        };

-template <typename... Ts>
-class AirConVLouverMiddleAction : public Action<Ts...> {
-   public:
-    explicit AirConVLouverMiddleAction(AirCon *ac) : ac_(ac) {}
+        template <typename... Ts>
+        class AirConVLouverMiddleAction : public Action<Ts...>
+        {
+        public:
+            explicit AirConVLouverMiddleAction(AirCon *ac) : ac_(ac) {}

-    void play(Ts... x) override { this->ac_->setVLouverMiddleSequence(); }
+            void play(const Ts &...x) override
+            {
+                this->ac_->setVLouverMiddleSequence();
+            }

-   protected:
-    AirCon *ac_;
-};
+        protected:
+            AirCon *ac_;
+        };

-template <typename... Ts>
-class AirConVLouverMiddleBelowAction : public Action<Ts...> {
-   public:
-    explicit AirConVLouverMiddleBelowAction(AirCon *ac) : ac_(ac) {}
+        template <typename... Ts>
+        class AirConVLouverMiddleBelowAction : public Action<Ts...>
+        {
+        public:
+            explicit AirConVLouverMiddleBelowAction(AirCon *ac) : ac_(ac) {}

-    void play(Ts... x) override { this->ac_->setVLouverMiddleBelowSequence(); }
+            void play(const Ts &...x) override
+            {
+                this->ac_->setVLouverMiddleBelowSequence();
+            }

-   protected:
-    AirCon *ac_;
-};
+        protected:
+            AirCon *ac_;
+        };

-template <typename... Ts>
-class AirConVLouverBottomAction : public Action<Ts...> {
-   public:
-    explicit AirConVLouverBottomAction(AirCon *ac) : ac_(ac) {}
+        template <typename... Ts>
+        class AirConVLouverBottomAction : public Action<Ts...>
+        {
+        public:
+            explicit AirConVLouverBottomAction(AirCon *ac) : ac_(ac) {}

-    void play(Ts... x) override { this->ac_->setVLouverBottomSequence(); }
+            void play(const Ts &...x) override
+            {
+                this->ac_->setVLouverBottomSequence();
+            }

-   protected:
-    AirCon *ac_;
-};
+        protected:
+            AirCon *ac_;
+        };

-template <typename... Ts>
-class AirConVLouverSetAction : public Action<Ts...> {
-   public:
-    AirConVLouverSetAction(AirCon *ac) : ac_(ac) {}
-    TEMPLATABLE_VALUE(uint8_t, value);
+        template <typename... Ts>
+        class AirConVLouverSetAction : public Action<Ts...>
+        {
+        public:
+            TEMPLATABLE_VALUE(uint8_t, value);

-    void play(Ts... x) {
-        vlpos_ = this->value_.value(x...);
-        this->ac_->setVLouverFrontendSequence((ac_vlouver_frontend)vlpos_);
-    }
+            AirConVLouverSetAction(AirCon *ac) : ac_(ac) {};

-   protected:
-    AirCon *ac_;
-    uint8_t vlpos_;
-};
+            void play(const Ts &...x) override
+            {
+                vlpos_ = this->value_.value(x...);
+                this->ac_->setVLouverFrontendSequence((ac_vlouver_frontend)vlpos_);
+            };

-// **************************************** SEND TEST PACKET ACTION ****************************************
-template <typename... Ts>
-class AirConSendTestPacketAction : public Action<Ts...> {
-   public:
-    explicit AirConSendTestPacketAction(AirCon *ac) : ac_(ac) {}
-    void set_data_template(std::function<std::vector<uint8_t>(Ts...)> func) {
-        this->data_func_ = func;
-        this->static_ = false;
-    }
-    void set_data_static(const std::vector<uint8_t> &data) {
-        this->data_static_ = data;
-        this->static_ = true;
-    }
+        protected:
+            AirCon *ac_;
+            uint8_t vlpos_;
+        };

-    void play(Ts... x) override {
-        if (this->static_) {
-            this->ac_->sendTestPacket(this->data_static_);
-        } else {
-            auto val = this->data_func_(x...);
-            this->ac_->sendTestPacket(val);
-        }
-    }
+        // **************************************** SEND TEST PACKET ACTION ****************************************
+        template <typename... Ts>
+        class AirConSendTestPacketAction : public Action<Ts...>
+        {
+        public:
+            explicit AirConSendTestPacketAction(AirCon *ac) : ac_(ac) {}
+            void set_data_template(std::function<std::vector<uint8_t>(Ts...)> func)
+            {
+                this->data_func_ = func;
+                this->static_ = false;
+            }
+            void set_data_static(const std::vector<uint8_t> &data)
+            {
+                this->data_static_ = data;
+                this->static_ = true;
+            }

-   protected:
-    AirCon *ac_;
-    bool static_{false};
-    std::function<std::vector<uint8_t>(Ts...)> data_func_{};
-    std::vector<uint8_t> data_static_{};
-};
+            void play(const Ts &...x) override
+            {
+                if (this->static_)
+                {
+                    this->ac_->sendTestPacket(this->data_static_);
+                }
+                else
+                {
+                    auto val = this->data_func_(x...);
+                    this->ac_->sendTestPacket(val);
+                }
+            }

-// **************************************** POWER LIMITATION ACTIONS ****************************************
-template <typename... Ts>
-class AirConPowerLimitationOffAction : public Action<Ts...> {
-   public:
-    explicit AirConPowerLimitationOffAction(AirCon *ac) : ac_(ac) {}
+        protected:
+            AirCon *ac_;
+            bool static_{false};
+            std::function<std::vector<uint8_t>(Ts...)> data_func_{};
+            std::vector<uint8_t> data_static_{};
+        };

-    void play(Ts... x) override { this->ac_->powerLimitationOffSequence(); }
+        // **************************************** POWER LIMITATION ACTIONS ****************************************
+        template <typename... Ts>
+        class AirConPowerLimitationOffAction : public Action<Ts...>
+        {
+        public:
+            explicit AirConPowerLimitationOffAction(AirCon *ac) : ac_(ac) {}

-   protected:
-    AirCon *ac_;
-};
+            void play(const Ts &...x) override
+            {
+                this->ac_->powerLimitationOffSequence();
+            }

-template <typename... Ts>
-class AirConPowerLimitationOnAction : public Action<Ts...> {
-   public:
-    AirConPowerLimitationOnAction(AirCon *ac) : ac_(ac) {}
-    TEMPLATABLE_VALUE(uint8_t, value);
+        protected:
+            AirCon *ac_;
+        };

-    void play(Ts... x) {
-        this->pwr_lim_ = this->value_.value(x...);
-        this->ac_->powerLimitationOnSequence(this->pwr_lim_);
-    }
+        template <typename... Ts>
+        class AirConPowerLimitationOnAction : public Action<Ts...>
+        {
+        public:
+            TEMPLATABLE_VALUE(uint8_t, value);

-   protected:
-    AirCon *ac_;
-    uint8_t pwr_lim_;
-};
+            AirConPowerLimitationOnAction(AirCon *ac) : ac_(ac) {};

-}  // namespace aux_ac
-}  // namespace esphome
+            void play(const Ts &...x) override
+            {
+                this->pwr_lim_ = this->value_.value(x...);
+                this->ac_->powerLimitationOnSequence(this->pwr_lim_);
+            }
+
+        protected:
+            AirCon *ac_;
+            uint8_t pwr_lim_;
+        };
+
+    } // namespace aux_ac
+} // namespace esphome
--- a/components/aux_ac/climate.py
+++ b/components/aux_ac/climate.py
@@ -26,6 +26,7 @@ from esphome.const import (
    DEVICE_CLASS_TEMPERATURE,
    DEVICE_CLASS_POWER_FACTOR,
    STATE_CLASS_MEASUREMENT,
+    __version__
 )
 from esphome.components.climate import (
    ClimateMode,
@@ -127,6 +128,12 @@ AirConPowerLimitationOnAction = aux_ac_ns.class_(
 )


+def use_new_api():
+    esphome_current_version = tuple(map(int, __version__.split('.')))
+    esphome_bc_version = tuple(map(int, "2025.11.0".split('.')))
+    return esphome_current_version >= esphome_bc_version
+
+
 def validate_packet_timeout(value):
    minV = AC_PACKET_TIMEOUT_MIN
    maxV = AC_PACKET_TIMEOUT_MAX
@@ -426,10 +433,20 @@ async def to_code(config):
        cg.add(var.set_supported_swing_modes(config[CONF_SUPPORTED_SWING_MODES]))
    if CONF_SUPPORTED_PRESETS in config:
        cg.add(var.set_supported_presets(config[CONF_SUPPORTED_PRESETS]))
-    if CONF_CUSTOM_PRESETS in config:
-        cg.add(var.set_custom_presets(config[CONF_CUSTOM_PRESETS]))
-    if CONF_CUSTOM_FAN_MODES in config:
-        cg.add(var.set_custom_fan_modes(config[CONF_CUSTOM_FAN_MODES]))
+    if use_new_api():
+        if CONF_CUSTOM_PRESETS in config:
+            presets = config[CONF_CUSTOM_PRESETS]
+            c_str_presets = [cg.RawExpression(f"aux_ac::Constants::{p}.c_str()") for p in presets]
+            cg.add(var.set_custom_presets(c_str_presets))
+        if CONF_CUSTOM_FAN_MODES in config:
+            fan_modes = config[CONF_CUSTOM_FAN_MODES]
+            c_str_fan_modes = [cg.RawExpression(f"aux_ac::Constants::{p}.c_str()") for p in fan_modes]
+            cg.add(var.set_custom_fan_modes(c_str_fan_modes))
+    else:
+        if CONF_CUSTOM_PRESETS in config:
+            cg.add(var.set_custom_presets(config[CONF_CUSTOM_PRESETS]))
+        if CONF_CUSTOM_FAN_MODES in config:
+            cg.add(var.set_custom_fan_modes(config[CONF_CUSTOM_FAN_MODES]))


 DISPLAY_ACTION_SCHEMA = maybe_simple_id(
Author	SHA1	Message	Date
GrKoR	efa0991dd0	fix: automations play() method fixed	2025-11-27 17:57:13 -08:00
GrKoR	2e0c421c9f	fix: removed module dependency"	2025-11-26 23:28:20 -08:00
GrKoR	53414d8ab4	fix: python code generator fix for custom presets & custom fan modes	2025-11-26 21:14:46 -08:00