Fix standalone Lua script screen flicker and improve error messages (#982)
* Relax assumptions about when Lua is called in foreground and background * Start Lua cycle timer both in foreground and background Do not assume that background/foreground alternates * Lua is called at every Standalone GUI cycle instead of 5 Hz Since Lua preempts every 50 ms or so, the GUI should remain responsive. * In standalone script, only call Lua once per GUI cycle, to avoid messing up buffer handling. * Revamped error reporting for Standalone and Telemetry Lua scripts * Font size for Lua error is reduced from XL to L on color if LCD_W < LCD_H * In drawTextLines, also possible linebreaks for opening brackets. * Smaller font for error message on tall color screen * Make titlebar height match font size on narrow LCD
This commit is contained in:
@@ -517,6 +517,9 @@ void drawTextLines(BitmapBuffer * dc, coord_t left, coord_t top, coord_t width,
|
||||
case '-':
|
||||
case '/':
|
||||
case ':':
|
||||
case '(':
|
||||
case '{':
|
||||
case '[':
|
||||
nxt++;
|
||||
case ' ':
|
||||
case '\n':
|
||||
|
||||
@@ -334,8 +334,7 @@ void RadioSdManagerPage::build(FormWindow * window)
|
||||
std::string fullpath = currentPath + "/" + name;
|
||||
menu->addLine(STR_EXECUTE_FILE, [=]() {
|
||||
luaExec(fullpath.c_str());
|
||||
if (luaState != INTERPRETER_RELOAD_PERMANENT_SCRIPTS)
|
||||
StandaloneLuaWindow::instance()->attach(window);
|
||||
StandaloneLuaWindow::instance()->attach(window);
|
||||
});
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -127,8 +127,7 @@ void RadioToolsPage::rebuild(FormWindow * window)
|
||||
f_chdir(toolPath);
|
||||
|
||||
luaExec(path_str.c_str());
|
||||
if (luaState != INTERPRETER_RELOAD_PERMANENT_SCRIPTS)
|
||||
StandaloneLuaWindow::instance()->attach(window);
|
||||
StandaloneLuaWindow::instance()->attach(window);
|
||||
|
||||
return 0;
|
||||
},
|
||||
|
||||
@@ -25,8 +25,6 @@
|
||||
|
||||
using std::string;
|
||||
|
||||
constexpr uint32_t STANDALONE_LUA_REFRESH = 1000 / 50; // 5Hz
|
||||
|
||||
void LuaPopup::paint(BitmapBuffer* dc, uint8_t type, const char* text, const char* info)
|
||||
{
|
||||
// popup background
|
||||
@@ -104,22 +102,15 @@ void StandaloneLuaWindow::paint(BitmapBuffer* dc)
|
||||
|
||||
void StandaloneLuaWindow::checkEvents()
|
||||
{
|
||||
// Execute first in case onEvent() is called.
|
||||
// (would trigger refresh)
|
||||
Window::checkEvents();
|
||||
|
||||
uint32_t now = RTOS_GET_MS();
|
||||
if (now - lastRefresh >= STANDALONE_LUA_REFRESH) {
|
||||
lastRefresh = now;
|
||||
runLua(0);
|
||||
}
|
||||
runLua(event);
|
||||
event = 0;
|
||||
}
|
||||
|
||||
#if defined(HARDWARE_KEYS)
|
||||
void StandaloneLuaWindow::onEvent(event_t evt)
|
||||
{
|
||||
lastRefresh = RTOS_GET_MS(); // mark as 'refreshed'
|
||||
runLua(evt);
|
||||
event = evt;
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -162,8 +153,6 @@ void StandaloneLuaWindow::runLua(event_t evt)
|
||||
TRACE("# StandaloneLuaWindow::invalidate()");
|
||||
#endif
|
||||
invalidate();
|
||||
} else {
|
||||
// The script was preempted, and the LCD should not be updated yet
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -58,11 +58,11 @@ public:
|
||||
protected:
|
||||
// GFX
|
||||
BitmapBuffer lcdBuffer;
|
||||
uint32_t lastRefresh = 0;
|
||||
|
||||
// pop-ups
|
||||
LuaPopup popup;
|
||||
|
||||
// run LUA code
|
||||
void runLua(event_t evt);
|
||||
event_t event = 0;
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user