feat: Increase resources for Lua widgets (#1498)
This commit is contained in:
+10
-18
@@ -29,9 +29,8 @@
|
|||||||
#include "api_colorlcd.h"
|
#include "api_colorlcd.h"
|
||||||
#include "view_main.h"
|
#include "view_main.h"
|
||||||
|
|
||||||
#define WIDGET_SCRIPTS_MAX_INSTRUCTIONS (10000/100)
|
#define MAX_INSTRUCTIONS (20000/100)
|
||||||
#define MANUAL_SCRIPTS_MAX_INSTRUCTIONS (20000/100)
|
#define LUA_WARNING_INFO_LEN 64
|
||||||
#define LUA_WARNING_INFO_LEN 64
|
|
||||||
|
|
||||||
#if defined(HARDWARE_TOUCH)
|
#if defined(HARDWARE_TOUCH)
|
||||||
#include "touch.h"
|
#include "touch.h"
|
||||||
@@ -40,8 +39,6 @@
|
|||||||
#define EVT_TOUCH_SWIPE_TIMEOUT 50
|
#define EVT_TOUCH_SWIPE_TIMEOUT 50
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
constexpr int LUA_WIDGET_REFRESH = 1000 / 10; // 10 Hz
|
|
||||||
|
|
||||||
lua_State * lsWidgets = NULL;
|
lua_State * lsWidgets = NULL;
|
||||||
|
|
||||||
extern int custom_lua_atpanic(lua_State *L);
|
extern int custom_lua_atpanic(lua_State *L);
|
||||||
@@ -272,8 +269,7 @@ class LuaWidget: public Widget
|
|||||||
protected:
|
protected:
|
||||||
int luaWidgetDataRef;
|
int luaWidgetDataRef;
|
||||||
char * errorMessage;
|
char * errorMessage;
|
||||||
uint32_t lastRefresh = 0;
|
bool refreshed = false;
|
||||||
bool refreshed = false;
|
|
||||||
|
|
||||||
static eventData events[EVENT_BUFFER_SIZE];
|
static eventData events[EVENT_BUFFER_SIZE];
|
||||||
#if defined(HARDWARE_TOUCH)
|
#if defined(HARDWARE_TOUCH)
|
||||||
@@ -334,7 +330,7 @@ class LuaWidgetFactory: public WidgetFactory
|
|||||||
if (lsWidgets == 0) return 0;
|
if (lsWidgets == 0) return 0;
|
||||||
initPersistentData(persistentData, init);
|
initPersistentData(persistentData, init);
|
||||||
|
|
||||||
luaSetInstructionsLimit(lsWidgets, WIDGET_SCRIPTS_MAX_INSTRUCTIONS);
|
luaSetInstructionsLimit(lsWidgets, MAX_INSTRUCTIONS);
|
||||||
lua_rawgeti(lsWidgets, LUA_REGISTRYINDEX, createFunction);
|
lua_rawgeti(lsWidgets, LUA_REGISTRYINDEX, createFunction);
|
||||||
|
|
||||||
lua_newtable(lsWidgets);
|
lua_newtable(lsWidgets);
|
||||||
@@ -399,16 +395,12 @@ void LuaWidget::checkEvents()
|
|||||||
refreshed = true;
|
refreshed = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
uint32_t now = RTOS_GET_MS();
|
refreshed = false;
|
||||||
if (now - lastRefresh >= LUA_WIDGET_REFRESH) {
|
invalidate();
|
||||||
lastRefresh = now;
|
|
||||||
refreshed = false;
|
|
||||||
invalidate();
|
|
||||||
|
|
||||||
#if defined(DEBUG_WINDOWS)
|
#if defined(DEBUG_WINDOWS)
|
||||||
TRACE_WINDOWS("# refresh: %s", getWindowDebugString().c_str());
|
TRACE_WINDOWS("# refresh: %s", getWindowDebugString().c_str());
|
||||||
#endif
|
#endif
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void LuaWidget::update()
|
void LuaWidget::update()
|
||||||
@@ -417,7 +409,7 @@ void LuaWidget::update()
|
|||||||
|
|
||||||
if (lsWidgets == 0 || errorMessage) return;
|
if (lsWidgets == 0 || errorMessage) return;
|
||||||
|
|
||||||
luaSetInstructionsLimit(lsWidgets, WIDGET_SCRIPTS_MAX_INSTRUCTIONS);
|
luaSetInstructionsLimit(lsWidgets, MAX_INSTRUCTIONS);
|
||||||
LuaWidgetFactory * factory = (LuaWidgetFactory *)this->factory;
|
LuaWidgetFactory * factory = (LuaWidgetFactory *)this->factory;
|
||||||
lua_rawgeti(lsWidgets, LUA_REGISTRYINDEX, factory->updateFunction);
|
lua_rawgeti(lsWidgets, LUA_REGISTRYINDEX, factory->updateFunction);
|
||||||
lua_rawgeti(lsWidgets, LUA_REGISTRYINDEX, luaWidgetDataRef);
|
lua_rawgeti(lsWidgets, LUA_REGISTRYINDEX, luaWidgetDataRef);
|
||||||
@@ -471,7 +463,7 @@ void LuaWidget::refresh(BitmapBuffer* dc)
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
luaSetInstructionsLimit(lsWidgets, WIDGET_SCRIPTS_MAX_INSTRUCTIONS);
|
luaSetInstructionsLimit(lsWidgets, MAX_INSTRUCTIONS);
|
||||||
LuaWidgetFactory * factory = (LuaWidgetFactory *)this->factory;
|
LuaWidgetFactory * factory = (LuaWidgetFactory *)this->factory;
|
||||||
lua_rawgeti(lsWidgets, LUA_REGISTRYINDEX, factory->refreshFunction);
|
lua_rawgeti(lsWidgets, LUA_REGISTRYINDEX, factory->refreshFunction);
|
||||||
lua_rawgeti(lsWidgets, LUA_REGISTRYINDEX, luaWidgetDataRef);
|
lua_rawgeti(lsWidgets, LUA_REGISTRYINDEX, luaWidgetDataRef);
|
||||||
@@ -553,7 +545,7 @@ void LuaWidget::background()
|
|||||||
if (lsWidgets == 0 || errorMessage) return;
|
if (lsWidgets == 0 || errorMessage) return;
|
||||||
|
|
||||||
// TRACE("LuaWidget::background()");
|
// TRACE("LuaWidget::background()");
|
||||||
luaSetInstructionsLimit(lsWidgets, WIDGET_SCRIPTS_MAX_INSTRUCTIONS);
|
luaSetInstructionsLimit(lsWidgets, MAX_INSTRUCTIONS);
|
||||||
LuaWidgetFactory * factory = (LuaWidgetFactory *)this->factory;
|
LuaWidgetFactory * factory = (LuaWidgetFactory *)this->factory;
|
||||||
if (factory->backgroundFunction) {
|
if (factory->backgroundFunction) {
|
||||||
lua_rawgeti(lsWidgets, LUA_REGISTRYINDEX, factory->backgroundFunction);
|
lua_rawgeti(lsWidgets, LUA_REGISTRYINDEX, factory->backgroundFunction);
|
||||||
@@ -713,7 +705,7 @@ void luaLoadFile(const char * filename, void (*callback)())
|
|||||||
|
|
||||||
TRACE("luaLoadFile(%s)", filename);
|
TRACE("luaLoadFile(%s)", filename);
|
||||||
|
|
||||||
luaSetInstructionsLimit(lsWidgets, MANUAL_SCRIPTS_MAX_INSTRUCTIONS);
|
luaSetInstructionsLimit(lsWidgets, MAX_INSTRUCTIONS);
|
||||||
|
|
||||||
PROTECT_LUA() {
|
PROTECT_LUA() {
|
||||||
if (luaLoadScriptFileToState(lsWidgets, filename, LUA_SCRIPT_LOAD_MODE) == SCRIPT_OK) {
|
if (luaLoadScriptFileToState(lsWidgets, filename, LUA_SCRIPT_LOAD_MODE) == SCRIPT_OK) {
|
||||||
|
|||||||
Reference in New Issue
Block a user