#1471 - Lua moved to thirdparty directory - io.seek added

companion/src/firmwares/opentx/simulator/CMakeLists.txt

@@ -38,6 +38,7 @@ include_directories(
   ${RADIO_SRC_DIRECTORY}/thirdparty/FatFs
   ${RADIO_SRC_DIRECTORY}/thirdparty/FatFs/option
   ${RADIO_SRC_DIRECTORY}/thirdparty/CoOS
+  ${RADIO_SRC_DIRECTORY}/thirdparty/Lua/src
 )
 
 if(DEFINED TRANSLATIONS)

companion/src/firmwares/opentx/simulator/opentxsimulator.cpp

@@ -269,35 +269,35 @@ namespace NAMESPACE {
 
 #if defined(LUA)
 #include "radio/src/lua_api.cpp"
-#include "radio/src/lua/src/lapi.c"
-#include "radio/src/lua/src/lcode.c"
-#include "radio/src/lua/src/lctype.c"
-#include "radio/src/lua/src/ldebug.c"
-#include "radio/src/lua/src/ldo.c"
-#include "radio/src/lua/src/ldump.c"
-#include "radio/src/lua/src/lfunc.c"
-#include "radio/src/lua/src/lgc.c"
-#include "radio/src/lua/src/llex.c"
-#include "radio/src/lua/src/lmem.c"
-#include "radio/src/lua/src/lobject.c"
-#include "radio/src/lua/src/lopcodes.c"
-#include "radio/src/lua/src/lparser.c"
-#include "radio/src/lua/src/lstate.c"
-#include "radio/src/lua/src/lstring.c"
-#include "radio/src/lua/src/ltable.c"
-#include "radio/src/lua/src/lrotable.c"
-#include "radio/src/lua/src/ltm.c"
-#include "radio/src/lua/src/lundump.c"
-#include "radio/src/lua/src/lvm.c"
-#include "radio/src/lua/src/lzio.c"
-#include "radio/src/lua/src/lbaselib.c"
-#include "radio/src/lua/src/linit.c"
-#include "radio/src/lua/src/lmathlib.c"
-#include "radio/src/lua/src/lbitlib.c"
-#include "radio/src/lua/src/loadlib.c"
-#include "radio/src/lua/src/lauxlib.c"
-#include "radio/src/lua/src/ltablib.c"
-#include "radio/src/lua/src/lcorolib.c"
+#include "radio/src/thirdparty/Lua/src/lapi.c"
+#include "radio/src/thirdparty/Lua/src/lcode.c"
+#include "radio/src/thirdparty/Lua/src/lctype.c"
+#include "radio/src/thirdparty/Lua/src/ldebug.c"
+#include "radio/src/thirdparty/Lua/src/ldo.c"
+#include "radio/src/thirdparty/Lua/src/ldump.c"
+#include "radio/src/thirdparty/Lua/src/lfunc.c"
+#include "radio/src/thirdparty/Lua/src/lgc.c"
+#include "radio/src/thirdparty/Lua/src/llex.c"
+#include "radio/src/thirdparty/Lua/src/lmem.c"
+#include "radio/src/thirdparty/Lua/src/lobject.c"
+#include "radio/src/thirdparty/Lua/src/lopcodes.c"
+#include "radio/src/thirdparty/Lua/src/lparser.c"
+#include "radio/src/thirdparty/Lua/src/lstate.c"
+#include "radio/src/thirdparty/Lua/src/lstring.c"
+#include "radio/src/thirdparty/Lua/src/ltable.c"
+#include "radio/src/thirdparty/Lua/src/lrotable.c"
+#include "radio/src/thirdparty/Lua/src/ltm.c"
+#include "radio/src/thirdparty/Lua/src/lundump.c"
+#include "radio/src/thirdparty/Lua/src/lvm.c"
+#include "radio/src/thirdparty/Lua/src/lzio.c"
+#include "radio/src/thirdparty/Lua/src/lbaselib.c"
+#include "radio/src/thirdparty/Lua/src/linit.c"
+#include "radio/src/thirdparty/Lua/src/lmathlib.c"
+#include "radio/src/thirdparty/Lua/src/lbitlib.c"
+#include "radio/src/thirdparty/Lua/src/loadlib.c"
+#include "radio/src/thirdparty/Lua/src/lauxlib.c"
+#include "radio/src/thirdparty/Lua/src/ltablib.c"
+#include "radio/src/thirdparty/Lua/src/lcorolib.c"
 #endif
 
 int16_t g_anas[NUM_STICKS+NUM_POTS];

radio/src/Makefile

@@ -373,6 +373,7 @@ VERSION = 2.0.99
 THIRDPARTY = thirdparty
 COOSDIR = $(THIRDPARTY)/CoOS
 FATFSDIR = $(THIRDPARTY)/FatFs
+LUADIR = $(THIRDPARTY)/Lua/src
 
 SRC =
 CPPSRC =
@@ -933,11 +934,11 @@ ifeq ($(PCB), TARANIS)
       GUIMODELSRC += gui/$(GUIDIRECTORY)/menu_model_custom_scripts.cpp
     endif
     CPPDEFS += -DLUA
-    INCDIRS += lua/src
+    INCDIRS += $(LUADIR)
     CPPSRC += lua_api.cpp
-    LUASRC = lua/src/lapi.c lua/src/lcode.c lua/src/lctype.c lua/src/ldebug.c lua/src/ldo.c lua/src/ldump.c lua/src/lfunc.c lua/src/lgc.c lua/src/llex.c lua/src/lmem.c \
-           lua/src/lobject.c lua/src/lopcodes.c lua/src/lparser.c lua/src/lstate.c lua/src/lstring.c lua/src/ltable.c lua/src/lrotable.c lua/src/ltm.c lua/src/lundump.c lua/src/lvm.c lua/src/lzio.c \
-           lua/src/lbaselib.c lua/src/linit.c lua/src/lmathlib.c lua/src/lbitlib.c lua/src/loadlib.c lua/src/lauxlib.c lua/src/ltablib.c lua/src/lcorolib.c lua/src/liolib.c
+    LUASRC = $(LUADIR)/lapi.c $(LUADIR)/lcode.c $(LUADIR)/lctype.c $(LUADIR)/ldebug.c $(LUADIR)/ldo.c $(LUADIR)/ldump.c $(LUADIR)/lfunc.c $(LUADIR)/lgc.c $(LUADIR)/llex.c $(LUADIR)/lmem.c \
+           $(LUADIR)/lobject.c $(LUADIR)/lopcodes.c $(LUADIR)/lparser.c $(LUADIR)/lstate.c $(LUADIR)/lstring.c $(LUADIR)/ltable.c $(LUADIR)/lrotable.c $(LUADIR)/ltm.c $(LUADIR)/lundump.c $(LUADIR)/lvm.c $(LUADIR)/lzio.c \
+           $(LUADIR)/lbaselib.c $(LUADIR)/linit.c $(LUADIR)/lmathlib.c $(LUADIR)/lbitlib.c $(LUADIR)/loadlib.c $(LUADIR)/lauxlib.c $(LUADIR)/ltablib.c $(LUADIR)/lcorolib.c $(LUADIR)/liolib.c
     SRC += $(LUASRC)
     LUADEP = lua_exports.inc
 	ifeq ($(USE_BIN_ALLOCATOR), YES)

radio/src/thirdparty/Lua/src/liolib.c

@@ -618,7 +618,6 @@ static int f_setvbuf (lua_State *L) {
 }
 
 
-#if !defined(USE_FATFS)
 static int io_flush (lua_State *L) {
   return luaL_fileresult(L, fflush(getiofile(L, IO_OUTPUT)) == 0, NULL);
 }
@@ -627,7 +626,15 @@ static int io_flush (lua_State *L) {
 static int f_flush (lua_State *L) {
   return luaL_fileresult(L, fflush(tofile(L)) == 0, NULL);
 }
-#endif
+
+#else
+
+static int io_seek (lua_State *L) {
+  FILE *f = tofile(L);
+  lua_Unsigned offset = luaL_checkunsigned(L, 2);
+  lua_pushinteger(L, f_lseek(f, offset));
+  return 1;
+}
 
 #endif
 
@@ -639,6 +646,7 @@ const luaL_Reg iolib[] = {
   // {"flush", io_flush},
   // {"input", io_input},
   // {"lines", io_lines},
+  {"seek", io_seek},
   {"open", io_open},
   // {"output", io_output},
   // {"popen", io_popen},