update luaaa (#3540)
* lua update * no stdlib mode * turn off system luaaa for now since it makes luaaa sad * let user heap do a little * gitmodules * memory shuffling Co-authored-by: Matthew Kennedy <makenne@microsoft.com>
This commit is contained in:
parent
dffab7abff
commit
a831bec797
|
@ -32,7 +32,7 @@
|
|||
[submodule "firmware/controllers/lua/luaaa"]
|
||||
path = firmware/controllers/lua/luaaa
|
||||
url = https://github.com/rusefi/luaaa
|
||||
branch = rusefi_prod_2019
|
||||
branch = rusefi_prod_2021_11_12
|
||||
[submodule "firmware/ext/openblt"]
|
||||
path = firmware/ext/openblt
|
||||
url = https://github.com/rusefi/openblt
|
||||
|
|
|
@ -270,7 +270,7 @@
|
|||
// small memory F40x can't fit perf trace
|
||||
#define ENABLE_PERF_TRACE FALSE
|
||||
|
||||
#define LUA_USER_HEAP 13000
|
||||
#define LUA_USER_HEAP 15000
|
||||
#define LUA_SYSTEM_HEAP 12000
|
||||
#endif
|
||||
|
||||
|
|
|
@ -753,7 +753,7 @@ void initEngineContoller(DECLARE_ENGINE_PARAMETER_SUFFIX) {
|
|||
* UNUSED_SIZE constants.
|
||||
*/
|
||||
#ifndef RAM_UNUSED_SIZE
|
||||
#define RAM_UNUSED_SIZE 4800
|
||||
#define RAM_UNUSED_SIZE 4000
|
||||
#endif
|
||||
#ifndef CCM_UNUSED_SIZE
|
||||
#define CCM_UNUSED_SIZE 2400
|
||||
|
|
|
@ -327,7 +327,7 @@ static bool runOneLua(lua_Alloc alloc, const char* script) {
|
|||
}
|
||||
|
||||
void LuaThread::ThreadTask() {
|
||||
initSystemLua();
|
||||
//initSystemLua();
|
||||
|
||||
while (!chThdShouldTerminateX()) {
|
||||
bool wasOk = runOneLua(myAlloc<0>, config->luaScript);
|
||||
|
|
|
@ -9,6 +9,9 @@
|
|||
#include "can_msg_tx.h"
|
||||
#include "settings.h"
|
||||
#include <new>
|
||||
|
||||
// We don't want to try and use the STL on a microcontroller
|
||||
#define LUAAA_WITHOUT_CPP_STDLIB
|
||||
#include "luaaa.hpp"
|
||||
#include "lua_hooks_util.h"
|
||||
using namespace luaaa;
|
||||
|
|
|
@ -1 +1 @@
|
|||
Subproject commit 499699790e6064e2f536fe5bdbff715a8cf1e5c2
|
||||
Subproject commit a7854a5928c2366def3dc2c6c581564e40329b23
|
Loading…
Reference in New Issue