Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-21 15:25:36 +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

23
src/main/fc/fc_tasks.c
View file

@ -41,9 +41,10 @@
#include "flight/altitudehold.h"
#include "io/cms.h"
#include "io/cms_types.h"
#include "io/beeper.h"
#include "io/display.h"
#include "io/dashboard.h"
#include "io/gps.h"
#include "io/ledstrip.h"
#include "io/osd.h"
@ -225,11 +226,11 @@ static void taskCalculateAltitude(uint32_t currentTime)
}}
#endif
#ifdef DISPLAY
static void taskUpdateDisplay(uint32_t currentTime)
#ifdef USE_DASHBOARD
static void taskUpdateDashboard(uint32_t currentTime)
{
if (feature(FEATURE_DISPLAY)) {
displayUpdate(currentTime);
if (feature(FEATURE_DASHBOARD)) {
dashboardUpdate(currentTime);
}
}
#endif
@ -323,8 +324,8 @@ void fcTasksInit(void)
#if defined(BARO) || defined(SONAR)
setTaskEnabled(TASK_ALTITUDE, sensors(SENSOR_BARO) || sensors(SENSOR_SONAR));
#endif
#ifdef DISPLAY
setTaskEnabled(TASK_DISPLAY, feature(FEATURE_DISPLAY));
#ifdef USE_DASHBOARD
setTaskEnabled(TASK_DASHBOARD, feature(FEATURE_DASHBOARD));
#endif
#ifdef TELEMETRY
setTaskEnabled(TASK_TELEMETRY, feature(FEATURE_TELEMETRY));
@ -469,10 +470,10 @@ cfTask_t cfTasks[TASK_COUNT] = {
},
#endif
#ifdef DISPLAY
[TASK_DISPLAY] = {
.taskName = "DISPLAY",
.taskFunc = taskUpdateDisplay,
#ifdef USE_DASHBOARD
[TASK_DASHBOARD] = {
.taskName = "DASHBOARD",
.taskFunc = taskUpdateDashboard,
.desiredPeriod = 1000000 / 10,
.staticPriority = TASK_PRIORITY_LOW,
},