From bc5c3587d86ba3e8cade732c4af265f1beea5292 Mon Sep 17 00:00:00 2001
From: 3djc <lesitewebdejc@hotmail.com>
Date: Mon, 18 Feb 2019 14:00:51 +0100
Subject: [PATCH] Some cleanups

---
 radio/src/gui/128x64/model_setup.cpp |  2 +-
 radio/src/opentx.h                   |  3 +--
 radio/src/pulses/pxx2.cpp            |  2 +-
 radio/src/telemetry/telemetry.cpp    | 10 +++++-----
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/radio/src/gui/128x64/model_setup.cpp b/radio/src/gui/128x64/model_setup.cpp
index 6906993bf..88aba0206 100644
--- a/radio/src/gui/128x64/model_setup.cpp
+++ b/radio/src/gui/128x64/model_setup.cpp
@@ -1235,7 +1235,7 @@ void menuModelSetup(event_t event)
               s_editMode = 0;
             }
             if (reusableBuffer.modelSetup.pxx2.bindStep == BIND_OK) {
-              memcpy(g_model.moduleData[INTERNAL_MODULE].pxx2.receivers[receiverIdx].rxName, reusableBuffer.modelSetup.pxx2.bindCandidateReceiversIds[reusableBuffer.modelSetup.pxx2.bindSelectedReceiverIndex], PXX2_LEN_RX_NAME);
+              memcpy(g_model.moduleData[INTERNAL_MODULE].pxx2.receivers[receiverIdx].rxName, reusableBuffer.modelSetup.pxx2.bindCandidateReceiversNames[reusableBuffer.modelSetup.pxx2.bindSelectedReceiverIndex], PXX2_LEN_RX_NAME);
             }
           }
           else if (menuHorizontalPosition == 1 && s_editMode > 0) {
diff --git a/radio/src/opentx.h b/radio/src/opentx.h
index 349fa1d6a..47336de39 100644
--- a/radio/src/opentx.h
+++ b/radio/src/opentx.h
@@ -1128,8 +1128,7 @@ union ReusableBuffer
         uint8_t registerPopupHorizontalPosition;
         int8_t registerPopupEditMode;
         char registerRxName[PXX2_LEN_RX_NAME];
-        char bindCandidateReceiversIds[PXX2_MAX_RECEIVERS_PER_MODULE][PXX2_LEN_RX_NAME];
-        char bindCandidateReceiversNames[PXX2_MAX_RECEIVERS_PER_MODULE][3*PXX2_LEN_RX_NAME+1];
+        char bindCandidateReceiversNames[PXX2_MAX_RECEIVERS_PER_MODULE][PXX2_LEN_RX_NAME];
         uint8_t bindCandidateReceiversCount;
         uint8_t bindSelectedReceiverIndex;
       } pxx2;
diff --git a/radio/src/pulses/pxx2.cpp b/radio/src/pulses/pxx2.cpp
index 1495d8f65..afe9f12b8 100644
--- a/radio/src/pulses/pxx2.cpp
+++ b/radio/src/pulses/pxx2.cpp
@@ -90,7 +90,7 @@ bool Pxx2Pulses::setupBindFrame(uint8_t module)
   else if (reusableBuffer.modelSetup.pxx2.bindStep == BIND_RX_NAME_SELECTED) {
     Pxx2Transport::addByte(0x01);
     for (uint8_t i=0; i<PXX2_LEN_RX_NAME; i++) {
-      Pxx2Transport::addByte(reusableBuffer.modelSetup.pxx2.bindCandidateReceiversIds[reusableBuffer.modelSetup.pxx2.bindSelectedReceiverIndex][i]);
+      Pxx2Transport::addByte(reusableBuffer.modelSetup.pxx2.bindCandidateReceiversNames[reusableBuffer.modelSetup.pxx2.bindSelectedReceiverIndex][i]);
     }
     Pxx2Transport::addByte(g_model.header.modelId[INTERNAL_MODULE]);
   }
diff --git a/radio/src/telemetry/telemetry.cpp b/radio/src/telemetry/telemetry.cpp
index ee7dbb827..6ef2d3dcd 100644
--- a/radio/src/telemetry/telemetry.cpp
+++ b/radio/src/telemetry/telemetry.cpp
@@ -102,14 +102,14 @@ void processBindFrame(uint8_t module, uint8_t * frame)
   if (frame[3] == 0x00) {
     bool found = false;
     for (uint8_t i=0; i<reusableBuffer.modelSetup.pxx2.bindCandidateReceiversCount; i++) {
-      if (memcmp(reusableBuffer.modelSetup.pxx2.bindCandidateReceiversIds[i], &frame[4], PXX2_LEN_RX_NAME) == 0) {
+      if (memcmp(reusableBuffer.modelSetup.pxx2.bindCandidateReceiversNames[i], &frame[4], PXX2_LEN_RX_NAME) == 0) {
         found = true;
         break;
       }
     }
     if (!found && reusableBuffer.modelSetup.pxx2.bindCandidateReceiversCount < PXX2_MAX_RECEIVERS_PER_MODULE) {
-      memcpy(reusableBuffer.modelSetup.pxx2.bindCandidateReceiversIds[reusableBuffer.modelSetup.pxx2.bindCandidateReceiversCount], &frame[4], PXX2_LEN_RX_NAME);
-      char * c = reusableBuffer.modelSetup.pxx2.bindCandidateReceiversNames[reusableBuffer.modelSetup.pxx2.bindCandidateReceiversCount];
+      memcpy(reusableBuffer.modelSetup.pxx2.bindCandidateReceiversNames[reusableBuffer.modelSetup.pxx2.bindCandidateReceiversCount], &frame[4], PXX2_LEN_RX_NAME);
+      /*char * c = reusableBuffer.modelSetup.pxx2.bindCandidateReceiversNames[reusableBuffer.modelSetup.pxx2.bindCandidateReceiversCount];
       for (uint8_t i=0; i<PXX2_LEN_RX_NAME; i++) {
         uint8_t byte = frame[4 + i];
         uint8_t quartet = (byte >> 4);
@@ -118,13 +118,13 @@ void processBindFrame(uint8_t module, uint8_t * frame)
         *c++ = (quartet >= 10 ? quartet + 'A' - 10 : quartet + '0');
         *c++ = ' ';
       }
-      *c = '\0';
+      *c = '\0';*/
       ++reusableBuffer.modelSetup.pxx2.bindCandidateReceiversCount;
       reusableBuffer.modelSetup.pxx2.bindStep = BIND_RX_NAME_RECEIVED;
     }
   }
   else if (frame[3] == 0x01) {
-    if (memcmp(reusableBuffer.modelSetup.pxx2.bindCandidateReceiversIds[reusableBuffer.modelSetup.pxx2.bindSelectedReceiverIndex], &frame[4], PXX2_LEN_RX_NAME) == 0) {
+    if (memcmp(reusableBuffer.modelSetup.pxx2.bindCandidateReceiversNames[reusableBuffer.modelSetup.pxx2.bindSelectedReceiverIndex], &frame[4], PXX2_LEN_RX_NAME) == 0) {
       reusableBuffer.modelSetup.pxx2.bindStep = BIND_WAIT;
       reusableBuffer.modelSetup.pxx2.bindWaitTimeout = get_tmr10ms() + 30;
     }