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

Rebased onto CMS (WIP, nasty OLEDCMS / cli hang bug)

Browse source 
When OLEDCMS is enabled, enter cli hangs the FC.
This commit is contained in:
jflyper 2016-11-04 01:59:02 +09:00
parent 2bf74e0513
commit 278cf811a7
111 changed files with 2415 additions and 1493 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/main/main.c.orig
View file

@ -84,18 +84,18 @@
#include "io/servos.h"
#include "io/gimbal.h"
#include "io/ledstrip.h"
#include "io/display.h"
#include "io/dashboard.h"
#include "io/asyncfatfs/asyncfatfs.h"
#include "io/serial_cli.h"
#include "io/transponder_ir.h"
#include "io/cms.h"
#include "io/osd.h"
#include "io/vtx.h"
<<<<<<< HEAD
#include "io/vtx.h"
#include "io/vtx_smartaudio.h"
=======
#include "io/canvas.h"
>>>>>>> bfdev-osd-cms-separation-poc
#include "io/canvas.h"
#include "io/vtx.h"
#include "scheduler/scheduler.h"
@ -407,9 +407,9 @@ void init(void)
cmsInit();
#endif
#ifdef DISPLAY
if (feature(FEATURE_DISPLAY)) {
displayInit(&masterConfig.rxConfig);
#ifdef USE_DASHBOARD
if (feature(FEATURE_DASHBOARD)) {
dashboardInit(&masterConfig.rxConfig);
}
#endif
@ -607,13 +607,13 @@ void init(void)
if (feature(FEATURE_VBAT | FEATURE_CURRENT_METER))
batteryInit(&masterConfig.batteryConfig);
#ifdef DISPLAY
if (feature(FEATURE_DISPLAY)) {
#ifdef USE_DASHBOARD
if (feature(FEATURE_DASHBOARD)) {
#ifdef USE_OLED_GPS_DEBUG_PAGE_ONLY
displayShowFixedPage(PAGE_GPS);
dashboardShowFixedPage(PAGE_GPS);
#else
displayResetPageCycling();
displayEnablePageCycling();
dashboardResetPageCycling();
dashboardEnablePageCycling();
#endif
}
#endif