From 8d08e6939d6001d659c844d1ac113ca95c47acb0 Mon Sep 17 00:00:00 2001
From: Bertrand Songis <bsongis@gmail.com>
Date: Wed, 6 Feb 2019 15:22:17 +0100
Subject: [PATCH] Split RX_ID display name and RX_ID binary

---
 radio/src/gui/128x64/model_setup.cpp |  4 ++--
 radio/src/opentx.h                   |  3 ++-
 radio/src/telemetry/telemetry.cpp    | 16 +++++++++++++---
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/radio/src/gui/128x64/model_setup.cpp b/radio/src/gui/128x64/model_setup.cpp
index 9804ba8a4..45876fbc4 100644
--- a/radio/src/gui/128x64/model_setup.cpp
+++ b/radio/src/gui/128x64/model_setup.cpp
@@ -226,7 +226,7 @@ enum MenuModelSetupItems {
 
 void onPXX2BindMenu(const char * result)
 {
-  reusableBuffer.modelsetup.pxx2_bind_receiver_index = (result - reusableBuffer.modelsetup.pxx2_bind_candidate_receivers[0]) / sizeof(reusableBuffer.modelsetup.pxx2_bind_candidate_receivers[0]);
+  reusableBuffer.modelsetup.pxx2_bind_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;
   TRACE("RECEIVER  SELECTED  : %d", reusableBuffer.modelsetup.pxx2_bind_receiver_index);
 }
@@ -1140,7 +1140,7 @@ void menuModelSetup(event_t event)
               if (reusableBuffer.modelsetup.pxx2_register_or_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[i];
+                  popupMenuItems[i] = reusableBuffer.modelsetup.pxx2_bind_candidate_receivers_names[i];
                 }
                 POPUP_MENU_START(onPXX2BindMenu);
               }
diff --git a/radio/src/opentx.h b/radio/src/opentx.h
index ed12239db..8a3d842bd 100644
--- a/radio/src/opentx.h
+++ b/radio/src/opentx.h
@@ -1118,7 +1118,8 @@ union ReusableBuffer
     char msg[64];
     uint8_t r9mPower;
     uint8_t pxx2_register_or_bind_step;
-    char pxx2_bind_candidate_receivers[PXX2_MAX_RECEIVERS_PER_MODULE][8];
+    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];
     uint8_t pxx2_bind_candidate_receivers_count;
     uint8_t pxx2_bind_receiver_index;
   } modelsetup;
diff --git a/radio/src/telemetry/telemetry.cpp b/radio/src/telemetry/telemetry.cpp
index acff000b1..ff0c17f64 100644
--- a/radio/src/telemetry/telemetry.cpp
+++ b/radio/src/telemetry/telemetry.cpp
@@ -92,19 +92,29 @@ void processBindFrame(uint8_t module, uint8_t * frame)
   if (frame[3] == 0x00) {
     bool found = false;
     for (uint8_t i=0; i<reusableBuffer.modelsetup.pxx2_bind_candidate_receivers_count; i++) {
-      if (memcmp(reusableBuffer.modelsetup.pxx2_bind_candidate_receivers[i], &frame[4], PXX2_LEN_RX_ID) == 0) {
+      if (memcmp(reusableBuffer.modelsetup.pxx2_bind_candidate_receivers_ids[i], &frame[4], PXX2_LEN_RX_ID) == 0) {
         found = true;
         break;
       }
     }
     if (!found && reusableBuffer.modelsetup.pxx2_bind_candidate_receivers_count < PXX2_MAX_RECEIVERS_PER_MODULE) {
-      memcpy(reusableBuffer.modelsetup.pxx2_bind_candidate_receivers[reusableBuffer.modelsetup.pxx2_bind_candidate_receivers_count], &frame[4], PXX2_LEN_RX_ID);
+      memcpy(reusableBuffer.modelsetup.pxx2_bind_candidate_receivers_ids[reusableBuffer.modelsetup.pxx2_bind_candidate_receivers_count], &frame[4], PXX2_LEN_RX_ID);
+      char * c = reusableBuffer.modelsetup.pxx2_bind_candidate_receivers_names[reusableBuffer.modelsetup.pxx2_bind_candidate_receivers_count];
+      for (uint8_t i=0; i<PXX2_LEN_RX_ID; i++) {
+        uint8_t byte = frame[i];
+        uint8_t quartet = (byte >> 4);
+        *c++ = (quartet >= 10 ? quartet + 'A' - 10 : quartet + '0');
+        quartet = (byte & 0x0f);
+        *c++ = (quartet >= 10 ? quartet + 'A' - 10 : quartet + '0');
+        *c++ = ' ';
+      }
+      *c = '\0';
       ++reusableBuffer.modelsetup.pxx2_bind_candidate_receivers_count;
       reusableBuffer.modelsetup.pxx2_register_or_bind_step = BIND_RX_ID_RECEIVED;
     }
   }
   else if (frame[3] == 0x01) {
-    if (memcmp(g_model.moduleData[module].pxx2.receivers[reusableBuffer.modelsetup.pxx2_bind_receiver_index].rxID, &frame[4], PXX2_LEN_RX_ID) == 0) {
+    if (memcmp(reusableBuffer.modelsetup.pxx2_bind_candidate_receivers_ids[reusableBuffer.modelsetup.pxx2_bind_candidate_receivers_count], &frame[4], PXX2_LEN_RX_ID) == 0) {
       reusableBuffer.modelsetup.pxx2_register_or_bind_step = BIND_OK;
       moduleSettings[module].mode = MODULE_MODE_NORMAL;
     }