From d0437be23d4588d30c3e5694819112af82e8cb36 Mon Sep 17 00:00:00 2001
From: Bertrand Songis <bsongis@gmail.com>
Date: Mon, 4 Mar 2019 16:57:38 +0100
Subject: [PATCH] Fixes

---
 radio/src/gui/128x64/model_setup.cpp | 5 +++--
 radio/src/opentx.h                   | 1 +
 radio/src/pulses/pxx2.cpp            | 4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/radio/src/gui/128x64/model_setup.cpp b/radio/src/gui/128x64/model_setup.cpp
index 59fb2ed4d..ed8131db1 100644
--- a/radio/src/gui/128x64/model_setup.cpp
+++ b/radio/src/gui/128x64/model_setup.cpp
@@ -264,7 +264,7 @@ enum MenuModelSetupItems {
 
 void onPXX2BindMenu(const char * result)
 {
-  reusableBuffer.moduleSetup.pxx2.bindSelectedReceiverIndex = (result - reusableBuffer.moduleSetup.pxx2.bindCandidateReceiversNames[0]) / sizeof(reusableBuffer.moduleSetup.pxx2.bindCandidateReceiversNames[0]);
+  reusableBuffer.moduleSetup.pxx2.bindSelectedReceiverIndex = (result - reusableBuffer.moduleSetup.pxx2.bindCandidateReceiversNames[0]) / PXX2_LEN_RX_NAME;
   reusableBuffer.moduleSetup.pxx2.bindStep = BIND_RX_NAME_SELECTED;
 }
 
@@ -1344,6 +1344,7 @@ void menuModelSetup(event_t event)
             if (event == EVT_KEY_BREAK(KEY_ENTER)) {
               reusableBuffer.moduleSetup.pxx2.bindStep = BIND_START;
               reusableBuffer.moduleSetup.pxx2.bindCandidateReceiversCount = 0;
+              reusableBuffer.moduleSetup.pxx2.bindReceiverSlot = receiverSlot;
               moduleSettings[moduleIdx].mode ^= MODULE_MODE_BIND;
             }
             if (moduleSettings[moduleIdx].mode == MODULE_MODE_BIND) {
@@ -1863,7 +1864,7 @@ void menuModelFailsafe(event_t event)
     const int32_t channelValue = channelOutputs[ch+channelStart];
     int32_t failsafeValue = g_model.failsafeChannels[ch];
 
-    //Channel
+    // Channel
     putsChn(x+1, y, ch+1, SMLSIZE);
 
     // Value
diff --git a/radio/src/opentx.h b/radio/src/opentx.h
index 9320c228f..0cb5d3bdf 100644
--- a/radio/src/opentx.h
+++ b/radio/src/opentx.h
@@ -1132,6 +1132,7 @@ union ReusableBuffer
         char registrationID[PXX2_LEN_REGISTRATION_ID];
         char bindCandidateReceiversNames[PXX2_MAX_RECEIVERS_PER_MODULE][PXX2_LEN_RX_NAME];
         uint8_t bindCandidateReceiversCount;
+        uint8_t bindReceiverSlot;
         union {
           uint8_t bindSelectedReceiverIndex;
           uint8_t shareReceiverIndex;
diff --git a/radio/src/pulses/pxx2.cpp b/radio/src/pulses/pxx2.cpp
index 4780e77fc..9bd209b31 100644
--- a/radio/src/pulses/pxx2.cpp
+++ b/radio/src/pulses/pxx2.cpp
@@ -143,8 +143,8 @@ bool Pxx2Pulses::setupBindFrame(uint8_t module)
     for (uint8_t i=0; i<PXX2_LEN_RX_NAME; i++) {
       Pxx2Transport::addByte(reusableBuffer.moduleSetup.pxx2.bindCandidateReceiversNames[reusableBuffer.moduleSetup.pxx2.bindSelectedReceiverIndex][i]);
     }
-    Pxx2Transport::addByte(1); // TODO RX_UID
-    Pxx2Transport::addByte(g_model.header.modelId[INTERNAL_MODULE]);
+    Pxx2Transport::addByte(reusableBuffer.moduleSetup.pxx2.bindReceiverSlot); // RX_UID is the slot index (which is unique and never moved)
+    Pxx2Transport::addByte(g_model.header.modelId[module]);
   }
   else {
     Pxx2Transport::addByte(0x00);