Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-24 16:55:20 +03:00
Code Issues Wiki Activity

Fixes #1796 - needs tests on the nightly builds. Caution I removed the

Browse source 
lcd.lock() function completely
This commit is contained in:
bsongis 2014-10-22 20:39:19 +02:00
parent ed16ed9cc4
commit 1066176b0f
5 changed files with 4 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

7
radio/src/lcd.h
View file

@ -298,13 +298,6 @@ void lcdSetContrast();
extern display_t lcd_buf[DISPLAY_BUF_SIZE]; extern display_t lcd_buf[DISPLAY_BUF_SIZE];
#endif #endif
#if defined(LUA)
extern bool lcd_locked;
#define LCD_LOCKED() lcd_locked
#else
#define LCD_LOCKED() 0
#endif
char * strAppend(char * dest, const char * source); char * strAppend(char * dest, const char * source);
char * strAppendDate(char * str, bool time=false); char * strAppendDate(char * str, bool time=false);
char * strAppendFilename(char * dest, const char * filename, const int size); char * strAppendFilename(char * dest, const char * filename, const int size);

4
radio/src/lcd_common.cpp
View file

@ -38,10 +38,6 @@
display_t displayBuf[DISPLAY_BUF_SIZE]; display_t displayBuf[DISPLAY_BUF_SIZE];
#if defined(LUA)
bool lcd_locked = false;
#endif
void lcd_clear() void lcd_clear()
{ {
memset(displayBuf, 0, sizeof(displayBuf)); memset(displayBuf, 0, sizeof(displayBuf));

9
radio/src/lua.cpp
View file

@ -346,12 +346,6 @@ static int luaGetGeneralSettings(lua_State *L)
return 1; return 1;
} }
static int luaLcdLock(lua_State *L)
{
lcd_locked = true;
return 0;
}
static int luaLcdClear(lua_State *L) static int luaLcdClear(lua_State *L)
{ {
lcd_clear(); lcd_clear();
@ -1522,7 +1516,6 @@ const luaL_Reg modelLib[] = {
}; };
const luaL_Reg lcdLib[] = { const luaL_Reg lcdLib[] = {
{ "lock", luaLcdLock },
{ "clear", luaLcdClear }, { "clear", luaLcdClear },
{ "getLastPos", luaLcdGetLastPos }, { "getLastPos", luaLcdGetLastPos },
{ "drawPoint", luaLcdDrawPoint }, { "drawPoint", luaLcdDrawPoint },
@ -2029,8 +2022,6 @@ void luaDoGc()
void luaTask(uint8_t evt) void luaTask(uint8_t evt)
{ {
lcd_locked = false;
uint32_t t0 = get_tmr10ms(); uint32_t t0 = get_tmr10ms();
static uint32_t lastLuaTime = 0; static uint32_t lastLuaTime = 0;
uint16_t interval = (lastLuaTime == 0 ? 0 : (t0 - lastLuaTime)); uint16_t interval = (lastLuaTime == 0 ? 0 : (t0 - lastLuaTime));

4
radio/src/opentx.cpp
View file

@ -2420,7 +2420,7 @@ void perMain()
const char *warn = s_warning; const char *warn = s_warning;
uint8_t menu = s_menu_count; uint8_t menu = s_menu_count;
if (!LCD_LOCKED()) { if (!LUA_STANDALONE_SCRIPT_RUNNING()) {
lcd_clear(); lcd_clear();
if (menuEvent) { if (menuEvent) {
m_posVert = menuEvent == EVT_ENTRY_UP ? g_menuPos[g_menuStackPtr] : 0; m_posVert = menuEvent == EVT_ENTRY_UP ? g_menuPos[g_menuStackPtr] : 0;
@ -2436,7 +2436,7 @@ void perMain()
luaTask(evt); luaTask(evt);
#endif #endif
if (!LCD_LOCKED()) { if (!LUA_STANDALONE_SCRIPT_RUNNING()) {
if (warn) DISPLAY_WARNING(evt); if (warn) DISPLAY_WARNING(evt);
#if defined(NAVIGATION_MENUS) #if defined(NAVIGATION_MENUS)
if (menu) { if (menu) {

3
radio/src/opentx.h
View file

@ -1566,7 +1566,7 @@ enum AUDIO_SOUNDS {
#define luaGetCpuUsed(idx) scriptInternalData[idx].instructions #define luaGetCpuUsed(idx) scriptInternalData[idx].instructions
#define LUA_LOAD_MODEL_SCRIPTS() luaState |= INTERPRETER_RELOAD_PERMANENT_SCRIPTS #define LUA_LOAD_MODEL_SCRIPTS() luaState |= INTERPRETER_RELOAD_PERMANENT_SCRIPTS
#define LUA_LOAD_MODEL_SCRIPT(idx) luaState |= INTERPRETER_RELOAD_PERMANENT_SCRIPTS #define LUA_LOAD_MODEL_SCRIPT(idx) luaState |= INTERPRETER_RELOAD_PERMANENT_SCRIPTS
#define LUA_STANDALONE_SCRIPT_RUNNING() (luaState == INTERPRETER_RUNNING_STANDALONE_SCRIPT)
// Lua PROTECT/UNPROTECT // Lua PROTECT/UNPROTECT
#include <setjmp.h> #include <setjmp.h>
struct our_longjmp { struct our_longjmp {
@ -1583,6 +1583,7 @@ enum AUDIO_SOUNDS {
#else #else
#define LUA_LOAD_MODEL_SCRIPTS() #define LUA_LOAD_MODEL_SCRIPTS()
#define LUA_LOAD_MODEL_SCRIPT(idx) #define LUA_LOAD_MODEL_SCRIPT(idx)
#define LUA_STANDALONE_SCRIPT_RUNNING() (0)
#endif #endif
#if defined(CPUARM) #if defined(CPUARM)