Fix build failure when ANALOG_ISR is set
This commit is contained in:
Josh Stewart
parent
d5d4274054
commit
fedd32e43c
|
|
@ -45,6 +45,38 @@ byte mapErrorCount = 0;
|
|||
|
||||
static inline void validateMAP(void);
|
||||
|
||||
#if defined(ANALOG_ISR)
|
||||
volatile int AnChannel[15];
|
||||
|
||||
ISR(ADC_vect)
|
||||
{
|
||||
byte nChannel = ADMUX & 0x07;
|
||||
int result = ADCL | (ADCH << 8);
|
||||
|
||||
BIT_CLEAR(ADCSRA, ADEN); //Disable ADC for Changing Channel (see chapter 26.5 of datasheet)
|
||||
|
||||
#if defined(__AVR_ATmega1281__) || defined(__AVR_ATmega2561__)
|
||||
if (nChannel==7) { ADMUX = 0x40; }
|
||||
#elif defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
|
||||
if( (ADCSRB & 0x08) > 0) { nChannel += 8; } //8 to 15
|
||||
if(nChannel == 15)
|
||||
{
|
||||
ADMUX = 0x40; //channel 0
|
||||
ADCSRB = 0x00; //clear MUX5 bit
|
||||
}
|
||||
else if (nChannel == 7) //channel 7
|
||||
{
|
||||
ADMUX = 0x40;
|
||||
ADCSRB = 0x08; //Set MUX5 bit
|
||||
}
|
||||
#endif
|
||||
else { ADMUX++; }
|
||||
AnChannel[nChannel] = result;
|
||||
|
||||
BIT_SET(ADCSRA, ADEN); //Enable ADC
|
||||
}
|
||||
#endif
|
||||
|
||||
/** Init all ADC conversions by setting resolutions, etc.
|
||||
*/
|
||||
void initialiseADC(void)
|
||||
|
|
@ -61,7 +93,9 @@ void initialiseADC(void)
|
|||
ADMUX = 0x40; //Select AREF as reference, ADC Left Adjust Result, Starting at channel 0
|
||||
|
||||
//All of the below is the longhand version of: ADCSRA = 0xEE;
|
||||
#define ADFR 5 //Why the HELL isn't this defined in the same place as everything else (wiring.h)?!?!
|
||||
#ifndef ADFR
|
||||
#define ADFR 5 //Looks like this is now defined. Retain this for compatibility with earlier versions of Arduino IDE that did not have this.
|
||||
#endif
|
||||
BIT_SET(ADCSRA,ADFR); //Set free running mode
|
||||
BIT_SET(ADCSRA,ADIE); //Set ADC interrupt enabled
|
||||
BIT_CLEAR(ADCSRA,ADIF); //Clear interrupt flag
|
||||
|
|
@ -265,8 +299,12 @@ void readMAP(void)
|
|||
//Repeat for EMAP if it's enabled
|
||||
if(configPage6.useEMAP == true)
|
||||
{
|
||||
tempReading = analogRead(pinEMAP);
|
||||
tempReading = analogRead(pinEMAP);
|
||||
#if defined(ANALOG_ISR_MAP)
|
||||
tempReading = AnChannel[pinEMAP-A0];
|
||||
#else
|
||||
tempReading = analogRead(pinEMAP);
|
||||
tempReading = analogRead(pinEMAP);
|
||||
#endif
|
||||
|
||||
//Error check
|
||||
if( (tempReading < VALID_MAP_MAX) && (tempReading > VALID_MAP_MIN) )
|
||||
|
|
@ -471,7 +509,7 @@ void readCLT(bool useFilter)
|
|||
{
|
||||
unsigned int tempReading;
|
||||
#if defined(ANALOG_ISR)
|
||||
tempReading = fastMap1023toX(AnChannel[pinCLT-A0], 511); //Get the current raw CLT value
|
||||
tempReading = AnChannel[pinCLT-A0]; //Get the current raw CLT value
|
||||
#else
|
||||
tempReading = analogRead(pinCLT);
|
||||
tempReading = analogRead(pinCLT);
|
||||
|
|
@ -488,7 +526,7 @@ void readIAT(void)
|
|||
{
|
||||
unsigned int tempReading;
|
||||
#if defined(ANALOG_ISR)
|
||||
tempReading = fastMap1023toX(AnChannel[pinIAT-A0], 511); //Get the current raw IAT value
|
||||
tempReading = AnChannel[pinIAT-A0]; //Get the current raw IAT value
|
||||
#else
|
||||
tempReading = analogRead(pinIAT);
|
||||
tempReading = analogRead(pinIAT);
|
||||
|
|
@ -556,7 +594,7 @@ void readO2(void)
|
|||
{
|
||||
unsigned int tempReading;
|
||||
#if defined(ANALOG_ISR)
|
||||
tempReading = fastMap1023toX(AnChannel[pinO2-A0], 511); //Get the current O2 value.
|
||||
tempReading = AnChannel[pinO2-A0]; //Get the current O2 value.
|
||||
#else
|
||||
tempReading = analogRead(pinO2);
|
||||
tempReading = analogRead(pinO2);
|
||||
|
|
@ -580,7 +618,7 @@ void readO2_2(void)
|
|||
//Get the current O2 value.
|
||||
unsigned int tempReading;
|
||||
#if defined(ANALOG_ISR)
|
||||
tempReading = fastMap1023toX(AnChannel[pinO2_2-A0], 511); //Get the current O2 value.
|
||||
tempReading = AnChannel[pinO2_2-A0]; //Get the current O2 value.
|
||||
#else
|
||||
tempReading = analogRead(pinO2_2);
|
||||
tempReading = analogRead(pinO2_2);
|
||||
|
|
@ -721,8 +759,12 @@ byte getFuelPressure(void)
|
|||
if(configPage10.fuelPressureEnable > 0)
|
||||
{
|
||||
//Perform ADC read
|
||||
tempReading = analogRead(pinFuelPressure);
|
||||
tempReading = analogRead(pinFuelPressure);
|
||||
#if defined(ANALOG_ISR)
|
||||
tempReading = AnChannel[pinFuelPressure-A0];
|
||||
#else
|
||||
tempReading = analogRead(pinFuelPressure);
|
||||
tempReading = analogRead(pinFuelPressure);
|
||||
#endif
|
||||
|
||||
tempFuelPressure = fastMap10Bit(tempReading, configPage10.fuelPressureMin, configPage10.fuelPressureMax);
|
||||
tempFuelPressure = ADC_FILTER(tempFuelPressure, ADCFILTER_PSI_DEFAULT, currentStatus.fuelPressure); //Apply smoothing factor
|
||||
|
|
@ -742,8 +784,12 @@ byte getOilPressure(void)
|
|||
if(configPage10.oilPressureEnable > 0)
|
||||
{
|
||||
//Perform ADC read
|
||||
tempReading = analogRead(pinOilPressure);
|
||||
tempReading = analogRead(pinOilPressure);
|
||||
#if defined(ANALOG_ISR)
|
||||
tempReading = AnChannel[pinOilPressure-A0];
|
||||
#else
|
||||
tempReading = analogRead(pinOilPressure);
|
||||
tempReading = analogRead(pinOilPressure);
|
||||
#endif
|
||||
|
||||
|
||||
tempOilPressure = fastMap10Bit(tempReading, configPage10.oilPressureMin, configPage10.oilPressureMax);
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#ifndef SENSORS_H
|
||||
#define SENSORS_H
|
||||
|
||||
#include "Arduino.h"
|
||||
#include "globals.h"
|
||||
|
||||
// The following are alpha values for the ADC filters.
|
||||
// Their values are from 0 to 240, with 0 being no filtering and 240 being maximum
|
||||
|
|
@ -28,12 +28,6 @@
|
|||
|
||||
#define TPS_READ_FREQUENCY 30 //ONLY VALID VALUES ARE 15 or 30!!!
|
||||
|
||||
/*
|
||||
#if defined(CORE_AVR)
|
||||
#define ANALOG_ISR
|
||||
#endif
|
||||
*/
|
||||
|
||||
extern volatile byte flexCounter;
|
||||
extern volatile unsigned long flexStartTime;
|
||||
extern volatile unsigned long flexPulseWidth;
|
||||
|
|
@ -80,69 +74,4 @@ void readBaro(void);
|
|||
void readMAP(void);
|
||||
void instanteneousMAPReading(void);
|
||||
|
||||
#if defined(ANALOG_ISR)
|
||||
volatile int AnChannel[15];
|
||||
|
||||
//Analog ISR interrupt routine
|
||||
/*
|
||||
ISR(ADC_vect)
|
||||
{
|
||||
byte nChannel;
|
||||
int result = ADCL | (ADCH << 8);
|
||||
|
||||
//ADCSRA = 0x6E; - ADC disabled by clearing bit 7(ADEN)
|
||||
//BIT_CLEAR(ADCSRA, ADIE);
|
||||
|
||||
nChannel = ADMUX & 0x07;
|
||||
#if defined(__AVR_ATmega1281__) || defined(__AVR_ATmega2561__)
|
||||
if (nChannel==7) { ADMUX = 0x40; }
|
||||
#elif defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
|
||||
if(ADCSRB & 0x08) { nChannel += 8; } //8 to 15
|
||||
if(nChannel == 15)
|
||||
{
|
||||
ADMUX = 0x40; //channel 0
|
||||
ADCSRB = 0x00; //clear MUX5 bit
|
||||
}
|
||||
else if (nChannel == 7) //channel 7
|
||||
{
|
||||
ADMUX = 0x40;
|
||||
ADCSRB = 0x08; //Set MUX5 bit
|
||||
}
|
||||
#endif
|
||||
else { ADMUX++; }
|
||||
AnChannel[nChannel-1] = result;
|
||||
|
||||
//BIT_SET(ADCSRA, ADIE);
|
||||
//ADCSRA = 0xEE; - ADC Interrupt Flag enabled
|
||||
}
|
||||
*/
|
||||
ISR(ADC_vect)
|
||||
{
|
||||
byte nChannel = ADMUX & 0x07;
|
||||
int result = ADCL | (ADCH << 8);
|
||||
|
||||
BIT_CLEAR(ADCSRA, ADEN); //Disable ADC for Changing Channel (see chapter 26.5 of datasheet)
|
||||
|
||||
#if defined(__AVR_ATmega1281__) || defined(__AVR_ATmega2561__)
|
||||
if (nChannel==7) { ADMUX = 0x40; }
|
||||
#elif defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
|
||||
if( (ADCSRB & 0x08) > 0) { nChannel += 8; } //8 to 15
|
||||
if(nChannel == 15)
|
||||
{
|
||||
ADMUX = 0x40; //channel 0
|
||||
ADCSRB = 0x00; //clear MUX5 bit
|
||||
}
|
||||
else if (nChannel == 7) //channel 7
|
||||
{
|
||||
ADMUX = 0x40;
|
||||
ADCSRB = 0x08; //Set MUX5 bit
|
||||
}
|
||||
#endif
|
||||
else { ADMUX++; }
|
||||
AnChannel[nChannel] = result;
|
||||
|
||||
BIT_SET(ADCSRA, ADEN); //Enable ADC
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif // SENSORS_H
|
||||
|
|
|
|||
Loading…
Reference in New Issue