Merge pull request #6286 from codecae/crsf_cms_init_fix

Optimized CMS over CRSF initialization

src/main/fc/fc_init.c

@@ -112,7 +112,6 @@
 #include "io/beeper.h"
 #include "io/displayport_max7456.h"
 #include "io/displayport_srxl.h"
-#include "io/displayport_crsf.h"
 #include "io/serial.h"
 #include "io/flashfs.h"
 #include "io/gps.h"
@@ -602,10 +601,6 @@ void init(void)
     cmsDisplayPortRegister(displayPortSrxlInit());
 #endif
 
-#if defined(USE_CMS) && defined(USE_CRSF_CMS_TELEMETRY) && defined(USE_TELEMETRY)
-    cmsDisplayPortRegister(displayPortCrsfInit());
-#endif
-
 #ifdef USE_GPS
     if (feature(FEATURE_GPS)) {
         gpsInit();

src/main/io/displayport_crsf.c

@@ -200,6 +200,7 @@ int crsfDisplayPortNextRow(void)
 
 displayPort_t *displayPortCrsfInit()
 {
+    crsfDisplayPortSetDimensions(CRSF_DISPLAY_PORT_ROWS_MAX, CRSF_DISPLAY_PORT_COLS_MAX);
     displayInit(&crsfDisplayPort, &crsfDisplayPortVTable);
     return &crsfDisplayPort;
 }

src/main/telemetry/crsf.c

@@ -40,6 +40,8 @@
 #include "common/streambuf.h"
 #include "common/utils.h"
 
+#include "cms/cms.h"
+
 #include "drivers/nvic.h"
 
 #include "fc/config.h"
@@ -431,6 +433,10 @@ 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)) {
         crsfSchedule[index++] = BV(CRSF_FRAME_ATTITUDE_INDEX);