From c5e8f18611bdc249fabc29fab7558d981f789c24 Mon Sep 17 00:00:00 2001
From: Bertrand Songis <bsongis@gmail.com>
Date: Thu, 7 Feb 2019 08:38:48 +0100
Subject: [PATCH] Model ID sent

---
 radio/src/gui/128x64/radio_spectrum.cpp |  4 ----
 radio/src/pulses/pxx2.cpp               |  2 +-
 radio/src/telemetry/telemetry.cpp       | 14 +++-----------
 3 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/radio/src/gui/128x64/radio_spectrum.cpp b/radio/src/gui/128x64/radio_spectrum.cpp
index 54999df62..818e28a26 100644
--- a/radio/src/gui/128x64/radio_spectrum.cpp
+++ b/radio/src/gui/128x64/radio_spectrum.cpp
@@ -33,8 +33,4 @@ void menuRadioSpectrum(event_t event)
     uint8_t h = reusableBuffer.spectrum.bars[i] >> 2;
     lcdDrawSolidVerticalLine(i, LCD_H - h, h);
   }
-  extern uint32_t FREQUENCY;
-  extern uint8_t POWER;
-  lcdDrawNumber(64, 32, FREQUENCY);
-  lcdDrawNumber(64, 40, POWER);
 }
diff --git a/radio/src/pulses/pxx2.cpp b/radio/src/pulses/pxx2.cpp
index 2fb9d1efb..a72520b17 100644
--- a/radio/src/pulses/pxx2.cpp
+++ b/radio/src/pulses/pxx2.cpp
@@ -81,7 +81,7 @@ bool Pxx2Pulses::setupBindFrame(uint8_t module)
     for (uint8_t i=0; i<PXX2_LEN_RX_ID; i++) {
       Pxx2Transport::addByte(reusableBuffer.modelsetup.pxx2_bind_candidate_receivers_ids[reusableBuffer.modelsetup.pxx2_bind_selected_receiver_index][i]);
     }
-    Pxx2Transport::addByte(0x00);
+    Pxx2Transport::addByte(g_model.header.modelId[INTERNAL_MODULE]);
   }
   else {
     Pxx2Transport::addByte(0x00);
diff --git a/radio/src/telemetry/telemetry.cpp b/radio/src/telemetry/telemetry.cpp
index 183bcce6c..3071bd34b 100644
--- a/radio/src/telemetry/telemetry.cpp
+++ b/radio/src/telemetry/telemetry.cpp
@@ -91,8 +91,6 @@ void processRegisterFrame(uint8_t module, uint8_t * frame)
   }
 }
 
-const uint8_t MY_RX_ID[] = { 0x46, 0x17, 0x32, 0x85 };
-
 void processBindFrame(uint8_t module, uint8_t * frame)
 {
   if (moduleSettings[module].mode != MODULE_MODE_BIND) {
@@ -102,13 +100,13 @@ 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_ids[i], MY_RX_ID /*TODO &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_ids[reusableBuffer.modelsetup.pxx2_bind_candidate_receivers_count], MY_RX_ID /*TODO &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[4 + i];
@@ -124,7 +122,7 @@ void processBindFrame(uint8_t module, uint8_t * frame)
     }
   }
   else if (frame[3] == 0x01) {
-    if (memcmp(reusableBuffer.modelsetup.pxx2_bind_candidate_receivers_ids[reusableBuffer.modelsetup.pxx2_bind_selected_receiver_index], MY_RX_ID /*TODO &frame[4]*/, PXX2_LEN_RX_ID) == 0) {
+    if (memcmp(reusableBuffer.modelsetup.pxx2_bind_candidate_receivers_ids[reusableBuffer.modelsetup.pxx2_bind_selected_receiver_index], &frame[4], PXX2_LEN_RX_ID) == 0) {
       reusableBuffer.modelsetup.pxx2_register_or_bind_step = BIND_OK;
       moduleSettings[module].mode = MODULE_MODE_NORMAL;
       POPUP_WARNING(STR_BIND_OK);
@@ -132,8 +130,6 @@ void processBindFrame(uint8_t module, uint8_t * frame)
   }
 }
 
-uint32_t FREQUENCY;
-uint8_t POWER;
 void processSpectrumFrame(uint8_t module, uint8_t * frame)
 {
   if (moduleSettings[module].mode != MODULE_MODE_SPECTRUM) {
@@ -147,10 +143,6 @@ void processSpectrumFrame(uint8_t module, uint8_t * frame)
   // left = 2500000000 - 5000
   // span = 10000
 
-  FREQUENCY = *frequency;
-  POWER = *power;
-
-
   // reusableBuffer.spectrum.bars[(*frequency - (2500000000 - 5000)) * 128 / 10000] = 127 + *power;
 }