From 764968d8879d34cb25f729d856a28b4ddfd34375 Mon Sep 17 00:00:00 2001
From: Ryan Powell <powell.rg@gmail.com>
Date: Tue, 18 Jun 2024 13:42:22 -0600
Subject: [PATCH 1/2] Wait until WiFi is connected before starting the gdo
 loop.

---
 components/secplus_gdo/secplus_gdo.cpp | 16 ++++++++++++++--
 components/secplus_gdo/secplus_gdo.h   |  3 +++
 packages/wifi.yaml                     |  3 +++
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/components/secplus_gdo/secplus_gdo.cpp b/components/secplus_gdo/secplus_gdo.cpp
index ca9cb37..c0d8566 100644
--- a/components/secplus_gdo/secplus_gdo.cpp
+++ b/components/secplus_gdo/secplus_gdo.cpp
@@ -133,8 +133,20 @@ namespace secplus_gdo {
 
         gdo_init(&gdo_conf);
         gdo_get_status(&this->status_);
-        gdo_start(gdo_event_handler, this);
-        ESP_LOGI(TAG, "secplus GDO started!");
+        if (this->start_gdo_) {
+            gdo_start(gdo_event_handler, this);
+            ESP_LOGI(TAG, "secplus GDO started!");
+        } else {
+            // check every 500ms for readiness before starting GDO
+            this->set_interval("gdo_start", 500, [=]() {
+                if (this->start_gdo_) {
+                    gdo_start(gdo_event_handler, this);
+                    ESP_LOGI(TAG, "secplus GDO started!");
+                    this->cancel_interval("gdo_start");
+                }
+            });
+
+        }
     }
 
     void GDOComponent::dump_config() {
diff --git a/components/secplus_gdo/secplus_gdo.h b/components/secplus_gdo/secplus_gdo.h
index 4f16d7e..03f2065 100644
--- a/components/secplus_gdo/secplus_gdo.h
+++ b/components/secplus_gdo/secplus_gdo.h
@@ -33,6 +33,8 @@ namespace secplus_gdo {
         void loop() override {};
         void dump_config() override;
         void on_shutdown() override { gdo_deinit(); }
+        void start_gdo() { start_gdo_ = true; }
+
         // Use Late priority so we do not start the GDO lib until all saved preferences are loaded
         float get_setup_priority() const override { return setup_priority::LATE; }
 
@@ -103,6 +105,7 @@ namespace secplus_gdo {
         GDOSelect*                                   protocol_select_{nullptr};
         GDOSwitch*                                   learn_switch_{nullptr};
         GDOSwitch*                                   toggle_only_switch_{nullptr};
+        bool                                         start_gdo_{false};
 
     }; // GDOComponent
 } // namespace secplus_gdo
diff --git a/packages/wifi.yaml b/packages/wifi.yaml
index b1e1094..3f96451 100644
--- a/packages/wifi.yaml
+++ b/packages/wifi.yaml
@@ -1,4 +1,7 @@
 wifi:
+  on_connect:
+    lambda: id(gdo_blaq).start_gdo();
+
   # Enable fallback hotspot (captive portal) in case wifi connection fails
   ap:
 

From ed267db9440dd62c24aeb3c61ab365ac6bad6f89 Mon Sep 17 00:00:00 2001
From: Nate Clark <nate@nateclark.com>
Date: Tue, 18 Jun 2024 16:15:38 -0400
Subject: [PATCH 2/2] move wifi on_connect to secplus-gdo package

---
 packages/secplus-gdo.yaml | 4 ++++
 packages/wifi.yaml        | 3 ---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/secplus-gdo.yaml b/packages/secplus-gdo.yaml
index 0e30338..dcf75ce 100644
--- a/packages/secplus-gdo.yaml
+++ b/packages/secplus-gdo.yaml
@@ -152,3 +152,7 @@ number:
     type: rolling_code
     mode: box
     internal: true
+
+wifi:
+  on_connect:
+    lambda: id(gdo_blaq).start_gdo();
diff --git a/packages/wifi.yaml b/packages/wifi.yaml
index 3f96451..b1e1094 100644
--- a/packages/wifi.yaml
+++ b/packages/wifi.yaml
@@ -1,7 +1,4 @@
 wifi:
-  on_connect:
-    lambda: id(gdo_blaq).start_gdo();
-
   # Enable fallback hotspot (captive portal) in case wifi connection fails
   ap: