1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-23 16:25:31 +03:00

More displayPort_t, CANVAS as new feature, multi-display cycling

- Further touch-ups with displayPort_t handling.
- CANVAS is a FEATURE now.
- Device specific xxxCmsInit() are registered by device’s init, and
called by CMS upon entry to menu.
- Multiple display devices can be cycled by entering menu invocation
command while in menu.
- The menu invocation command is (was) changed to THR-Mid + YAW-Left +
Pitch-Full to avoid collision with MWOSD menu invocation command.
- More separation attempt.
This commit is contained in:
jflyper 2016-10-28 13:22:28 +09:00
parent 7960b1665d
commit 720a841008
17 changed files with 267 additions and 182 deletions

View file

@ -91,6 +91,7 @@
#include "io/cms.h"
#include "io/osd.h"
#include "io/vtx.h"
#include "io/canvas.h"
#include "scheduler/scheduler.h"
@ -398,6 +399,10 @@ void init(void)
initBoardAlignment(&masterConfig.boardAlignment);
#ifdef CMS
cmsInit();
#endif
#ifdef DISPLAY
if (feature(FEATURE_DISPLAY)) {
displayInit(&masterConfig.rxConfig);
@ -419,10 +424,6 @@ void init(void)
}
#endif
#ifdef CMS
cmsInit();
#endif
if (!sensorsAutodetect(&masterConfig.sensorAlignmentConfig,
masterConfig.acc_hardware,
masterConfig.mag_hardware,
@ -461,6 +462,12 @@ void init(void)
mspFcInit();
mspSerialInit();
#ifdef CANVAS
if (feature(FEATURE_CANVAS)) {
canvasInit();
}
#endif
#ifdef USE_CLI
cliInit(&masterConfig.serialConfig);
#endif