Merge 9f54e2ea30 into f721a72b47

Co-authored-by: Flavio Fernandes <flavio@flaviof.com>

base.yaml

@@ -6,6 +6,8 @@ external_components:
       url: https://github.com/ratgdo/esphome-ratgdo
     refresh: 1s
 
+safe_mode:
+
 preferences:
   flash_write_interval: 1min
 
@@ -45,6 +47,9 @@ api:
             id($id_prefix).clear_paired_devices(ratgdo::PairedDevice::ACCESSORY);
           }
 
+ota:
+  - platform: esphome
+
 sensor:
   - platform: ratgdo
     id: ${id_prefix}_openings

base_drycontact.yaml

@@ -8,6 +8,8 @@ external_components:
       url: https://github.com/ratgdo/esphome-ratgdo
     refresh: 1s
 
+safe_mode:
+
 preferences:
   flash_write_interval: 1min
 
@@ -25,6 +27,9 @@ ratgdo:
   discrete_close_pin: ${discrete_close_pin}
   protocol: drycontact
 
+ota:
+  - platform: esphome
+
 binary_sensor:
   - platform: ratgdo
     type: obstruction

base_secplusv1.yaml

@@ -6,6 +6,8 @@ external_components:
       url: https://github.com/ratgdo/esphome-ratgdo
     refresh: 1s
 
+safe_mode:
+
 preferences:
   flash_write_interval: 1min
 
@@ -28,6 +30,9 @@ ratgdo:
             message: "Failed to communicate with garage opener on startup."
             notification_id: "esphome_ratgdo_${id_prefix}_sync_failed"
 
+ota:
+  - platform: esphome
+
 lock:
   - platform: ratgdo
     id: ${id_prefix}_lock_remotes

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

static/v25board_esp32_d1_mini.yaml

@@ -41,8 +41,6 @@ time:
 api:
   id: api_server
 
-ota:
-
 improv_serial:
 
 wifi:

static/v25board_esp32_d1_mini_secplusv1.yaml

@@ -41,8 +41,6 @@ time:
 api:
   id: api_server
 
-ota:
-
 improv_serial:
 
 wifi:

static/v25board_esp8266_d1_mini.yaml

@@ -42,8 +42,6 @@ time:
 api:
   id: api_server
 
-ota:
-
 improv_serial:
 
 wifi:

static/v25board_esp8266_d1_mini_lite.yaml

@@ -42,8 +42,6 @@ time:
 api:
   id: api_server
 
-ota:
-
 improv_serial:
 
 wifi:

static/v25board_esp8266_d1_mini_lite_secplusv1.yaml

@@ -42,8 +42,6 @@ time:
 api:
   id: api_server
 
-ota:
-
 improv_serial:
 
 wifi:

static/v25board_esp8266_d1_mini_secplusv1.yaml

@@ -42,8 +42,6 @@ time:
 api:
   id: api_server
 
-ota:
-
 improv_serial:
 
 wifi:

static/v25iboard.yaml

@@ -42,8 +42,6 @@ time:
 api:
   id: api_server
 
-ota:
-
 improv_serial:
 
 wifi:

static/v25iboard_drycontact.yaml

@@ -42,8 +42,6 @@ time:
 api:
   id: api_server
 
-ota:
-
 improv_serial:
 
 wifi:

static/v25iboard_secplusv1.yaml

@@ -42,8 +42,6 @@ time:
 api:
   id: api_server
 
-ota:
-
 improv_serial:
 
 wifi:

static/v2board_esp32_d1_mini.yaml

@@ -41,8 +41,6 @@ time:
 api:
   id: api_server
 
-ota:
-
 improv_serial:
 
 wifi:

static/v2board_esp32_lolin_s2_mini.yaml

@@ -41,8 +41,6 @@ time:
 api:
   id: api_server
 
-ota:
-
 improv_serial:
 
 wifi:

static/v2board_esp8266_d1_mini.yaml

@@ -42,8 +42,6 @@ time:
 api:
   id: api_server
 
-ota:
-
 improv_serial:
 
 wifi:

static/v2board_esp8266_d1_mini_lite.yaml

@@ -42,8 +42,6 @@ time:
 api:
   id: api_server
 
-ota:
-
 improv_serial:
 
 wifi: