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

Merge pull request #2800 from jflyper/bfdef-cms-resurrect-display-cycling

Browse source 
[CMS] Resurrect display cycling
This commit is contained in:
Martin Budden 2017-04-03 20:52:30 +01:00 • committed by GitHub
commit 149ed180f6
3 changed files with 42 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

60
src/main/fc/fc_init.c
View file

@ -382,25 +382,6 @@ void init(void)
initBoardAlignment(boardAlignment());
#ifdef CMS
cmsInit();
#endif
#ifdef USE_DASHBOARD
if (feature(FEATURE_DASHBOARD)) {
dashboardInit();
}
#endif
#ifdef USE_RTC6705
if (feature(FEATURE_VTX)) {
rtc6705_soft_spi_init();
current_vtx_channel = vtxConfig()->vtx_channel;
rtc6705_soft_spi_set_channel(vtx_freq[current_vtx_channel]);
rtc6705_soft_spi_set_rf_power(vtxConfig()->vtx_power);
}
#endif
if (!sensorsAutodetect()) {
// if gyro was not detected due to whatever reason, we give up now.
failureMode(FAILURE_MISSING_ACC);
@ -439,6 +420,26 @@ void init(void)
rxInit();
/*
* VTX
*/
#ifdef USE_RTC6705
if (feature(FEATURE_VTX)) {
rtc6705_soft_spi_init();
current_vtx_channel = vtxConfig()->vtx_channel;
rtc6705_soft_spi_set_channel(vtx_freq[current_vtx_channel]);
rtc6705_soft_spi_set_rf_power(vtxConfig()->vtx_power);
}
#endif
/*
* CMS, display devices and OSD
*/
#ifdef CMS
cmsInit();
#endif
#if ( defined(OSD) || (defined(USE_MSP_DISPLAYPORT) && defined(CMS)) )
displayPort_t *osdDisplayPort = NULL;
#endif
@ -448,23 +449,30 @@ void init(void)
if (feature(FEATURE_OSD)) {
#if defined(USE_MAX7456)
// if there is a max7456 chip for the OSD then use it, otherwise use MSP
// If there is a max7456 chip for the OSD then use it
osdDisplayPort = max7456DisplayPortInit(vcdProfile());
#elif defined(USE_MSP_DISPLAYPORT)
#elif defined(USE_OSD_OVER_MSP_DISPLAYPORT) // OSD over MSP; not supported (yet)
osdDisplayPort = displayPortMspInit();
#endif
// osdInit will register with CMS by itself.
osdInit(osdDisplayPort);
}
#endif
#if defined(USE_MSP_DISPLAYPORT) && defined(CMS)
// If BFOSD is active, then register it as CMS device, else register MSP.
if (osdDisplayPort)
cmsDisplayPortRegister(osdDisplayPort);
else
#if defined(CMS) && defined(USE_MSP_DISPLAYPORT)
// If BFOSD is not active, then register MSP_DISPLAYPORT as a CMS device.
if (!osdDisplayPort)
cmsDisplayPortRegister(displayPortMspInit());
#endif
#ifdef USE_DASHBOARD
// Dashbord will register with CMS by itself.
if (feature(FEATURE_DASHBOARD)) {
dashboardInit();
}
#endif
#ifdef GPS
if (feature(FEATURE_GPS)) {
gpsInit();