piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

More fixes

Browse Source
This commit is contained in:
Raphael Coeffic
2021-05-06 12:55:59 +02:00
committed by Raphael Coeffic
parent 11c9c7dc33
commit 7b26fe708b
3 changed files with 140 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/lua/api_general.cpp
+47 -21
View File
@@ -28,6 +28,7 @@
#if defined(LIBOPENUI)
#include "libopenui.h"
#include "api_colorlcd.h"
#endif
#if defined(PCBX12S)
@@ -1794,8 +1795,8 @@ const luaR_value_entry opentxConstants[] = {
{ "MIDSIZE", FONT(L) },
{ "SMLSIZE", FONT(XS) },
{ "TINSIZE", FONT(XXS) },
{ "BLINK", 0 }, // obsolete
{ "INVERS", 0 }, // obsolete
{ "BLINK", BLINK },
{ "INVERS", INVERS },
#else
{ "XXLSIZE", XXLSIZE },
{ "DBLSIZE", DBLSIZE },
@@ -1845,25 +1846,50 @@ const luaR_value_entry opentxConstants[] = {
{ "COLOR", ZoneOption::Color },
{ "BOOL", ZoneOption::Bool },
{ "STRING", ZoneOption::String },
{ "DEFAULT_COLOR", DEFAULT_COLOR_INDEX },
{ "DEFAULT_BGCOLOR", DEFAULT_BGCOLOR_INDEX },
{ "FOCUS_COLOR", FOCUS_COLOR_INDEX },
{ "FOCUS_BGCOLOR", FOCUS_BGCOLOR_INDEX },
{ "DISABLE_COLOR", DISABLE_COLOR_INDEX },
{ "HIGHLIGHT_COLOR", HIGHLIGHT_COLOR_INDEX },
{ "CHECKBOX_COLOR", CHECKBOX_COLOR_INDEX },
{ "SCROLLBAR_COLOR", SCROLLBAR_COLOR_INDEX },
{ "MENU_COLOR", MENU_COLOR_INDEX },
{ "MENU_BGCOLOR", MENU_BGCOLOR_INDEX },
// TODO : FIX { "MENU_TITLE_BGCOLOR", MENU_TITLE_BGCOLOR },
{ "MENU_LINE_COLOR", MENU_LINE_COLOR_INDEX },
{ "MENU_HIGHLIGHT_COLOR", MENU_HIGHLIGHT_COLOR_INDEX },
{ "MENU_HIGHLIGHT_BGCOLOR", MENU_HIGHLIGHT_BGCOLOR_INDEX },
{ "OVERLAY_COLOR", OVERLAY_COLOR_INDEX },
{ "TABLE_BGCOLOR", TABLE_BGCOLOR_INDEX },
{ "TABLE_HEADER_BGCOLOR", TABLE_HEADER_BGCOLOR_INDEX },
{ "CUSTOM_COLOR", CUSTOM_COLOR_INDEX },
{ "MENU_HEADER_HEIGHT", MENU_HEADER_HEIGHT },
// Colors gui/colorlcd/colors.h
{ "ALARM_COLOR", COLOR2FLAGS(ALARM_COLOR_INDEX) },
{ "BARGRAPH1_COLOR", COLOR2FLAGS(BARGRAPH1_COLOR_INDEX) },
{ "BARGRAPH2_COLOR", COLOR2FLAGS(BARGRAPH2_COLOR_INDEX) },
{ "BARGRAPH_BGCOLOR", COLOR2FLAGS(BARGRAPH_BGCOLOR_INDEX) },
//{ "BATTERY_CHARGE_COLOR", COLOR2FLAGS(BATTERY_CHARGE_COLOR_INDEX) },
{ "CHECKBOX_COLOR", COLOR2FLAGS(CHECKBOX_COLOR_INDEX) },
{ "CURVE_AXIS_COLOR", COLOR2FLAGS(CURVE_AXIS_COLOR_INDEX) },
{ "CURVE_COLOR", COLOR2FLAGS(CURVE_COLOR_INDEX) },
{ "CURVE_CURSOR_COLOR", COLOR2FLAGS(CURVE_CURSOR_COLOR_INDEX) },
{ "CUSTOM_COLOR", COLOR2FLAGS(CUSTOM_COLOR_INDEX) },
{ "DEFAULT_BGCOLOR", COLOR2FLAGS(DEFAULT_BGCOLOR_INDEX) },
{ "DEFAULT_COLOR", COLOR2FLAGS(DEFAULT_COLOR_INDEX) },
{ "DISABLE_COLOR", COLOR2FLAGS(DISABLE_COLOR_INDEX) },
{ "FOCUS_BGCOLOR", COLOR2FLAGS(FOCUS_BGCOLOR_INDEX) },
{ "FOCUS_COLOR", COLOR2FLAGS(FOCUS_COLOR_INDEX) },
{ "HEADER_BGCOLOR", COLOR2FLAGS(HEADER_BGCOLOR_INDEX) },
{ "HEADER_COLOR", COLOR2FLAGS(HEADER_COLOR_INDEX) },
{ "HEADER_CURRENT_BGCOLOR", COLOR2FLAGS(HEADER_CURRENT_BGCOLOR_INDEX) },
{ "HEADER_ICON_BGCOLOR", COLOR2FLAGS(HEADER_ICON_BGCOLOR_INDEX) },
//{ "HEADER_SEPARATOR_COLOR", COLOR2FLAGS(HEADER_SEPARATOR_COLOR_INDEX) },
{ "HIGHLIGHT_COLOR", COLOR2FLAGS(HIGHLIGHT_COLOR_INDEX) },
{ "LINE_COLOR", COLOR2FLAGS(LINE_COLOR_INDEX) },
{ "MAINVIEW_GRAPHICS_COLOR", COLOR2FLAGS(MAINVIEW_GRAPHICS_COLOR_INDEX) },
{ "MAINVIEW_PANES_COLOR", COLOR2FLAGS(MAINVIEW_PANES_COLOR_INDEX) },
{ "MENU_BGCOLOR", COLOR2FLAGS(MENU_BGCOLOR_INDEX) },
{ "MENU_COLOR", COLOR2FLAGS(MENU_COLOR_INDEX) },
{ "MENU_HEADER_HEIGHT", COLOR2FLAGS(MENU_HEADER_HEIGHT) },
{ "MENU_HIGHLIGHT_BGCOLOR", COLOR2FLAGS(MENU_HIGHLIGHT_BGCOLOR_INDEX) },
{ "MENU_HIGHLIGHT_COLOR", COLOR2FLAGS(MENU_HIGHLIGHT_COLOR_INDEX) },
{ "MENU_LINE_COLOR", COLOR2FLAGS(MENU_LINE_COLOR_INDEX) },
//{ "MENU_TITLE_BGCOLOR", COLOR2FLAGS(MENU_TITLE_BGCOLOR) },
{ "OVERLAY_COLOR", COLOR2FLAGS(OVERLAY_COLOR_INDEX) },
{ "SCROLLBAR_COLOR", COLOR2FLAGS(SCROLLBAR_COLOR_INDEX) },
{ "TABLE_BGCOLOR", COLOR2FLAGS(TABLE_BGCOLOR_INDEX) },
{ "TABLE_HEADER_BGCOLOR", COLOR2FLAGS(TABLE_HEADER_BGCOLOR_INDEX) },
{ "TEXT_DISABLE_COLOR", COLOR2FLAGS(TEXT_DISABLE_COLOR_INDEX) },
{ "TEXT_STATUSBAR_COLOR", COLOR2FLAGS(TEXT_STATUSBAR_COLOR_INDEX) },
{ "TITLE_BGCOLOR", COLOR2FLAGS(TITLE_BGCOLOR_INDEX) },
// Synonyms of the above colors
{ "TEXT_BGCOLOR", COLOR2FLAGS(DEFAULT_BGCOLOR_INDEX) },
{ "WHITE", (double)WHITE },
{ "GREY", (double)GREY },
{ "DARKGREY", (double)DARKGREY },