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

Epic: Remove FSIO #2928

This commit is contained in:
rusefillc 2021-11-14 11:04:51 -05:00
parent 3327b0d4e7
commit 1a3fb4a0db
5 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
firmware/config/engines/mazda_miata_custom_hunchback.cpp
View File

@ -36,7 +36,7 @@ const float mazda_miata_nb2_LoadBins[FUEL_LOAD_COUNT] = {20.0, 25.0, 30.0, 35.0,
135.0, 158.0, 185.0, 220.0}
;
static uint8_t const SCRIPT_TABLE__dyno[SCRIPT_TABLE__8][SCRIPT_TABLE__8] = {
static uint8_t const SCRIPT_TABLE_dyno[SCRIPT_TABLE_8][SCRIPT_TABLE_8] = {
/* Generated by TS2C on Sun May 07 09:35:13 EDT 2017*/
{/* 0 30.000 *//* 0 700.0*/1, /* 1 1000.0*/3, /* 2 2000.0*/10, /* 3 3000.0*/20, /* 4 3500.0*/20, /* 5 4500.0*/16, /* 6 5500.0*/11, /* 7 6500.0*/10, },
{/* 1 40.000 *//* 0 700.0*/3, /* 1 1000.0*/10, /* 2 2000.0*/19, /* 3 3000.0*/26, /* 4 3500.0*/20, /* 5 4500.0*/16, /* 6 5500.0*/11, /* 7 6500.0*/10, },
@ -84,7 +84,7 @@ static const float mazda_miata_nb2_targetLambdaLoadBins[FUEL_LOAD_COUNT] = {10.0
void setMazdaMiata2003EngineConfigurationNaFuelRail(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
setMazdaMiata2003EngineConfiguration(PASS_CONFIG_PARAMETER_SIGNATURE);
copyTable(config->scriptTable1, SCRIPT_TABLE__dyno);
copyTable(config->scriptTable1, SCRIPT_TABLE_dyno);
copyArray(config->veRpmBins, mazda_miata_nb2_RpmBins);
copyArray(config->veLoadBins, mazda_miata_nb2_LoadBins);

8
firmware/config/engines/mazda_miata_vvt.cpp
View File

@ -71,15 +71,15 @@ static const float injectorLagCorrection[VBAT_INJECTOR_CURVE_SIZE] = {
1.5 , 1.35, 1.25 , 1.20
};
static const float vvt18fsioRpmBins[SCRIPT_TABLE__8] =
static const float vvt18fsioRpmBins[SCRIPT_TABLE_8] =
{700.0, 1000.0, 2000.0, 3000.0, 3500.0, 4500.0, 5500.0, 6500.0}
;
static const float vvt18fsioLoadBins[SCRIPT_TABLE__8] =
static const float vvt18fsioLoadBins[SCRIPT_TABLE_8] =
{30.0, 40.0, 50.0, 60.0, 70.0, 75.0, 82.0, 85.0}
;
static const uint8_t SCRIPT_TABLE__vvt_target[SCRIPT_TABLE__8][SCRIPT_TABLE__8] = {
static const uint8_t SCRIPT_TABLE_vvt_target[SCRIPT_TABLE_8][SCRIPT_TABLE_8] = {
/* Generated by TS2C on Mon Feb 13 19:11:32 EST 2017*/
{/* 0 30 *//* 0 700.0*/1, /* 1 1000.0*/3, /* 2 2000.0*/10, /* 3 3000.0*/20, /* 4 3500.0*/27, /* 5 4500.0*/28, /* 6 5500.0*/11, /* 7 6500.0*/5, },
{/* 1 40 *//* 0 700.0*/3, /* 1 1000.0*/10, /* 2 2000.0*/19, /* 3 3000.0*/26, /* 4 3500.0*/30, /* 5 4500.0*/28, /* 6 5500.0*/11, /* 7 6500.0*/5, },
@ -237,7 +237,7 @@ void setMazdaMiataNbInjectorLag(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
void setMazdaNB2VVTSettings(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
copyArray(config->vvtTable1RpmBins, vvt18fsioRpmBins);
copyArray(config->vvtTable1LoadBins, vvt18fsioLoadBins);
copyTable(config->vvtTable1, SCRIPT_TABLE__vvt_target);
copyTable(config->vvtTable1, SCRIPT_TABLE_vvt_target);
// VVT closed loop
engineConfiguration->auxPid[0].pFactor = 2;

12
firmware/controllers/algo/engine_configuration.cpp
View File

@ -553,17 +553,17 @@ static void setDefaultEngineConfiguration(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
setLinearCurve(engineConfiguration->map.samplingWindow, 50, 50, 1);
setLinearCurve(config->vvtTable1LoadBins, 20, 120, 10);
setRpmTableBin(config->vvtTable1RpmBins, SCRIPT_TABLE__8);
setRpmTableBin(config->vvtTable1RpmBins, SCRIPT_TABLE_8);
setLinearCurve(config->vvtTable2LoadBins, 20, 120, 10);
setRpmTableBin(config->vvtTable2RpmBins, SCRIPT_TABLE__8);
setRpmTableBin(config->vvtTable2RpmBins, SCRIPT_TABLE_8);
setLinearCurve(config->scriptTable1LoadBins, 20, 120, 10);
setRpmTableBin(config->scriptTable1RpmBins, SCRIPT_TABLE__8);
setRpmTableBin(config->scriptTable1RpmBins, SCRIPT_TABLE_8);
setLinearCurve(config->scriptTable2LoadBins, 20, 120, 10);
setRpmTableBin(config->scriptTable2RpmBins, SCRIPT_TABLE__8);
setRpmTableBin(config->scriptTable2RpmBins, SCRIPT_TABLE_8);
setLinearCurve(config->scriptTable3LoadBins, 20, 120, 10);
setRpmTableBin(config->scriptTable3RpmBins, SCRIPT_TABLE__8);
setRpmTableBin(config->scriptTable3RpmBins, SCRIPT_TABLE_8);
setLinearCurve(config->scriptTable4LoadBins, 20, 120, 10);
setRpmTableBin(config->scriptTable4RpmBins, SCRIPT_TABLE__8);
setRpmTableBin(config->scriptTable4RpmBins, SCRIPT_TABLE_8);
setDefaultEngineNoiseTable(PASS_ENGINE_PARAMETER_SIGNATURE);

6
firmware/controllers/can/can_rx.cpp
View File

@ -12,7 +12,7 @@
#include "rusefi_lua.h"
typedef float SCRIPT_TABLE__8x8_f32t_linear[SCRIPT_TABLE__8 * SCRIPT_TABLE__8];
typedef float SCRIPT_TABLE_8x8_f32t_linear[SCRIPT_TABLE_8 * SCRIPT_TABLE_8];
bool acceptCanRx(int sid DECLARE_ENGINE_PARAMETER_SUFFIX) {
if (!CONFIG(usescriptTableForCanSniffingFiltering)) {
@ -21,8 +21,8 @@ bool acceptCanRx(int sid DECLARE_ENGINE_PARAMETER_SUFFIX) {
}
/*
// the whole table reuse and 2D table cast to 1D array is a major hack, but it's OK for prototyping
SCRIPT_TABLE__8x8_f32t_linear *array =
(SCRIPT_TABLE__8x8_f32t_linear*) (void*) &config->scriptTable1;
SCRIPT_TABLE_8x8_f32t_linear *array =
(SCRIPT_TABLE_8x8_f32t_linear*) (void*) &config->scriptTable1;
int arraySize = efi::size(*array);

4
firmware/controllers/core/fsio_impl.h
View File

@ -17,8 +17,8 @@
// see useFSIO5ForCriticalIssueEngineStop
#define MAGIC_OFFSET_FOR_CRITICAL_ENGINE 5
typedef Map3D<SCRIPT_TABLE__8, SCRIPT_TABLE__8, float, float, float> fsio8_Map3D_f32t;
typedef Map3D<SCRIPT_TABLE__8, SCRIPT_TABLE__8, uint8_t, float, float> fsio8_Map3D_u8t;
typedef Map3D<SCRIPT_TABLE_8, SCRIPT_TABLE_8, float, float, float> fsio8_Map3D_f32t;
typedef Map3D<SCRIPT_TABLE_8, SCRIPT_TABLE_8, uint8_t, float, float> fsio8_Map3D_u8t;
expected<float> getEngineValue(le_action_e action DECLARE_ENGINE_PARAMETER_SUFFIX);