chores: update to LUA 5.3 (#4203)

Co-authored-by: Peter Feerick <peter.feerick@gmail.com> Co-authored-by: philmoz <phil.a.mitchell@gmail.com>
EdgeTX · Dec 24, 2024 · 47cba22 · 47cba22
1 parent 28b0cb9
commit 47cba22
Show file tree

Hide file tree

Showing 87 changed files with 9,426 additions and 6,692 deletions.
diff --git a/radio/src/cli.cpp b/radio/src/cli.cpp
@@ -47,6 +47,7 @@
 #include <new>
 #include <stdarg.h>
 
+#include "lua/lua_states.h"
 
 #define CLI_COMMAND_MAX_ARGS           8
 #define CLI_COMMAND_MAX_LEN            256

diff --git a/radio/src/edgetx.cpp b/radio/src/edgetx.cpp
@@ -73,6 +73,10 @@
 #include <malloc.h>
 #endif
 
+#if defined(LUA)
+#include "lua/lua_states.h"
+#endif
+
 RadioData  g_eeGeneral;
 ModelData  g_model;
 
@@ -1085,10 +1089,6 @@ void edgeTxClose(uint8_t shutdown)
 #endif
   }
 
-#if defined(LUA)
-  luaClose(&lsScripts);
-#endif
-
   logsClose();
 
   storageFlushCurrentModel();
@@ -1112,11 +1112,13 @@ void edgeTxClose(uint8_t shutdown)
   MainWindow::instance()->shutdown();
 #if defined(LUA)
   luaUnregisterWidgets();
-  luaClose(&lsWidgets);
-  lsWidgets = 0;
 #endif
 #endif
 
+#if defined(LUA)
+  luaClose();
+#endif
+
   sdDone();
 }
 

diff --git a/radio/src/gui/212x64/model_custom_scripts.cpp b/radio/src/gui/212x64/model_custom_scripts.cpp
@@ -20,6 +20,7 @@
  */
 
 #include "edgetx.h"
+#include "lua/lua_states.h"
 
 void onModelCustomScriptMenu(const char *result)
 {

diff --git a/radio/src/gui/colorlcd/libui/bitmapbuffer_draw_extra.cpp b/radio/src/gui/colorlcd/libui/bitmapbuffer_draw_extra.cpp
@@ -27,6 +27,8 @@
 #include "telemetry/telemetry_sensors.h"
 #include "translations.h"
 
+#include <cmath>
+
 // Drawing functions used by Lua API
 
 void BitmapBuffer::invertRect(coord_t x, coord_t y, coord_t w, coord_t h,

diff --git a/radio/src/gui/colorlcd/mainview/view_statistics.cpp b/radio/src/gui/colorlcd/mainview/view_statistics.cpp
@@ -25,6 +25,7 @@
 #include "tasks.h"
 #include "tasks/mixer_task.h"
 #include "mixer_scheduler.h"
+#include "lua/lua_states.h"
 
 class StatisticsViewPage : public PageTab
 {

diff --git a/radio/src/gui/colorlcd/standalone_lua.cpp b/radio/src/gui/colorlcd/standalone_lua.cpp
@@ -58,7 +58,7 @@ static void luaStandaloneInit()
   lsStandaloneTrace.script = "lua_newstate(scripts)";
   lsStandalone = lua_newstate(tracer_alloc, &lsStandaloneTrace);   //we use tracer allocator
 #else
-  lsStandalone = lua_newstate(l_alloc, nullptr);   //we use Lua default allocator
+  lsStandalone = luaL_newstate();   //we use Lua default allocator
 #endif
   if (lsStandalone) {
     // install our panic handler

diff --git a/radio/src/gui/common/stdlcd/popups.cpp b/radio/src/gui/common/stdlcd/popups.cpp
@@ -20,6 +20,7 @@
  */
 
 #include "edgetx.h"
+#include <stdarg.h>
 
 const char * warningText = nullptr;
 const char * warningInfoText;

diff --git a/radio/src/lua/CMakeLists.txt b/radio/src/lua/CMakeLists.txt
@@ -81,6 +81,8 @@ set(LUA_SRC
   lstrlib.c
 )
 
+add_compile_definitions(LUA_COMPAT_5_2)
+
 foreach(FILE ${LUA_SRC})
   set(SRC ${SRC} ${LUA_DIR}/${FILE})
 endforeach()
-Original file line number
+Diff line change
@@ Expand Up / @@ -20,6 +20,7 @@ @@
      */
     #include "edgetx.h"
+    #include "lua/lua_states.h"
     void onModelCustomScriptMenu(const char *result)
     {
@@ Expand Down @@