mirror of https://github.com/rusefi/rusefi-1.git
auto-sync
This commit is contained in:
parent
d36edd5f03
commit
65deb8131a
|
@ -20,6 +20,9 @@
|
||||||
#include "fsio_core.h"
|
#include "fsio_core.h"
|
||||||
#include "fsio_impl.h"
|
#include "fsio_impl.h"
|
||||||
|
|
||||||
|
extern fsio8_Map3D_t fsioTable1;
|
||||||
|
extern fsio8_Map3D_t fsioTable2;
|
||||||
|
|
||||||
LENameOrdinalPair * LE_FIRST = NULL;
|
LENameOrdinalPair * LE_FIRST = NULL;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -251,16 +254,16 @@ bool LECalculator::processElement(Engine *engine, LEElement *element) {
|
||||||
break;
|
break;
|
||||||
case LE_METHOD_FSIO_TABLE: {
|
case LE_METHOD_FSIO_TABLE: {
|
||||||
float i = pop(LE_METHOD_FSIO_TABLE);
|
float i = pop(LE_METHOD_FSIO_TABLE);
|
||||||
float xValue = pop(LE_METHOD_FSIO_TABLE);
|
|
||||||
float yValue = pop(LE_METHOD_FSIO_TABLE);
|
float yValue = pop(LE_METHOD_FSIO_TABLE);
|
||||||
|
float xValue = pop(LE_METHOD_FSIO_TABLE);
|
||||||
int index = (int) i;
|
int index = (int) i;
|
||||||
if (index < 0 || index > 2) {
|
if (index < 1 || index > 2) {
|
||||||
push(element->action, NAN);
|
push(element->action, NAN);
|
||||||
} else {
|
} else {
|
||||||
|
fsio8_Map3D_t *t = index == 1 ? &fsioTable1 : &fsioTable2;
|
||||||
|
|
||||||
|
push(element->action, t->getValue(xValue, yValue));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case LE_METHOD_KNOCK:
|
case LE_METHOD_KNOCK:
|
||||||
|
|
|
@ -17,6 +17,10 @@
|
||||||
|
|
||||||
#define NO_PWM 0
|
#define NO_PWM 0
|
||||||
|
|
||||||
|
fsio8_Map3D_t fsioTable1("fsio#1");
|
||||||
|
fsio8_Map3D_t fsioTable2("fsio#2");
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Here we define all rusEfi-specific methods
|
* Here we define all rusEfi-specific methods
|
||||||
*/
|
*/
|
||||||
|
@ -475,6 +479,12 @@ void initFsioImpl(Logging *sharedLogger DECLARE_ENGINE_PARAMETER_S) {
|
||||||
addConsoleAction("fsioinfo", showFsioInfo);
|
addConsoleAction("fsioinfo", showFsioInfo);
|
||||||
addConsoleActionSP("eval", (VoidCharPtrVoidPtr) eval, engine);
|
addConsoleActionSP("eval", (VoidCharPtrVoidPtr) eval, engine);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
fsioTable1.init(config->fsioTable1, config->fsioTable1LoadBins,
|
||||||
|
config->fsioTable1RpmBins);
|
||||||
|
fsioTable2.init(config->fsioTable2, config->fsioTable2LoadBins,
|
||||||
|
config->fsioTable2RpmBins);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -11,6 +11,9 @@
|
||||||
|
|
||||||
#include "fsio_core.h"
|
#include "fsio_core.h"
|
||||||
#include "engine.h"
|
#include "engine.h"
|
||||||
|
#include "table_helper.h"
|
||||||
|
|
||||||
|
typedef Map3D<FSIO_TABLE_8, FSIO_TABLE_8> fsio8_Map3D_t;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* In human language that's
|
* In human language that's
|
||||||
|
|
|
@ -292,5 +292,5 @@ int getRusEfiVersion(void) {
|
||||||
return 123; // this is here to make the compiler happy about the unused array
|
return 123; // this is here to make the compiler happy about the unused array
|
||||||
if (UNUSED_CCM_SIZE[0] * 0 != 0)
|
if (UNUSED_CCM_SIZE[0] * 0 != 0)
|
||||||
return 3211; // this is here to make the compiler happy about the unused array
|
return 3211; // this is here to make the compiler happy about the unused array
|
||||||
return 20160312;
|
return 20160404;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue