diff --git a/radio/src/CMakeLists.txt b/radio/src/CMakeLists.txt index d36706293..101581344 100644 --- a/radio/src/CMakeLists.txt +++ b/radio/src/CMakeLists.txt @@ -199,9 +199,9 @@ if(NOT LUA STREQUAL NO) if(LUA STREQUAL YES) add_definitions(-DLUA_MODEL_SCRIPTS) endif() - set(SRC ${SRC} lua/interface.cpp lua/api_general.cpp lua/api_model.cpp lua/widgets.cpp) + set(SRC ${SRC} lua/interface.cpp lua/api_general.cpp lua/api_model.cpp) if(GUI_DIR STREQUAL colorlcd) - set(SRC ${SRC} lua/api_colorlcd.cpp) + set(SRC ${SRC} lua/api_colorlcd.cpp lua/widgets.cpp) else() set(SRC ${SRC} lua/api_stdlcd.cpp) endif() diff --git a/radio/src/gui/128x64/lcd.h b/radio/src/gui/128x64/lcd.h index 2672f74a6..009159fcf 100644 --- a/radio/src/gui/128x64/lcd.h +++ b/radio/src/gui/128x64/lcd.h @@ -22,9 +22,12 @@ #define _LCD_H_ #include +#include "board.h" + typedef uint32_t LcdFlags; typedef uint8_t pixel_t; +typedef int coord_t; #define BOX_WIDTH 23 #define CENTER diff --git a/radio/src/lua/api_colorlcd.cpp b/radio/src/lua/api_colorlcd.cpp index 93aa6f325..e9ab1b30a 100644 --- a/radio/src/lua/api_colorlcd.cpp +++ b/radio/src/lua/api_colorlcd.cpp @@ -26,7 +26,6 @@ #include "api_colorlcd.h" -bool luaLcdAllowed = false; BitmapBuffer* luaLcdBuffer = nullptr; /*luadoc diff --git a/radio/src/lua/interface.cpp b/radio/src/lua/interface.cpp index a0100e29a..f30f1ba60 100644 --- a/radio/src/lua/interface.cpp +++ b/radio/src/lua/interface.cpp @@ -46,6 +46,7 @@ extern "C" { lua_State *lsScripts = nullptr; uint8_t luaState = 0; uint8_t luaScriptsCount = 0; +bool luaLcdAllowed = false; ScriptInternalData scriptInternalData[MAX_SCRIPTS]; ScriptInputsOutputs scriptInputsOutputs[MAX_SCRIPTS]; ScriptInternalData standaloneScript; diff --git a/radio/src/lua/lua_api.h b/radio/src/lua/lua_api.h index 944a37507..7e0510b3c 100644 --- a/radio/src/lua/lua_api.h +++ b/radio/src/lua/lua_api.h @@ -126,6 +126,7 @@ struct ScriptInputsOutputs { #define INTERPRETER_PANIC 255 extern uint8_t luaState; extern uint8_t luaScriptsCount; +extern bool luaLcdAllowed; extern ScriptInternalData standaloneScript; extern ScriptInternalData scriptInternalData[MAX_SCRIPTS]; extern ScriptInputsOutputs scriptInputsOutputs[MAX_SCRIPTS]; diff --git a/radio/src/targets/simu/simulcd.cpp b/radio/src/targets/simu/simulcd.cpp index f18c842b9..c0df0e729 100644 --- a/radio/src/targets/simu/simulcd.cpp +++ b/radio/src/targets/simu/simulcd.cpp @@ -21,15 +21,7 @@ #include "lcd.h" #include "simulcd.h" -// #if defined(SIMU) -// extern pixel_t displayBuf[DISPLAY_BUFFER_SIZE]; -// #else -// #define displayBuf lcd->getData() -// #endif - -// #define DISPLAY_END (displayBuf + DISPLAY_BUFFER_SIZE) -// #define ASSERT_IN_DISPLAY(p) assert((p) >= displayBuf && (p) < DISPLAY_END) - +#if defined(COLORLCD) BitmapBuffer _lcd(BMP_RGB565, LCD_W, LCD_H, displayBuf); BitmapBuffer * lcd = &_lcd; @@ -106,3 +98,4 @@ void DMABitmapConvert(uint16_t * dest, const uint8_t * src, uint16_t w, uint16_t } } } +#endif