andreika-git
/
rusefi
mirror of https://github.com/andreika-git/rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

don't lowercase console commands (#2664) 

* don't lowercase commands

* print bool lua results

* lua memory command
This commit is contained in:
Matthew Kennedy 2021-05-10 08:30:50 -07:00 committed by GitHub
parent 13ecc35af7
commit 6cc7b0eeec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
firmware/controllers/lua/lua.cpp
View File

@ -159,6 +159,8 @@ void doInteractive(LuaHandle& ls) {
efiPrintf(TAG "interactive returned number: %f", lua_tonumber(ls, -1)); efiPrintf(TAG "interactive returned number: %f", lua_tonumber(ls, -1));
} else if (lua_isstring(ls, -1)) { } else if (lua_isstring(ls, -1)) {
efiPrintf(TAG "interactive returned string: '%s'", lua_tostring(ls, -1)); efiPrintf(TAG "interactive returned string: '%s'", lua_tostring(ls, -1));
} else if (lua_isboolean(ls, -1)) {
efiPrintf(TAG "interactive returned bool: %s", lua_toboolean(ls, -1) ? "true" : "false");
} else if (lua_isnil(ls, -1)) { } else if (lua_isnil(ls, -1)) {
efiPrintf(TAG "interactive returned nil."); efiPrintf(TAG "interactive returned nil.");
} else { } else {
@ -248,6 +250,11 @@ void startLua() {
interactivePending = true; interactivePending = true;
}); });
addConsoleAction("luamemory", [](){
float pct = 100.0f * memoryUsed / LUA_HEAP_SIZE;
efiPrintf("Lua memory: %d / %d bytes = %.1f%%", memoryUsed, LUA_HEAP_SIZE, pct);
});
} }
#else // not EFI_UNIT_TEST #else // not EFI_UNIT_TEST

2
java_console/ui/src/main/java/com/rusefi/ui/widgets/AnyCommand.java
View File

@ -129,7 +129,7 @@ public class AnyCommand {
listener.onSend(); listener.onSend();
int timeout = CommandQueue.getTimeout(cmd); int timeout = CommandQueue.getTimeout(cmd);
reentrant = true; reentrant = true;
uiContext.getCommandQueue().write(cmd.toLowerCase(), timeout); uiContext.getCommandQueue().write(cmd, timeout);
reentrant = false; reentrant = false;
} }