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

auto-sync

This commit is contained in:
rusEfi 2016-06-30 01:01:38 -04:00
parent 3a84562760
commit 5f2eb115fb
10 changed files with 32 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/config/engines/ford_festiva.cpp
View File

@ -152,7 +152,7 @@ void setFordEscortGt(DECLARE_ENGINE_PARAMETER_F) {
setWholeTimingTable(10 PASS_ENGINE_PARAMETER);
// set_whole_fuel_map 5
setWholeFuelMap(5 PASS_ENGINE_PARAMETER);
setMap(config->afrTable, 13.5);
setAfrMap(config->afrTable, 13.5);
setSingleCoilDwell(engineConfiguration);
engineConfiguration->ignitionMode = IM_ONE_COIL;

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

@ -131,6 +131,14 @@ void setConstantDwell(floatms_t dwellMs DECLARE_ENGINE_PARAMETER_S) {
}
}
void setAfrMap(afr_table_t table, float value) {
for (int l = 0; l < FUEL_LOAD_COUNT; l++) {
for (int rpmIndex = 0; rpmIndex < FUEL_RPM_COUNT; rpmIndex++) {
table[l][rpmIndex] = value;
}
}
}
void setMap(fuel_table_t table, float value) {
for (int l = 0; l < FUEL_LOAD_COUNT; l++) {
for (int rpmIndex = 0; rpmIndex < FUEL_RPM_COUNT; rpmIndex++) {
@ -367,7 +375,7 @@ void setDefaultConfiguration(DECLARE_ENGINE_PARAMETER_F) {
// set_whole_timing_map 3
setWholeFuelMap(3 PASS_ENGINE_PARAMETER);
setMap(config->afrTable, 14.7);
setAfrMap(config->afrTable, 14.7);
setDefaultVETable(PASS_ENGINE_PARAMETER_F);

14
firmware/controllers/core/fsio_core.cpp
View File

@ -20,8 +20,8 @@
#include "fsio_core.h"
#include "fsio_impl.h"
extern fsio8_Map3D_t fsioTable1;
extern fsio8_Map3D_t fsioTable2;
extern fsio8_Map3D_f32t fsioTable1;
extern fsio8_Map3D_f32t fsioTable2;
LENameOrdinalPair * LE_FIRST = NULL;
@ -265,9 +265,15 @@ bool LECalculator::processElement(Engine *engine, LEElement *element) {
if (index < 1 || index > 2) {
push(element->action, NAN);
} else {
fsio8_Map3D_t *t = index == 1 ? &fsioTable1 : &fsioTable2;
if (index == 1) {
fsio8_Map3D_f32t *t = &fsioTable1;
push(element->action, t->getValue(xValue, yValue));
push(element->action, t->getValue(xValue, yValue));
} else {
fsio8_Map3D_f32t *t = &fsioTable2;
push(element->action, t->getValue(xValue, yValue));
}
}
}
break;

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

@ -17,8 +17,8 @@
#define NO_PWM 0
fsio8_Map3D_t fsioTable1("fsio#1");
fsio8_Map3D_t fsioTable2("fsio#2");
fsio8_Map3D_f32t fsioTable1("fsio#1");
fsio8_Map3D_f32t fsioTable2("fsio#2");
/**

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

@ -13,7 +13,8 @@
#include "engine.h"
#include "table_helper.h"
typedef Map3D<FSIO_TABLE_8, FSIO_TABLE_8, float> fsio8_Map3D_t;
typedef Map3D<FSIO_TABLE_8, FSIO_TABLE_8, float> fsio8_Map3D_f32t;
typedef Map3D<FSIO_TABLE_8, FSIO_TABLE_8, uint8_t> fsio8_Map3D_u8t;
/**
* In human language that's

4
firmware/controllers/core/interpolation.cpp
View File

@ -17,8 +17,10 @@
#include "efilib2.h"
#include "interpolation.h"
bool needInterpolationLoggingValue = true;
int needInterpolationLogging(void) {
return true;
return needInterpolationLoggingValue;
}
#define BINARY_PERF true

1
firmware/controllers/core/interpolation.h
View File

@ -12,6 +12,7 @@
#include "datalogging.h"
#include "efilib.h"
#include "obd_error_codes.h"
#include "error_handling.h"
#define INTERPOLATION_A(x1, y1, x2, y2) ((y1 - y2) / (x1 - x2))

1
firmware/controllers/core/table_helper.h
View File

@ -112,6 +112,7 @@ void Map3D<RPM_BIN_SIZE, LOAD_BIN_SIZE, vType>::setAll(vType value) {
}
}
typedef Map3D<FUEL_RPM_COUNT, FUEL_LOAD_COUNT, float> afr_Map3D_t;
typedef Map3D<IGN_RPM_COUNT, IGN_LOAD_COUNT, float> ign_Map3D_t;
typedef Map3D<FUEL_RPM_COUNT, FUEL_LOAD_COUNT, float> fuel_Map3D_t;
typedef Map3D<BARO_CORR_SIZE, BARO_CORR_SIZE, float> baroCorr_Map3D_t;

2
firmware/controllers/math/speed_density.cpp
View File

@ -24,7 +24,7 @@
fuel_Map3D_t veMap("VE");
fuel_Map3D_t ve2Map("VE2");
fuel_Map3D_t afrMap("AFR");
afr_Map3D_t afrMap("AFR");
baroCorr_Map3D_t baroCorrMap("baro");
#define tpMin 0

4
unit_tests/map_resize.cpp
View File

@ -97,7 +97,7 @@ static float newKeyBin[newKeySize];
//EngineConfiguration *engineConfiguration;
extern int needInterpolationLogging;
extern bool needInterpolationLoggingValue;
void resizeMap(void) {
// float keyMin = 1.2;
@ -124,7 +124,7 @@ void resizeMap(void) {
// engineConfiguration->fuelRpmBins,
// FUEL_RPM_COUNT, fuel_ptrs));
needInterpolationLogging = 0;
needInterpolationLoggingValue = 0;
// printf("static float ad_maf_table[AD_LOAD_COUNT] = {");
// for (int i = 0; i < newKeySize; i++) {