Mirror/edgetx
1
0
Fork 0
mirror of https://github.com/EdgeTX/edgetx.git synced 2025-07-19 22:35:10 +03:00
Code Activity

[Horus] Compilation fixes

Browse source
This commit is contained in:
Bertrand Songis 2016-02-11 23:34:07 +01:00
parent 02f06706c2
commit 48081db9f6
3 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
companion/src/firmwares/opentx/simulator/opentxsimulator.cpp
View file

@ -172,8 +172,11 @@ namespace NAMESPACE {
#include "radio/src/gui/horus/view_about.cpp" #include "radio/src/gui/horus/view_about.cpp"
#include "radio/src/gui/horus/lcd.cpp" #include "radio/src/gui/horus/lcd.cpp"
#include "radio/src/gui/horus/splash.cpp" #include "radio/src/gui/horus/splash.cpp"
#include "radio/src/gui/horus/widget.cpp" #include "radio/src/gui/horus/theme.cpp"
#include "radio/src/gui/horus/layout.cpp" #include "radio/src/gui/horus/layout.cpp"
#include "radio/src/gui/horus/widget.cpp"
#include "radio/src/gui/horus/themes/default.cpp"
#include "radio/src/gui/horus/themes/darkblue.cpp"
#include "radio/src/gui/horus/layouts/layout2+1.cpp" #include "radio/src/gui/horus/layouts/layout2+1.cpp"
#include "radio/src/gui/horus/layouts/layout1x1.cpp" #include "radio/src/gui/horus/layouts/layout1x1.cpp"
#include "radio/src/gui/horus/layouts/layout2x2.cpp" #include "radio/src/gui/horus/layouts/layout2x2.cpp"

3
radio/src/gui/horus/screens_setup.cpp
View file

@ -255,12 +255,15 @@ bool menuScreensTheme(evt_t event)
break; break;
} }
} }
return true;
} }
bool menuScreenAdd(evt_t event) bool menuScreenAdd(evt_t event)
{ {
int menuItemsCount = updateMainviewsMenu(); int menuItemsCount = updateMainviewsMenu();
MENU_WITH_OPTIONS("Add main view", LBM_MAINVIEWS_ICONS, menuTabMainviews, menuItemsCount, menuItemsCount-1, 0, { uint8_t(NAVIGATION_LINE_BY_LINE|uint8_t(countRegisteredLayouts-1)), ORPHAN_ROW, 0, 0, 0, 0 }); MENU_WITH_OPTIONS("Add main view", LBM_MAINVIEWS_ICONS, menuTabMainviews, menuItemsCount, menuItemsCount-1, 0, { uint8_t(NAVIGATION_LINE_BY_LINE|uint8_t(countRegisteredLayouts-1)), ORPHAN_ROW, 0, 0, 0, 0 });
return true;
} }
template <int T> template <int T>

2
radio/src/lua/api_general.cpp
View file

@ -806,7 +806,9 @@ const luaR_value_entry opentxConstants[] = {
{ "INVERS", INVERS }, { "INVERS", INVERS },
{ "BOLD", BOLD }, { "BOLD", BOLD },
{ "BLINK", BLINK }, { "BLINK", BLINK },
#if !defined(COLORLCD)
{ "FIXEDWIDTH", FIXEDWIDTH }, { "FIXEDWIDTH", FIXEDWIDTH },
#endif
{ "LEFT", LEFT }, { "LEFT", LEFT },
{ "PREC1", PREC1 }, { "PREC1", PREC1 },
{ "PREC2", PREC2 }, { "PREC2", PREC2 },