speed-dreams/speed-dreams-code
6
0
Fork 1
Code Issues 8 Pull requests 1 Projects Releases Packages Wiki Activity Actions

Temporary fix for #255

Browse source 
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@3068 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 52e8be271599f5101d2dd23361e4ff6e40c8cb71
Former-commit-id: 2b20a667dac4bfd426146064f4136b071d483e2c
This commit is contained in:
kakukri 2010-10-29 17:54:22 +00:00
parent c641ddcb2b
commit 2f87e05da3
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/modules/simu/simuv2.1/engine.cpp
View file

@ -248,11 +248,13 @@ freerads += engine->Tq / engine->I * SimDeltaTime;
engine->Tq = 0.0; engine->Tq = 0.0;
} else if (engine->rads > engine->revsMax) { } else if (engine->rads > engine->revsMax) {
engine->rads = engine->revsMax; engine->rads = engine->revsMax;
if (trans->curOverallRatio > 0) if ( (trans->curOverallRatio > 0.01) || (trans->curOverallRatio < -0.01) )
return engine->revsMax / trans->curOverallRatio; return engine->revsMax / trans->curOverallRatio;
else else {
GfLogError("Bug #225 triggered!\n");
return engine->revsMax; return engine->revsMax;
} }
}
if ((trans->curOverallRatio!=0.0) && (I_response > 0)) { if ((trans->curOverallRatio!=0.0) && (I_response > 0)) {
return axleRpm - sdI * ttq * trans->curOverallRatio * SimDeltaTime / ( I_response); return axleRpm - sdI * ttq * trans->curOverallRatio * SimDeltaTime / ( I_response);

6
src/modules/simu/simuv2/engine.cpp
View file

@ -248,11 +248,13 @@ freerads += engine->Tq / engine->I * SimDeltaTime;
engine->Tq = 0.0; engine->Tq = 0.0;
} else if (engine->rads > engine->revsMax) { } else if (engine->rads > engine->revsMax) {
engine->rads = engine->revsMax; engine->rads = engine->revsMax;
if (trans->curOverallRatio > 0) if ( (trans->curOverallRatio > 0.01) || (trans->curOverallRatio < -0.01) )
return engine->revsMax / trans->curOverallRatio; return engine->revsMax / trans->curOverallRatio;
else else {
GfLogError("Bug #225 triggered!\n");
return engine->revsMax; return engine->revsMax;
} }
}
if ((trans->curOverallRatio!=0.0) && (I_response > 0)) { if ((trans->curOverallRatio!=0.0) && (I_response > 0)) {
return axleRpm - sdI * ttq * trans->curOverallRatio * SimDeltaTime / ( I_response); return axleRpm - sdI * ttq * trans->curOverallRatio * SimDeltaTime / ( I_response);