Merge 9f54e2ea30 into a90b6fb65f

fixes #192

base.yaml

@@ -49,6 +49,7 @@ api:
 
 ota:
   - platform: esphome
+    id: ratgdo_ota
 
 sensor:
   - platform: ratgdo

base_drycontact.yaml

@@ -29,6 +29,7 @@ ratgdo:
 
 ota:
   - platform: esphome
+    id: ratgdo_ota
 
 binary_sensor:
   - platform: ratgdo

base_secplusv1.yaml

@@ -32,6 +32,7 @@ ratgdo:
 
 ota:
   - platform: esphome
+    id: ratgdo_ota
 
 lock:
   - platform: ratgdo

components/ratgdo/cover/__init__.py

@@ -18,9 +18,13 @@ CoverOpeningTrigger = ratgdo_ns.class_(
 CoverClosingTrigger = ratgdo_ns.class_(
     "CoverClosingTrigger", automation.Trigger.template()
 )
+CoverStateTrigger = ratgdo_ns.class_(
+    "CoverStateTrigger", automation.Trigger.template()
+)
 
 CONF_ON_OPENING = "on_opening"
 CONF_ON_CLOSING = "on_closing"
+CONF_ON_STATE_CHANGE = "on_state_change"
 
 CONFIG_SCHEMA = cover.COVER_SCHEMA.extend(
     {
@@ -31,6 +35,9 @@ CONFIG_SCHEMA = cover.COVER_SCHEMA.extend(
         cv.Optional(CONF_ON_CLOSING): automation.validate_automation(
             {cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(CoverClosingTrigger)}
         ),
+        cv.Optional(CONF_ON_STATE_CHANGE): automation.validate_automation(
+            {cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(CoverStateTrigger)}
+        ),
     }
 ).extend(RATGDO_CLIENT_SCHMEA)
 
@@ -46,5 +53,8 @@ async def to_code(config):
     for conf in config.get(CONF_ON_CLOSING, []):
         trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], var)
         await automation.build_automation(trigger, [], conf)
+    for conf in config.get(CONF_ON_STATE_CHANGE, []):
+        trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], var)
+        await automation.build_automation(trigger, [], conf)
 
     await register_ratgdo_child(var, config)

components/ratgdo/cover/automation.h

@@ -31,5 +31,15 @@ namespace ratgdo {
         }
     };
 
+    class CoverStateTrigger : public Trigger<> {
+    public:
+        CoverStateTrigger(cover::Cover* a_cover)
+        {
+            a_cover->add_on_state_callback([this, a_cover]() {
+                this->trigger();
+            });
+        }
+    };
+
 } // namespace ratgdo
 } // namespace esphome