From abe263ecf7fe23caf8e99e8c136614f1723f3116 Mon Sep 17 00:00:00 2001
From: Nick Whyte <nick@nickwhyte.com>
Date: Mon, 1 Nov 2021 07:55:26 +1100
Subject: [PATCH] continue iterating map when next blind code to be sent

---
 home-assistant/313a/esphome/raex_blind_tx.h | 88 +++++++++++----------
 1 file changed, 45 insertions(+), 43 deletions(-)

diff --git a/home-assistant/313a/esphome/raex_blind_tx.h b/home-assistant/313a/esphome/raex_blind_tx.h
index 19197b61..da8b8ede 100644
--- a/home-assistant/313a/esphome/raex_blind_tx.h
+++ b/home-assistant/313a/esphome/raex_blind_tx.h
@@ -13,7 +13,7 @@
 #define TRANSMIT_RETRY_DELAY_MS 1000
 
 #define CLOCK_WIDTH 330
-#define LOCKOUT_DELAY_MS 200
+#define LOCKOUT_DELAY_MS 400
 
 static const char *TAG = "raex_blind_tx";
 
@@ -68,6 +68,8 @@ class RaexBlindTransmitComponent : public Component, public CustomAPIDevice {
     std::map<uint32_t, RaexMessage*> pending_messages;
     int lockout_until = 0;
 
+    std::map<uint32_t, RaexMessage*>::iterator pending_messages_iter = pending_messages.begin();
+
   public:
 
     void setup() override {
@@ -82,51 +84,51 @@ class RaexBlindTransmitComponent : public Component, public CustomAPIDevice {
     }
 
     void loop() override {
-      if (!pending_messages.empty()) {
-        int now = millis();
-        if (lockout_until > now) {
-          // To avoid trasmissions which are sent nearby to improve successful transmission.
-          return;
-        }
+      int now = millis();
+      if (lockout_until > now) {
+        // To avoid trasmissions which are sent nearby to improve successful transmission.
+        return;
+      }
+      
+      if (pending_messages.empty()) {
+        return;
+      }
 
-        // Check for pending messages
-        for (auto it = pending_messages.begin(); it != pending_messages.end(); it++) {
-          auto key = it->first;
-          auto msg = it->second;
-
-          if (msg->execute_time <= now) {
-            ESP_LOGD(TAG, "Executing send for [%d,%d,%d] [retries: %d, blocks: %d]",
-              msg->remote_id, msg->channel_id, msg->action_id, msg->retries_remain, msg->blocks_remain);
-
-            txPrepare(TX_PIN, 200, CLOCK_WIDTH);
-            txRaexSend(TX_PIN, msg->remote_id, msg->channel_id, msg->action_id, CLOCK_WIDTH);
-            lockout_until = millis() + LOCKOUT_DELAY_MS;
-
-            if (msg->retries_remain > 0) {
-              // Schedule next retry
-              msg->retries_remain--;
-              msg->execute_time = now + TRANSMIT_RETRY_DELAY_MS;
-              return;
-            }
-
-            if (msg->blocks_remain > 0) {
-              // Schedule next block
-              msg->blocks_remain--;
-              msg->retries_remain = TRANSMIT_RETRIES - 1;
-              msg->execute_time = now + TRANSMIT_BLOCKS_DELAY_MS;
-              return;
-            }
-
-
-            // No retries or blocks remain, remove from pending messages
-            ESP_LOGD(TAG, "No retries or blocks remain for [%d,%d,%d], removing",
-              msg->remote_id, msg->channel_id, msg->action_id);
-            pending_messages.erase(it);
-            delete msg;
-            return;
-          }
+      if (pending_messages_iter == pending_messages.end()) {
+        pending_messages_iter = pending_messages.begin();
+      }
+
+      auto key = pending_messages_iter->first;
+      auto msg = pending_messages_iter->second;
+
+      if (msg->execute_time <= now) {
+        ESP_LOGD(TAG, "Executing send for [%d,%d,%d] [retries: %d, blocks: %d] (%d)",
+          msg->remote_id, msg->channel_id, msg->action_id, msg->retries_remain, msg->blocks_remain, now);
+
+        txPrepare(TX_PIN, 200, CLOCK_WIDTH);
+        txRaexSend(TX_PIN, msg->remote_id, msg->channel_id, msg->action_id, CLOCK_WIDTH);
+
+        if (msg->retries_remain > 0) {
+          // Schedule next retry
+          msg->retries_remain--;
+          msg->execute_time = now + TRANSMIT_RETRY_DELAY_MS;
+        } else if (msg->blocks_remain > 0) {
+          // Schedule next block
+          msg->blocks_remain--;
+          msg->retries_remain = TRANSMIT_RETRIES - 1;
+          msg->execute_time = now + TRANSMIT_BLOCKS_DELAY_MS;
+        } else {
+          // No retries or blocks remain, remove from pending messages
+          ESP_LOGD(TAG, "No retries or blocks remain for [%d,%d,%d], removing",
+            msg->remote_id, msg->channel_id, msg->action_id);
+          pending_messages.erase(pending_messages_iter);
+          delete msg;
         }
+        
+        lockout_until = millis() + LOCKOUT_DELAY_MS;
       }
+
+      pending_messages_iter++;;
     }
 
     void transmit(int remote_id, int channel_id, std::string action) {