From 9ed83cf67c16bfbce8a28ea7e12955bc529f59d3 Mon Sep 17 00:00:00 2001
From: mikeller <github@ike.ch>
Date: Mon, 1 Jun 2020 21:06:27 +1200
Subject: [PATCH] Moved calculation of available boxes into 'activateConfig()'
 to avoid a reboot.

---
 src/main/config/config.c | 4 ++++
 src/main/msp/msp.c       | 1 -
 src/main/msp/msp_box.c   | 4 +++-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/main/config/config.c b/src/main/config/config.c
index 6d8e5563d..95e49dfe6 100644
--- a/src/main/config/config.c
+++ b/src/main/config/config.c
@@ -60,6 +60,8 @@
 #include "io/serial.h"
 #include "io/vtx.h"
 
+#include "msp/msp_box.h"
+
 #include "osd/osd.h"
 
 #include "pg/adc.h"
@@ -181,6 +183,8 @@ static void activateConfig(void)
 #if defined(USE_LED_STRIP_STATUS_MODE)
     reevaluateLedConfig();
 #endif
+
+    initActiveBoxIds();
 }
 
 static void adjustFilterLimit(uint16_t *parm, uint16_t resetValue)
diff --git a/src/main/msp/msp.c b/src/main/msp/msp.c
index 25118a361..38cc1ecab 100644
--- a/src/main/msp/msp.c
+++ b/src/main/msp/msp.c
@@ -3600,5 +3600,4 @@ void mspFcProcessReply(mspPacket_t *reply)
 
 void mspInit(void)
 {
-    initActiveBoxIds();
 }
diff --git a/src/main/msp/msp_box.c b/src/main/msp/msp_box.c
index 12ac9f048..f58c64ef3 100644
--- a/src/main/msp/msp_box.c
+++ b/src/main/msp/msp_box.c
@@ -125,8 +125,10 @@ const box_t *findBoxByPermanentId(uint8_t permanentId)
 
 static bool activeBoxIdGet(boxId_e boxId)
 {
-    if (boxId > sizeof(activeBoxIds) * 8)
+    if (boxId > sizeof(activeBoxIds) * 8) {
         return false;
+    }
+
     return bitArrayGet(&activeBoxIds, boxId);
 }
 
-- 
2.11.4.GIT