From 2f46e6306fa7af2ba4bb46aed1b1fbfd42f8396c Mon Sep 17 00:00:00 2001 From: Josh Stewart Date: Wed, 22 Apr 2015 00:06:42 +1000 Subject: [PATCH] Cleanup and remove some old, unused code --- testing.h | 110 ------------------------------------------------------ utils.h | 1 - utils.ino | 9 ----- 3 files changed, 120 deletions(-) delete mode 100644 testing.h diff --git a/testing.h b/testing.h deleted file mode 100644 index 53b64731..00000000 --- a/testing.h +++ /dev/null @@ -1,110 +0,0 @@ -/* -This file has a few functions that are helpful for testing such as creating dummy maps and faking interrupts -*/ -#ifndef TESTING_H -#define TESTING_H -/* -Aim is to create an 8x8 table that looks like the below: - MAP -______________________________________________ -|100|| 78 | 88 | 92 | 95 | 97 |101 |107 |110 | -| 88|| 58 | 88 | 75 | 63 | 50 | 38 | 25 | 13 | -| 75|| 45 | 88 | 75 | 63 | 50 | 38 | 25 | 13 | -| 63|| 35 | 88 | 75 | 63 | 50 | 38 | 25 | 13 | -| 50|| 28 | 88 | 75 | 63 | 50 | 38 | 25 | 13 | -| 38|| 22 | 23 | 75 | 63 | 50 | 38 | 25 | 13 | -| 25|| 17 | 21 | 75 | 63 | 50 | 38 | 25 | 13 | -| 13|| 15 | 20 | 25 | 63 | 50 | 38 | 25 | 13 | -| || 500|1500|2000|2500|3000|4000|5000|6000| RPM - -This is not really a realistic 8x8 VE vs RPM 2D map, but it's enough for testing -Here is a run through of how the interpolation would flow: -Pass in: -x = 1000 -y = 20 - -yMax = 13 -yMin = 25 - -xMax = 1500 -xMin = 500 - -A 17 -B 21 -C 15 -D 20 -p (1000 - 500) / (1500 - 500) = 1/2 = 0.5 -q (20 - 13) / (25 - 13) = 7/12 = 0.583 -m (1 - 0.5) * (1 - 0.583) = 0.2083 -n 0.5 * (1 - 0.583) = 0.2083 -o (1 - 0.5) * 0.583 = 0.29166 -r (0.5 * 0.583) = 0.29166 - -VE = ( (17 * 0.2083) + (21 * 0.2083) + (15 * 0.9166) + (20 * 0.29166) ) = 18.125 - -*/ - -void dummyFuelTable(struct table3D *myFuelTable) - { - //table myFuelTable; - - int tempXAxis[8] = {500,1500,2000,2500,3000,4000,5000,6000}; - for (byte x = 0; x< myFuelTable->xSize; x++) { myFuelTable->axisX[x] = tempXAxis[x]; } - //*myFuelTable->axisX = *tempXAxis; - int tempYAxis[8] = {100,88,75,63,50,30,20,10}; - for (byte x = 0; x< myFuelTable->ySize; x++) { myFuelTable->axisY[x] = tempYAxis[x]; } - //*myFuelTable->axisY = *tempYAxis; - - //Go through the 8 rows and add the column values - byte tempRow1[8] = {78,88,92,95,97,101,107,110}; - byte tempRow2[8] = {58,88,75,63,50,38,25,13}; - byte tempRow3[8] = {45,88,75,63,50,38,25,13}; - byte tempRow4[8] = {35,88,75,63,50,38,25,13}; - byte tempRow5[8] = {28,88,75,63,50,38,25,13}; - byte tempRow6[8] = {22,23,75,63,50,38,25,13}; - byte tempRow7[8] = {17,21,75,63,50,38,25,13}; - byte tempRow8[8] = {15,20,25,63,50,38,25,13}; - for (byte x = 0; x< myFuelTable->xSize; x++) { myFuelTable->values[0][x] = tempRow1[x]; } - for (byte x = 0; x< myFuelTable->xSize; x++) { myFuelTable->values[1][x] = tempRow2[x]; } - for (byte x = 0; x< myFuelTable->xSize; x++) { myFuelTable->values[2][x] = tempRow3[x]; } - for (byte x = 0; x< myFuelTable->xSize; x++) { myFuelTable->values[3][x] = tempRow4[x]; } - for (byte x = 0; x< myFuelTable->xSize; x++) { myFuelTable->values[4][x] = tempRow5[x]; } - for (byte x = 0; x< myFuelTable->xSize; x++) { myFuelTable->values[5][x] = tempRow6[x]; } - for (byte x = 0; x< myFuelTable->xSize; x++) { myFuelTable->values[6][x] = tempRow7[x]; } - for (byte x = 0; x< myFuelTable->xSize; x++) { myFuelTable->values[7][x] = tempRow8[x]; } - - } - -/* -Populates a table with some reasonably realistic ignition advance data -*/ -void dummyIgnitionTable(struct table3D *mySparkTable) - { - int tempXAxis[8] = {500,1500,2000,2500,3000,4000,5000,6000}; - for (byte x = 0; x< mySparkTable->xSize; x++) { mySparkTable->axisX[x] = tempXAxis[x]; } - //*myFuelTable->axisX = *tempXAxis; - int tempYAxis[8] = {100,88,75,63,50,30,20,10}; - for (byte x = 0; x< mySparkTable->ySize; x++) { mySparkTable->axisY[x] = tempYAxis[x]; } - //*myFuelTable->axisY = *tempYAxis; - - //Go through the 8 rows and add the column values - byte tempRow1[8] = {10,15,20,26,35,40,43,44}; - byte tempRow2[8] = {10,88,75,63,50,38,25,44}; - byte tempRow3[8] = {12,88,75,63,50,38,25,40}; - byte tempRow4[8] = {12,88,75,63,50,38,25,36}; - byte tempRow5[8] = {28,88,75,63,50,38,25,13}; - byte tempRow6[8] = {22,23,75,63,50,38,25,13}; - byte tempRow7[8] = {17,21,75,63,50,38,25,13}; - byte tempRow8[8] = {15,20,25,63,50,38,25,13}; - for (byte x = 0; x< mySparkTable->xSize; x++) { mySparkTable->values[0][x] = tempRow1[x]; } - for (byte x = 0; x< mySparkTable->xSize; x++) { mySparkTable->values[1][x] = tempRow2[x]; } - for (byte x = 0; x< mySparkTable->xSize; x++) { mySparkTable->values[2][x] = tempRow3[x]; } - for (byte x = 0; x< mySparkTable->xSize; x++) { mySparkTable->values[3][x] = tempRow4[x]; } - for (byte x = 0; x< mySparkTable->xSize; x++) { mySparkTable->values[4][x] = tempRow5[x]; } - for (byte x = 0; x< mySparkTable->xSize; x++) { mySparkTable->values[5][x] = tempRow6[x]; } - for (byte x = 0; x< mySparkTable->xSize; x++) { mySparkTable->values[6][x] = tempRow7[x]; } - for (byte x = 0; x< mySparkTable->xSize; x++) { mySparkTable->values[7][x] = tempRow8[x]; } - - } - -#endif // TESTING_H diff --git a/utils.h b/utils.h index ebb98eb2..f869895a 100644 --- a/utils.h +++ b/utils.h @@ -10,7 +10,6 @@ These are some utility functions and variables used through the main code int freeRam (); void setPinMapping(byte boardID); -int AIRDEN(); unsigned int PW(); unsigned int PW_SD(); unsigned int PW_AN(); diff --git a/utils.ino b/utils.ino index 441f1473..ce6b72e7 100644 --- a/utils.ino +++ b/utils.ino @@ -173,15 +173,6 @@ void setPinMapping(byte boardID) } } - -/* The following functions help determine the required fuel constant. For more information about these calculations, please refer to http://www.megamanual.com/v22manual/mfuel.htm - Calc below are for metric inputs of temp (degrees C) and MAP (kPa) to produce kg/m3. -*/ -int AIRDEN(int MAP, int temp) - { - return (1.2929 * 273.13/(temp+273.13) * MAP/101.325); - } - /* This function retuns a pulsewidth time (in us) using a either Alpha-N or Speed Density algorithms, given the following: REQ_FUEL