From d76465e23a9e431aad69aeeed09b8a8483cca261 Mon Sep 17 00:00:00 2001
From: Curtis Bangert <codecae@gmail.com>
Date: Sun, 19 Apr 2020 15:48:56 -0400
Subject: [PATCH] Relocated CMS Displayport init from telemetry to init

---
 src/main/fc/init.c        | 5 +++++
 src/main/telemetry/crsf.c | 4 ----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/main/fc/init.c b/src/main/fc/init.c
index 6f89833963..f590e4b441 100644
--- a/src/main/fc/init.c
+++ b/src/main/fc/init.c
@@ -101,6 +101,7 @@
 #include "io/asyncfatfs/asyncfatfs.h"
 #include "io/beeper.h"
 #include "io/dashboard.h"
+#include "io/displayport_crsf.h"
 #include "io/displayport_frsky_osd.h"
 #include "io/displayport_max7456.h"
 #include "io/displayport_msp.h"
@@ -1024,6 +1025,10 @@ void init(void)
     cmsDisplayPortRegister(displayPortSrxlInit());
 #endif
 
+#if defined(USE_CMS) && defined(USE_CRSF_CMS_TELEMETRY)
+    cmsDisplayPortRegister(displayPortCrsfInit());
+#endif
+
     setArmingDisabled(ARMING_DISABLED_BOOT_GRACE_TIME);
 
 #ifdef USE_MOTOR
diff --git a/src/main/telemetry/crsf.c b/src/main/telemetry/crsf.c
index a042ae317d..9f21fad177 100644
--- a/src/main/telemetry/crsf.c
+++ b/src/main/telemetry/crsf.c
@@ -462,10 +462,6 @@ void initCrsfTelemetry(void)
     mspReplyPending = false;
 #endif
 
-#if defined(USE_CMS) && defined(USE_CRSF_CMS_TELEMETRY)
-    cmsDisplayPortRegister(displayPortCrsfInit());
-#endif
-
     int index = 0;
     if (sensors(SENSOR_ACC) && telemetryIsSensorEnabled(SENSOR_PITCH | SENSOR_ROLL | SENSOR_HEADING)) {
         crsfSchedule[index++] = BV(CRSF_FRAME_ATTITUDE_INDEX);