AirFlow-interpolated tCharge Mode #612
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
andreika-git
commented
Sep 25, 2018
| @@ -686,7 +686,7 @@ void updateTunerStudioState(TunerStudioOutputChannels *tsOutputChannels DECLARE_ | |||
| tsOutputChannels->intakeAirTemperature = intake; | |||
| tsOutputChannels->throttlePositon = tps; | |||
| tsOutputChannels->massAirFlowVoltage = hasMafSensor() ? getMaf(PASS_ENGINE_PARAMETER_SIGNATURE) : 0; | |||
| tsOutputChannels->massAirFlow = hasMafSensor() ? getRealMaf(PASS_ENGINE_PARAMETER_SIGNATURE) : 0; | |||
| tsOutputChannels->massAirFlow = hasMafSensor() ? getRealMaf(PASS_ENGINE_PARAMETER_SIGNATURE) : engine->engineState.airFlow; | |||
There was a problem hiding this comment.
For air-interpolated tCharge mode, we calculate a decent massAirFlow approximation, so we can show it to users even without MAF sensor!
andreika-git
commented
Sep 25, 2018
| @@ -914,7 +914,7 @@ void updateTunerStudioState(TunerStudioOutputChannels *tsOutputChannels DECLARE_ | |||
| tsOutputChannels->clutchDownState = engine->clutchDownState; | |||
| tsOutputChannels->brakePedalState = engine->brakePedalState; | |||
|
|
|||
| tsOutputChannels->tCharge = getTCharge(rpm, tps, coolant, intake PASS_ENGINE_PARAMETER_SUFFIX); | |||
| tsOutputChannels->tCharge = ENGINE(engineState.tCharge); | |||
There was a problem hiding this comment.
tCharge depends on the previous state now, so we should use the stored value.
andreika-git
commented
Sep 25, 2018
| @@ -194,7 +199,9 @@ class EngineState { | |||
| float baroCorrection; | |||
|
|
|||
| // speed density | |||
| float tChargeK; | |||
| float tCharge, tChargeK; | |||
There was a problem hiding this comment.
Rate-of-change limiter is applied to degrees, so we store both Kelvin and degrees.
andreika-git
commented
Sep 25, 2018
| float minRpmKcurrentTPS = interpolateMsg("minRpm", tpMin, engineConfiguration->tChargeMinRpmMinTps, tpMax, | ||
| engineConfiguration->tChargeMinRpmMaxTps, tps); | ||
| float maxRpmKcurrentTPS = interpolateMsg("maxRpm", tpMin, engineConfiguration->tChargeMaxRpmMinTps, tpMax, | ||
| engineConfiguration->tChargeMaxRpmMaxTps, tps); |
There was a problem hiding this comment.
Moved below, it's now one of the possible modes inside if() statement.
andreika-git
commented
Sep 25, 2018
| if (cisnan(Tcharge_coff)) { | ||
| warning(CUSTOM_ERR_T2_CHARGE, "t2-getTCharge NaN"); | ||
| return coolantTemp; | ||
| } | ||
|
|
||
| float Tcharge = coolantTemp * (1 - Tcharge_coff) + airTemp * Tcharge_coff; | ||
| float Tcharge = interpolateClamped(0.0f, coolantTemp, 1.0f, airTemp, Tcharge_coff); |
There was a problem hiding this comment.
We use more robust interp. function for proper tcharge_coff clamping.
andreika-git
commented
Sep 25, 2018
| @@ -66,6 +66,8 @@ bool isSameF(float v1, float v2); | |||
| bool strEqualCaseInsensitive(const char *str1, const char *str2); | |||
| bool strEqual(const char *str1, const char *str2); | |||
|
|
|||
| float limitRateOfChange(float newValue, float oldValue, float incrLimitPerSec, float decrLimitPerSec, float secsPassed); | |||
|
|
|||
There was a problem hiding this comment.
Currently used by air-interp. tCharge mode.
andreika-git
force-pushed
the
AirFlowBasedTCharge
branch
from
cb217cb
to
7f2e15b
Compare
andreika-git
force-pushed
the
AirFlowBasedTCharge
branch
from
6975fa8
to
4a7d601
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Please merge #610 first.