From af70f8f2f6b5eba932630af3fecef0e03104ae30 Mon Sep 17 00:00:00 2001
From: 3djc <lesitewebdejc@hotmail.com>
Date: Fri, 8 Mar 2019 11:54:09 +0100
Subject: [PATCH] Fix pinmap

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

diff --git a/radio/src/gui/128x64/model_setup.cpp b/radio/src/gui/128x64/model_setup.cpp
index da164c678..ae4e0371f 100644
--- a/radio/src/gui/128x64/model_setup.cpp
+++ b/radio/src/gui/128x64/model_setup.cpp
@@ -1943,7 +1943,7 @@ void menuModelPinmap(event_t event)
   lcdInvertLine(0);
 
   if (event == EVT_ENTRY || (reusableBuffer.receiverSetup.state == 0x00 && get_tmr10ms() >= reusableBuffer.receiverSetup.updateTime)) {
-    reusableBuffer.receiverSetup.updateTime = get_tmr10ms() + 100/*1s*/;
+    reusableBuffer.receiverSetup.updateTime = get_tmr10ms() + 500/*5s*/;
     reusableBuffer.receiverSetup.timeout = 0;
     moduleSettings[reusableBuffer.receiverSetup.moduleIdx].mode = MODULE_MODE_RECEIVER_SETTINGS;
   }
diff --git a/radio/src/io/frsky_pxx2.h b/radio/src/io/frsky_pxx2.h
index 560ae2b9b..9149c9891 100644
--- a/radio/src/io/frsky_pxx2.h
+++ b/radio/src/io/frsky_pxx2.h
@@ -25,7 +25,7 @@
 
 #define PXX2_BAUDRATE            230400
 #define PXX2_PERIOD              4 // 4ms
-#define PXX2_FRAME_MAXLENGTH     32
+#define PXX2_FRAME_MAXLENGTH     64
 
 class ModuleFifo : public Fifo<uint8_t, PXX2_FRAME_MAXLENGTH> {
   public:
diff --git a/radio/src/pulses/pxx2.cpp b/radio/src/pulses/pxx2.cpp
index c280f65cb..875b14b44 100644
--- a/radio/src/pulses/pxx2.cpp
+++ b/radio/src/pulses/pxx2.cpp
@@ -149,8 +149,7 @@ void Pxx2Pulses::setupReceiverSettingsFrame(uint8_t module)
       reusableBuffer.receiverSetup.timeout = 0;
       moduleSettings[module].mode = MODULE_MODE_NORMAL;
     }
-    #warning "TODO send channels during the timeout"
-    //setupChannelsFrame(module);
+    setupChannelsFrame(module);
   }
   else {
     addFrameType(PXX2_TYPE_C_MODULE, PXX2_TYPE_ID_RX_SETTINGS);
@@ -159,7 +158,7 @@ void Pxx2Pulses::setupReceiverSettingsFrame(uint8_t module)
     for (int i = 0; i < 24; i++) {
       Pxx2Transport::addByte(reusableBuffer.receiverSetup.channelMapping[i]);
     }
-    reusableBuffer.receiverSetup.timeout = get_tmr10ms() + 10/*100ms*/;
+    reusableBuffer.receiverSetup.timeout = get_tmr10ms() + 20/*200ms*/;
   }
 }
 
diff --git a/radio/src/telemetry/telemetry.cpp b/radio/src/telemetry/telemetry.cpp
index 0244c458d..0d8b2160f 100644
--- a/radio/src/telemetry/telemetry.cpp
+++ b/radio/src/telemetry/telemetry.cpp
@@ -99,6 +99,7 @@ void processReceiverSettingsFrame(uint8_t module, uint8_t * frame)
   }
 
   reusableBuffer.receiverSetup.state = 0xFF;
+  moduleSettings[module].mode = MODULE_MODE_NORMAL;
 }
 
 void processRegisterFrame(uint8_t module, uint8_t * frame)
diff --git a/radio/src/translations.cpp b/radio/src/translations.cpp
index 8c44fbceb..0340a0335 100644
--- a/radio/src/translations.cpp
+++ b/radio/src/translations.cpp
@@ -710,6 +710,7 @@ const char STR_RX_NAME[]  = TR_RX_NAME;
 
 #if defined(PCBTARANIS) || defined(DSM2)
   const char STR_MODULE_RANGE[]  = TR_MODULE_RANGE;
+const char STR_RECEIVER_OPTIONS[]  = TR_RECEIVER_OPTIONS;
 const char STR_DEL_BUTTON[]  = TR_DEL_BUTTON;
 #endif
 
diff --git a/radio/src/translations.h b/radio/src/translations.h
index d729e4b9f..1a82e543b 100644
--- a/radio/src/translations.h
+++ b/radio/src/translations.h
@@ -976,6 +976,7 @@ extern const char STR_JITTER_FILTER[];
 
 #if defined(PCBTARANIS) || defined(DSM2)
   extern const char STR_MODULE_RANGE[];
+extern const char STR_RECEIVER_OPTIONS[];
   extern const char STR_DEL_BUTTON[];
 #endif