From bd7562942371afb4956bbdb334c01a6b0e3b0c5e Mon Sep 17 00:00:00 2001
From: Bertrand Songis <bsongis@gmail.com>
Date: Thu, 11 Apr 2019 22:01:31 +0200
Subject: [PATCH] Register Loop Index now retrieven from RX at Register (not
 always 0)

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

diff --git a/radio/src/gui/128x64/model_setup.cpp b/radio/src/gui/128x64/model_setup.cpp
index 8c24cc546..956e818be 100644
--- a/radio/src/gui/128x64/model_setup.cpp
+++ b/radio/src/gui/128x64/model_setup.cpp
@@ -380,11 +380,11 @@ void runPopupRegister(event_t event)
     lcdDrawText(WARNING_LINE_X, WARNING_LINE_Y - 4, STR_REG_ID);
     editName(WARNING_LINE_X + 8*FW, WARNING_LINE_Y - 4, g_model.modelRegistrationID, PXX2_LEN_REGISTRATION_ID, event, menuVerticalPosition == ITEM_REGISTER_PASSWORD);
 
-    // module index
+    // loop index (will be removed in future)
     lcdDrawText(WARNING_LINE_X, WARNING_LINE_Y - 4 + FH, "UID");
-    lcdDrawNumber(WARNING_LINE_X + 8*FW, WARNING_LINE_Y - 4 + FH, reusableBuffer.moduleSetup.pxx2.registerModuleIndex, menuVerticalPosition == ITEM_REGISTER_MODULE_INDEX ? (s_editMode ? INVERS + BLINK : INVERS) : 0);
+    lcdDrawNumber(WARNING_LINE_X + 8*FW, WARNING_LINE_Y - 4 + FH, reusableBuffer.moduleSetup.pxx2.registerLoopIndex, menuVerticalPosition == ITEM_REGISTER_MODULE_INDEX ? (s_editMode ? INVERS + BLINK : INVERS) : 0);
     if (menuVerticalPosition == ITEM_REGISTER_MODULE_INDEX && s_editMode) {
-      CHECK_INCDEC_MODELVAR_ZERO(event, reusableBuffer.moduleSetup.pxx2.registerModuleIndex, 7);
+      CHECK_INCDEC_MODELVAR_ZERO(event, reusableBuffer.moduleSetup.pxx2.registerLoopIndex, 7);
     }
 
     // RX name
diff --git a/radio/src/opentx.h b/radio/src/opentx.h
index 82a245b27..5809197aa 100644
--- a/radio/src/opentx.h
+++ b/radio/src/opentx.h
@@ -1142,7 +1142,7 @@ union ReusableBuffer
         uint8_t registerPopupHorizontalPosition;
         int8_t registerPopupEditMode;
         char registerRxName[PXX2_LEN_RX_NAME];
-        uint8_t registerModuleIndex;
+        uint8_t registerLoopIndex; // will be removed later
         char bindCandidateReceiversNames[PXX2_MAX_RECEIVERS_PER_MODULE][PXX2_LEN_RX_NAME + 1];
         uint8_t bindCandidateReceiversCount;
         uint8_t bindReceiverIndex;
diff --git a/radio/src/pulses/pxx2.cpp b/radio/src/pulses/pxx2.cpp
index ea86f36b5..467ba41aa 100644
--- a/radio/src/pulses/pxx2.cpp
+++ b/radio/src/pulses/pxx2.cpp
@@ -160,7 +160,7 @@ void Pxx2Pulses::setupRegisterFrame(uint8_t module)
     for (uint8_t i=0; i<PXX2_LEN_REGISTRATION_ID; i++) {
       Pxx2Transport::addByte(zchar2char(g_model.modelRegistrationID[i]));
     }
-    Pxx2Transport::addByte(reusableBuffer.moduleSetup.pxx2.registerModuleIndex);
+    Pxx2Transport::addByte(reusableBuffer.moduleSetup.pxx2.registerLoopIndex);
   }
   else {
     Pxx2Transport::addByte(0);
diff --git a/radio/src/telemetry/frsky_pxx2.cpp b/radio/src/telemetry/frsky_pxx2.cpp
index 9d820cf16..c15c0d0e9 100644
--- a/radio/src/telemetry/frsky_pxx2.cpp
+++ b/radio/src/telemetry/frsky_pxx2.cpp
@@ -109,6 +109,7 @@ void processRegisterFrame(uint8_t module, uint8_t * frame)
       if (reusableBuffer.moduleSetup.pxx2.registerStep == REGISTER_START) {
         // RX_NAME follows, we store it for the next step
         str2zchar(reusableBuffer.moduleSetup.pxx2.registerRxName, (const char *)&frame[4], PXX2_LEN_RX_NAME);
+        reusableBuffer.moduleSetup.pxx2.registerLoopIndex = frame[12];
         reusableBuffer.moduleSetup.pxx2.registerStep = REGISTER_RX_NAME_RECEIVED;
       }
       break;