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

maf cleanup

This commit is contained in:
Matthew Kennedy 2023-11-01 17:12:46 -04:00 committed by rusefillc
parent ab4e11f865
commit e3edb2b15c
5 changed files with 44 additions and 125 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -68,8 +68,6 @@ void setFordEscortGt() {
engineConfiguration->trigger.type = trigger_type_e::TT_MAZDA_DOHC_1_4;
setDensoTODO(config);
engineConfiguration->globalFuelCorrection = 0.75;
engineConfiguration->displacement = 1.839;
setAlgorithm(LM_SPEED_DENSITY);

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

@ -32,7 +32,7 @@ void setHellen121nissanQR() {
}
static void setNissanVqEngineConfig() {
setNissanMAF0031(config);
setNissanMAF0031();
engineConfiguration->trigger.type = trigger_type_e::TT_NISSAN_VQ35;
engineConfiguration->cylindersCount = 6;

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

@ -421,7 +421,7 @@ static void setDefaultEngineConfiguration() {
engineConfiguration->can2BaudRate = B500KBPS;
engineConfiguration->mafSensorType = Bosch0280218037;
setBosch0280218037(config);
setBosch0280218037();
engineConfiguration->canSleepPeriodMs = 50;
engineConfiguration->canReadEnabled = true;

154
firmware/controllers/sensors/impl/maf.cpp
View File

@ -1,146 +1,72 @@
#include "pch.h"
static int addMafPoint(persistent_config_s *p_config, int index, float kgHrValue, float voltage) {
p_config->mafDecoding[index] = kgHrValue;
p_config->mafDecodingBins[index] = voltage;
static int addMafPoint(int index, float kgHrValue, float voltage) {
config->mafDecoding[index] = kgHrValue;
config->mafDecodingBins[index] = voltage;
return index + 1;
}
static int addMafPointByVoltage(persistent_config_s *p_config, int index, float voltage, float kgHrValue) {
return addMafPoint(p_config, index, kgHrValue, voltage);
static int addMafPointByVoltage(int index, float voltage, float kgHrValue) {
return addMafPoint(index, kgHrValue, voltage);
}
static void fillTheRest(persistent_config_s *e, int i) {
static void fillTheRest(int i) {
/**
* unrealistic values just to make binary search happy
*/
while (i < MAF_DECODING_COUNT) {
i = addMafPoint(e, i, 3000, 2010 + i);
i = addMafPoint(i, 3000, 2010 + i);
}
}
/**
* Hot-film air-mass meter, Type HFM 5
*/
void setBosch0280218037(persistent_config_s *e) {
void setBosch0280218037() {
int i = 0;
i = addMafPoint(e, i, -34.5, 0);
i = addMafPoint(e, i, -6, 0.78125);
i = addMafPoint(i, -34.5, 0);
i = addMafPoint(i, -6, 0.78125);
e->mafDecoding[i] = 10.5;
e->mafDecodingBins[i++] = 1.38671875;
config->mafDecoding[i] = 10.5;
config->mafDecodingBins[i++] = 1.38671875;
e->mafDecoding[i] = 105.3;
e->mafDecodingBins[i++] = 2.91015625;
config->mafDecoding[i] = 105.3;
config->mafDecodingBins[i++] = 2.91015625;
e->mafDecoding[i] = 387.5;
e->mafDecodingBins[i++] = 4.2578125;
config->mafDecoding[i] = 387.5;
config->mafDecodingBins[i++] = 4.2578125;
e->mafDecoding[i] = 738;
e->mafDecodingBins[i++] = 4.98046875;
config->mafDecoding[i] = 738;
config->mafDecodingBins[i++] = 4.98046875;
fillTheRest(e, i);
fillTheRest(i);
}
void setBosch0280218004(persistent_config_s *e) {
void setBosch0280218004() {
int i = 0;
fillTheRest(e, i);
fillTheRest(i);
}
void setDensoTODO(persistent_config_s *e) {
int i = 0;
i = addMafPoint(e, i, 116.3, 0.8);
i = addMafPoint(e, i, 76.3, 1.04);
i = addMafPoint(e, i, 40.5, 1.4);
i = addMafPoint(e, i, 32.5, 1.60);
i = addMafPoint(e, i, 23.8, 1.83);
i = addMafPoint(e, i, 0, 3);
while (i < MAF_DECODING_COUNT) {
e->mafDecoding[i] = 0;
e->mafDecodingBins[i] = 10 + i;
i++;
}
}
void setMazdaMiataNAMaf(persistent_config_s *e) {
int i = 0;
i= addMafPoint(e, i, 0.000000, 0.000000);
i= addMafPoint(e, i, 0.000028, 0.100000);
i= addMafPoint(e, i, 0.000387, 0.200000);
i= addMafPoint(e, i, 0.001809, 0.300000);
i= addMafPoint(e, i, 0.005409, 0.400000);
i= addMafPoint(e, i, 0.012648, 0.500000);
i= addMafPoint(e, i, 0.025320, 0.600000);
i= addMafPoint(e, i, 0.045532, 0.700000);
i= addMafPoint(e, i, 0.075698, 0.800000);
i= addMafPoint(e, i, 0.118525, 0.900000);
i= addMafPoint(e, i, 0.177011, 1.000000);
i= addMafPoint(e, i, 0.254434, 1.100000);
i= addMafPoint(e, i, 0.354347, 1.200000);
i= addMafPoint(e, i, 0.480576, 1.300000);
i= addMafPoint(e, i, 0.637210, 1.400000);
i= addMafPoint(e, i, 0.828604, 1.500000);
i= addMafPoint(e, i, 1.059369, 1.600000);
i= addMafPoint(e, i, 1.334371, 1.700000);
i= addMafPoint(e, i, 1.658728, 1.800000);
i= addMafPoint(e, i, 2.037809, 1.900000);
i= addMafPoint(e, i, 2.477225, 2.000000);
i= addMafPoint(e, i, 2.982835, 2.100000);
i= addMafPoint(e, i, 3.560736, 2.200000);
i= addMafPoint(e, i, 4.217265, 2.300000);
i= addMafPoint(e, i, 4.958995, 2.400000);
i= addMafPoint(e, i, 5.792737, 2.500000);
i= addMafPoint(e, i, 6.725531, 2.600000);
i= addMafPoint(e, i, 7.764648, 2.700000);
i= addMafPoint(e, i, 8.917592, 2.800000);
i= addMafPoint(e, i, 10.192092, 2.900000);
i= addMafPoint(e, i, 11.596102, 3.000000);
i= addMafPoint(e, i, 13.137802, 3.100000);
i= addMafPoint(e, i, 14.825595, 3.200000);
i= addMafPoint(e, i, 16.668105, 3.300000);
i= addMafPoint(e, i, 18.674177, 3.400000);
i= addMafPoint(e, i, 20.852874, 3.500000);
i= addMafPoint(e, i, 23.213478, 3.600000);
i= addMafPoint(e, i, 25.765485, 3.700000);
i= addMafPoint(e, i, 28.518610, 3.800000);
i= addMafPoint(e, i, 31.482778, 3.900000);
i= addMafPoint(e, i, 34.668130, 4.000000);
i= addMafPoint(e, i, 38.085019, 4.100000);
i= addMafPoint(e, i, 41.744006, 4.200000);
i= addMafPoint(e, i, 45.655865, 4.300000);
i= addMafPoint(e, i, 49.831577, 4.400000);
i= addMafPoint(e, i, 54.282334, 4.500000);
i= addMafPoint(e, i, 59.019531, 4.600000);
i= addMafPoint(e, i, 64.054771, 4.700000);
i= addMafPoint(e, i, 69.399864, 4.800000);
i= addMafPoint(e, i, 75.066822, 4.900000);
i= addMafPoint(e, i, 81.067862, 5.000000);
fillTheRest(e, i);
}
void setNissanMAF0031(persistent_config_s *e) {
void setNissanMAF0031() {
int i = 0;
// I am copy-pasting from a spreadsheet, it works better if voltage goes first
i = addMafPointByVoltage(e, i, 0.29, 3.1768838175);
i = addMafPointByVoltage(e, i, 0.49, 3.6987752861);
i = addMafPointByVoltage(e, i, 0.72, 5.8013108424);
i = addMafPointByVoltage(e, i, 1, 11.1849);
i = addMafPointByVoltage(e, i, 1.37, 24.5646673361);
i = addMafPointByVoltage(e, i, 1.66, 41.453048941);
i = addMafPointByVoltage(e, i, 1.91, 61.5847903829);
i = addMafPointByVoltage(e, i, 2.09, 79.7924502089);
i = addMafPointByVoltage(e, i, 2.34, 110.961012317);
i = addMafPointByVoltage(e, i, 2.89, 208.198652496);
i = addMafPointByVoltage(e, i, 3.11, 260.1030585044);
i = addMafPointByVoltage(e, i, 3.54, 387.150427974);
i = addMafPointByVoltage(e, i, 3.81, 486.5363959026);
i = addMafPointByVoltage(e, i, 4, 566.628);
i = addMafPointByVoltage(e, i, 4.32, 722.3485684449);
i = addMafPointByVoltage(e, i, 4.65, 913.0847954331);
i = addMafPointByVoltage(e, i, 4.98, 1137.8746972553);
fillTheRest(e, i);
i = addMafPointByVoltage(i, 0.29, 3.1768838175);
i = addMafPointByVoltage(i, 0.49, 3.6987752861);
i = addMafPointByVoltage(i, 0.72, 5.8013108424);
i = addMafPointByVoltage(i, 1, 11.1849);
i = addMafPointByVoltage(i, 1.37, 24.5646673361);
i = addMafPointByVoltage(i, 1.66, 41.453048941);
i = addMafPointByVoltage(i, 1.91, 61.5847903829);
i = addMafPointByVoltage(i, 2.09, 79.7924502089);
i = addMafPointByVoltage(i, 2.34, 110.961012317);
i = addMafPointByVoltage(i, 2.89, 208.198652496);
i = addMafPointByVoltage(i, 3.11, 260.1030585044);
i = addMafPointByVoltage(i, 3.54, 387.150427974);
i = addMafPointByVoltage(i, 3.81, 486.5363959026);
i = addMafPointByVoltage(i, 4, 566.628);
i = addMafPointByVoltage(i, 4.32, 722.3485684449);
i = addMafPointByVoltage(i, 4.65, 913.0847954331);
i = addMafPointByVoltage(i, 4.98, 1137.8746972553);
fillTheRest(i);
}

9
firmware/controllers/sensors/impl/maf.h
View File

@ -11,14 +11,9 @@
#pragma once
void setBosch0280218037(persistent_config_s *engineConfiguration);
void setBosch0280218004(persistent_config_s *engineConfiguration);
void setDensoTODO(persistent_config_s *engineConfiguration);
void setMazdaMiataNAMaf(persistent_config_s *e);
void setBosch0280218037();
/**
* 22680-7S000
*/
void setNissanMAF0031(persistent_config_s *engineConfiguration);
void setNissanMAF0031();