[Horus] UI continued

This commit is contained in:
Bertrand Songis
2016-02-08 20:56:02 +01:00
parent afddad9396
commit 366c286e73
61 changed files with 1575 additions and 562 deletions
+170 -223
View File
@@ -2,7 +2,7 @@
* Copyright (C) OpenTX
*
* Based on code named
* th9x - http://code.google.com/p/th9x
* th9x - http://code.google.com/p/th9x
* er9x - http://code.google.com/p/er9x
* gruvin9x - http://code.google.com/p/gruvin9x
*
@@ -18,249 +18,196 @@
* GNU General Public License for more details.
*/
#include "../../opentx.h"
#include "opentx.h"
#define SETUP_SCREEN_COLUMN2 200
#define SETUP_SCREEN_COLUMN3 275
#define SETUP_SCREEN_COLUMN4 350
Layout * currentScreen;
Widget * currentWidget;
enum menuSetupScreensViewItems
#define SCREENS_SETUP_2ND_COLUMN 200
void onWidgetChoiceMenu(const char * result)
{
ITEM_SETUP_TOP_BAR_LABEL,
ITEM_SETUP_TOP_BAR_VOLTAGE,
ITEM_SETUP_TOP_BAR_ALTITUDE,
ITEM_SETUP_SCREEN_LABEL1,
ITEM_SETUP_SCREEN_LINE1,
ITEM_SETUP_SCREEN_LINE2,
ITEM_SETUP_SCREEN_LINE3,
ITEM_SETUP_SCREEN_LINE4,
ITEM_SETUP_SCREEN_LABEL2,
ITEM_SETUP_SCREEN_LINE5,
ITEM_SETUP_SCREEN_LINE6,
ITEM_SETUP_SCREEN_LINE7,
ITEM_SETUP_SCREEN_LINE8,
ITEM_SETUP_SCREEN_LABEL3,
ITEM_SETUP_SCREEN_LINE9,
ITEM_SETUP_SCREEN_LINE10,
ITEM_SETUP_SCREEN_LINE11,
ITEM_SETUP_SCREEN_LINE12,
ITEM_SETUP_SCREEN_LABEL4,
ITEM_SETUP_SCREEN_LINE13,
ITEM_SETUP_SCREEN_LINE14,
ITEM_SETUP_SCREEN_LINE15,
ITEM_SETUP_SCREEN_LINE16,
ITEM_SETUP_SCREEN_MAX
};
customScreens[0]->setWidget(menuVerticalPosition, result);
}
#if defined(LUA)
#define SCREEN_TYPE_ROWS 1
#define SETUP_SCREEN_LINE(x) ((TELEMETRY_SCREEN_TYPE(x) == TELEMETRY_SCREEN_TYPE_NONE || TELEMETRY_SCREEN_TYPE(x) == TELEMETRY_SCREEN_TYPE_SCRIPT) ? HIDDEN_ROW : (uint8_t)2)
#else
#define SCREEN_TYPE_ROWS 0
#define SETUP_SCREEN_LINE(x) (TELEMETRY_SCREEN_TYPE(x) == TELEMETRY_SCREEN_TYPE_NONE ? HIDDEN_ROW : (uint8_t)2)
#endif
#define SETUP_SCREEN_ROWS(x) SCREEN_TYPE_ROWS, SETUP_SCREEN_LINE(x), SETUP_SCREEN_LINE(x), SETUP_SCREEN_LINE(x), SETUP_SCREEN_LINE(x)
#define TELEMETRY_CURRENT_SCREEN(k) (k < ITEM_SETUP_SCREEN_LABEL2 ? 0 : (k < ITEM_SETUP_SCREEN_LABEL3 ? 1 : (k < ITEM_SETUP_SCREEN_LABEL4 ? 2 : 3)))
#if defined(LUA)
void onSetupScriptFileSelectionMenu(const char * result)
ZoneOptionValue editZoneOption(coord_t y, const ZoneOption * option, ZoneOptionValue value, LcdFlags attr, evt_t event)
{
int screenIndex = TELEMETRY_CURRENT_SCREEN(menuVerticalPosition);
lcdDrawText(MENUS_MARGIN_LEFT + INDENT_WIDTH, y, option->name);
if (result == STR_UPDATE_LIST) {
if (!sdListFiles(SCRIPTS_TELEM_PATH, SCRIPTS_EXT, sizeof(g_model.frsky.screens[screenIndex].script.file), NULL)) {
POPUP_WARNING(STR_NO_SCRIPTS_ON_SD);
if (option->type == ZoneOption::Bool) {
value.boolValue = editCheckBox(value.boolValue, SCREENS_SETUP_2ND_COLUMN, y, attr, event);
}
else if (option->type == ZoneOption::Integer) {
lcdDrawNumber(SCREENS_SETUP_2ND_COLUMN, y, value.signedValue, attr | LEFT);
if (attr) {
CHECK_INCDEC_MODELVAR(event, value.signedValue, -30000, 30000);
}
}
else {
// The user choosed a file in the list
memcpy(g_model.frsky.screens[screenIndex].script.file, result, sizeof(g_model.frsky.screens[screenIndex].script.file));
storageDirty(EE_MODEL);
LUA_LOAD_MODEL_SCRIPTS();
else if (option->type == ZoneOption::String) {
editName(SCREENS_SETUP_2ND_COLUMN, y, value.stringValue, sizeof(value.stringValue), event, attr|EE_MODEL);
}
else if (option->type == ZoneOption::TextSize) {
lcdDrawTextAtIndex(SCREENS_SETUP_2ND_COLUMN, y, "\010StandardTiny\0 Small\0 Mid\0 Double", value.unsignedValue, attr);
if (attr) {
value.unsignedValue = checkIncDec(event, value.unsignedValue, 0, 4, EE_MODEL);
}
}
else if (option->type == ZoneOption::Timer) {
drawStringWithIndex(SCREENS_SETUP_2ND_COLUMN, y, STR_TIMER, value.unsignedValue + 1, attr);
if (attr) {
value.unsignedValue = checkIncDec(event, value.unsignedValue, 0, MAX_TIMERS - 1, EE_MODEL);
}
}
else if (option->type == ZoneOption::Source) {
putsMixerSource(SCREENS_SETUP_2ND_COLUMN, y, value.unsignedValue, attr);
if (attr) {
CHECK_INCDEC_MODELSOURCE(event, value.unsignedValue, 1, MIXSRC_LAST);
}
}
else if (option->type == ZoneOption::Color) {
lcdSetColor(value.unsignedValue);
lcdDrawSolidRect(SCREENS_SETUP_2ND_COLUMN, y, 40, 15, attr ? TEXT_INVERTED_BGCOLOR : TEXT_COLOR);
lcdDrawSolidFilledRect(SCREENS_SETUP_2ND_COLUMN + 1, y + 1, 38, 13, CUSTOM_COLOR);
if (attr) {
CHECK_INCDEC_MODELVAR(event, value.unsignedValue, 0, 65535);
}
}
return value;
}
bool menuWidgetSettings(evt_t event)
{
linesCount = 0;
const ZoneOption * options = currentWidget->getFactory()->getOptions();
for (const ZoneOption * option = options; option->name; option++) {
linesCount++;
}
SUBMENU_WITH_OPTIONS("Widget settings", LBM_MAINVIEWS_ICON, linesCount, OPTION_MENU_TITLE_BAR, { 0, 0, 0 });
for (int i=0; i<NUM_BODY_LINES+1; i++) {
coord_t y = MENU_CONTENT_TOP + i * FH;
int k = i + menuVerticalOffset;
LcdFlags blink = ((s_editMode>0) ? BLINK|INVERS : INVERS);
LcdFlags attr = (menuVerticalPosition == k ? blink : 0);
if (k < linesCount) {
const ZoneOption * option = &options[k];
ZoneOptionValue value = currentWidget->getOptionValue(k);
value = editZoneOption(y, option, value, attr, event);
if (attr) {
currentWidget->setOptionValue(k, value);
}
}
}
return true;
}
void onZoneMenu(const char * result)
{
if (result == STR_SELECT_WIDGET) {
for (unsigned int i=0; i<countRegisteredWidgets; i++) {
POPUP_MENU_ADD_ITEM(registeredWidgets[i]->getName());
}
popupMenuHandler = onWidgetChoiceMenu;
}
else if (result == STR_WIDGET_SETTINGS) {
currentWidget = currentScreen->getWidget(menuVerticalPosition);
pushMenu(menuWidgetSettings);
}
else if (result == STR_REMOVE_WIDGET) {
currentScreen->setWidget(menuVerticalPosition, NULL);
}
}
#endif
bool menuSetupWidgets(evt_t event)
{
switch (event) {
case EVT_ENTRY:
menuVerticalPosition = 0;
break;
case EVT_KEY_BREAK(KEY_EXIT):
popMenu();
return false;
}
currentScreen->refresh(true);
for (int i=currentScreen->getZonesCount()-1; i>=0; i--) {
Zone zone = currentScreen->getZone(i);
if (menuVerticalPosition == i) {
lcdDrawSolidRect(zone.x, zone.y, zone.w, zone.h, TEXT_INVERTED_COLOR);
lcdDrawSolidRect(zone.x-1, zone.y-1, zone.w+2, zone.h+2, TEXT_INVERTED_COLOR);
if (event == EVT_KEY_BREAK(KEY_ENTER)) {
Widget * widget = currentScreen->getWidget(i);
if (widget) {
POPUP_MENU_ADD_ITEM(STR_SELECT_WIDGET);
if (widget->getFactory()->getOptions())
POPUP_MENU_ADD_ITEM(STR_WIDGET_SETTINGS);
POPUP_MENU_ADD_ITEM(STR_REMOVE_WIDGET);
popupMenuHandler = onZoneMenu;
}
else {
onZoneMenu(STR_SELECT_WIDGET);
}
}
}
else {
lcdDrawRect(zone.x, zone.y, zone.w, zone.h, DOTTED, TEXT_INVERTED_COLOR);
}
}
navigate(event, currentScreen->getZonesCount(), currentScreen->getZonesCount(), 1);
return true;
}
bool menuSetupScreensView(evt_t event)
{
MENU_ONE_PAGE("Setup screens", ITEM_SETUP_SCREEN_MAX, DEFAULT_SCROLLBAR_X, { LABEL(TopBar), 0, 0, SETUP_SCREEN_ROWS(0), SETUP_SCREEN_ROWS(1), SETUP_SCREEN_ROWS(2), SETUP_SCREEN_ROWS(3) });
currentScreen = customScreens[0];
unsigned int layoutIndex = 0;
for (unsigned int i=0; i<countRegisteredLayouts; i++) {
if (registeredLayouts[i] == currentScreen->getFactory()) {
layoutIndex = i;
break;
}
}
linesCount = 1;
const ZoneOption * options = currentScreen->getFactory()->getOptions();
for (const ZoneOption * option = options; option->name; option++) {
linesCount++;
}
SUBMENU_WITH_OPTIONS("Main views setup", LBM_MAINVIEWS_ICON, linesCount, OPTION_MENU_TITLE_BAR, { 0, 0, 0 });
for (int i=0; i<NUM_BODY_LINES+1; i++) {
coord_t y = MENU_CONTENT_TOP + (i - 1) * FH - 5;
coord_t y = MENU_CONTENT_TOP + i * FH;
int k = i + menuVerticalOffset;
for (int j=0; j<k; j++) {
if (mstate_tab[j + 1] == HIDDEN_ROW) {
if (++k >= (int) DIM(mstate_tab)) {
return true;
LcdFlags blink = ((s_editMode>0) ? BLINK|INVERS : INVERS);
LcdFlags attr = (menuVerticalPosition == k ? blink : 0);
if (k == 0) {
lcdDrawText(MENUS_MARGIN_LEFT, y, "Layout");
lcdDrawText(SCREENS_SETUP_2ND_COLUMN, y, currentScreen->getFactory()->getName(), attr);
if (attr) {
layoutIndex = checkIncDec(event, layoutIndex, 0, countRegisteredLayouts-1, EE_MODEL);
if (checkIncDec_Ret) {
customScreens[0] = registeredLayouts[layoutIndex]->create(&g_model.screenData[0].layoutData);
strncpy(g_model.screenData[0].layoutName, customScreens[0]->getFactory()->getName(), sizeof(g_model.screenData[0].layoutName));
}
else if (event == EVT_KEY_LONG(KEY_ENTER)) {
pushMenu(menuSetupWidgets);
}
}
}
LcdFlags blink = ((s_editMode > 0) ? BLINK | INVERS : INVERS);
LcdFlags attr = (menuVerticalPosition == k ? blink : 0);
switch (k) {
case ITEM_SETUP_TOP_BAR_LABEL:
lcdDrawText(MENUS_MARGIN_LEFT, y, STR_TOP_BAR);
break;
case ITEM_SETUP_TOP_BAR_VOLTAGE:
lcdDrawText(MENUS_MARGIN_LEFT, y, STR_VOLTAGE);
putsMixerSource(SETUP_SCREEN_COLUMN2, y, g_model.frsky.voltsSource ? MIXSRC_FIRST_TELEM+3*(g_model.frsky.voltsSource-1) : 0, attr);
if (attr) {
g_model.frsky.voltsSource = checkIncDec(event, g_model.frsky.voltsSource, 0, MAX_SENSORS, EE_MODEL|NO_INCDEC_MARKS, isVoltsSensor);
}
break;
case ITEM_SETUP_TOP_BAR_ALTITUDE:
lcdDrawText(MENUS_MARGIN_LEFT, y, STR_ALTITUDE);
putsMixerSource(SETUP_SCREEN_COLUMN2, y, g_model.frsky.altitudeSource ? MIXSRC_FIRST_TELEM+3*(g_model.frsky.altitudeSource-1) : 0, attr);
if (attr) {
g_model.frsky.altitudeSource = checkIncDec(event, g_model.frsky.altitudeSource, 0, MAX_SENSORS, EE_MODEL|NO_INCDEC_MARKS, isAltSensor);
}
break;
case ITEM_SETUP_SCREEN_LABEL1:
case ITEM_SETUP_SCREEN_LABEL2:
case ITEM_SETUP_SCREEN_LABEL3:
case ITEM_SETUP_SCREEN_LABEL4:
{
uint8_t screenIndex = TELEMETRY_CURRENT_SCREEN(k);
drawStringWithIndex(MENUS_MARGIN_LEFT, y, STR_SCREEN, screenIndex+1);
TelemetryScreenType oldScreenType = TELEMETRY_SCREEN_TYPE(screenIndex);
TelemetryScreenType newScreenType = (TelemetryScreenType)selectMenuItem(SETUP_SCREEN_COLUMN2, y, STR_VTELEMSCREENTYPE, oldScreenType, 0, TELEMETRY_SCREEN_TYPE_MAX, (menuHorizontalPosition==0 ? attr : 0), event);
if (newScreenType != oldScreenType) {
g_model.frsky.screensType = (g_model.frsky.screensType & (~(0x03 << (2*screenIndex)))) | (newScreenType << (2*screenIndex));
memset(&g_model.frsky.screens[screenIndex], 0, sizeof(g_model.frsky.screens[screenIndex]));
}
#if defined(LUA)
if (newScreenType == TELEMETRY_SCREEN_TYPE_SCRIPT) {
TelemetryScriptData & scriptData = g_model.frsky.screens[screenIndex].script;
// TODO better function name for ---
// TODO function for these lines
if (ZEXIST(scriptData.file))
lcdDrawSizedText(SETUP_SCREEN_COLUMN3, y, scriptData.file, sizeof(scriptData.file), (menuHorizontalPosition==1 ? attr : 0));
else
lcdDrawTextAtIndex(SETUP_SCREEN_COLUMN3, y, STR_VCSWFUNC, 0, (menuHorizontalPosition==1 ? attr : 0));
if (menuHorizontalPosition==1 && attr && event==EVT_KEY_BREAK(KEY_ENTER) && READ_ONLY_UNLOCKED()) {
s_editMode = 0;
if (sdListFiles(SCRIPTS_TELEM_PATH, SCRIPTS_EXT, sizeof(g_model.frsky.screens[screenIndex].script.file), g_model.frsky.screens[screenIndex].script.file)) {
popupMenuHandler = onSetupScriptFileSelectionMenu;
}
else {
POPUP_WARNING(STR_NO_SCRIPTS_ON_SD);
}
}
}
else if (attr) {
MOVE_CURSOR_FROM_HERE();
}
#endif
break;
}
case ITEM_SETUP_SCREEN_LINE1:
case ITEM_SETUP_SCREEN_LINE2:
case ITEM_SETUP_SCREEN_LINE3:
case ITEM_SETUP_SCREEN_LINE4:
case ITEM_SETUP_SCREEN_LINE5:
case ITEM_SETUP_SCREEN_LINE6:
case ITEM_SETUP_SCREEN_LINE7:
case ITEM_SETUP_SCREEN_LINE8:
case ITEM_SETUP_SCREEN_LINE9:
case ITEM_SETUP_SCREEN_LINE10:
case ITEM_SETUP_SCREEN_LINE11:
case ITEM_SETUP_SCREEN_LINE12:
case ITEM_SETUP_SCREEN_LINE13:
case ITEM_SETUP_SCREEN_LINE14:
case ITEM_SETUP_SCREEN_LINE15:
case ITEM_SETUP_SCREEN_LINE16: {
uint8_t screenIndex, lineIndex;
if (k < ITEM_SETUP_SCREEN_LABEL2) {
screenIndex = 0;
lineIndex = k - ITEM_SETUP_SCREEN_LINE1;
}
else if (k >= ITEM_SETUP_SCREEN_LABEL4) {
screenIndex = 3;
lineIndex = k - ITEM_SETUP_SCREEN_LINE13;
}
else if (k >= ITEM_SETUP_SCREEN_LABEL3) {
screenIndex = 2;
lineIndex = k - ITEM_SETUP_SCREEN_LINE9;
}
else {
screenIndex = 1;
lineIndex = k - ITEM_SETUP_SCREEN_LINE5;
}
#if defined(GAUGES)
if (IS_BARS_SCREEN(screenIndex)) {
FrSkyBarData & bar = g_model.frsky.screens[screenIndex].bars[lineIndex];
source_t barSource = bar.source;
putsMixerSource(MENUS_MARGIN_LEFT+INDENT_WIDTH, y, barSource, (menuHorizontalPosition==0 ? attr : 0));
int barMax = getMaximumValue(barSource);
int barMin = -barMax;
if (barSource) {
if (barSource <= MIXSRC_LAST_CH) {
putsChannelValue(SETUP_SCREEN_COLUMN2, y, barSource, calc100toRESX(bar.barMin), (menuHorizontalPosition==1 ? attr : 0) | LEFT);
putsChannelValue(SETUP_SCREEN_COLUMN4, y, barSource, calc100toRESX(bar.barMax), (menuHorizontalPosition==2 ? attr : 0) | LEFT);
}
else {
putsChannelValue(SETUP_SCREEN_COLUMN2, y, barSource, bar.barMin, (menuHorizontalPosition==1 ? attr : 0) | LEFT);
putsChannelValue(SETUP_SCREEN_COLUMN4, y, barSource, bar.barMax, (menuHorizontalPosition==2 ? attr : 0) | LEFT);
}
}
else if (attr) {
MOVE_CURSOR_FROM_HERE();
}
if (attr && s_editMode>0) {
switch (menuHorizontalPosition) {
case 0:
bar.source = checkIncDec(event, barSource, 0, MIXSRC_LAST_TELEM, EE_MODEL|INCDEC_SOURCE|NO_INCDEC_MARKS, isSourceAvailable);
if (checkIncDec_Ret) {
if (barSource <= MIXSRC_LAST_CH) {
bar.barMin = -100;
bar.barMax = 100;
}
else {
bar.barMin = 0;
bar.barMax = 0;
}
}
break;
case 1:
bar.barMin = checkIncDec(event, bar.barMin, barMin, bar.barMax, EE_MODEL|NO_INCDEC_MARKS);
break;
case 2:
bar.barMax = checkIncDec(event, bar.barMax, bar.barMin, barMax, EE_MODEL|NO_INCDEC_MARKS);
break;
}
}
}
else
#endif
{
for (int c = 0; c < NUM_LINE_ITEMS; c++) {
LcdFlags cellAttr = (menuHorizontalPosition == c ? attr : 0);
source_t &value = g_model.frsky.screens[screenIndex].lines[lineIndex].sources[c];
const coord_t pos[] = {MENUS_MARGIN_LEFT + INDENT_WIDTH, SETUP_SCREEN_COLUMN2, SETUP_SCREEN_COLUMN4};
putsMixerSource(pos[c], y, value, cellAttr);
if (cellAttr && s_editMode > 0) {
value = checkIncDec(event, value, 0, MIXSRC_LAST_TELEM, EE_MODEL | INCDEC_SOURCE | NO_INCDEC_MARKS,
isSourceAvailable);
}
}
if (attr && menuHorizontalPosition == NUM_LINE_ITEMS) {
REPEAT_LAST_CURSOR_MOVE(0);
}
}
break;
else if (k < linesCount) {
const ZoneOption * option = &options[k-1];
ZoneOptionValue value = currentScreen->getOptionValue(k-1);
value = editZoneOption(y, option, value, attr, event);
if (attr) {
currentScreen->setOptionValue(k-1, value);
}
}
}
return true;
}