Index: firmware/App/Drivers/InternalADC.c =================================================================== diff -u -ra7bf3ca23ea37a61000379facae628a31b3ecc59 -rf308cc4c35eab630ebbbde405cfe47d049afeafb --- firmware/App/Drivers/InternalADC.c (.../InternalADC.c) (revision a7bf3ca23ea37a61000379facae628a31b3ecc59) +++ firmware/App/Drivers/InternalADC.c (.../InternalADC.c) (revision f308cc4c35eab630ebbbde405cfe47d049afeafb) @@ -7,8 +7,8 @@ * * @file InternalADC.c * -* @author (last) Sean Nash -* @date (last) 10-Jun-2020 +* @author (last) Quang Nguyen +* @date (last) 21-Jul-2020 * * @author (original) Sean * @date (original) 04-Feb-2020 @@ -79,7 +79,6 @@ * @details * Inputs : none * Outputs : InternalADC module is initialized. - * @param none * @return none *************************************************************************/ void initInternalADC( void ) @@ -112,8 +111,8 @@ * @details * Inputs : ADC FIFO * Outputs : adcRawReadingsCount, adcRawReadings[] - * @param adc : pointer to the ADC1 controller - * @param group : ADC channel group ID + * @param adc pointer to the ADC1 controller + * @param group ADC channel group ID * @return none *************************************************************************/ void adcNotification( adcBASE_t *adc, uint32 group ) @@ -131,8 +130,8 @@ * @details * Inputs : adcRawReadingsCount, adcRawReadings[] * Outputs : adcReadings[][], adcReadingsIdx[], adcReadingsTotals[], adcReadingsAvgs[] - * @param adc : pointer to the ADC1 controller - * @param group : ADC channel group ID + * @param adc pointer to the ADC1 controller + * @param group ADC channel group ID * @return none *************************************************************************/ void execInternalADC( void ) @@ -144,7 +143,7 @@ // process readings from last conversion for ( i = 0; i < adcRawReadingsCount; i++ ) { - U32 ch = adcChannelNum2ChannelId[ adcRawReadings[ i ].id ]; + U32 ch = adcChannelNum2ChannelId[ adcRawReadings[ i ].id ]; // TODO - need to range check .id? adcReadingsTotals[ ch ] -= adcReadings[ ch ][ adcReadingsIdx[ ch ] ]; adcReadings[ ch ][ adcReadingsIdx[ ch ] ] = adcRawReadings[i].value; @@ -155,7 +154,7 @@ } else { - SET_ALARM_WITH_2_U32_DATA( ALARM_ID_SOFTWARE_FAULT, SW_FAULT_ID_INT_ADC_DATA_OVERRUN, adcRawReadingsCount ) + SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_INT_ADC_DATA_OVERRUN, adcRawReadingsCount ) } // start an adc channel group conversion @@ -169,7 +168,7 @@ * @details * Inputs : adcReadingsAvgs[] * Outputs : none - * @param channel : adc channel to retrieve a reading for + * @param channel adc channel to retrieve a reading for * @return average reading for the given channel *************************************************************************/ U16 getIntADCReading( INT_ADC_CHANNEL_T channel ) @@ -182,7 +181,7 @@ } else { - SET_ALARM_WITH_2_U32_DATA( ALARM_ID_SOFTWARE_FAULT, SW_FAULT_ID_INT_ADC_INVALID_CHANNEL_REQUESTED, channel ) + SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_INT_ADC_INVALID_CHANNEL_REQUESTED, channel ) } return result;