Index: firmware/App/Drivers/InternalADC.c =================================================================== diff -u -ra9c88c428c6ab7e9bdaa273826c1fde1b0a8a1f5 -r6029b4ee6c8482d6109597a4de6073e539697d51 --- firmware/App/Drivers/InternalADC.c (.../InternalADC.c) (revision a9c88c428c6ab7e9bdaa273826c1fde1b0a8a1f5) +++ firmware/App/Drivers/InternalADC.c (.../InternalADC.c) (revision 6029b4ee6c8482d6109597a4de6073e539697d51) @@ -152,29 +152,29 @@ *************************************************************************/ void execInternalADC( void ) { -// U32 i; -// -// if ( adcRawReadingsCount < NUM_OF_INT_ADC_CHANNELS ) -// { -// // Process readings from last conversion -// for ( i = 0; i < adcRawReadingsCount; i++ ) -// { -// U32 ch = ADC_CHANNEL_NUM_TO_CHANNEL_ID[ 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 ); -// } -// } -// else -// { -// SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_INT_ADC_DATA_OVERRUN, adcRawReadingsCount ) -// } -// -// // Start an adc channel group conversion -// adcStartConversion( adcREG1, adcGROUP1 ); + U32 i; + + if ( adcRawReadingsCount < NUM_OF_INT_ADC_CHANNELS ) + { + // Process readings from last conversion + for ( i = 0; i < adcRawReadingsCount; i++ ) + { + U32 ch = ADC_CHANNEL_NUM_TO_CHANNEL_ID[ 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 ); + } + } + else + { + SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_INT_ADC_DATA_OVERRUN, adcRawReadingsCount ) + } + + // Start an adc channel group conversion + adcStartConversion( adcREG1, adcGROUP1 ); } /*********************************************************************//**