Index: firmware/App/Drivers/InternalADC.c =================================================================== diff -u -ra0aca1a4d87df989303b4f7f41208a4916861afa -r1bbf9da32e622975efed00b1a7589387a9829440 --- firmware/App/Drivers/InternalADC.c (.../InternalADC.c) (revision a0aca1a4d87df989303b4f7f41208a4916861afa) +++ firmware/App/Drivers/InternalADC.c (.../InternalADC.c) (revision 1bbf9da32e622975efed00b1a7589387a9829440) @@ -24,7 +24,7 @@ #define SIZE_OF_ROLLING_AVG 16 // samples in rolling average calculations #define ROLLING_AVG_SHIFT_DIVIDER 4 // rolling average shift divider -const INT_ADC_CHANNEL_T adcChannelNum2ChannelId[MAX_ADC_CHANNELS+1] = +const INT_ADC_CHANNEL_T adcChannelNum2ChannelId[ MAX_ADC_CHANNELS + 1 ] = { INT_ADC_NOT_USED, // 0 (N/A - channels start at 1) INT_ADC_NOT_USED, // 1 @@ -55,13 +55,13 @@ // ********** private data ********** -static adcData_t adcRawReadings[NUM_OF_INT_ADC_CHANNELS]; // buffer holds latest adc channel readings -static U32 adcRawReadingsCount = 0; // readings count for raw readings buffer +static adcData_t adcRawReadings[ NUM_OF_INT_ADC_CHANNELS ]; // buffer holds latest adc channel readings +static U32 adcRawReadingsCount = 0; // readings count for raw readings buffer -static U16 adcReadings[NUM_OF_INT_ADC_CHANNELS][SIZE_OF_ROLLING_AVG]; // holds samples for each channel for a rolling average -static U32 adcReadingsIdx[NUM_OF_INT_ADC_CHANNELS]; // index for next reading in each rolling average array -static U32 adcReadingsTotals[NUM_OF_INT_ADC_CHANNELS]; // rolling total for each channel - used to calc average -static U32 adcReadingsAvgs[NUM_OF_INT_ADC_CHANNELS]; // rolling average for each channel +static U16 adcReadings[ NUM_OF_INT_ADC_CHANNELS ][ SIZE_OF_ROLLING_AVG ]; // holds samples for each channel for a rolling average +static U32 adcReadingsIdx[ NUM_OF_INT_ADC_CHANNELS ]; // index for next reading in each rolling average array +static U32 adcReadingsTotals[ NUM_OF_INT_ADC_CHANNELS ]; // rolling total for each channel - used to calc average +static U32 adcReadingsAvgs[ NUM_OF_INT_ADC_CHANNELS ]; // rolling average for each channel // ********** private function prototypes ********** @@ -84,14 +84,14 @@ adcRawReadingsCount = 0; for ( c = 0; c < NUM_OF_INT_ADC_CHANNELS; c++ ) { - adcRawReadings[c].id = 0; - adcRawReadings[c].value = 0; - adcReadingsIdx[c] = 0; - adcReadingsTotals[c] = 0; - adcReadingsAvgs[c] = 0; + adcRawReadings[ c ].id = 0; + adcRawReadings[ c ].value = 0; + adcReadingsIdx[ c ] = 0; + adcReadingsTotals[ c ] = 0; + adcReadingsAvgs[ c ] = 0; for ( r = 0; r < SIZE_OF_ROLLING_AVG; r++ ) { - adcReadings[c][r] = 0; + adcReadings[ c ][ r ] = 0; } } @@ -138,13 +138,13 @@ // process readings from last conversion for ( i = 0; i < adcRawReadingsCount; i++ ) { - U32 ch = adcChannelNum2ChannelId[adcRawReadings[i].id]; + U32 ch = adcChannelNum2ChannelId[ adcRawReadings[ i ].id ]; - adcReadingsTotals[ch] -= adcReadings[ch][adcReadingsIdx[ch]]; - adcReadings[ch][adcReadingsIdx[ch]] = adcRawReadings[i].value; - adcReadingsTotals[ch] += adcRawReadings[i].value; - adcReadingsAvgs[ch] = adcReadingsTotals[ch] >> ROLLING_AVG_SHIFT_DIVIDER; - adcReadingsIdx[ch] = INC_WRAP( adcReadingsIdx[ch], 0, SIZE_OF_ROLLING_AVG-1 ); + adcReadingsTotals[ ch ] -= adcReadings[ ch ][ adcReadingsIdx[ ch ] ]; + adcReadings[ ch ][ adcReadingsIdx[ ch ] ] = adcRawReadings[i].value; + adcReadingsTotals[ ch ] += adcRawReadings[ i ].value; + adcReadingsAvgs[ ch ] = adcReadingsTotals[ ch ] >> ROLLING_AVG_SHIFT_DIVIDER; + adcReadingsIdx[ ch ] = INC_WRAP( adcReadingsIdx[ ch ], 0, SIZE_OF_ROLLING_AVG - 1 ); } } else @@ -172,7 +172,7 @@ if ( channel < NUM_OF_INT_ADC_CHANNELS ) { - result = adcReadingsAvgs[channel]; + result = adcReadingsAvgs[ channel ]; } else {