From dd0ac2c008af7a5ffb2eb035a4807b88dc9549f5 Mon Sep 17 00:00:00 2001
From: Bertrand Songis <bsongis@gmail.com>
Date: Wed, 13 Feb 2019 08:42:47 +0100
Subject: [PATCH] Delay introduced at the end of BIND ...

---
 radio/src/gui/128x64/model_setup.cpp |  8 ++++----
 radio/src/opentx.h                   |  6 +++++-
 radio/src/pulses/pxx2.cpp            | 13 +++++++++++--
 radio/src/pulses/pxx2.h              |  1 +
 radio/src/telemetry/telemetry.cpp    | 11 +++++------
 5 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/radio/src/gui/128x64/model_setup.cpp b/radio/src/gui/128x64/model_setup.cpp
index 1256c7b99..46c7bfe91 100644
--- a/radio/src/gui/128x64/model_setup.cpp
+++ b/radio/src/gui/128x64/model_setup.cpp
@@ -239,7 +239,7 @@ enum MenuModelSetupItems {
 void onPXX2BindMenu(const char * result)
 {
   reusableBuffer.modelsetup.pxx2_bind_selected_receiver_index = (result - reusableBuffer.modelsetup.pxx2_bind_candidate_receivers_names[0]) / sizeof(reusableBuffer.modelsetup.pxx2_bind_candidate_receivers_names[0]);
-  reusableBuffer.modelsetup.pxx2_register_or_bind_step = BIND_RX_ID_SELECTED;
+  reusableBuffer.modelsetup.pxx2_bind_step = BIND_RX_ID_SELECTED;
 }
 
 void onBindMenu(const char * result)
@@ -1160,13 +1160,13 @@ void menuModelSetup(event_t event)
         if (attr) {
           if (menuHorizontalPosition == 0) {
             if (event == EVT_KEY_BREAK(KEY_ENTER)) {
-              reusableBuffer.modelsetup.pxx2_register_or_bind_step = BIND_START;
+              reusableBuffer.modelsetup.pxx2_bind_step = BIND_START;
               reusableBuffer.modelsetup.pxx2_bind_candidate_receivers_count = 0;
               moduleSettings[INTERNAL_MODULE].mode ^= MODULE_MODE_BIND;
             }
             if (moduleSettings[INTERNAL_MODULE].mode == MODULE_MODE_BIND) {
               s_editMode = 1;
-              if (reusableBuffer.modelsetup.pxx2_register_or_bind_step == BIND_RX_ID_RECEIVED) {
+              if (reusableBuffer.modelsetup.pxx2_bind_step == BIND_RX_ID_RECEIVED) {
                 popupMenuItemsCount = min<uint8_t>(reusableBuffer.modelsetup.pxx2_bind_candidate_receivers_count, PXX2_MAX_RECEIVERS_PER_MODULE);
                 for (uint8_t i=0; i<popupMenuItemsCount; i++) {
                   popupMenuItems[i] = reusableBuffer.modelsetup.pxx2_bind_candidate_receivers_names[i];
@@ -1177,7 +1177,7 @@ void menuModelSetup(event_t event)
             else {
               s_editMode = 0;
             }
-            if (reusableBuffer.modelsetup.pxx2_register_or_bind_step == BIND_OK) {
+            if (reusableBuffer.modelsetup.pxx2_bind_step == BIND_OK) {
               memcpy(g_model.moduleData[INTERNAL_MODULE].pxx2.receivers[receiverIdx].rxID, reusableBuffer.modelsetup.pxx2_bind_candidate_receivers_ids[reusableBuffer.modelsetup.pxx2_bind_selected_receiver_index], PXX2_LEN_RX_ID);
             }
           }
diff --git a/radio/src/opentx.h b/radio/src/opentx.h
index 0ee179743..55e67ee6d 100644
--- a/radio/src/opentx.h
+++ b/radio/src/opentx.h
@@ -1117,7 +1117,11 @@ union ReusableBuffer
   struct {
     char msg[64];
     uint8_t r9mPower;
-    uint8_t pxx2_register_or_bind_step;
+    union {
+      uint8_t pxx2_register_step;
+      uint8_t pxx2_bind_step;
+    };
+    uint32_t pxx2_bind_wait_timeout;
     uint8_t pxx2_register_rx_id[PXX2_LEN_RX_ID];
     char pxx2_bind_candidate_receivers_ids[PXX2_MAX_RECEIVERS_PER_MODULE][PXX2_LEN_RX_ID];
     char pxx2_bind_candidate_receivers_names[PXX2_MAX_RECEIVERS_PER_MODULE][3*PXX2_LEN_RX_ID+1];
diff --git a/radio/src/pulses/pxx2.cpp b/radio/src/pulses/pxx2.cpp
index 13372452f..5e19e3879 100644
--- a/radio/src/pulses/pxx2.cpp
+++ b/radio/src/pulses/pxx2.cpp
@@ -58,7 +58,7 @@ bool Pxx2Pulses::setupRegisterFrame(uint8_t module)
 {
   addFrameType(PXX2_TYPE_C_MODULE, PXX2_TYPE_ID_REGISTER);
 
-  if (reusableBuffer.modelsetup.pxx2_register_or_bind_step == REGISTER_COUNTER_ID_RECEIVED) {
+  if (reusableBuffer.modelsetup.pxx2_register_step == REGISTER_COUNTER_ID_RECEIVED) {
     Pxx2Transport::addByte(0x01);
     for (uint8_t i=0; i<PXX2_LEN_RX_ID; i++) {
       Pxx2Transport::addByte(0x00);
@@ -78,7 +78,16 @@ bool Pxx2Pulses::setupBindFrame(uint8_t module)
 {
   addFrameType(PXX2_TYPE_C_MODULE, PXX2_TYPE_ID_BIND);
 
-  if (reusableBuffer.modelsetup.pxx2_register_or_bind_step == BIND_RX_ID_SELECTED) {
+  if (reusableBuffer.modelsetup.pxx2_bind_step == BIND_WAIT) {
+    if (get_tmr10ms() > reusableBuffer.modelsetup.pxx2_bind_wait_timeout) {
+      moduleSettings[module].mode = MODULE_MODE_NORMAL;
+      POPUP_INFORMATION(STR_BIND_OK);
+    }
+    else {
+      return false;
+    }
+  }
+  else if (reusableBuffer.modelsetup.pxx2_bind_step == BIND_RX_ID_SELECTED) {
     Pxx2Transport::addByte(0x01);
     for (uint8_t i=0; i<PXX2_LEN_RX_ID; i++) {
       Pxx2Transport::addByte(reusableBuffer.modelsetup.pxx2_bind_candidate_receivers_ids[reusableBuffer.modelsetup.pxx2_bind_selected_receiver_index][i]);
diff --git a/radio/src/pulses/pxx2.h b/radio/src/pulses/pxx2.h
index 3152a0691..bc813b7ac 100644
--- a/radio/src/pulses/pxx2.h
+++ b/radio/src/pulses/pxx2.h
@@ -51,6 +51,7 @@ enum PXX2BindSteps {
     BIND_START,
     BIND_RX_ID_RECEIVED,
     BIND_RX_ID_SELECTED,
+    BIND_WAIT,
     BIND_OK
 };
 
diff --git a/radio/src/telemetry/telemetry.cpp b/radio/src/telemetry/telemetry.cpp
index 57adbc6e2..8c35713a2 100644
--- a/radio/src/telemetry/telemetry.cpp
+++ b/radio/src/telemetry/telemetry.cpp
@@ -80,13 +80,13 @@ void processRegisterFrame(uint8_t module, uint8_t * frame)
   if (frame[3] == 0x00) {
     // RX_ID follows, we store it for the next step
     memcpy(reusableBuffer.modelsetup.pxx2_register_rx_id, &frame[4], PXX2_LEN_RX_ID);
-    reusableBuffer.modelsetup.pxx2_register_or_bind_step = REGISTER_COUNTER_ID_RECEIVED;
+    reusableBuffer.modelsetup.pxx2_register_step = REGISTER_COUNTER_ID_RECEIVED;
   }
   else if (frame[3] == 0x01) {
     // RX_ID + PASSWORD follow, we check they are good
     if (memcmp(&frame[4], reusableBuffer.modelsetup.pxx2_register_rx_id, PXX2_LEN_RX_ID) == 0 &&
         memcmp(&frame[12], g_model.modelRegistrationID, PXX2_LEN_REGISTRATION_ID) == 0) {
-      reusableBuffer.modelsetup.pxx2_register_or_bind_step = REGISTER_OK;
+      reusableBuffer.modelsetup.pxx2_register_step = REGISTER_OK;
       moduleSettings[module].mode = MODULE_MODE_NORMAL;
       POPUP_INFORMATION(STR_REG_OK);
     }
@@ -120,14 +120,13 @@ void processBindFrame(uint8_t module, uint8_t * frame)
       }
       *c = '\0';
       ++reusableBuffer.modelsetup.pxx2_bind_candidate_receivers_count;
-      reusableBuffer.modelsetup.pxx2_register_or_bind_step = BIND_RX_ID_RECEIVED;
+      reusableBuffer.modelsetup.pxx2_bind_step = BIND_RX_ID_RECEIVED;
     }
   }
   else if (frame[3] == 0x01) {
     if (memcmp(reusableBuffer.modelsetup.pxx2_bind_candidate_receivers_ids[reusableBuffer.modelsetup.pxx2_bind_selected_receiver_index], &frame[4], PXX2_LEN_RX_ID) == 0) {
-      reusableBuffer.modelsetup.pxx2_register_or_bind_step = BIND_OK;
-      moduleSettings[module].mode = MODULE_MODE_NORMAL;
-      POPUP_INFORMATION(STR_BIND_OK);
+      reusableBuffer.modelsetup.pxx2_bind_step = BIND_WAIT;
+      reusableBuffer.modelsetup.pxx2_bind_wait_timeout = get_tmr10ms() + 30;
     }
   }
 }