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

Fix some maf logic (#880) 

* fix maf

* thank you vscode for mangling ANSI -> utf8
This commit is contained in:
Matthew Kennedy 2019-07-09 23:14:47 -07:00 committed by rusefi
parent b4e9503fab
commit 77075fce3d
11 changed files with 16 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
firmware/console/status_loop.cpp
View File

@ -245,7 +245,7 @@ static void printSensors(Logging *log) {
reportSensorF(log, fileFormat, GAUGE_NAME_ACCEL_Y, "G", engine->sensors.accelerometer.y, 3);
if (hasMafSensor()) {
reportSensorF(log, fileFormat, "maf", "V", getMaf(PASS_ENGINE_PARAMETER_SIGNATURE), 2);
reportSensorF(log, fileFormat, "maf", "V", getMafVoltage(PASS_ENGINE_PARAMETER_SIGNATURE), 2);
reportSensorF(log, fileFormat, "mafr", "kg/hr", getRealMaf(PASS_ENGINE_PARAMETER_SIGNATURE), 2);
}
@ -689,7 +689,7 @@ void updateTunerStudioState(TunerStudioOutputChannels *tsOutputChannels DECLARE_
tsOutputChannels->coolantTemperature = coolant;
tsOutputChannels->intakeAirTemperature = intake;
tsOutputChannels->throttlePositon = tps;
tsOutputChannels->massAirFlowVoltage = hasMafSensor() ? getMaf(PASS_ENGINE_PARAMETER_SIGNATURE) : 0;
tsOutputChannels->massAirFlowVoltage = hasMafSensor() ? getMafVoltage(PASS_ENGINE_PARAMETER_SIGNATURE) : 0;
// For air-interpolated tCharge mode, we calculate a decent massAirFlow approximation, so we can show it to users even without MAF sensor!
tsOutputChannels->massAirFlow = hasMafSensor() ? getRealMaf(PASS_ENGINE_PARAMETER_SIGNATURE) : engine->engineState.airFlow;
tsOutputChannels->oilPressure = engine->sensors.oilPressure;

2
firmware/controllers/actuators/lcd_controller.cpp
View File

@ -293,7 +293,7 @@ static void showLine(lcd_line_e line, int screenY) {
return;
case LL_MAF_V:
if (hasMafSensor()) {
lcdPrintf("MAF: %.2fv", getMaf(PASS_ENGINE_PARAMETER_SIGNATURE));
lcdPrintf("MAF: %.2fv", getMafVoltage(PASS_ENGINE_PARAMETER_SIGNATURE));
} else {
lcdPrintf("MAF: none");
}

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

@ -195,16 +195,6 @@ void Engine::preCalculate(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
#else
adcToVoltageInputDividerCoefficient = engineConfigurationPtr->analogInputDividerCoefficient;
#endif
/**
* Here we prepare a fast, index-based MAF lookup from a slower curve description
*/
for (int i = 0; i < MAF_DECODING_CACHE_SIZE; i++) {
float volts = i / MAF_DECODING_CACHE_MULT;
float maf = interpolate2d("maf", volts, config->mafDecodingBins,
config->mafDecoding);
mafDecodingLookup[i] = maf;
}
}
void Engine::setConfig(persistent_config_s *config) {

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

@ -283,12 +283,6 @@ public:
*/
uint32_t engineCycleEventCount = 0;
/**
* fast kg/hour MAF decoding lookup table with ~0.2 volt step
* This table is build based on MAF decoding curve
*/
float mafDecodingLookup[MAF_DECODING_CACHE_SIZE];
void preCalculate(DECLARE_ENGINE_PARAMETER_SIGNATURE);
void watchdog();

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

@ -124,7 +124,7 @@ float getEngineValue(le_action_e action DECLARE_ENGINE_PARAMETER_SUFFIX) {
case LE_METHOD_RPM:
return engine->rpmCalculator.getRpm();
case LE_METHOD_MAF:
return getMaf(PASS_ENGINE_PARAMETER_SIGNATURE);
return getRealMaf(PASS_ENGINE_PARAMETER_SIGNATURE);
case LE_METHOD_MAP:
return getMap(PASS_ENGINE_PARAMETER_SIGNATURE);
case LE_METHOD_INTAKE_VVT:

3
firmware/controllers/math/engine_math.cpp
View File

@ -60,9 +60,10 @@ float getEngineLoadT(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
warning(CUSTOM_MAF_NEEDED, "MAF sensor needed for current fuel algorithm");
return NAN;
}
return getMafT(engineConfiguration);
return getMafVoltage(PASS_ENGINE_PARAMETER_SIGNATURE);
case LM_SPEED_DENSITY:
// SD engine load is used for timing lookup but not for fuel calculation
[[fallthrough]]
case LM_MAP:
return getMap(PASS_ENGINE_PARAMETER_SIGNATURE);
case LM_ALPHA_N:

2
firmware/controllers/obd2.cpp
View File

@ -167,7 +167,7 @@ static void handleGetDataRequest(CANRxFrame *rx) {
break;
case PID_INTAKE_MAF:
scheduleMsg(&logger, "Got MAF request");
obdSendValue(1, pid, 2, getMaf(PASS_ENGINE_PARAMETER_SIGNATURE) * 100.0f); // grams/sec (A*256+B)/100
obdSendValue(1, pid, 2, getRealMaf(PASS_ENGINE_PARAMETER_SIGNATURE) * 100.0f); // grams/sec (A*256+B)/100
break;
case PID_THROTTLE:
scheduleMsg(&logger, "Got throttle request");

12
firmware/controllers/sensors/maf.cpp
View File

@ -9,8 +9,8 @@ EXTERN_ENGINE
/**
* @return MAF sensor voltage
*/
float getMaf(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
return getMafT(engineConfiguration);
float getMafVoltage(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
return getVoltageDivided("maf", engineConfiguration->mafAdcChannel);
}
bool hasMafSensor(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
@ -21,11 +21,9 @@ bool hasMafSensor(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
* @return kg/hour value
*/
float getRealMaf(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
int mafAdc = getAdcValue("maf", engineConfiguration->mafAdcChannel);
/**
* here we drop from 12 bit ADC to 8 bit index
*/
return engine->mafDecodingLookup[mafAdc >> 4];
float volts = getMafVoltage(PASS_ENGINE_PARAMETER_SIGNATURE);
return interpolate2d("maf", volts, config->mafDecodingBins, config->mafDecoding);
}
static void fillTheRest(persistent_config_s *e, int i) {

5
firmware/controllers/sensors/maf.h
View File

@ -2,7 +2,7 @@
* @file maf.h
* @brief
*
* by the way 2.081989116 kg/h = 1 ft³/m
* by the way 2.081989116 kg/h = 1 ft^3/min
*
*
* @date Nov 15, 2013
@ -14,8 +14,7 @@
#include "global.h"
#define getMafT(ec) (getVoltageDivided("maf", ec->mafAdcChannel))
float getMaf(DECLARE_ENGINE_PARAMETER_SIGNATURE);
float getMafVoltage(DECLARE_ENGINE_PARAMETER_SIGNATURE);
bool hasMafSensor(DECLARE_ENGINE_PARAMETER_SIGNATURE);
float getRealMaf(DECLARE_ENGINE_PARAMETER_SIGNATURE);

15
unit_tests/tests/test_engine_math.cpp
View File

@ -92,21 +92,6 @@ TEST(misc, testIgnitionMapGenerator) {
assertEqualsM2("20@800", 14.2, getInitialAdvance(800, 20, 36), 0.2);
}
TEST(misc, testMafLookup) {
printf("*************************************************** testMafLookup\r\n");
WITH_ENGINE_TEST_HELPER(FORD_ESCORT_GT);
setBosch0280218037(config);
engine->preCalculate(PASS_ENGINE_PARAMETER_SIGNATURE);
assertEqualsM("@0", -34.5000, engine->mafDecodingLookup[0]);
assertEqualsM("@1", -33.7875, engine->mafDecodingLookup[1]);
assertEqualsM("@2", -33.0750, engine->mafDecodingLookup[2]);
assertEqualsM("@200", 313.8826, engine->mafDecodingLookup[200]);
ASSERT_EQ( 738, engine->mafDecodingLookup[255]) << "@255";
}
float getMap(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
return engine->mockMapValue;
}

4
unit_tests/tests/test_trigger_decoder.cpp
View File

@ -674,7 +674,7 @@ static void setTestBug299(EngineTestHelper *eth) {
ASSERT_EQ( 0, engine->engineState.injectorLag) << "lag";
testMafValue = 0;
ASSERT_EQ( 0, getMaf(PASS_ENGINE_PARAMETER_SIGNATURE)) << "maf";
ASSERT_EQ( 0, getMafVoltage(PASS_ENGINE_PARAMETER_SIGNATURE)) << "maf";
ASSERT_EQ( 3000, GET_RPM()) << "setTestBug299: RPM";
@ -682,7 +682,7 @@ static void setTestBug299(EngineTestHelper *eth) {
assertEqualsM("duty for maf=0", 7.5, getInjectorDutyCycle(GET_RPM() PASS_ENGINE_PARAMETER_SUFFIX));
testMafValue = 3;
ASSERT_EQ( 3, getMaf(PASS_ENGINE_PARAMETER_SIGNATURE)) << "maf";
ASSERT_EQ( 3, getMafVoltage(PASS_ENGINE_PARAMETER_SIGNATURE)) << "maf";
}
static void assertInjectors(const char *msg, int value0, int value1) {