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

auto-sync

This commit is contained in:
rusEfi 2015-04-23 19:04:51 -04:00
parent bcfb778652
commit b46e15a61a
5 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
firmware/console/binary/tunerstudio_configuration.h
View File

@ -90,8 +90,8 @@ typedef struct {
float rpmAcceleration; float rpmAcceleration;
float massAirFlowValue; float massAirFlowValue;
float veValue; float veValue;
float maxDelta; float deltaTps;
float minDelta; float unused120;
float currentMapAccelDelta; float currentMapAccelDelta;
float tpsAccelFuel; float tpsAccelFuel;
int unused3[16]; int unused3[16];

2
firmware/console/status_loop.cpp
View File

@ -562,6 +562,8 @@ void updateTunerStudioState(TunerStudioOutputChannels *tsOutputChannels DECLARE_
tsOutputChannels->rpmAcceleration = engine->rpmCalculator.getRpmAcceleration(); tsOutputChannels->rpmAcceleration = engine->rpmCalculator.getRpmAcceleration();
tsOutputChannels->currentMapAccelDelta = engine->mapAccelEnrichment.getMapEnrichment(PASS_ENGINE_PARAMETER_F) * 100 / getMap(); tsOutputChannels->currentMapAccelDelta = engine->mapAccelEnrichment.getMapEnrichment(PASS_ENGINE_PARAMETER_F) * 100 / getMap();
tsOutputChannels->tpsAccelFuel = engine->tpsAccelEnrichment.getTpsEnrichment(PASS_ENGINE_PARAMETER_F); tsOutputChannels->tpsAccelFuel = engine->tpsAccelEnrichment.getTpsEnrichment(PASS_ENGINE_PARAMETER_F);
tsOutputChannels->deltaTps = engine->tpsAccelEnrichment.getDelta();
tsOutputChannels->checkEngine = hasErrorCodes(); tsOutputChannels->checkEngine = hasErrorCodes();
#if EFI_PROD_CODE || defined(__DOXYGEN__) #if EFI_PROD_CODE || defined(__DOXYGEN__)

9
firmware/controllers/algo/accel_enrichment.cpp
View File

@ -37,17 +37,20 @@ void AccelEnrichmemnt::updateDiffEnrichment(engine_configuration_s *engineConfig
// return diffEnrichment; // return diffEnrichment;
//} //}
float AccelEnrichmemnt::getDelta() {
return cb.maxValue(cb.getSize());
}
floatms_t AccelEnrichmemnt::getTpsEnrichment(DECLARE_ENGINE_PARAMETER_F) { floatms_t AccelEnrichmemnt::getTpsEnrichment(DECLARE_ENGINE_PARAMETER_F) {
float d = cb.maxValue(cb.getSize()); float d = getDelta();
if (d > engineConfiguration->tpsAccelEnrichmentThreshold) { if (d > engineConfiguration->tpsAccelEnrichmentThreshold) {
return d * engineConfiguration->tpsAccelEnrichmentMultiplier; return d * engineConfiguration->tpsAccelEnrichmentMultiplier;
} }
return 0; return 0;
} }
float AccelEnrichmemnt::getMapEnrichment(DECLARE_ENGINE_PARAMETER_F) { float AccelEnrichmemnt::getMapEnrichment(DECLARE_ENGINE_PARAMETER_F) {
float d = cb.maxValue(cb.getSize()); float d = getDelta();
if (d > engineConfiguration->mapAccelEnrichmentThreshold) { if (d > engineConfiguration->mapAccelEnrichmentThreshold) {
return d * engineConfiguration->mapAccelEnrichmentMultiplier; return d * engineConfiguration->mapAccelEnrichmentMultiplier;
} }

3
firmware/controllers/algo/accel_enrichment.h
View File

@ -22,12 +22,11 @@ public:
float engineLoad); float engineLoad);
float getMapEnrichment(DECLARE_ENGINE_PARAMETER_F); float getMapEnrichment(DECLARE_ENGINE_PARAMETER_F);
floatms_t getTpsEnrichment(DECLARE_ENGINE_PARAMETER_F); floatms_t getTpsEnrichment(DECLARE_ENGINE_PARAMETER_F);
float getDelta();
void onEngineCycle(DECLARE_ENGINE_PARAMETER_F); void onEngineCycle(DECLARE_ENGINE_PARAMETER_F);
void onEngineCycleTps(DECLARE_ENGINE_PARAMETER_F); void onEngineCycleTps(DECLARE_ENGINE_PARAMETER_F);
void reset(); void reset();
float maxDelta;
float minDelta;
float delta; float delta;
cyclic_buffer<float> cb; cyclic_buffer<float> cb;

10
firmware/tunerstudio/rusefi.ini
View File

@ -627,8 +627,8 @@ fileVersion = { 20150406 }
rpmAcceleration = scalar, F32, 104, "dRpm", 1, 0 rpmAcceleration = scalar, F32, 104, "dRpm", 1, 0
massAirFlowValue= scalar, F32, 108, "Kg/h", 1, 0 massAirFlowValue= scalar, F32, 108, "Kg/h", 1, 0
veValue = scalar, F32, 112, "ratio", 1, 0 veValue = scalar, F32, 112, "ratio", 1, 0
maxDelta = scalar, F32, 116, "ratio", 1, 0 deltaTps = scalar, F32, 116, "ratio", 1, 0
minDelta = scalar, F32, 120, "ratio", 1, 0 unused120 = scalar, F32, 120, "ratio", 1, 0
currentMapAccelDelta = scalar,F32, 124, "%", 1, 0 currentMapAccelDelta = scalar,F32, 124, "%", 1, 0
currentTpsAccel = scalar, F32, 128, "ms", 1, 0 currentTpsAccel = scalar, F32, 128, "ms", 1, 0
egoCorrection = { 0 } egoCorrection = { 0 }
@ -814,8 +814,8 @@ fileVersion = { 20150406 }
rpmAccelerationGa = rpmAcceleration, "rpm d", "dRpm", 0, 3, 0, 1, 3, 4, 1, 1 rpmAccelerationGa = rpmAcceleration, "rpm d", "dRpm", 0, 3, 0, 1, 3, 4, 1, 1
massAirFlowValueGa = massAirFlowValue,"Air Flow", "kg/hr", 0, 50, -999, -999, 999, 999, 1, 1 massAirFlowValueGa = massAirFlowValue,"Air Flow", "kg/hr", 0, 50, -999, -999, 999, 999, 1, 1
veValueGauge = veValue, "%", "", 0, 120, 10, 10, 100, 100, 1, 1 veValueGauge = veValue, "%", "", 0, 120, 10, 10, 100, 100, 1, 1
maxDeltaGauge = maxDelta, "%", "", 0, 120, 10, 10, 100, 100, 1, 1 deltaTpsGauge = deltaTps, "%", "", 0, 120, 10, 10, 100, 100, 1, 1
minDeltaGauge = minDelta, "%", "", 0, 120, 10, 10, 100, 100, 1, 1 ; minDeltaGauge = minDelta, "%", "", 0, 120, 10, 10, 100, 100, 1, 1
currentMapAccelDeltaGauge = currentMapAccelDelta,"MAP enrich", "%", 0, 120, 10, 10, 100, 100, 1, 1 currentMapAccelDeltaGauge = currentMapAccelDelta,"MAP enrich", "%", 0, 120, 10, 10, 100, 100, 1, 1
currentTpsAccelGauge = currentTpsAccel,"TPS enrich", "ms", 0, 120, 10, 10, 100, 100, 1, 1 currentTpsAccelGauge = currentTpsAccel,"TPS enrich", "ms", 0, 120, 10, 10, 100, 100, 1, 1
@ -1259,6 +1259,8 @@ fileVersion = { 20150406 }
field = "tunerStudioSerialSpeed", tunerStudioSerialSpeed field = "tunerStudioSerialSpeed", tunerStudioSerialSpeed
field = "Use PC10/PC11 serial?", useSerialPort field = "Use PC10/PC11 serial?", useSerialPort
field = "RPM Hard Limit", rpmHardLimit field = "RPM Hard Limit", rpmHardLimit
field = "cut fuel on hard limit", cutFuelOnHardLimit
field = "cut spark on hard limit", cutSparkOnHardLimit
field = "" field = ""
field = "Fuel Algorithm", algorithm field = "Fuel Algorithm", algorithm
field = "" field = ""