From 133ab5618bd8771240f49c2544e788742fb34801 Mon Sep 17 00:00:00 2001
From: rusefillc <sdfsdfqsf2334234234>
Date: Thu, 14 Jul 2022 07:52:58 -0400
Subject: [PATCH] FSIO is dead

---
 firmware/controllers/core/core.mk                            | 1 -
 firmware/controllers/engine_controller.cpp                   | 5 ++---
 firmware/controllers/lua/lua.mk                              | 1 +
 firmware/controllers/lua/lua_hooks.cpp                       | 3 +--
 .../controllers/{core/fsio_impl.cpp => lua/script_impl.cpp}  | 5 ++---
 firmware/controllers/{core/fsio_impl.h => lua/script_impl.h} | 2 +-
 unit_tests/tests/lua/test_lua_with_engine.cpp                | 2 +-
 7 files changed, 8 insertions(+), 11 deletions(-)
 rename firmware/controllers/{core/fsio_impl.cpp => lua/script_impl.cpp} (97%)
 rename firmware/controllers/{core/fsio_impl.h => lua/script_impl.h} (96%)

diff --git a/firmware/controllers/core/core.mk b/firmware/controllers/core/core.mk
index 15216b93fc..67fddd7643 100644
--- a/firmware/controllers/core/core.mk
+++ b/firmware/controllers/core/core.mk
@@ -1,5 +1,4 @@
 
 CONTROLLERS_CORE_SRC_CPP = \
 	$(PROJECT_DIR)/controllers/core/state_sequence.cpp \
-	$(PROJECT_DIR)/controllers/core/fsio_impl.cpp \
 	
diff --git a/firmware/controllers/engine_controller.cpp b/firmware/controllers/engine_controller.cpp
index 4d5977b5cc..05a462c684 100644
--- a/firmware/controllers/engine_controller.cpp
+++ b/firmware/controllers/engine_controller.cpp
@@ -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();
 
diff --git a/firmware/controllers/lua/lua.mk b/firmware/controllers/lua/lua.mk
index 6daa02f259..76f27ba576 100644
--- a/firmware/controllers/lua/lua.mk
+++ b/firmware/controllers/lua/lua.mk
@@ -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 \
diff --git a/firmware/controllers/lua/lua_hooks.cpp b/firmware/controllers/lua/lua_hooks.cpp
index 1a626009b7..c647baa78c 100644
--- a/firmware/controllers/lua/lua_hooks.cpp
+++ b/firmware/controllers/lua/lua_hooks.cpp
@@ -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"
diff --git a/firmware/controllers/core/fsio_impl.cpp b/firmware/controllers/lua/script_impl.cpp
similarity index 97%
rename from firmware/controllers/core/fsio_impl.cpp
rename to firmware/controllers/lua/script_impl.cpp
index 0e0222511e..ec71f76545 100644
--- a/firmware/controllers/core/fsio_impl.cpp
+++ b/firmware/controllers/lua/script_impl.cpp
@@ -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,
diff --git a/firmware/controllers/core/fsio_impl.h b/firmware/controllers/lua/script_impl.h
similarity index 96%
rename from firmware/controllers/core/fsio_impl.h
rename to firmware/controllers/lua/script_impl.h
index a17ad731f5..113df42754 100644
--- a/firmware/controllers/core/fsio_impl.h
+++ b/firmware/controllers/lua/script_impl.h
@@ -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);
diff --git a/unit_tests/tests/lua/test_lua_with_engine.cpp b/unit_tests/tests/lua/test_lua_with_engine.cpp
index 273621a7e7..d33a302e26 100644
--- a/unit_tests/tests/lua/test_lua_with_engine.cpp
+++ b/unit_tests/tests/lua/test_lua_with_engine.cpp
@@ -6,7 +6,7 @@
  */
 
 #include "pch.h"
-#include "fsio_impl.h"
+#include "script_impl.h"
 #include "rusefi_lua.h"
 
 static const char* curveTestScript = R"(