From 6bec8cef5a138f4f33bbf878a56a2b15f1422e9f Mon Sep 17 00:00:00 2001
From: Arne Schwabe <arne@rfc2549.org>
Date: Sun, 16 Oct 2016 22:17:11 +0200
Subject: [PATCH] Stop bind on bind response received

---
 radio/src/gui/212x64/model_setup.cpp | 7 +++++++
 radio/src/telemetry/spektrum.cpp     | 6 ++++++
 radio/src/telemetry/spektrum.h       | 1 +
 3 files changed, 14 insertions(+)

diff --git a/radio/src/gui/212x64/model_setup.cpp b/radio/src/gui/212x64/model_setup.cpp
index d32649b91..2f60ad74e 100644
--- a/radio/src/gui/212x64/model_setup.cpp
+++ b/radio/src/gui/212x64/model_setup.cpp
@@ -929,6 +929,12 @@ void menuModelSetup(event_t event)
             lcdDrawText(MODEL_SETUP_2ND_COLUMN+xOffsetBind, y, STR_MODULE_BIND, l_posHorz==1 ? attr : 0);
             lcdDrawText(MODEL_SETUP_2ND_COLUMN+MODEL_SETUP_RANGE_OFS+xOffsetBind, y, STR_MODULE_RANGE, l_posHorz==2 ? attr : 0);
             uint8_t newFlag = 0;
+#if defined(MULTIMODULE)
+            if (spektrumBindFinished) {
+               spektrumBindFinished = false;
+               s_editMode=0;
+            }
+#endif
             if (attr && l_posHorz>0 && s_editMode>0) {
               if (l_posHorz == 1)
                 newFlag = MODULE_BIND;
@@ -937,6 +943,7 @@ void menuModelSetup(event_t event)
               }
             }
             moduleFlag[moduleIdx] = newFlag;
+
           }
         }
         break;
diff --git a/radio/src/telemetry/spektrum.cpp b/radio/src/telemetry/spektrum.cpp
index 2b4ac18f2..5b0242bda 100644
--- a/radio/src/telemetry/spektrum.cpp
+++ b/radio/src/telemetry/spektrum.cpp
@@ -257,6 +257,7 @@ bool isSpektrumValidValue(int32_t value, const SpektrumDataType type)
   }
 }
 
+bool spektrumBindFinished = 0;
 void processSpektrumPacket(const uint8_t *packet)
 {
   setTelemetryValue(TELEM_PROTO_SPEKTRUM, (I2C_PSEUDO_TX << 8) + 0, 0, 0, packet[1], UNIT_RAW, 0);
@@ -373,6 +374,11 @@ void processDSMBindPacket(const uint8_t *packet)
   /* log the bind packet as telemetry for quick debugging */
   setTelemetryValue(TELEM_PROTO_SPEKTRUM, (I2C_PSEUDO_TX << 8) + 4, 0, 0, debugval, UNIT_RAW, 0);
 
+  /* Finally stop binding as the rx just told us that it is bound */
+  if (g_model.moduleData[EXTERNAL_MODULE].type == MODULE_TYPE_MULTIMODULE && g_model.moduleData[EXTERNAL_MODULE].getMultiProtocol(true) == MM_RF_PROTO_DSM2
+    && moduleFlag[EXTERNAL_MODULE] == MODULE_BIND) {
+    spektrumBindFinished=true;
+  }
 }
 
 void processSpektrumTelemetryData(uint8_t data)
diff --git a/radio/src/telemetry/spektrum.h b/radio/src/telemetry/spektrum.h
index e78b44a98..5585cf277 100644
--- a/radio/src/telemetry/spektrum.h
+++ b/radio/src/telemetry/spektrum.h
@@ -24,4 +24,5 @@
 void processSpektrumTelemetryData(uint8_t data);
 void spektrumSetDefault(int index, uint16_t id, uint8_t subId, uint8_t instance);
 
+extern bool spektrumBindFinished;
 #endif