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

Accuracy improvements to the table lookup

This commit is contained in:
Josh Stewart 2013-12-29 23:43:19 +11:00
parent 789395e874
commit f280856959
2 changed files with 47 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
kartduino.ino
View File

@ -3,7 +3,7 @@
// Config section
//The following lines are configurable, but the defaults are probably pretty good for most applications
#define engineInjectorDeadTime 1500 //Time in uS that the injector takes to open
#define engineInjectorDeadTime 1500 //Time in uS that the injector takes to open minus the time it takes to close
#define engineSquirtsPerCycle 2 //Would be 1 for a 2 stroke
//Pin mappings as per the v0.1 shield
@ -193,6 +193,13 @@ void loop()
currentStatus.RPM = 0;
currentStatus.hasSync = false;
}
//Uncomment the following for testing
/*
currentStatus.hasSync = true;
currentStatus.TPS = 100;
currentStatus.RPM = 5500;
*/
//***SET STATUSES***
//-----------------------------------------------------------------------------------------------------
@ -222,16 +229,18 @@ void loop()
//Speed Density
currentStatus.VE = getTableValue(fuelTable, currentStatus.MAP, currentStatus.RPM); //Perform lookup into fuel map for RPM vs MAP value
currentStatus.PW = PW_SD(req_fuel_uS, currentStatus.VE, currentStatus.MAP, 100, engineInjectorDeadTime); //The 100 here is just a placeholder for any enrichment factors (Cold start, acceleration etc). To add 10% extra fuel, this would be 110
currentStatus.advance = getTableValue(ignitionTable, currentStatus.MAP, currentStatus.RPM); //As above, but for ignition advance
}
else
{
//Alpha-N
currentStatus.VE = getTableValue(fuelTable, currentStatus.TPS, currentStatus.RPM); //Perform lookup into fuel map for RPM vs TPS value
currentStatus.PW = PW_AN(req_fuel_uS, currentStatus.VE, currentStatus.TPS, 100, engineInjectorDeadTime); //The 100 here is just a placeholder for any enrichment factors (Cold start, acceleration etc). To add 10% extra fuel, this would be 110
//currentStatus.PW = 20000;
currentStatus.advance = getTableValue(ignitionTable, currentStatus.TPS, currentStatus.RPM); //As above, but for ignition advance
}
//Perform a lookup to get the desired ignition advance
currentStatus.advance = getTableValue(ignitionTable, currentStatus.MAP, currentStatus.RPM);
//Determine the current crank angle
//This is the current angle ATDC the engine is at

62
table.h
View File

@ -43,19 +43,19 @@ int getTableValue(struct table fromTable, int Y, int X)
if(X > xMaxValue) { X = xMaxValue; }
if(X < xMinValue) { X = xMinValue; }
for (int x = fromTable.xSize-1; x > 0; x--)
for (int x = fromTable.xSize-1; x >= 0; x--)
{
//Checks the case where the X value is exactly what was requested
if (X == fromTable.axisX[x-1])
if ( (X == fromTable.axisX[x]) || (x == 0) )
{
xMaxValue = fromTable.axisX[x-1];
xMinValue = fromTable.axisX[x-1];
xMax = x-1;
xMin = x-1;
xMaxValue = fromTable.axisX[x];
xMinValue = fromTable.axisX[x];
xMax = x;
xMin = x;
break;
}
//Normal case
if ( (X <= fromTable.axisX[x]) && (X >= fromTable.axisX[x-1]) )
if ( (X <= fromTable.axisX[x]) && (X > fromTable.axisX[x-1]) )
{
xMaxValue = fromTable.axisX[x];
xMinValue = fromTable.axisX[x-1];
@ -75,21 +75,20 @@ int getTableValue(struct table fromTable, int Y, int X)
if(Y > yMaxValue) { Y = yMaxValue; }
if(Y < yMinValue) { Y = yMinValue; }
for (int y = fromTable.ySize-1; y > 0; y--)
for (int y = fromTable.ySize-1; y >= 0; y--)
{
//Checks the case where the Y value is exactly what was requested
if (Y == fromTable.axisY[y-1])
if ( (Y == fromTable.axisY[y]) || (y==0) )
{
yMaxValue = fromTable.axisY[y-1];
yMinValue = fromTable.axisY[y-1];
yMax = y-1;
yMin = y-1;
yMaxValue = fromTable.axisY[y];
yMinValue = fromTable.axisY[y];
yMax = y;
yMin = y;
break;
}
//Normal case
if ( (Y >= fromTable.axisY[y]) && (Y <= fromTable.axisY[y-1]) )
if ( (Y >= fromTable.axisY[y]) && (Y < fromTable.axisY[y-1]) )
{
yMaxValue = fromTable.axisY[y];
yMinValue = fromTable.axisY[y-1];
yMax = y;
@ -121,8 +120,14 @@ int getTableValue(struct table fromTable, int Y, int X)
// Float version
/*
float p = ((float)(X - xMinValue)) / (float)(xMaxValue - xMinValue);
float q = ((float)(Y - yMaxValue)) / (float)(yMinValue - yMaxValue);
float p, q;
if (xMaxValue == xMinValue)
{ p = (float)(X-xMinValue); }
else { p = ((float)(X - xMinValue)) / (float)(xMaxValue - xMinValue); }
if (yMaxValue == yMinValue)
{ q = (float)(Y - yMinValue); }
else { q = ((float)(Y - yMaxValue)) / (float)(yMinValue - yMaxValue); }
float m = (1.0-p) * (1.0-q);
float n = p * (1-q);
@ -135,22 +140,23 @@ int getTableValue(struct table fromTable, int Y, int X)
// Non-Float version:
//Initial check incase the values were hit straight on
int p;
long p;
if (xMaxValue == xMinValue)
{ p = ((X - xMinValue) << 7); } //This only occurs if the requested X value was equal to one of the X axis bins
{ p = ((long)(X - xMinValue) << 8); } //This only occurs if the requested X value was equal to one of the X axis bins
else
{ p = ((X - xMinValue) << 7) / (xMaxValue - xMinValue); } //This is the standard case
{
p = ((long)(X - xMinValue) << 8) / (xMaxValue - xMinValue); } //This is the standard case
int q;
long q;
if (yMaxValue == yMinValue)
{ q = ((Y - yMinValue) << 7); }
{ q = ((long)(Y - yMinValue) << 8); }
else
{ q = ((Y - yMaxValue) << 7) / (yMinValue - yMaxValue); }
{ q = ((long)(Y - yMaxValue) << 8) / (yMinValue - yMaxValue); }
int m = ((128-p) * (128-q)) >> 7;
int n = (p * (128-q)) >> 7;
int o = ((128-p) * q) >> 7;
int r = (p * q) >> 7;
int m = ((257-p) * (257-q)) >> 8;
int n = (p * (257-q)) >> 8;
int o = ((257-p) * q) >> 8;
int r = (p * q) >> 8;
return ( (A * m) + (B * n) + (C * o) + (D * r) ) >> 7;
return ( (A * m) + (B * n) + (C * o) + (D * r) ) >> 8;
}