Fixes Horus compilation
This commit is contained in:
@@ -155,7 +155,7 @@ bool menuModelLimits(evt_t event)
|
||||
// last line available - add the "copy trim menu" line
|
||||
uint8_t attr = (sub==NUM_CHNOUT) ? INVERS : 0;
|
||||
// TODO CENTER attribute
|
||||
lcdDrawText(100, y, STR_TRIMS2OFFSETS, s_noHi ? 0 : attr);
|
||||
lcdDrawText(100, y, STR_TRIMS2OFFSETS, noHighlightCounter ? 0 : attr);
|
||||
if (attr) {
|
||||
s_editMode = 0;
|
||||
if (event==EVT_KEY_LONG(KEY_ENTER)) {
|
||||
|
||||
@@ -323,7 +323,7 @@ bool menuModelSetup(evt_t event)
|
||||
case ITEM_MODEL_EXTENDED_TRIMS:
|
||||
lcdDrawText(MENUS_MARGIN_LEFT, y, STR_ETRIMS);
|
||||
g_model.extendedTrims = onoffMenuItem(g_model.extendedTrims, MODEL_SETUP_2ND_COLUMN, y, menuHorizontalPosition<=0 ? attr : 0, event==EVT_KEY_BREAK(KEY_ENTER) ? event : 0);
|
||||
lcdDrawText(MODEL_SETUP_2ND_COLUMN+18, y, STR_RESET_BTN, menuHorizontalPosition>0 && !s_noHi ? attr : 0);
|
||||
lcdDrawText(MODEL_SETUP_2ND_COLUMN+18, y, STR_RESET_BTN, menuHorizontalPosition>0 && !noHighlightCounter ? attr : 0);
|
||||
if (attr && menuHorizontalPosition>0) {
|
||||
s_editMode = 0;
|
||||
if (event==EVT_KEY_LONG(KEY_ENTER)) {
|
||||
@@ -746,7 +746,7 @@ bool menuModelFailsafe(evt_t event)
|
||||
|
||||
// Value
|
||||
LcdFlags flags = TINSIZE;
|
||||
if (menuVerticalPosition == ch && !s_noHi) {
|
||||
if (menuVerticalPosition == ch && !noHighlightCounter) {
|
||||
flags |= INVERS;
|
||||
if (s_editMode)
|
||||
flags |= BLINK;
|
||||
|
||||
@@ -40,7 +40,7 @@ vertpos_t menuVerticalOffset;
|
||||
vertpos_t menuVerticalPosition;
|
||||
horzpos_t menuHorizontalPosition;
|
||||
int8_t s_editMode;
|
||||
uint8_t s_noHi;
|
||||
uint8_t noHighlightCounter;
|
||||
uint8_t calibrationState; // TODO rename this variable
|
||||
|
||||
#if defined(AUTOSWITCH)
|
||||
|
||||
@@ -100,7 +100,7 @@ void message(const pm_char *title, const pm_char *t, const char *last MESSAGE_SO
|
||||
clearKeyEvents();
|
||||
}
|
||||
|
||||
void displayPopup(const char *title)
|
||||
void displayPopup(const char * title)
|
||||
{
|
||||
// displayMessageBox();
|
||||
lcdDrawSizedText(WARNING_LINE_X, WARNING_LINE_Y, title, WARNING_LINE_LEN, DBLSIZE|WARNING_COLOR);
|
||||
@@ -138,7 +138,7 @@ void displayWarning(evt_t event)
|
||||
}
|
||||
}
|
||||
|
||||
const char * displayMenu(evt_t event)
|
||||
const char * displayPopupMenu(evt_t event)
|
||||
{
|
||||
const char * result = NULL;
|
||||
uint8_t display_count = min(popupMenuNoItems, (uint16_t)POPUP_MENU_MAX_LINES);
|
||||
|
||||
@@ -57,3 +57,8 @@ make PCB=MEGA2560
|
||||
# OpenTX on MEGA2560 with MAVLINK
|
||||
make clean
|
||||
make PCB=MEGA2560 EXT=MAVLINK
|
||||
|
||||
# OpenTX on Horus
|
||||
make clean
|
||||
make PCB=HORUS HELI=NO USB=SERIAL CLI=YES DEBUG=YES
|
||||
make simu PCB=HORUS HELI=NO USB=SERIAL CLI=YES DEBUG=YES
|
||||
|
||||
Reference in New Issue
Block a user