From 1877cfa1dc69e723f860f1c5aa344fb27194dba4 Mon Sep 17 00:00:00 2001 From: Andreika Date: Sun, 23 Jul 2023 17:50:22 +0300 Subject: [PATCH] Lua conditional get xxx value by name for vw121 (#5439) * VW121 config: better way to say EFI_LUA_LOOKUP=FALSE * Conditional compilation of getOutputValueByName getConfigValueByName #5434 --- .../boards/hellen/hellen121vag/board.mk | 5 +++- firmware/controllers/lua/lua.mk | 11 +++++++-- .../controllers/lua/value_lookup_stubs.cpp | 23 +++++++++++++++++++ 3 files changed, 36 insertions(+), 3 deletions(-) create mode 100644 firmware/controllers/lua/value_lookup_stubs.cpp diff --git a/firmware/config/boards/hellen/hellen121vag/board.mk b/firmware/config/boards/hellen/hellen121vag/board.mk index 8f3072120a..f71a5f1832 100644 --- a/firmware/config/boards/hellen/hellen121vag/board.mk +++ b/firmware/config/boards/hellen/hellen121vag/board.mk @@ -14,7 +14,10 @@ DDEFS += -DFIRMWARE_ID=\"hellen121vag\" $(VAR_DEF_ENGINE_TYPE) DDEFS += -DEFI_SOFTWARE_KNOCK=TRUE -DSTM32_ADC_USE_ADC3=TRUE # Use less Flash memory for this config -DDEFS += -DEFI_LUA_LOOKUP=FALSE +ifeq ($(EFI_LUA_LOOKUP),) + EFI_LUA_LOOKUP = FALSE +endif +DDEFS += -DEFI_LUA_LOOKUP=$(EFI_LUA_LOOKUP) DDEFS += -DSHORT_BOARD_NAME=hellen121vag diff --git a/firmware/controllers/lua/lua.mk b/firmware/controllers/lua/lua.mk index e10ed3a223..2198fa48e9 100644 --- a/firmware/controllers/lua/lua.mk +++ b/firmware/controllers/lua/lua.mk @@ -6,10 +6,17 @@ ALLCPPSRC += $(LUA_DIR)/lua.cpp \ $(LUA_DIR)/can_filter.cpp \ $(LUA_DIR)/lua_hooks_util.cpp \ $(LUA_DIR)/script_impl.cpp \ - $(LUA_DIR)/generated/output_lookup_generated.cpp \ - $(LUA_DIR)/generated/value_lookup_generated.cpp \ $(LUA_DIR)/lua_can_rx.cpp \ +ifeq ($(EFI_LUA_LOOKUP), FALSE) + ALLCPPSRC += $(LUA_DIR)/value_lookup_stubs.cpp \ + +else + ALLCPPSRC += $(LUA_DIR)/generated/output_lookup_generated.cpp \ + $(LUA_DIR)/generated/value_lookup_generated.cpp \ + +endif + ALLINC += $(LUA_DIR) $(LUA_DIR)/luaaa $(LUA_EXT) ALLCSRC += \ $(LUA_EXT)/lapi.c \ diff --git a/firmware/controllers/lua/value_lookup_stubs.cpp b/firmware/controllers/lua/value_lookup_stubs.cpp new file mode 100644 index 0000000000..18fbeb3e69 --- /dev/null +++ b/firmware/controllers/lua/value_lookup_stubs.cpp @@ -0,0 +1,23 @@ +/** + * @file value_lookup_stubs.cpp + * @brief These stubs are used to reduce the Flash amount used for some configs + * + * @date Jul 23, 2023 + * @author andreika + * @author Andrey Belomutskiy, (c) 2012-2020 + */ + +#include "pch.h" +#include "value_lookup.h" + +float getOutputValueByName(const char * /*name*/) { + return EFI_ERROR_CODE; +} + +float getConfigValueByName(const char * /*name*/) { + return EFI_ERROR_CODE; +} + +bool setConfigValueByName(const char * /*name*/, float /*value*/) { + return false; +}