From ecc083001b060f7893b0d675e5f7fe6dabf0ed65 Mon Sep 17 00:00:00 2001 From: philmoz Date: Mon, 16 Sep 2024 09:46:03 +1000 Subject: [PATCH] chore(lua): remove redundant entries (#5535) added in 5518 --- radio/src/gui/colorlcd/mainview/zone.h | 2 ++ radio/src/lua/api_general.cpp | 4 ++-- radio/src/lua/lua_api.h | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/radio/src/gui/colorlcd/mainview/zone.h b/radio/src/gui/colorlcd/mainview/zone.h index 6bd2577eb..213838351 100644 --- a/radio/src/gui/colorlcd/mainview/zone.h +++ b/radio/src/gui/colorlcd/mainview/zone.h @@ -60,6 +60,8 @@ enum ZoneOptionValueEnum { struct ZoneOption { + // First two entries must match luaScriptInputType enum + // TODO: should be cleaned up enum Type { Integer, Source, diff --git a/radio/src/lua/api_general.cpp b/radio/src/lua/api_general.cpp index eaaea96a1..86cb4ad4c 100644 --- a/radio/src/lua/api_general.cpp +++ b/radio/src/lua/api_general.cpp @@ -3107,6 +3107,8 @@ LROT_BEGIN(etxcst, NULL, 0) LROT_NUMENTRY( FUNC_SET_SCREEN, FUNC_SET_SCREEN ) LROT_NUMENTRY( SHADOWED, SHADOWED ) + // ZoneType::Integer == INPUT_TYPE_VALUE - use VALUE in widget options + // ZoneType::Source == INPUT_TYPE_SOURCE - use SOURCE in widget options LROT_NUMENTRY( COLOR, ZoneOption::Color ) LROT_NUMENTRY( BOOL, ZoneOption::Bool ) LROT_NUMENTRY( STRING, ZoneOption::String ) @@ -3114,8 +3116,6 @@ LROT_BEGIN(etxcst, NULL, 0) LROT_NUMENTRY( TEXT_SIZE, ZoneOption::TextSize ) LROT_NUMENTRY( ALIGNMENT, ZoneOption::Align ) LROT_NUMENTRY( SWITCH, ZoneOption::Switch ) - LROT_NUMENTRY( INTVAL, ZoneOption::Integer ) - LROT_NUMENTRY( SRCVAL, ZoneOption::Source ) LROT_NUMENTRY( SLIDER, ZoneOption::Slider ) LROT_NUMENTRY( CHOICE, ZoneOption::Choice ) LROT_NUMENTRY( MENU_HEADER_HEIGHT, COLOR2FLAGS(EdgeTxStyles::MENU_HEADER_HEIGHT) ) diff --git a/radio/src/lua/lua_api.h b/radio/src/lua/lua_api.h index 17d19dfc7..bdb650a50 100644 --- a/radio/src/lua/lua_api.h +++ b/radio/src/lua/lua_api.h @@ -100,6 +100,8 @@ void luaEmptyEventBuffer(); #define lua_registerlib(L, name, tab) (luaL_newmetatable(L, name), luaL_setfuncs(L, tab, 0), lua_setglobal(L, name)) +// Must match first two entries in ZoneOpton::Type enum +// TODO: should be cleaned up enum luaScriptInputType { INPUT_TYPE_FIRST = 0, INPUT_TYPE_VALUE = INPUT_TYPE_FIRST,