rename lua in headers

CMakeLists.txt

@@ -1,7 +1,4 @@
-
-# minimum CMake version required for C++20 support, among other things
 cmake_minimum_required(VERSION 3.18)
-
 # detect if Monocoque is being used as a sub-project of another CMake project
 if(NOT DEFINED PROJECT_NAME)
     set(MONOCOQUE_SUBPROJECT OFF)
@@ -20,12 +17,24 @@ set(CMAKE_EXE_LINKER_FLAGS "-Wl,--no-as-needed -ldl")
 set(LIBUSB_INCLUDE_DIR /usr/include/libusb-1.0)
 set(LIBXML_INCLUDE_DIR /usr/include/libxml2)
 
-FIND_PACKAGE(Lua 5.4 EXACT REQUIRED)
-set(INCLUDE_DIRS ${LUA_INCLUDE_DIR})
-include_directories(${LUA_INCLUDE_DIR})
-
-
+FIND_PACKAGE(Lua)
+#FIND_PACKAGE(Lua 5.4 REQUIRED EXACT)
+if(Lua_FOUND AND NOT TARGET Lua::Lua)
+  add_library(Lua::Lua INTERFACE IMPORTED)
+  set_target_properties(
+    Lua::Lua
+    PROPERTIES
+      INTERFACE_INCLUDE_DIRECTORIES "${LUA_INCLUDE_DIR}"
+      INTERFACE_LINK_LIBRARIES "${LUA_LIBRARIES}"
+  )
 
+endif()
+message("Lua ${Lua_VERSION} found")
+if (Lua_VERSION VERSION_GREATER_EQUAL "5.5.0")
+    add_compile_definitions(USE_LUA_55)
+else()
+    remove_definitions(USE_LUA_55)
+endif()
 
 #FIND_PATH(LIBUSB_INCLUDE_DIR libusb.h
 #	HINTS $ENV{LIBUSB_ROOT}
@@ -64,9 +73,9 @@ endif()
 
 message("Using pulseaudio backend...")
 add_compile_definitions(USE_PULSEAUDIO=true)
-target_link_libraries(monocoque m hidapi-hidraw pulse serialport xml2 argtable2 config gameloop helper devices slog simulatorapi uv xdg-basedir ${LUA_LIBRARY} proc2)
+target_link_libraries(monocoque m hidapi-hidraw pulse serialport xml2 argtable2 config gameloop helper devices slog simulatorapi uv xdg-basedir lua proc2)
 
-target_include_directories(monocoque PUBLIC config ${LIBXML_INCLUDE_DIR})
+target_include_directories(monocoque PUBLIC config ${LIBXML_INCLUDE_DIR} ${LUA_INCLUDE_DIR})
 
 add_subdirectory(src/monocoque/gameloop)
 add_subdirectory(src/monocoque/simulatorapi)

install.sh

@@ -95,7 +95,7 @@ install_dependencies() {
     
     case $DISTRO in
         arch|manjaro)
-            local deps="yder libuv argtable libserialport libconfig hidapi lua libxdg-basedir mingw-w64-gcc"
+            local deps="yder libuv argtable libserialport libconfig hidapi lua54 libpulse pkgconfig libxdg-basedir mingw-w64-gcc"
             
             # Check if yay is available for AUR
             if command -v yay &> /dev/null; then
@@ -537,7 +537,7 @@ main() {
     clone_repositories
     
     log_info "Building components (this may take a few minutes)..."
-    #build_simapi
+    build_simapi
     build_simd
     build_monocoque
     build_simshmbridge

src/monocoque/devices/serial/arduinoledlua.c

@@ -64,6 +64,39 @@ int simdata_to_lua(lua_State *L, SimData* simdata) {
     }
     lua_setfield(L, -2, "pd");
 
+    lua_pushnumber(L, simdata->gas);
+    lua_setfield(L, -2, "gas");
+
+    lua_pushnumber(L, simdata->fuel);
+    lua_setfield(L, -2, "fuel");
+
+    lua_pushnumber(L, simdata->turboboost);
+    lua_setfield(L, -2, "turboboost");
+
+    lua_newtable(L);
+    for(int i = 0; i < 4; i++)
+    {
+        lua_pushnumber(L, simdata->tyreRPS[i]);
+        lua_rawseti(L, -2, i+1);
+    }
+    lua_setfield(L, -2, "tyreRPS");
+
+    lua_newtable(L);
+    for(int i = 0; i < 4; i++)
+    {
+        lua_pushnumber(L, simdata->tyrediameter[i]);
+        lua_rawseti(L, -2, i+1);
+    }
+    lua_setfield(L, -2, "tyrediameter");
+
+    lua_newtable(L);
+    for(int i = 0; i < 4; i++)
+    {
+        lua_pushnumber(L, simdata->tyretemp[i]);
+        lua_rawseti(L, -2, i+1);
+    }
+    lua_setfield(L, -2, "tyretemp");
+
     return 0; // Return the table to Lua
 }
 

src/monocoque/devices/serial/arduinoledlua.h

@@ -1,10 +1,15 @@
 #ifndef _ARDUINOLEDLUA_H
 #define _ARDUINOLEDLUA_H
 
-#include "lua.h"
+//#include <lua.h>
 #include "lauxlib.h"
 #include "lualib.h"
 
+#ifdef USE_LUA_55
+/* open all libraries */
+#define luaL_openlibs(L)	luaL_openselectedlibs(L, ~0, 0)
+#endif
+
 #include "../../simulatorapi/simapi/simapi/simdata.h"
 
 typedef enum {