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 2015-03-15 11:05:48 -05:00
parent 7ef4f0a3c4
commit a7c40d9539
5 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -120,6 +120,12 @@ void setWholeFuelMap(float value DECLARE_ENGINE_PARAMETER_S) {
setMap(engineConfiguration->fuelTable, value);
}
void setFuelTablesLoadBin(float minValue, float maxValue DECLARE_ENGINE_PARAMETER_S) {
setTableBin2(engineConfiguration->injPhaseLoadBins, FUEL_LOAD_COUNT, minValue, maxValue, 1);
setTableBin2(engineConfiguration->veLoadBins, FUEL_LOAD_COUNT, minValue, maxValue, 1);
setTableBin2(engineConfiguration->afrLoadBins, FUEL_LOAD_COUNT, minValue, maxValue, 1);
}
void setWholeTimingTable(float value DECLARE_ENGINE_PARAMETER_S) {
// todo: table helper?
for (int l = 0; l < IGN_LOAD_COUNT; l++) {
@ -192,11 +198,11 @@ void setDefaultConfiguration(DECLARE_ENGINE_PARAMETER_F) {
setWholeFuelMap(3 PASS_ENGINE_PARAMETER);
setMap(engineConfiguration->afrTable, 14.7);
setDetaultVETable(PASS_ENGINE_PARAMETER_F);
setDefaultVETable(PASS_ENGINE_PARAMETER_F);
setMap(engineConfiguration->injectionPhase, -180);
setRpmTableBin(engineConfiguration->injPhaseRpmBins, FUEL_RPM_COUNT);
setTableBin2(engineConfiguration->injPhaseLoadBins, FUEL_LOAD_COUNT, 10, 300, 1);
setFuelTablesLoadBin(10, 160 PASS_ENGINE_PARAMETER);
setThermistorConfiguration(&engineConfiguration->clt, 0, 9500, 23.8889, 2100, 48.8889, 1000);
engineConfiguration->clt.bias_resistor = 1500;

1
firmware/controllers/algo/engine_configuration.h
View File

@ -63,6 +63,7 @@ typedef struct {
void setDefaultConfiguration(DECLARE_ENGINE_PARAMETER_F);
void setMap(fuel_table_t table, float value);
void setWholeFuelMap(float value DECLARE_ENGINE_PARAMETER_S);
void setFuelTablesLoadBin(float minValue, float maxValue DECLARE_ENGINE_PARAMETER_S);
void setWholeTimingTable(float value DECLARE_ENGINE_PARAMETER_S);
void setConstantDwell(engine_configuration_s *engineConfiguration, float dwellMs);
void printFloatArray(const char *prefix, float array[], int size);

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

@ -95,9 +95,8 @@ float getSpeedDensityFuel(int rpm DECLARE_ENGINE_PARAMETER_S) {
return sdMath(engineConfiguration, VE, map, AFR, tChargeK) * 1000;
}
void setDetaultVETable(DECLARE_ENGINE_PARAMETER_F) {
void setDefaultVETable(DECLARE_ENGINE_PARAMETER_F) {
setRpmTableBin(engineConfiguration->veRpmBins, FUEL_RPM_COUNT);
setTableBin2(engineConfiguration->veLoadBins, FUEL_LOAD_COUNT, 10, 300, 1);
veMap.setAll(80);
// setRpmTableBin(engineConfiguration->ve2RpmBins, FUEL_RPM_COUNT);
@ -105,7 +104,6 @@ void setDetaultVETable(DECLARE_ENGINE_PARAMETER_F) {
// ve2Map.setAll(0.81);
setRpmTableBin(engineConfiguration->afrRpmBins, FUEL_RPM_COUNT);
setTableBin2(engineConfiguration->afrLoadBins, FUEL_LOAD_COUNT, 10, 300, 1);
afrMap.setAll(14.7);
}

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

@ -17,7 +17,7 @@ float sdMath(engine_configuration_s *engineConfiguration, float VE, float MAP, f
#define cc_minute_to_gramm_second(ccm) ((ccm) * 0.0119997981)
void setDetaultVETable(DECLARE_ENGINE_PARAMETER_F);
void setDefaultVETable(DECLARE_ENGINE_PARAMETER_F);
void initSpeedDensity(DECLARE_ENGINE_PARAMETER_F);
float getSpeedDensityFuel(int rpm DECLARE_ENGINE_PARAMETER_S);

2
firmware/rusefi.cpp
View File

@ -276,5 +276,5 @@ int getRusEfiVersion(void) {
return 1; // this is here to make the compiler happy about the unused array
if (UNUSED_CCM_SIZE[0] == 0)
return 1; // this is here to make the compiler happy about the unused array
return 20150314;
return 20150315;
}