From 183e9aeb6b03160052b5e44cc7b8ba04213191d3 Mon Sep 17 00:00:00 2001
From: Bertrand Songis <bsongis@gmail.com>
Date: Tue, 12 Feb 2019 12:28:11 +0100
Subject: [PATCH] Spec was wrong, update ...

---
 radio/src/dataconstants.h         | 2 +-
 radio/src/pulses/pxx2.cpp         | 3 +++
 radio/src/telemetry/telemetry.cpp | 6 +++++-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/radio/src/dataconstants.h b/radio/src/dataconstants.h
index 596c57e5f..30ed86365 100644
--- a/radio/src/dataconstants.h
+++ b/radio/src/dataconstants.h
@@ -787,7 +787,7 @@ enum BluetoothModes {
 };
 
 // PXX2 constants
-#define PXX2_LEN_REGISTRATION_ID            4
+#define PXX2_LEN_REGISTRATION_ID            8
 #define PXX2_LEN_RX_ID                      8
 #define PXX2_MAX_RECEIVERS_PER_MODULE       5
 
diff --git a/radio/src/pulses/pxx2.cpp b/radio/src/pulses/pxx2.cpp
index fbc219e60..13372452f 100644
--- a/radio/src/pulses/pxx2.cpp
+++ b/radio/src/pulses/pxx2.cpp
@@ -60,6 +60,9 @@ bool Pxx2Pulses::setupRegisterFrame(uint8_t module)
 
   if (reusableBuffer.modelsetup.pxx2_register_or_bind_step == REGISTER_COUNTER_ID_RECEIVED) {
     Pxx2Transport::addByte(0x01);
+    for (uint8_t i=0; i<PXX2_LEN_RX_ID; i++) {
+      Pxx2Transport::addByte(0x00);
+    }
     for (uint8_t i=0; i<PXX2_LEN_REGISTRATION_ID; i++) {
       Pxx2Transport::addByte(g_model.modelRegistrationID[i]);
     }
diff --git a/radio/src/telemetry/telemetry.cpp b/radio/src/telemetry/telemetry.cpp
index f88a216e1..a5fe76ceb 100644
--- a/radio/src/telemetry/telemetry.cpp
+++ b/radio/src/telemetry/telemetry.cpp
@@ -82,8 +82,12 @@ void processRegisterFrame(uint8_t module, uint8_t * frame)
     reusableBuffer.modelsetup.pxx2_register_or_bind_step = REGISTER_COUNTER_ID_RECEIVED;
   }
   else if (frame[3] == 0x01) {
+    // RX_ID follows, we check it is good
+    if (1) {
+
+    }
     // PASSWORD follows, we check it is good
-    if (memcmp(&frame[4], g_model.modelRegistrationID, PXX2_LEN_REGISTRATION_ID) == 0) {
+    if (memcmp(&frame[8], g_model.modelRegistrationID, PXX2_LEN_REGISTRATION_ID) == 0) {
       reusableBuffer.modelsetup.pxx2_register_or_bind_step = REGISTER_OK;
       moduleSettings[module].mode = MODULE_MODE_NORMAL;
       POPUP_INFORMATION(STR_REG_OK);