Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-21 15:25:17 +03:00
Code Issues Wiki Activity

The Lua Wizard was broken in 2.0.11

Browse source
This commit is contained in:
bsongis 2014-09-10 15:35:06 +02:00
parent e22c658ee9
commit f584766fc7
2 changed files with 14 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

21
radio/src/lua.cpp
View file

@ -1748,16 +1748,17 @@ void luaError(uint8_t error)
void luaExec(const char *filename) void luaExec(const char *filename)
{ {
luaInit(); luaInit();
if (L) {
standaloneScript.state = SCRIPT_NOFILE; standaloneScript.state = SCRIPT_NOFILE;
int result = luaLoad(filename, standaloneScript); int result = luaLoad(filename, standaloneScript);
// TODO the same with run ... // TODO the same with run ...
if (result == SCRIPT_OK) { if (result == SCRIPT_OK) {
luaState = INTERPRETER_RUNNING_STANDALONE_SCRIPT; luaState = INTERPRETER_RUNNING_STANDALONE_SCRIPT;
} }
else { else {
luaError(result); luaError(result);
luaState = INTERPRETER_RELOAD_PERMANENT_SCRIPTS; luaState = INTERPRETER_RELOAD_PERMANENT_SCRIPTS;
}
} }
} }

9
radio/src/opentx.h
View file

@ -1500,12 +1500,9 @@ enum AUDIO_SOUNDS {
uint8_t outputsCount; uint8_t outputsCount;
ScriptOutput outputs[MAX_SCRIPT_OUTPUTS]; ScriptOutput outputs[MAX_SCRIPT_OUTPUTS];
}; };
enum InterpreterState { #define INTERPRETER_RUNNING_STANDALONE_SCRIPT 1
INTERPRETER_RUNNING_PERMANENT_SCRIPTS, #define INTERPRETER_RELOAD_PERMANENT_SCRIPTS 2
INTERPRETER_RUNNING_STANDALONE_SCRIPT, #define INTERPRETER_PANIC 255
INTERPRETER_RELOAD_PERMANENT_SCRIPTS,
INTERPRETER_PANIC,
};
extern uint8_t luaState; extern uint8_t luaState;
extern uint8_t luaScriptsCount; extern uint8_t luaScriptsCount;
extern ScriptInternalData standaloneScript; extern ScriptInternalData standaloneScript;