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

Renamed display to dashboard

Browse source
This commit is contained in:
Martin Budden 2016-11-02 05:00:09 +00:00
parent 229d47943e
commit 5bc1105871
16 changed files with 70 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/main/main.c
View file

@ -82,7 +82,7 @@
#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"
@ -395,9 +395,9 @@ void init(void)
initBoardAlignment(&masterConfig.boardAlignment);
#ifdef DISPLAY
if (feature(FEATURE_DISPLAY)) {
displayInit(&masterConfig.rxConfig);
#ifdef USE_DASHBOARD
if (feature(FEATURE_DASHBOARD)) {
dashboardInit(&masterConfig.rxConfig);
}
#endif
@ -585,13 +585,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