rusefi
/
custom-board-bundle-sample-fork-of-rusefi
mirror of https://github.com/rusefi/custom-board-bundle-sample-fork-of-rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Lua timer (#3218) 

* Lua: Timer class #3159

* Lua: Timer class #3159

* Lua: Timer class #3159

* Lua: Timer class #3159

* lua timer is happy (#3216)

* hooks are happy

* don't need that any more

* format

* update lib

* module

Co-authored-by: rusefillc <sdfsdfqsf2334234234>
Co-authored-by: Matthew Kennedy <matthewkennedy@outlook.com>
This commit is contained in:
rusefillc 2021-09-03 20:21:39 -04:00 committed by GitHub
parent 66a9bc5ce7
commit 0b73150ea4
5 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitmodules vendored
View File

@ -29,3 +29,7 @@
path = firmware/ext/lua path = firmware/ext/lua
url = https://github.com/rusefi/lua url = https://github.com/rusefi/lua
branch = rusefi-5.4.3 branch = rusefi-5.4.3
[submodule "firmware/controllers/lua/luaaa"]
path = firmware/controllers/lua/luaaa
url = https://github.com/rusefi/luaaa
branch = rusefi_prod

2
firmware/controllers/lua/lua.mk
View File

@ -4,7 +4,7 @@ LUA_EXT=$(PROJECT_DIR)/ext/lua
ALLCPPSRC += $(LUA_DIR)/lua.cpp \ ALLCPPSRC += $(LUA_DIR)/lua.cpp \
$(LUA_DIR)/lua_hooks.cpp \ $(LUA_DIR)/lua_hooks.cpp \
ALLINC += $(LUA_DIR) $(LUA_EXT) ALLINC += $(LUA_DIR) $(LUA_DIR)/luaaa $(LUA_EXT)
ALLCSRC += \ ALLCSRC += \
$(LUA_EXT)/lapi.c \ $(LUA_EXT)/lapi.c \
$(LUA_EXT)/lcode.c \ $(LUA_EXT)/lcode.c \

10
firmware/controllers/lua/lua_hooks.cpp
View File

@ -8,6 +8,9 @@
#include "lua_airmass.h" #include "lua_airmass.h"
#include "can_msg_tx.h" #include "can_msg_tx.h"
#include "settings.h" #include "settings.h"
#include <new>
#include "luaaa.hpp"
using namespace luaaa;
// Some functions lean on existing FSIO implementation // Some functions lean on existing FSIO implementation
#include "fsio_impl.h" #include "fsio_impl.h"
@ -307,6 +310,13 @@ static int lua_stopEngine(lua_State*) {
#endif // EFI_UNIT_TEST #endif // EFI_UNIT_TEST
void configureRusefiLuaHooks(lua_State* l) { void configureRusefiLuaHooks(lua_State* l) {
LuaClass<Timer> luaTimer(l, "Timer");
luaTimer
.ctor()
.fun("reset", static_cast<void (Timer::*)() >(&Timer::reset ))
.fun("getElapsedSeconds", static_cast<float(Timer::*)()const>(&Timer::getElapsedSeconds));
lua_register(l, "print", lua_efi_print); lua_register(l, "print", lua_efi_print);
lua_register(l, "readPin", lua_readpin); lua_register(l, "readPin", lua_readpin);
lua_register(l, "getAuxAnalog", lua_getAuxAnalog); lua_register(l, "getAuxAnalog", lua_getAuxAnalog);

1
firmware/controllers/lua/luaaa Submodule

@ -0,0 +1 @@
Subproject commit 97ee01219e52271f9c5bfb57522a9be919798b01

12
unit_tests/tests/lua/test_lua_hooks.cpp
View File

@ -73,3 +73,15 @@ TEST(LuaHooks, CanTxDataLength) {
// invalid: not a table // invalid: not a table
EXPECT_ANY_THROW(testLuaExecString("txCan(1, 0, 0, 26)")); EXPECT_ANY_THROW(testLuaExecString("txCan(1, 0, 0, 26)"));
} }
static const char* timerTest = R"(
function testFunc()
local a = Timer.new()
a:reset()
return a:getElapsedSeconds()
end
)";
TEST(LuaHooks, TestLuaTimer) {
EXPECT_EQ(testLuaReturnsNumber(timerTest), 0);
}