Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-16 21:05:35 +03:00
Code Issues Wiki Activity

Merge pull request #9720 from codecae/crsf_displayport_init_fix

Browse source 
Relocated CRSF CMS display port init from telemetry to fc
This commit is contained in:
Michael Keller 2020-04-23 00:39:08 +12:00 • committed by GitHub
commit bf9cc615c5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/main/fc/init.c
View file

@ -101,6 +101,7 @@
#include "io/asyncfatfs/asyncfatfs.h" #include "io/asyncfatfs/asyncfatfs.h"
#include "io/beeper.h" #include "io/beeper.h"
#include "io/dashboard.h" #include "io/dashboard.h"
#include "io/displayport_crsf.h"
#include "io/displayport_frsky_osd.h" #include "io/displayport_frsky_osd.h"
#include "io/displayport_max7456.h" #include "io/displayport_max7456.h"
#include "io/displayport_msp.h" #include "io/displayport_msp.h"
@ -1024,6 +1025,10 @@ void init(void)
cmsDisplayPortRegister(displayPortSrxlInit()); cmsDisplayPortRegister(displayPortSrxlInit());
#endif #endif
#if defined(USE_CMS) && defined(USE_CRSF_CMS_TELEMETRY)
cmsDisplayPortRegister(displayPortCrsfInit());
#endif
setArmingDisabled(ARMING_DISABLED_BOOT_GRACE_TIME); setArmingDisabled(ARMING_DISABLED_BOOT_GRACE_TIME);
#ifdef USE_MOTOR #ifdef USE_MOTOR

4
src/main/telemetry/crsf.c
View file

@ -462,10 +462,6 @@ void initCrsfTelemetry(void)
mspReplyPending = false; mspReplyPending = false;
#endif #endif
#if defined(USE_CMS) && defined(USE_CRSF_CMS_TELEMETRY)
cmsDisplayPortRegister(displayPortCrsfInit());
#endif
int index = 0; int index = 0;
if (sensors(SENSOR_ACC) && telemetryIsSensorEnabled(SENSOR_PITCH | SENSOR_ROLL | SENSOR_HEADING)) { if (sensors(SENSOR_ACC) && telemetryIsSensorEnabled(SENSOR_PITCH | SENSOR_ROLL | SENSOR_HEADING)) {
crsfSchedule[index++] = BV(CRSF_FRAME_ATTITUDE_INDEX); crsfSchedule[index++] = BV(CRSF_FRAME_ATTITUDE_INDEX);