Merge pull request #373 from EdgeTX/2.4

Merge from 2.4
This commit is contained in:
richardclli
2021-06-30 15:14:08 +08:00
committed by GitHub
58 changed files with 375 additions and 1296 deletions
+7 -4
View File
@@ -240,7 +240,10 @@ inline uint8_t MODULE_SUBTYPE_ROWS(int moduleIdx)
}
#define POT_WARN_ROWS ((g_model.potsWarnMode) ? (uint8_t)(NUM_POTS+NUM_SLIDERS) : (uint8_t)0)
#define TIMER_ROWS 1, 0, 1, 0, 0, 0
#define TIMER_ROWS(x) \
1, 0, 1, 0, 0, \
g_model.timers[x].countdownBeep != COUNTDOWN_SILENT ? (uint8_t)1 \
: (uint8_t)0
#if defined(PCBSKY9X)
#define EXTRA_MODULE_ROWS LABEL(ExtraModule), 1, 2,
@@ -411,9 +414,9 @@ void menuModelSetup(event_t event)
MENU_TAB({
HEADER_LINE_COLUMNS
0,
TIMER_ROWS,
TIMER_ROWS,
TIMER_ROWS,
TIMER_ROWS(0),
TIMER_ROWS(1),
TIMER_ROWS(2),
0, // Extended limits
1, // Extended trims
0, // Show trims
+9 -128
View File
@@ -20,145 +20,26 @@
#include "opentx.h"
const unsigned char about_bmp[] = {
#include "about.lbm"
};
enum AboutScreens {
ABOUT_OPENTX,
ABOUT_HARDWARE,
ABOUT_BERTRAND,
ABOUT_ANDRE,
ABOUT_MIKE,
ABOUT_KJELL,
ABOUT_MARTIN,
ABOUT_ROMOLO,
ABOUT_ROB,
ABOUT_PARENTS,
ABOUT_END,
ABOUT_COUNT,
};
#define ABOUT_X 2
#define ABOUT_INDENT 4
#if defined(KEYS_GPIO_REG_PAGEDN)
#define EVT_KEY_PREVIOUS_VIEW EVT_KEY_BREAK(KEY_PAGEUP)
#define EVT_KEY_NEXT_VIEW EVT_KEY_BREAK(KEY_PAGEDN)
#elif defined(NAVIGATION_X7)
#define EVT_KEY_PREVIOUS_VIEW EVT_KEY_LONG(KEY_PAGE)
#define EVT_KEY_NEXT_VIEW EVT_KEY_BREAK(KEY_PAGE)
#else
#define EVT_KEY_PREVIOUS_VIEW EVT_KEY_FIRST(KEY_UP)
#define EVT_KEY_NEXT_VIEW EVT_KEY_FIRST(KEY_DOWN)
#endif
const char ABOUT_VERSION_1[] = "EdgeTX Endeavour (2.4.0)";
const char ABOUT_VERSION_2[] = "Copyright (C) 2021 EdgeTX";
const char ABOUT_VERSION_3[] = "https://edge-tx.org";
void menuAboutView(event_t event)
{
static uint8_t screenIndex;
static uint8_t greyIndex;
switch(event)
{
case EVT_ENTRY:
screenIndex = 0;
greyIndex = 0;
break;
case EVT_KEY_NEXT_VIEW:
screenIndex < ABOUT_PARENTS ? screenIndex++ : screenIndex = ABOUT_OPENTX;
greyIndex = 0;
break;
case EVT_KEY_PREVIOUS_VIEW:
if (IS_KEY_LONG(EVT_KEY_PREVIOUS_VIEW)) {
killEvents(event);
}
screenIndex > ABOUT_OPENTX ? screenIndex-- : screenIndex = ABOUT_PARENTS;
greyIndex = 0;
break;
case EVT_KEY_FIRST(KEY_EXIT):
case EVT_KEY_FIRST(KEY_ENTER):
chainMenu(menuMainView);
break;
}
lcdDrawText(17, 0, STR_ABOUTUS, DBLSIZE|INVERS);
lcdDrawSolidHorizontalLine(17, 16, LCD_W-17);
lcdDraw1bitBitmap(8, 0, about_bmp, 0);
LcdFlags att = 0;
lcdDrawText(2, 0, STR_ABOUTUS, DBLSIZE|INVERS);
lcdDrawSolidHorizontalLine(0, 16, LCD_W-17);
uint8_t screenDuration = 150;
switch (screenIndex) {
case ABOUT_OPENTX:
case ABOUT_END:
lcdDrawText(ABOUT_X, 22, STR_ABOUT_OPENTX_1, SMLSIZE);
lcdDrawText(ABOUT_X, 30, STR_ABOUT_OPENTX_2, SMLSIZE);
lcdDrawText(ABOUT_X, 38, STR_ABOUT_OPENTX_3, SMLSIZE);
lcdDrawText(ABOUT_X, 46, STR_ABOUT_OPENTX_4, SMLSIZE);
lcdDrawText(ABOUT_X, 54, STR_ABOUT_OPENTX_5, SMLSIZE);
screenDuration = 255;
break;
case ABOUT_BERTRAND:
lcdDrawText(ABOUT_X, 24, STR_ABOUT_BERTRAND_1, att);
lcdDrawText(ABOUT_X+ABOUT_INDENT, 36, STR_ABOUT_BERTRAND_2, att|SMLSIZE);
lcdDrawText(ABOUT_X+ABOUT_INDENT, 44, STR_ABOUT_BERTRAND_3, att|SMLSIZE);
break;
case ABOUT_ANDRE:
lcdDrawText(ABOUT_X, 24, STR_ABOUT_ANDRE_1, att);
lcdDrawText(ABOUT_X+ABOUT_INDENT, 36, STR_ABOUT_ANDRE_2, att|SMLSIZE);
lcdDrawText(ABOUT_X+ABOUT_INDENT, 44, STR_ABOUT_ANDRE_3, att|SMLSIZE);
break;
case ABOUT_MIKE:
lcdDrawText(ABOUT_X, 24, STR_ABOUT_MIKE_1, att);
lcdDrawText(ABOUT_X+ABOUT_INDENT, 36, STR_ABOUT_MIKE_2, att|SMLSIZE);
lcdDrawText(ABOUT_X+ABOUT_INDENT, 44, STR_ABOUT_MIKE_3, att|SMLSIZE);
lcdDrawText(ABOUT_X+ABOUT_INDENT, 52, STR_ABOUT_MIKE_4, att|SMLSIZE);
break;
case ABOUT_KJELL:
lcdDrawText(ABOUT_X, 24, STR_ABOUT_KJELL_1, att);
lcdDrawText(ABOUT_X+ABOUT_INDENT, 36, STR_ABOUT_KJELL_2, att|SMLSIZE);
lcdDrawText(ABOUT_X+ABOUT_INDENT, 44, STR_ABOUT_KJELL_3, att|SMLSIZE);
lcdDrawText(ABOUT_X+ABOUT_INDENT, 52, STR_ABOUT_KJELL_4, att|SMLSIZE);
break;
case ABOUT_MARTIN:
lcdDrawText(ABOUT_X, 24, STR_ABOUT_MARTIN_1, att);
lcdDrawText(ABOUT_X+ABOUT_INDENT, 36, STR_ABOUT_MARTIN_2, att|SMLSIZE);
break;
case ABOUT_ROMOLO:
lcdDrawText(ABOUT_X, 24, STR_ABOUT_ROMOLO_1, att);
lcdDrawText(ABOUT_X+ABOUT_INDENT, 36, STR_ABOUT_ROMOLO_2, att|SMLSIZE);
lcdDrawText(ABOUT_X+ABOUT_INDENT, 44, STR_ABOUT_ROMOLO_3, att|SMLSIZE);
break;
case ABOUT_ROB:
lcdDrawText(ABOUT_X, 24, STR_ABOUT_ROB_1, att);
lcdDrawText(ABOUT_X+ABOUT_INDENT, 36, STR_ABOUT_ROB_2, att|SMLSIZE);
break;
case ABOUT_HARDWARE:
lcdDrawText(ABOUT_X, 24, STR_ABOUT_HARDWARE_1, att);
lcdDrawText(ABOUT_X+ABOUT_INDENT, 36, STR_ABOUT_HARDWARE_2, att|SMLSIZE);
lcdDrawText(ABOUT_X+ABOUT_INDENT, 44, STR_ABOUT_HARDWARE_3, att|SMLSIZE);
break;
case ABOUT_PARENTS:
lcdDrawText(ABOUT_X, 24, STR_ABOUT_PARENTS_1, att);
lcdDrawText(ABOUT_X+ABOUT_INDENT, 36, STR_ABOUT_PARENTS_2, att|SMLSIZE);
lcdDrawText(ABOUT_X+ABOUT_INDENT, 44, STR_ABOUT_PARENTS_3, att|SMLSIZE);
lcdDrawText(ABOUT_X+ABOUT_INDENT, 52, STR_ABOUT_PARENTS_4, att|SMLSIZE);
screenDuration = 255;
break;
}
if (++greyIndex == screenDuration) {
greyIndex = 0;
if (++screenIndex == ABOUT_COUNT) {
chainMenu(menuMainView);
}
}
lcdDrawText(ABOUT_INDENT, 22, ABOUT_VERSION_1, SMLSIZE);
lcdDrawText(ABOUT_INDENT, 30, ABOUT_VERSION_2, SMLSIZE);
lcdDrawText(ABOUT_INDENT, 38, ABOUT_VERSION_3, SMLSIZE);
}
+7 -5
View File
@@ -275,8 +275,10 @@ void editTimerCountdown(int timerIdx, coord_t y, LcdFlags attr, event_t event)
#define TRAINER_ROWS LABEL(Trainer), 0, TRAINER_CHANNELS_ROW, TRAINER_PPM_PARAMS_ROW
#endif
#define TIMER_ROWS \
1 | NAVIGATION_LINE_BY_LINE, 0, 1 | NAVIGATION_LINE_BY_LINE, 0, 0, 0
#define TIMER_ROWS(x) \
1 | NAVIGATION_LINE_BY_LINE, 0, 1 | NAVIGATION_LINE_BY_LINE, 0, 0, \
g_model.timers[x].countdownBeep != COUNTDOWN_SILENT ? (uint8_t)1 \
: (uint8_t)0
inline uint8_t EXTERNAL_MODULE_TYPE_ROW()
{
@@ -287,11 +289,11 @@ inline uint8_t EXTERNAL_MODULE_TYPE_ROW()
}
#if TIMERS == 1
#define TIMERS_ROWS TIMER_ROWS
#define TIMERS_ROWS TIMER_ROWS(0)
#elif TIMERS == 2
#define TIMERS_ROWS TIMER_ROWS, TIMER_ROWS
#define TIMERS_ROWS TIMER_ROWS(0), TIMER_ROWS(1)
#elif TIMERS == 3
#define TIMERS_ROWS TIMER_ROWS, TIMER_ROWS, TIMER_ROWS
#define TIMERS_ROWS TIMER_ROWS(0), TIMER_ROWS(1), TIMER_ROWS(2)
#endif
#if defined(PCBX9E)
#define SW_WARN_ROWS uint8_t(NAVIGATION_LINE_BY_LINE|(getSwitchWarningsCount()-1)), uint8_t(getSwitchWarningsCount() > 8 ? TITLE_ROW : HIDDEN_ROW), uint8_t(getSwitchWarningsCount() > 16 ? TITLE_ROW : HIDDEN_ROW)
+10 -116
View File
@@ -20,132 +20,26 @@
#include "opentx.h"
const unsigned char about_bmp[] = {
#include "about.lbm"
};
enum AboutScreens {
ABOUT_OPENTX,
ABOUT_HARDWARE,
ABOUT_BERTRAND,
ABOUT_ANDRE,
ABOUT_MIKE,
ABOUT_KJELL,
ABOUT_MARTIN,
ABOUT_ROMOLO,
ABOUT_ROB,
ABOUT_PARENTS,
ABOUT_END,
ABOUT_COUNT,
};
#define ABOUT_X 62
#define ABOUT_INDENT 6
const char ABOUT_VERSION_1[] = "EdgeTX Endeavour (2.4.0)";
const char ABOUT_VERSION_2[] = "Copyright (C) 2021 EdgeTX";
const char ABOUT_VERSION_3[] = "https://edge-tx.org";
void menuAboutView(event_t event)
{
static uint8_t screenIndex;
static uint8_t greyIndex;
switch(event)
{
case EVT_ENTRY:
screenIndex = 0;
greyIndex = 0;
break;
case EVT_KEY_FIRST(KEY_DOWN):
screenIndex < ABOUT_PARENTS ? screenIndex++ : screenIndex = ABOUT_OPENTX;
greyIndex = 0;
break;
case EVT_KEY_FIRST(KEY_UP):
screenIndex > ABOUT_OPENTX ? screenIndex-- : screenIndex = ABOUT_PARENTS;
greyIndex = 0;
break;
case EVT_KEY_FIRST(KEY_ENTER):
case EVT_KEY_FIRST(KEY_EXIT):
chainMenu(menuMainView);
break;
}
lcdDrawBitmap(0, 0, about_bmp);
lcdDrawText(64, 0, STR_ABOUTUS, DBLSIZE);
lcdDrawSolidHorizontalLine(ABOUT_X, 18, 120);
lcdDrawSolidHorizontalLine(ABOUT_X, 19, 130, GREY_DEFAULT);
LcdFlags att = GREY(max(0, 15-greyIndex/2));
lcdDrawText(2, 2, STR_ABOUTUS, BOLD);
lcdDrawSolidHorizontalLine(0, 11, 130, GREY_DEFAULT);
uint8_t screenDuration = 150;
switch (screenIndex) {
case ABOUT_OPENTX:
case ABOUT_END:
lcdDrawText(ABOUT_X, 22, STR_ABOUT_OPENTX_1, SMLSIZE);
lcdDrawText(ABOUT_X, 30, STR_ABOUT_OPENTX_2, SMLSIZE);
lcdDrawText(ABOUT_X, 38, STR_ABOUT_OPENTX_3, SMLSIZE);
lcdDrawText(ABOUT_X, 46, STR_ABOUT_OPENTX_4, SMLSIZE);
lcdDrawText(ABOUT_X, 54, STR_ABOUT_OPENTX_5, SMLSIZE);
screenDuration = 255;
break;
case ABOUT_BERTRAND:
lcdDrawText(ABOUT_X, 24, STR_ABOUT_BERTRAND_1, att);
lcdDrawText(ABOUT_X+ABOUT_INDENT, 36, STR_ABOUT_BERTRAND_2, att|SMLSIZE);
lcdDrawText(ABOUT_X+ABOUT_INDENT, 44, STR_ABOUT_BERTRAND_3, att|SMLSIZE);
break;
case ABOUT_ANDRE:
lcdDrawText(ABOUT_X, 24, STR_ABOUT_ANDRE_1, att);
lcdDrawText(ABOUT_X+ABOUT_INDENT, 36, STR_ABOUT_ANDRE_2, att|SMLSIZE);
lcdDrawText(ABOUT_X+ABOUT_INDENT, 44, STR_ABOUT_ANDRE_3, att|SMLSIZE);
break;
case ABOUT_MIKE:
lcdDrawText(ABOUT_X, 24, STR_ABOUT_MIKE_1, att);
lcdDrawText(ABOUT_X+ABOUT_INDENT, 36, STR_ABOUT_MIKE_2, att|SMLSIZE);
lcdDrawText(ABOUT_X+ABOUT_INDENT, 44, STR_ABOUT_MIKE_3, att|SMLSIZE);
lcdDrawText(ABOUT_X+ABOUT_INDENT, 52, STR_ABOUT_MIKE_4, att|SMLSIZE);
break;
case ABOUT_KJELL:
lcdDrawText(ABOUT_X, 24, STR_ABOUT_KJELL_1, att);
lcdDrawText(ABOUT_X+ABOUT_INDENT, 36, STR_ABOUT_KJELL_2, att|SMLSIZE);
lcdDrawText(ABOUT_X+ABOUT_INDENT, 44, STR_ABOUT_KJELL_3, att|SMLSIZE);
lcdDrawText(ABOUT_X+ABOUT_INDENT, 52, STR_ABOUT_KJELL_4, att|SMLSIZE);
break;
case ABOUT_MARTIN:
lcdDrawText(ABOUT_X, 24, STR_ABOUT_MARTIN_1, att);
lcdDrawText(ABOUT_X+ABOUT_INDENT, 36, STR_ABOUT_MARTIN_2, att|SMLSIZE);
break;
case ABOUT_ROMOLO:
lcdDrawText(ABOUT_X, 24, STR_ABOUT_ROMOLO_1, att);
lcdDrawText(ABOUT_X+ABOUT_INDENT, 36, STR_ABOUT_ROMOLO_2, att|SMLSIZE);
lcdDrawText(ABOUT_X+ABOUT_INDENT, 44, STR_ABOUT_ROMOLO_3, att|SMLSIZE);
break;
case ABOUT_ROB:
lcdDrawText(ABOUT_X, 24, STR_ABOUT_ROB_1, att);
lcdDrawText(ABOUT_X+ABOUT_INDENT, 36, STR_ABOUT_ROB_2, att|SMLSIZE);
break;
case ABOUT_HARDWARE:
lcdDrawText(ABOUT_X, 24, STR_ABOUT_HARDWARE_1, att);
lcdDrawText(ABOUT_X+ABOUT_INDENT, 36, STR_ABOUT_HARDWARE_2, att|SMLSIZE);
lcdDrawText(ABOUT_X+ABOUT_INDENT, 44, STR_ABOUT_HARDWARE_3, att|SMLSIZE);
break;
case ABOUT_PARENTS:
lcdDrawText(ABOUT_X, 24, STR_ABOUT_PARENTS_1, att);
lcdDrawText(ABOUT_X+ABOUT_INDENT, 36, STR_ABOUT_PARENTS_2, att|SMLSIZE);
lcdDrawText(ABOUT_X+ABOUT_INDENT, 44, STR_ABOUT_PARENTS_3, att|SMLSIZE);
lcdDrawText(ABOUT_X+ABOUT_INDENT, 52, STR_ABOUT_PARENTS_4, att|SMLSIZE);
screenDuration = 255;
break;
}
if (++greyIndex == screenDuration) {
greyIndex = 0;
if (++screenIndex == ABOUT_COUNT) {
chainMenu(menuMainView);
}
}
lcdDrawText(ABOUT_INDENT, 22, ABOUT_VERSION_1);
lcdDrawText(ABOUT_INDENT, 32, ABOUT_VERSION_2, SMLSIZE);
lcdDrawText(ABOUT_INDENT, 42, ABOUT_VERSION_3);
}
+1
View File
@@ -55,6 +55,7 @@ set(GUI_SRC
radio_diagkeys.cpp
radio_diaganas.cpp
radio_calibration.cpp
view_about.cpp
view_main.cpp
view_main_menu.cpp
view_main_decoration.cpp
+6 -6
View File
@@ -324,15 +324,15 @@ coord_t drawGPSCoord(BitmapBuffer * dc, coord_t x, coord_t y, int32_t value, con
void drawGPSPosition(BitmapBuffer * dc, coord_t x, coord_t y, int32_t longitude, int32_t latitude, LcdFlags flags)
{
if (flags & PREC1) {
drawGPSCoord(dc, x, y, latitude, "NS", flags, false);
drawGPSCoord(dc, x, y + FH, longitude, "EW", flags, false);
drawGPSCoord(dc, x, y, latitude, "NS", flags, true);
drawGPSCoord(dc, x, y + FH, longitude, "EW", flags, true);
} else {
if (flags & RIGHT) {
x = drawGPSCoord(dc, x, y, longitude, "EW", flags, false);
drawGPSCoord(dc, x - 5, y, latitude, "NS", flags, false);
x = drawGPSCoord(dc, x, y, longitude, "EW", flags, true);
drawGPSCoord(dc, x - 5, y, latitude, "NS", flags, true);
} else {
x = drawGPSCoord(dc, x, y, latitude, "NS", flags, false);
drawGPSCoord(dc, x + 5, y, longitude, "EW", flags, false);
x = drawGPSCoord(dc, x, y, latitude, "NS", flags, true);
drawGPSCoord(dc, x + 5, y, longitude, "EW", flags, true);
}
}
}
+2 -1
View File
@@ -24,7 +24,8 @@
void MainViewTrim::checkEvents()
{
Window::checkEvents();
int8_t newValue = getTrimValue(mixerCurrentFlightMode, idx);
int8_t stickIndex = CONVERT_MODE(idx);
int8_t newValue = getTrimValue(mixerCurrentFlightMode, stickIndex);
if (value != newValue) {
value = newValue;
invalidate();
+1 -1
View File
@@ -56,7 +56,7 @@ void ModelHeliPage::build(FormWindow * window)
// Aileron source
new StaticText(window, grid.getLabelSlot(), STR_AILERON);
new SourceChoice(window, grid.getFieldSlot(), 0, MIXSRC_LAST_CH, GET_SET_DEFAULT(g_model.swashR.aileronWeight));
new SourceChoice(window, grid.getFieldSlot(), 0, MIXSRC_LAST_CH, GET_SET_DEFAULT(g_model.swashR.aileronSource));
grid.nextLine();
// Aileron weight
+6 -1
View File
@@ -337,7 +337,7 @@ void CommonInputOrMixButton::drawFlightModes(BitmapBuffer *dc,
void CommonInputOrMixButton::paint(BitmapBuffer * dc)
{
dc->drawSolidFilledRect(0, 0, width(), height(),
/*hasFocus() ? FOCUS_BGCOLOR :*/ FIELD_BGCOLOR);
isActive() ? HIGHLIGHT_COLOR : FIELD_BGCOLOR);
paintBody(dc);
if (!hasFocus())
@@ -397,12 +397,17 @@ class InputLineButton : public CommonInputOrMixButton
if (line.flightModes) {
drawFlightModes(dc, line.flightModes, textColor);
}
}
};
ModelInputsPage::ModelInputsPage():
PageTab(STR_MENUINPUTS, ICON_MODEL_INPUTS)
{
setOnSetVisibleHandler([]() {
// reset clipboard
s_copyMode = 0;
});
}
void ModelInputsPage::rebuild(FormWindow * window, int8_t focusIndex)
+4
View File
@@ -312,6 +312,10 @@ void insertMix(uint8_t idx, uint8_t channel)
ModelMixesPage::ModelMixesPage() :
PageTab(STR_MIXES, ICON_MODEL_MIXER)
{
setOnSetVisibleHandler([]() {
// reset clipboard
s_copyMode = 0;
});
}
void ModelMixesPage::rebuild(FormWindow * window, int8_t focusMixIndex)
+19 -5
View File
@@ -120,7 +120,7 @@ class ModelButton : public Button
partialModel.header.name[0] != '\0') {
if (version == 219) {
size_t len = sizeof(partialModel.header.name);
int len = (int)sizeof(partialModel.header.name);
char* str = partialModel.header.name;
for (int i=0; i < len; i++) {
str[i] = zchar2char(str[i]);
@@ -210,14 +210,21 @@ class ModelCategoryPageBody : public FormWindow
update();
}
void update(int selected = 0)
void update(int selected = -1)
{
clear();
if (selected < 0) {
auto model = modelslist.getCurrentModel();
selected = category->getModelIndex(model);
if (selected < 0) selected = 0;
}
int index = 0;
coord_t y = MODEL_CELL_PADDING;
coord_t x = MODEL_CELL_PADDING;
ModelButton* selectButton = nullptr;
for (auto &model : *category) {
auto button = new ModelButton(
this, {x, y, MODEL_SELECT_CELL_WIDTH, MODEL_SELECT_CELL_HEIGHT},
@@ -237,7 +244,7 @@ class ModelCategoryPageBody : public FormWindow
storageCheck(true);
modelslist.setCurrentModel(model);
update(); // modelslist.getModelIndex(modelCell));
update();
});
}
menu->addLine(STR_CREATE_MODEL, getCreateModelAction());
@@ -264,7 +271,7 @@ class ModelCategoryPageBody : public FormWindow
.c_str(),
[=] {
modelslist.removeModel(category, model);
update(index > 0 ? index - 1 : 0);
update(index < category->size() - 1 ? index : index - 1);
});
});
}
@@ -275,7 +282,7 @@ class ModelCategoryPageBody : public FormWindow
});
if (selected == index) {
button->setFocus(SET_FOCUS_DEFAULT);
selectButton = button;
}
index++;
@@ -299,6 +306,8 @@ class ModelCategoryPageBody : public FormWindow
if (category->empty()) {
setFocus();
} else if (selectButton) {
selectButton->setFocus();
}
}
@@ -368,4 +377,9 @@ ModelSelectMenu::ModelSelectMenu():
for (auto category: modelslist.getCategories()) {
addTab(new ModelCategoryPage(category));
}
int idx = modelslist.getCurrentCategoryIdx();
if (idx >= 0) {
setCurrentTab(idx);
}
}
+14 -7
View File
@@ -84,6 +84,9 @@ class SensorButton : public Button {
else
dc->drawSolidFilledRect(2, 2, rect.w - 4, rect.h - 4, FIELD_BGCOLOR);
if (telemetryItem.isFresh())
dc->drawFilledCircle(24, (2 + rect.h - 4)/2, 4, DEFAULT_COLOR);
dc->drawNumber(2, 1, number, LEFT, 0, nullptr, ":");
dc->drawSizedText(SENSOR_COL1, line1, g_model.telemetrySensors[index].label, TELEM_LABEL_LEN);
@@ -122,17 +125,21 @@ class SensorEditWindow : public Page {
Page(ICON_MODEL_TELEMETRY),
index(index)
{
buildBody(&body);
buildHeader(&header);
buildBody(&body);
}
protected:
uint8_t index;
FormWindow * sensorParametersWindow = nullptr;
FormGroup * sensorParametersWindow = nullptr;
void buildHeader(Window * window)
{
new StaticText(window, {PAGE_TITLE_LEFT, PAGE_TITLE_TOP, LCD_W - PAGE_TITLE_LEFT, PAGE_LINE_HEIGHT}, STR_SENSOR + std::to_string(index + 1), 0, MENU_COLOR);
new StaticText(window,
{PAGE_TITLE_LEFT, PAGE_TITLE_TOP, LCD_W - PAGE_TITLE_LEFT,
PAGE_LINE_HEIGHT},
STR_SENSOR + std::to_string(index + 1), 0,
MENU_HIGHLIGHT_COLOR);
// dynamic display of sensor value ?
//new StaticText(window, {70, 28, 100, 20}, "SF" + std::to_string(index), 0, MENU_COLOR);
}
@@ -321,9 +328,7 @@ class SensorEditWindow : public Page {
SET_DIRTY();
});
coord_t delta = sensorParametersWindow->adjustHeight();
Window * parent = sensorParametersWindow->getParent();
parent->moveWindowsTop(sensorParametersWindow->top(), delta);
sensorParametersWindow->adjustHeight();
}
void buildBody(FormWindow * window)
@@ -355,7 +360,9 @@ class SensorEditWindow : public Page {
});
grid.nextLine();
sensorParametersWindow = new FormWindow(window, {0, grid.getWindowHeight(), LCD_W, 0});
sensorParametersWindow = new FormGroup(window, {0, grid.getWindowHeight(), LCD_W, 0},
FORM_FORWARD_FOCUS | FORM_NO_BORDER
| FORWARD_SCROLL);
updateSensorParametersWindow();
grid.addWindow(sensorParametersWindow);
+1 -1
View File
@@ -67,7 +67,7 @@ class RadioAnalogsDiagsWindow: public Window {
void RadioAnalogsDiagsPage::buildHeader(Window * window)
{
new StaticText(window, {PAGE_TITLE_LEFT, PAGE_TITLE_TOP + 10, LCD_W - PAGE_TITLE_LEFT, PAGE_LINE_HEIGHT}, STR_MENU_RADIO_ANALOGS, 0, MENU_COLOR);
new StaticText(window, {PAGE_TITLE_LEFT, PAGE_TITLE_TOP + 10, LCD_W - PAGE_TITLE_LEFT, PAGE_LINE_HEIGHT}, STR_MENU_RADIO_ANALOGS, 0, MENU_HIGHLIGHT_COLOR);
}
void RadioAnalogsDiagsPage::buildBody(Window * window)
+1 -1
View File
@@ -114,7 +114,7 @@ class RadioKeyDiagsWindow : public Window
void RadioKeyDiagsPage::buildHeader(Window * window)
{
new StaticText(window, {PAGE_TITLE_LEFT, PAGE_TITLE_TOP + 10, LCD_W - PAGE_TITLE_LEFT, PAGE_LINE_HEIGHT}, STR_MENU_RADIO_SWITCHES, 0, MENU_COLOR);
new StaticText(window, {PAGE_TITLE_LEFT, PAGE_TITLE_TOP + 10, LCD_W - PAGE_TITLE_LEFT, PAGE_LINE_HEIGHT}, STR_MENU_RADIO_SWITCHES, 0, MENU_HIGHLIGHT_COLOR);
}
void RadioKeyDiagsPage::buildBody(Window * window)
+18 -8
View File
@@ -278,19 +278,29 @@ void RadioHardwarePage::build(FormWindow * window)
#if defined(AUX_SERIAL)
new StaticText(window, grid.getLabelSlot(), STR_AUX_SERIAL_MODE);
auto aux = new Choice(window, grid.getFieldSlot(1,0), STR_AUX_SERIAL_MODES, 0, UART_MODE_MAX, GET_SET_DEFAULT(g_eeGeneral.auxSerialMode));
aux->setAvailableHandler([=](int value) {
return isAuxModeAvailable;
});
auto aux =
new Choice(window, grid.getFieldSlot(1, 0), STR_AUX_SERIAL_MODES, 0,
UART_MODE_MAX, GET_DEFAULT(g_eeGeneral.auxSerialMode),
[](int value) {
g_eeGeneral.auxSerialMode = value;
auxSerialInit(g_eeGeneral.auxSerialMode, modelTelemetryProtocol());
SET_DIRTY();
});
aux->setAvailableHandler(isAuxModeAvailable);
grid.nextLine();
#endif
#if defined(AUX2_SERIAL)
new StaticText(window, grid.getLabelSlot(), STR_AUX2_SERIAL_MODE);
auto aux2 = new Choice(window, grid.getFieldSlot(1,0), STR_AUX_SERIAL_MODES, 0, UART_MODE_MAX, GET_SET_DEFAULT(g_eeGeneral.aux2SerialMode));
aux2->setAvailableHandler([=](int value) {
return isAux2ModeAvailable;
});
auto aux2 =
new Choice(window, grid.getFieldSlot(1, 0), STR_AUX_SERIAL_MODES, 0,
UART_MODE_MAX, GET_DEFAULT(g_eeGeneral.aux2SerialMode),
[](int value) {
g_eeGeneral.aux2SerialMode = value;
aux2SerialInit(g_eeGeneral.aux2SerialMode, modelTelemetryProtocol());
SET_DIRTY();
});
aux2->setAvailableHandler(isAux2ModeAvailable);
grid.nextLine();
#endif
+2 -2
View File
@@ -33,8 +33,8 @@ class FileNameEditWindow : public Page
FileNameEditWindow(const std::string iName) :
Page(ICON_RADIO_SD_MANAGER), name(std::move(iName))
{
buildBody(&body);
buildHeader(&header);
buildBody(&body);
};
#if defined(DEBUG_WINDOWS)
@@ -45,7 +45,7 @@ class FileNameEditWindow : public Page
void buildHeader(Window *window)
{
new StaticText(window, {70, 4, 180, 30}, STR_RENAME_FILE, MENU_BGCOLOR);
new StaticText(window, {PAGE_TITLE_LEFT, PAGE_TITLE_TOP + 10, LCD_W - PAGE_TITLE_LEFT, PAGE_LINE_HEIGHT}, STR_RENAME_FILE, 0, MENU_HIGHLIGHT_COLOR);
}
void buildBody(Window *window)
+8 -1
View File
@@ -302,7 +302,7 @@ void RadioSetupPage::build(FormWindow * window)
// Battery warning
new StaticText(window, grid.getLabelSlot(true), STR_BATTERYWARNING);
edit = new NumberEdit(window, grid.getFieldSlot(), 30, 120, GET_SET_DEFAULT(g_eeGeneral.vBatWarn), 0, PREC1);
edit->setSuffix("v");
edit->setSuffix("V");
grid.nextLine();
// Inactivity alarm
@@ -356,6 +356,13 @@ void RadioSetupPage::build(FormWindow * window)
new Slider(window, grid.getFieldSlot(), BACKLIGHT_LEVEL_MIN, BACKLIGHT_LEVEL_MAX, GET_SET_DEFAULT(g_eeGeneral.blOffBright));
grid.nextLine();
#if defined(KEYS_BACKLIGHT_GPIO)
// Keys backlight
new StaticText(window, grid.getLabelSlot(true), STR_KEYS_BACKLIGHT);
new CheckBox(window, grid.getFieldSlot(), GET_SET_DEFAULT(g_eeGeneral.keysBacklight));
grid.nextLine();
#endif
// Flash beep
new StaticText(window, grid.getLabelSlot(true), STR_ALARM);
new CheckBox(window, grid.getFieldSlot(), GET_SET_DEFAULT(g_eeGeneral.alarmsFlash));
+15 -2
View File
@@ -60,7 +60,7 @@ class SpecialFunctionEditPage : public Page
if (active != isActive()) {
invalidate();
headerSF->setTextFlags(isActive() ? FONT(BOLD) | HIGHLIGHT_COLOR
: MENU_COLOR);
: FOCUS_COLOR);
active = !active;
}
}
@@ -384,10 +384,23 @@ class SpecialFunctionEditPage : public Page
});
grid.nextLine();
// Patch function in case not available
if (!isAssignableFunctionAvailable(CFN_FUNC(cfn), functions)) {
auto func = 0;
while(!isAssignableFunctionAvailable(func, functions)
&& (func < FUNC_MAX - 1)) {
func++;
}
if (func < FUNC_MAX - 1) {
CFN_FUNC(cfn) = func;
}
}
// Function
new StaticText(window, grid.getLabelSlot(), STR_FUNC);
auto functionChoice =
new Choice(window, grid.getFieldSlot(), STR_VFSWFUNC, 0, FUNC_MAX - 1,
new Choice(window, grid.getFieldSlot(), STR_VFSWFUNC,
0, FUNC_MAX - 1,
GET_DEFAULT(CFN_FUNC(cfn)));
functionChoice->setSetValueHandler([=](int32_t newValue) {
CFN_FUNC(cfn) = newValue;
+25 -124
View File
@@ -1,7 +1,8 @@
/*
* Copyright (C) OpenTX
* Copyright (C) EdgeTX
*
* Based on code named
* opentx - https://github.com/opentx/opentx
* th9x - http://code.google.com/p/th9x
* er9x - http://code.google.com/p/er9x
* gruvin9x - http://code.google.com/p/gruvin9x
@@ -18,136 +19,36 @@
* GNU General Public License for more details.
*/
#include "view_about.h"
#include "opentx.h"
enum AboutScreens {
ABOUT_OPENTX,
ABOUT_HARDWARE,
ABOUT_BERTRAND,
ABOUT_ANDRE,
ABOUT_MIKE,
ABOUT_KJELL,
ABOUT_MARTIN,
ABOUT_ROMOLO,
ABOUT_ROB,
ABOUT_PARENTS,
ABOUT_END,
ABOUT_COUNT,
const uint8_t mask_qrcode[] = {
#include "mask_qrcode.lbm"
};
#define ABOUT_X 62
#define ABOUT_INDENT 16
constexpr coord_t ABOUT_WIDTH = 220;
bool menuAboutView(event_t event)
AboutUs::AboutUs() :
MessageDialog(MainWindow::instance(), STR_ABOUT_US, "")
{
static uint8_t screenIndex = 0;
static uint8_t greyIndex = 0;
content->setRect({(LCD_W - ABOUT_WIDTH) / 2, 20, ABOUT_WIDTH, LCD_H - 40});
switch (event) {
case EVT_ENTRY:
screenIndex = 0;
greyIndex = 0;
break;
#if defined(PCBX12S)
case EVT_KEY_FIRST(KEY_PGDN):
#elif defined(PCBX10)
case EVT_KEY_BREAK(KEY_PGDN):
#endif
screenIndex < ABOUT_PARENTS ? screenIndex++ : screenIndex = ABOUT_OPENTX;
greyIndex = 0;
break;
case EVT_KEY_FIRST(KEY_PGUP):
#if defined(PCBX10)
case EVT_KEY_LONG(KEY_PGDN):
#endif
screenIndex > ABOUT_OPENTX ? screenIndex-- : screenIndex = ABOUT_PARENTS;
greyIndex = 0;
killEvents(event);
break;
case EVT_KEY_FIRST(KEY_EXIT):
chainMenu(menuMainView);
break;
}
messageWidget->setTextFlags(CENTERED | FONT(BOLD) | DEFAULT_COLOR);
messageWidget->setTop(content->top() + 40);
messageWidget->setHeight(2*PAGE_LINE_HEIGHT);
theme->drawBackground();
theme->drawTopbarBackground(0);
messageWidget->setText("EdgeTX Endeavour (2.4.0)\n"
"Copyright (C) 2021 EdgeTX");
uint8_t screenDuration = 150;
switch (screenIndex) {
case ABOUT_OPENTX:
case ABOUT_END:
lcdDrawText(ABOUT_X, MENU_CONTENT_TOP, STR_ABOUT_OPENTX_1);
lcdDrawText(ABOUT_X, MENU_CONTENT_TOP + FH, STR_ABOUT_OPENTX_2);
lcdDrawText(ABOUT_X, MENU_CONTENT_TOP + 2*FH, STR_ABOUT_OPENTX_3);
lcdDrawText(ABOUT_X, MENU_CONTENT_TOP + 3*FH, STR_ABOUT_OPENTX_4);
lcdDrawText(ABOUT_X, MENU_CONTENT_TOP + 4*FH, STR_ABOUT_OPENTX_5);
screenDuration = 255;
break;
case ABOUT_BERTRAND:
lcdDrawText(ABOUT_X, MENU_CONTENT_TOP, STR_ABOUT_BERTRAND_1, INVERS);
lcdDrawText(ABOUT_X+ABOUT_INDENT, MENU_CONTENT_TOP + FH, STR_ABOUT_BERTRAND_2);
lcdDrawText(ABOUT_X+ABOUT_INDENT, MENU_CONTENT_TOP + 2*FH, STR_ABOUT_BERTRAND_3);
break;
case ABOUT_ANDRE:
lcdDrawText(ABOUT_X, MENU_CONTENT_TOP, STR_ABOUT_ANDRE_1, INVERS);
lcdDrawText(ABOUT_X+ABOUT_INDENT, MENU_CONTENT_TOP + FH, STR_ABOUT_ANDRE_2);
lcdDrawText(ABOUT_X+ABOUT_INDENT, MENU_CONTENT_TOP + 2*FH, STR_ABOUT_ANDRE_3);
break;
case ABOUT_MIKE:
lcdDrawText(ABOUT_X, MENU_CONTENT_TOP, STR_ABOUT_MIKE_1, INVERS);
lcdDrawText(ABOUT_X+ABOUT_INDENT, MENU_CONTENT_TOP + FH, STR_ABOUT_MIKE_2);
lcdDrawText(ABOUT_X+ABOUT_INDENT, MENU_CONTENT_TOP + 2*FH, STR_ABOUT_MIKE_3);
lcdDrawText(ABOUT_X+ABOUT_INDENT, MENU_CONTENT_TOP + 3*FH, STR_ABOUT_MIKE_4);
break;
case ABOUT_KJELL:
lcdDrawText(ABOUT_X, MENU_CONTENT_TOP, STR_ABOUT_KJELL_1, INVERS);
lcdDrawText(ABOUT_X+ABOUT_INDENT, MENU_CONTENT_TOP + FH, STR_ABOUT_KJELL_2);
lcdDrawText(ABOUT_X+ABOUT_INDENT, MENU_CONTENT_TOP + 2*FH, STR_ABOUT_KJELL_3);
lcdDrawText(ABOUT_X+ABOUT_INDENT, MENU_CONTENT_TOP + 3*FH, STR_ABOUT_KJELL_4);
break;
case ABOUT_MARTIN:
lcdDrawText(ABOUT_X, MENU_CONTENT_TOP, STR_ABOUT_MARTIN_1, INVERS);
lcdDrawText(ABOUT_X+ABOUT_INDENT, MENU_CONTENT_TOP + FH, STR_ABOUT_MARTIN_2);
break;
case ABOUT_ROMOLO:
lcdDrawText(ABOUT_X, MENU_CONTENT_TOP, STR_ABOUT_ROMOLO_1, INVERS);
lcdDrawText(ABOUT_X+ABOUT_INDENT, MENU_CONTENT_TOP + FH, STR_ABOUT_ROMOLO_2);
lcdDrawText(ABOUT_X+ABOUT_INDENT, MENU_CONTENT_TOP + 2*FH, STR_ABOUT_ROMOLO_3);
break;
case ABOUT_ROB:
lcdDrawText(ABOUT_X, MENU_CONTENT_TOP, STR_ABOUT_ROB_1, INVERS);
lcdDrawText(ABOUT_X+ABOUT_INDENT, MENU_CONTENT_TOP + FH, STR_ABOUT_ROB_2);
break;
case ABOUT_HARDWARE:
lcdDrawText(ABOUT_X, MENU_CONTENT_TOP, STR_ABOUT_HARDWARE_1, INVERS);
lcdDrawText(ABOUT_X+ABOUT_INDENT, MENU_CONTENT_TOP + FH, STR_ABOUT_HARDWARE_2);
lcdDrawText(ABOUT_X+ABOUT_INDENT, MENU_CONTENT_TOP + 2*FH, STR_ABOUT_HARDWARE_3);
break;
case ABOUT_PARENTS:
lcdDrawText(ABOUT_X, MENU_CONTENT_TOP, STR_ABOUT_PARENTS_1, INVERS);
lcdDrawText(ABOUT_X+ABOUT_INDENT, MENU_CONTENT_TOP + FH, STR_ABOUT_PARENTS_2);
lcdDrawText(ABOUT_X+ABOUT_INDENT, MENU_CONTENT_TOP + 2*FH, STR_ABOUT_PARENTS_3);
lcdDrawText(ABOUT_X+ABOUT_INDENT, MENU_CONTENT_TOP + 3*FH, STR_ABOUT_PARENTS_4);
screenDuration = 255;
break;
}
if (++greyIndex == screenDuration) {
greyIndex = 0;
if (++screenIndex == ABOUT_COUNT) {
chainMenu(menuMainView);
}
}
return true;
qrcode = BitmapBuffer::load8bitMaskOnBackground(mask_qrcode, DEFAULT_COLOR,
DEFAULT_BGCOLOR);
new StaticBitmap(content,
rect_t{ content->width() / 2 - qrcode->width() / 2, 80,
qrcode->width(), qrcode->height()},
qrcode);
}
AboutUs::~AboutUs()
{
delete qrcode;
}
+31
View File
@@ -0,0 +1,31 @@
/*
* Copyright (C) EdgeTX
*
* Based on code named
* opentx - https://github.com/opentx/opentx
* th9x - http://code.google.com/p/th9x
* er9x - http://code.google.com/p/er9x
* gruvin9x - http://code.google.com/p/gruvin9x
*
* License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*/
#include "libopenui.h"
class AboutUs : public MessageDialog
{
BitmapBuffer* qrcode = nullptr;
public:
AboutUs();
~AboutUs();
};
+10 -10
View File
@@ -53,7 +53,7 @@ void ViewMainDecoration::setSlidersVisible(bool visible)
//
sliders[SLIDERS_REAR_LEFT]->setWidth(visible ? TRIM_SQUARE_SIZE : 0);
#if defined(HARDWARE_EXT1)
#if defined(HARDWARE_EXT1) || defined(PCBX12S)
if (IS_POT_SLIDER_AVAILABLE(EXT1)) {
sliders[SLIDERS_EXT1]->setWidth(visible ? TRIM_SQUARE_SIZE : 0);
}
@@ -61,7 +61,7 @@ void ViewMainDecoration::setSlidersVisible(bool visible)
sliders[SLIDERS_REAR_RIGHT]->setWidth(visible ? TRIM_SQUARE_SIZE : 0);
#if defined(HARDWARE_EXT2)
#if defined(HARDWARE_EXT2) || defined(PCBX12S)
if (IS_POT_SLIDER_AVAILABLE(EXT2)) {
sliders[SLIDERS_EXT2]->setWidth(visible ? TRIM_SQUARE_SIZE : 0);
}
@@ -140,7 +140,7 @@ void ViewMainDecoration::adjustDecoration()
sliders[SLIDERS_REAR_LEFT]->setLeft(pos);
sliders[SLIDERS_REAR_LEFT]->setTop(vertTop);
#if defined(HARDWARE_EXT1)
#if defined(HARDWARE_EXT1) || defined(PCBX12S)
sliders[SLIDERS_EXT1]->setLeft(pos);
if (IS_POT_SLIDER_AVAILABLE(EXT1)) {
auto rl = sliders[SLIDERS_REAR_LEFT];
@@ -167,7 +167,7 @@ void ViewMainDecoration::adjustDecoration()
sliders[SLIDERS_REAR_RIGHT]->setLeft(pos);
sliders[SLIDERS_REAR_RIGHT]->setTop(vertTop);
#if defined(HARDWARE_EXT2)
#if defined(HARDWARE_EXT2) || defined(PCBX12S)
sliders[SLIDERS_EXT2]->setLeft(pos);
if (IS_POT_SLIDER_AVAILABLE(EXT2)) {
auto rr = sliders[SLIDERS_REAR_RIGHT];
@@ -268,11 +268,11 @@ void ViewMainDecoration::createSliders()
sliders[SLIDERS_REAR_LEFT] = new MainViewVerticalSlider(this, r, CALIBRATED_SLIDER_REAR_LEFT);
sliders[SLIDERS_REAR_RIGHT] = new MainViewVerticalSlider(this, r, CALIBRATED_SLIDER_REAR_RIGHT);
#if defined(HARDWARE_EXT1)
#if defined(HARDWARE_EXT1) || defined(PCBX12S)
sliders[SLIDERS_EXT1] = new MainViewVerticalSlider(this, r, CALIBRATED_POT_EXT1);
#endif
#if defined(HARDWARE_EXT2)
#if defined(HARDWARE_EXT2) || defined(PCBX12S)
sliders[SLIDERS_EXT2] = new MainViewVerticalSlider(this, r, CALIBRATED_POT_EXT2);
#endif
}
@@ -286,22 +286,22 @@ void ViewMainDecoration::createTrims()
HORIZONTAL_SLIDERS_WIDTH, 0
};
trims[TRIMS_LH] = new MainViewHorizontalTrim(this, r, 0);
trims[TRIMS_LH] = new MainViewHorizontalTrim(this, r, TRIMS_LH);
r = rect_t {
right() - HORIZONTAL_SLIDERS_WIDTH - HMARGIN, 0,
HORIZONTAL_SLIDERS_WIDTH, 0
};
trims[TRIMS_RH] = new MainViewHorizontalTrim(this, r, 3);
trims[TRIMS_RH] = new MainViewHorizontalTrim(this, r, TRIMS_RH);
r = rect_t {
0, 0, 0,
VERTICAL_SLIDERS_HEIGHT
};
trims[TRIMS_LV] = new MainViewVerticalTrim(this, r, 2);
trims[TRIMS_RV] = new MainViewVerticalTrim(this, r, 1);
trims[TRIMS_LV] = new MainViewVerticalTrim(this, r, TRIMS_LV);
trims[TRIMS_RV] = new MainViewVerticalTrim(this, r, TRIMS_RV);
}
void ViewMainDecoration::createFlightMode()
+3 -1
View File
@@ -26,6 +26,7 @@
#include "menu_model.h"
#include "menu_radio.h"
#include "menu_screen.h"
#include "view_about.h"
#include "view_channels.h"
#include "view_statistics.h"
#include "select_fab_carousel.h"
@@ -89,6 +90,7 @@ ViewMainMenu::ViewMainMenu(Window* parent) :
resetMenu->addLine(STR_RESET_TIMER2, []() { timerReset(1); });
resetMenu->addLine(STR_RESET_TIMER3, []() { timerReset(2); });
resetMenu->addLine(STR_RESET_TELEMETRY, []() { telemetryReset(); });
resetMenu->setLeft(parent->getScrollPositionX());
return 0;
});
@@ -100,7 +102,7 @@ ViewMainMenu::ViewMainMenu(Window* parent) :
carousel->addButton(ICON_OPENTX, "About\nEdgeTX", [=]() -> uint8_t {
deleteLater();
//TODO: new AboutUs();
new AboutUs();
return 0;
});
+1 -1
View File
@@ -123,7 +123,7 @@ bool isSwitch2POSWarningStateAvailable(int state);
#endif
#if defined(LIBOPENUI)
#define IS_INSTANT_TRIM_ALLOWED() false
#define IS_INSTANT_TRIM_ALLOWED() true
#elif defined(GUI)
#define IS_INSTANT_TRIM_ALLOWED() (IS_MAIN_VIEW_DISPLAYED() || IS_TELEMETRY_VIEW_DISPLAYED() || IS_OTHER_VIEW_DISPLAYED())
#else