FOME-Tech
/
fome-fw
mirror of https://github.com/FOME-Tech/fome-fw.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FSIO is dead

This commit is contained in:
rusefillc 2022-07-14 07:52:58 -04:00
parent 04e47532ef
commit 133ab5618b
7 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
firmware/controllers/core/core.mk
View File

@ -1,5 +1,4 @@
CONTROLLERS_CORE_SRC_CPP = \
$(PROJECT_DIR)/controllers/core/state_sequence.cpp \
$(PROJECT_DIR)/controllers/core/fsio_impl.cpp \

5
firmware/controllers/engine_controller.cpp
View File

@ -25,7 +25,7 @@
#include "os_access.h"
#include "trigger_central.h"
#include "fsio_impl.h"
#include "script_impl.h"
#include "idle_thread.h"
#include "advance_map.h"
#include "main_trigger_callback.h"
@ -507,8 +507,7 @@ void commonInitEngineController() {
initAccelEnrichment();
// TODO: rename
initFsioImpl();
initScriptImpl();
initGpPwm();

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

@ -4,6 +4,7 @@ LUA_EXT=$(PROJECT_DIR)/ext/lua
ALLCPPSRC += $(LUA_DIR)/lua.cpp \
$(LUA_DIR)/lua_hooks.cpp \
$(LUA_DIR)/lua_hooks_util.cpp \
$(LUA_DIR)/script_impl.cpp \
$(LUA_DIR)/generated/output_lookup_generated.cpp \
$(LUA_DIR)/generated/value_lookup_generated.cpp \
$(LUA_DIR)/lua_can_rx.cpp \

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

@ -20,8 +20,7 @@
#include "lua_hooks_util.h"
using namespace luaaa;
// Some functions lean on existing FSIO implementation
#include "fsio_impl.h"
#include "script_impl.h"
#if EFI_PROD_CODE
#include "electronic_throttle_impl.h"

5
firmware/controllers/core/fsio_impl.cpp → firmware/controllers/lua/script_impl.cpp
View File

@ -10,7 +10,7 @@
#include "pch.h"
#include "fsio_impl.h"
#include "script_impl.h"
static fsio8_Map3D_f32t scriptTable1;
static fsio8_Map3D_u8t scriptTable2;
@ -79,8 +79,7 @@ float getCurveValue(int index, float key) {
}
}
// TODO: rename
void initFsioImpl() {
void initScriptImpl() {
scriptTable1.init(config->scriptTable1, config->scriptTable1LoadBins,
config->scriptTable1RpmBins);
scriptTable2.init(config->scriptTable2, config->scriptTable2LoadBins,

2
firmware/controllers/core/fsio_impl.h → firmware/controllers/lua/script_impl.h
View File

@ -13,7 +13,7 @@
typedef Map3D<SCRIPT_TABLE_8, SCRIPT_TABLE_8, float, int16_t, int16_t> fsio8_Map3D_f32t;
typedef Map3D<SCRIPT_TABLE_8, SCRIPT_TABLE_8, uint8_t, int16_t, int16_t> fsio8_Map3D_u8t;
void initFsioImpl();
void initScriptImpl();
float getCurveValue(int index, float key);
int getCurveIndexByName(const char *name);

2
unit_tests/tests/lua/test_lua_with_engine.cpp
View File

@ -6,7 +6,7 @@
*/
#include "pch.h"
#include "fsio_impl.h"
#include "script_impl.h"
#include "rusefi_lua.h"
static const char* curveTestScript = R"(