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

Sanity checks on the average MAP calculation

This commit is contained in:
Josh Stewart 2017-02-09 14:17:20 +11:00
parent 74137338e5
commit 7db51bd416
3 changed files with 40 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
platformio.ini
View File

@ -39,7 +39,8 @@ build_flags = -fpermissive
[platformio] [platformio]
src_dir=speeduino src_dir=speeduino
env_default = megaatmega2560, teensy35 env_default = megaatmega2560
;The following lines are for testing / experimentation only. Comment the line above to try them out ;The following lines are for testing / experimentation only. Comment the line above to try them out
;env_default = teensy35
;env_default = LaunchPad_tm4c1294ncpdt ;env_default = LaunchPad_tm4c1294ncpdt
;env_default = genericSTM32F103RB ;env_default = genericSTM32F103RB

10
speeduino/sensors.h
View File

@ -1,7 +1,7 @@
#ifndef SENSORS_H #ifndef SENSORS_H
#define SENSORS_H #define SENSORS_H
// The following are alpha values for the ADC filters. // The following are alpha values for the ADC filters.
// Their values are from 0 to 255 with 0 being no filtering and 255 being maximum // Their values are from 0 to 255 with 0 being no filtering and 255 being maximum
#define ADCFILTER_TPS 128 #define ADCFILTER_TPS 128
#define ADCFILTER_CLT 180 #define ADCFILTER_CLT 180
@ -21,12 +21,12 @@ volatile int AnChannel[15];
unsigned long MAPrunningValue; //Used for tracking either the total of all MAP readings in this cycle (Event average) or the lowest value detected in this cycle (event minimum) unsigned long MAPrunningValue; //Used for tracking either the total of all MAP readings in this cycle (Event average) or the lowest value detected in this cycle (event minimum)
unsigned int MAPcount; //Number of samples taken in the current MAP cycle unsigned int MAPcount; //Number of samples taken in the current MAP cycle
byte MAPcurRev = 0; //Tracks which revolution we're sampling on byte MAPcurRev; //Tracks which revolution we're sampling on
/* /*
* Simple low pass IIR filter macro for the analog inputs * Simple low pass IIR filter macro for the analog inputs
* This is effectively implementing the smooth filter from http://playground.arduino.cc/Main/Smooth * This is effectively implementing the smooth filter from http://playground.arduino.cc/Main/Smooth
* But removes the use of floats and uses 8 bits of fixed precision. * But removes the use of floats and uses 8 bits of fixed precision.
*/ */
#define ADC_FILTER(input, alpha, prior) (((long)input * (256 - alpha) + ((long)prior * alpha))) >> 8 #define ADC_FILTER(input, alpha, prior) (((long)input * (256 - alpha) + ((long)prior * alpha))) >> 8
@ -45,7 +45,7 @@ ISR(ADC_vect)
//ADCSRA = 0x6E; // ADC disabled by clearing bit 7(ADEN) //ADCSRA = 0x6E; // ADC disabled by clearing bit 7(ADEN)
//BIT_CLEAR(ADCSRA, ADIE); //BIT_CLEAR(ADCSRA, ADIE);
nChannel = ADMUX & 0x07; nChannel = ADMUX & 0x07;
#if defined(__AVR_ATmega1281__) || defined(__AVR_ATmega2561__) #if defined(__AVR_ATmega1281__) || defined(__AVR_ATmega2561__)
if (nChannel==7) { ADMUX = 0x40; } if (nChannel==7) { ADMUX = 0x40; }
@ -57,7 +57,7 @@ ISR(ADC_vect)
ADCSRB = 0x00; //clear MUX5 bit ADCSRB = 0x00; //clear MUX5 bit
} }
else if (nChannel == 7) //channel 7 else if (nChannel == 7) //channel 7
{ {
ADMUX = 0x40; ADMUX = 0x40;
ADCSRB = 0x08; //Set MUX5 bit ADCSRB = 0x08; //Set MUX5 bit
} }

62
speeduino/sensors.ino
View File

@ -14,7 +14,7 @@ void initialiseADC()
//the code on ISR run each conversion every 25 ADC clock, conversion run about 100KHz effectively //the code on ISR run each conversion every 25 ADC clock, conversion run about 100KHz effectively
//making a 6250 conversions/s on 16 channels and 12500 on 8 channels devices. //making a 6250 conversions/s on 16 channels and 12500 on 8 channels devices.
noInterrupts(); //Interrupts should be turned off when playing with any of these registers noInterrupts(); //Interrupts should be turned off when playing with any of these registers
ADCSRB = 0x00; //ADC Auto Trigger Source is in Free Running mode ADCSRB = 0x00; //ADC Auto Trigger Source is in Free Running mode
ADMUX = 0x40; //Select AREF as reference, ADC Left Adjust Result, Starting at channel 0 ADMUX = 0x40; //Select AREF as reference, ADC Left Adjust Result, Starting at channel 0
@ -28,12 +28,12 @@ void initialiseADC()
BIT_SET(ADCSRA,ADPS2); BIT_SET(ADCSRA,ADPS2);
BIT_SET(ADCSRA,ADPS1); BIT_SET(ADCSRA,ADPS1);
BIT_SET(ADCSRA,ADPS0); BIT_SET(ADCSRA,ADPS0);
BIT_SET(ADCSRA,ADEN); //Enable ADC BIT_SET(ADCSRA,ADEN); //Enable ADC
interrupts(); interrupts();
BIT_SET(ADCSRA,ADSC); //Start conversion BIT_SET(ADCSRA,ADSC); //Start conversion
#else #else
//This sets the ADC (Analog to Digitial Converter) to run at 1Mhz, greatly reducing analog read times (MAP/TPS) when using the standard analogRead() function //This sets the ADC (Analog to Digitial Converter) to run at 1Mhz, greatly reducing analog read times (MAP/TPS) when using the standard analogRead() function
//1Mhz is the fastest speed permitted by the CPU without affecting accuracy //1Mhz is the fastest speed permitted by the CPU without affecting accuracy
@ -42,22 +42,23 @@ void initialiseADC()
BIT_CLEAR(ADCSRA,ADPS1); BIT_CLEAR(ADCSRA,ADPS1);
BIT_CLEAR(ADCSRA,ADPS0); BIT_CLEAR(ADCSRA,ADPS0);
#endif #endif
MAPcurRev = 0;
#endif #endif
} }
void instanteneousMAPReading() void instanteneousMAPReading()
{ {
//Instantaneous MAP readings //Instantaneous MAP readings
#if defined(ANALOG_ISR) #if defined(ANALOG_ISR)
tempReading = AnChannel[pinMAP-A0]; tempReading = AnChannel[pinMAP-A0];
#else #else
tempReading = analogRead(pinMAP); tempReading = analogRead(pinMAP);
tempReading = analogRead(pinMAP); tempReading = analogRead(pinMAP);
#endif #endif
//Error checking //Error checking
if(tempReading >= VALID_MAP_MAX || tempReading <= VALID_MAP_MIN) { mapErrorCount += 1; } if(tempReading >= VALID_MAP_MAX || tempReading <= VALID_MAP_MIN) { mapErrorCount += 1; }
else { currentStatus.mapADC = tempReading; mapErrorCount = 0; } else { currentStatus.mapADC = tempReading; mapErrorCount = 0; }
currentStatus.MAP = fastMap1023toX(currentStatus.mapADC, configPage1.mapMax); //Get the current MAP value currentStatus.MAP = fastMap1023toX(currentStatus.mapADC, configPage1.mapMax); //Get the current MAP value
} }
@ -70,21 +71,21 @@ void readMAP()
//Instantaneous MAP readings //Instantaneous MAP readings
instanteneousMAPReading(); instanteneousMAPReading();
break; break;
case 1: case 1:
//Average of a cycle //Average of a cycle
if (currentStatus.RPM < 1) { instanteneousMAPReading(); return; } //If the engine isn't running, fall back to instantaneous reads if (currentStatus.RPM < 1 || !currentStatus.hasSync) { instanteneousMAPReading(); return; } //If the engine isn't running, fall back to instantaneous reads
if( (MAPcurRev == currentStatus.startRevolutions) || (MAPcurRev == currentStatus.startRevolutions+1) ) //2 revolutions are looked at for 4 stroke. 2 stroke not currently catered for. if( (MAPcurRev == currentStatus.startRevolutions) || (MAPcurRev == currentStatus.startRevolutions+1) ) //2 revolutions are looked at for 4 stroke. 2 stroke not currently catered for.
{ {
#if defined(ANALOG_ISR) #if defined(ANALOG_ISR)
tempReading = AnChannel[pinMAP-A0]; tempReading = AnChannel[pinMAP-A0];
#else #else
tempReading = analogRead(pinMAP); tempReading = analogRead(pinMAP);
tempReading = analogRead(pinMAP); tempReading = analogRead(pinMAP);
#endif #endif
//Error check //Error check
if(tempReading < VALID_MAP_MAX && tempReading > VALID_MAP_MIN) if(tempReading < VALID_MAP_MAX && tempReading > VALID_MAP_MIN)
{ {
@ -96,6 +97,10 @@ void readMAP()
else else
{ {
//Reaching here means that the last cylce has completed and the MAP value should be calculated //Reaching here means that the last cylce has completed and the MAP value should be calculated
//Sanity check
if (MAPrunningValue == 0 || MAPcount == 0) { instanteneousMAPReading(); return; }
currentStatus.mapADC = ldiv(MAPrunningValue, MAPcount).quot; currentStatus.mapADC = ldiv(MAPrunningValue, MAPcount).quot;
currentStatus.MAP = fastMap1023toX(currentStatus.mapADC, configPage1.mapMax); //Get the current MAP value currentStatus.MAP = fastMap1023toX(currentStatus.mapADC, configPage1.mapMax); //Get the current MAP value
MAPcurRev = currentStatus.startRevolutions; //Reset the current rev count MAPcurRev = currentStatus.startRevolutions; //Reset the current rev count
@ -103,14 +108,14 @@ void readMAP()
MAPcount = 0; MAPcount = 0;
} }
break; break;
case 2: case 2:
//Minimum reading in a cycle //Minimum reading in a cycle
if (currentStatus.RPM < 1) { instanteneousMAPReading(); return; } //If the engine isn't running, fall back to instantaneous reads if (currentStatus.RPM < 1) { instanteneousMAPReading(); return; } //If the engine isn't running, fall back to instantaneous reads
if( (MAPcurRev == currentStatus.startRevolutions) || (MAPcurRev == currentStatus.startRevolutions+1) ) //2 revolutions are looked at for 4 stroke. 2 stroke not currently catered for. if( (MAPcurRev == currentStatus.startRevolutions) || (MAPcurRev == currentStatus.startRevolutions+1) ) //2 revolutions are looked at for 4 stroke. 2 stroke not currently catered for.
{ {
#if defined(ANALOG_ISR) #if defined(ANALOG_ISR)
tempReading = AnChannel[pinMAP-A0]; tempReading = AnChannel[pinMAP-A0];
#else #else
tempReading = analogRead(pinMAP); tempReading = analogRead(pinMAP);
@ -139,24 +144,24 @@ void readTPS()
{ {
currentStatus.TPSlast = currentStatus.TPS; currentStatus.TPSlast = currentStatus.TPS;
currentStatus.TPSlast_time = currentStatus.TPS_time; currentStatus.TPSlast_time = currentStatus.TPS_time;
#if defined(ANALOG_ISR) #if defined(ANALOG_ISR)
byte tempTPS = fastMap1023toX(AnChannel[pinTPS-A0], 255); //Get the current raw TPS ADC value and map it into a byte byte tempTPS = fastMap1023toX(AnChannel[pinTPS-A0], 255); //Get the current raw TPS ADC value and map it into a byte
#else #else
analogRead(pinTPS); analogRead(pinTPS);
byte tempTPS = fastMap1023toX(analogRead(pinTPS), 255); //Get the current raw TPS ADC value and map it into a byte byte tempTPS = fastMap1023toX(analogRead(pinTPS), 255); //Get the current raw TPS ADC value and map it into a byte
#endif #endif
currentStatus.tpsADC = ADC_FILTER(tempTPS, ADCFILTER_TPS, currentStatus.tpsADC); currentStatus.tpsADC = ADC_FILTER(tempTPS, ADCFILTER_TPS, currentStatus.tpsADC);
//Check that the ADC values fall within the min and max ranges (Should always be the case, but noise can cause these to fluctuate outside the defined range). //Check that the ADC values fall within the min and max ranges (Should always be the case, but noise can cause these to fluctuate outside the defined range).
byte tempADC = currentStatus.tpsADC; //The tempADC value is used in order to allow TunerStudio to recover and redo the TPS calibration if this somehow gets corrupted byte tempADC = currentStatus.tpsADC; //The tempADC value is used in order to allow TunerStudio to recover and redo the TPS calibration if this somehow gets corrupted
if (currentStatus.tpsADC < configPage1.tpsMin) { tempADC = configPage1.tpsMin; } if (currentStatus.tpsADC < configPage1.tpsMin) { tempADC = configPage1.tpsMin; }
else if(currentStatus.tpsADC > configPage1.tpsMax) { tempADC = configPage1.tpsMax; } else if(currentStatus.tpsADC > configPage1.tpsMax) { tempADC = configPage1.tpsMax; }
currentStatus.TPS = map(tempADC, configPage1.tpsMin, configPage1.tpsMax, 0, 100); //Take the raw TPS ADC value and convert it into a TPS% based on the calibrated values currentStatus.TPS = map(tempADC, configPage1.tpsMin, configPage1.tpsMax, 0, 100); //Take the raw TPS ADC value and convert it into a TPS% based on the calibrated values
currentStatus.TPS_time = currentLoopTime; currentStatus.TPS_time = currentLoopTime;
} }
void readCLT() void readCLT()
{ {
#if defined(ANALOG_ISR) #if defined(ANALOG_ISR)
tempReading = fastMap1023toX(AnChannel[pinCLT-A0], 511); //Get the current raw CLT value tempReading = fastMap1023toX(AnChannel[pinCLT-A0], 511); //Get the current raw CLT value
#else #else
tempReading = analogRead(pinCLT); tempReading = analogRead(pinCLT);
@ -168,7 +173,7 @@ void readCLT()
void readIAT() void readIAT()
{ {
#if defined(ANALOG_ISR) #if defined(ANALOG_ISR)
tempReading = fastMap1023toX(AnChannel[pinIAT-A0], 511); //Get the current raw IAT value tempReading = fastMap1023toX(AnChannel[pinIAT-A0], 511); //Get the current raw IAT value
#else #else
tempReading = analogRead(pinIAT); tempReading = analogRead(pinIAT);
@ -180,16 +185,16 @@ void readIAT()
void readO2() void readO2()
{ {
#if defined(ANALOG_ISR) #if defined(ANALOG_ISR)
tempReading = fastMap1023toX(AnChannel[pinO2-A0], 511); //Get the current O2 value. tempReading = fastMap1023toX(AnChannel[pinO2-A0], 511); //Get the current O2 value.
#else #else
tempReading = analogRead(pinO2); tempReading = analogRead(pinO2);
tempReading = fastMap1023toX(analogRead(pinO2), 511); //Get the current O2 value. tempReading = fastMap1023toX(analogRead(pinO2), 511); //Get the current O2 value.
#endif #endif
currentStatus.O2ADC = ADC_FILTER(tempReading, ADCFILTER_O2, currentStatus.O2ADC); currentStatus.O2ADC = ADC_FILTER(tempReading, ADCFILTER_O2, currentStatus.O2ADC);
currentStatus.O2 = o2CalibrationTable[currentStatus.O2ADC]; currentStatus.O2 = o2CalibrationTable[currentStatus.O2ADC];
} }
/* Second O2 currently disabled as its not being used /* Second O2 currently disabled as its not being used
currentStatus.O2_2ADC = map(analogRead(pinO2_2), 0, 1023, 0, 511); //Get the current O2 value. currentStatus.O2_2ADC = map(analogRead(pinO2_2), 0, 1023, 0, 511); //Get the current O2 value.
currentStatus.O2_2ADC = ADC_FILTER(tempReading, ADCFILTER_O2, currentStatus.O2_2ADC); currentStatus.O2_2ADC = ADC_FILTER(tempReading, ADCFILTER_O2, currentStatus.O2_2ADC);
@ -198,7 +203,7 @@ void readO2()
void readBat() void readBat()
{ {
#if defined(ANALOG_ISR) #if defined(ANALOG_ISR)
tempReading = fastMap1023toX(AnChannel[pinBat-A0], 245); //Get the current raw Battery value. Permissible values are from 0v to 24.5v (245) tempReading = fastMap1023toX(AnChannel[pinBat-A0], 245); //Get the current raw Battery value. Permissible values are from 0v to 24.5v (245)
#else #else
tempReading = analogRead(pinBat); tempReading = analogRead(pinBat);
@ -215,4 +220,3 @@ void flexPulse()
{ {
++flexCounter; ++flexCounter;
} }