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

refactoring

This commit is contained in:
rusefi 2019-06-10 11:17:36 -04:00
parent ca57f51492
commit 4f939bbe4a
3 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
firmware/controllers/algo/engine.cpp
View File

@ -190,9 +190,6 @@ void Engine::reset() {
* so that we can prepare some helper structures * so that we can prepare some helper structures
*/ */
void Engine::preCalculate(DECLARE_ENGINE_PARAMETER_SIGNATURE) { void Engine::preCalculate(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
sparkTable.preCalc(engineConfiguration->sparkDwellRpmBins,
engineConfiguration->sparkDwellValues);
#if HAL_USE_ADC #if HAL_USE_ADC
adcToVoltageInputDividerCoefficient = adcToVolts(1) * engineConfiguration->analogInputDividerCoefficient; adcToVoltageInputDividerCoefficient = adcToVolts(1) * engineConfiguration->analogInputDividerCoefficient;
#else #else

6
firmware/controllers/algo/engine.h
View File

@ -283,12 +283,6 @@ public:
*/ */
uint32_t engineCycleEventCount = 0; uint32_t engineCycleEventCount = 0;
/**
* fast spark dwell time interpolation helper
* todo: finish the implementation and
*/
Table2D<DWELL_CURVE_SIZE> sparkTable;
/** /**
* fast kg/hour MAF decoding lookup table with ~0.2 volt step * fast kg/hour MAF decoding lookup table with ~0.2 volt step
* This table is build based on MAF decoding curve * This table is build based on MAF decoding curve

4
firmware/util/containers/table_helper.h
View File

@ -36,6 +36,7 @@ private:
float multiplier; float multiplier;
}; };
/*
template<int SIZE> template<int SIZE>
class Table2D { class Table2D {
public: public:
@ -45,7 +46,6 @@ public:
float bTable[SIZE]; float bTable[SIZE];
float *bin; float *bin;
}; };
template<int SIZE> template<int SIZE>
Table2D<SIZE>::Table2D() { Table2D<SIZE>::Table2D() {
bin = NULL; bin = NULL;
@ -69,7 +69,7 @@ void Table2D<SIZE>::preCalc(float *bin, float *values) {
bTable[i] = y1 - aTable[i] * x1; bTable[i] = y1 - aTable[i] * x1;
} }
} }
*/
template<int RPM_BIN_SIZE, int LOAD_BIN_SIZE, typename vType> template<int RPM_BIN_SIZE, int LOAD_BIN_SIZE, typename vType>
void Map3D<RPM_BIN_SIZE, LOAD_BIN_SIZE, vType>::init(vType table[RPM_BIN_SIZE][LOAD_BIN_SIZE], void Map3D<RPM_BIN_SIZE, LOAD_BIN_SIZE, vType>::init(vType table[RPM_BIN_SIZE][LOAD_BIN_SIZE],