New test for the ADC module, made refactoring.

Author: abdoaboganima

MCAL/ADC/ADC_interface.h

@@ -7,56 +7,77 @@
  * @copyright Copyright (c) 2022
  * 
  */
-/**
- * @addtogroup MCAL_drivers
- * @{
- * @addtogroup ADC_drivers
- * @{
- */ 
+
 #ifndef _ADC_INTERFACE_H_
 #define _ADC_INTERFACE_H_
 #include "../../LIB/STD_TYPES.h"
+
+
+/**
+ * @brief Specify the ADC channel 
+ */
+typedef enum
+  {
+   adc0,  /**< ADC channel 0, single ended input */
+   adc1,  /**< ADC channel 1, single ended input */
+   adc2,  /**< ADC channel 2, single ended input */
+   adc3,  /**< ADC channel 3, single ended input */
+   adc4,  /**< ADC channel 4, single ended input */
+   adc5,  /**< ADC channel 5, single ended input */
+   adc6,  /**< ADC channel 6, single ended input */
+   adc7   /**< ADC channel 7, single ended input */
+  } ADC_channel;
+
+typedef enum
+  {
+   free_running_mode,
+   analog_comparator,
+   int0,
+   timer0_compare_match,
+   timer0_overflow,
+   timer1_compare_match_channelB,
+   timer1_overflow,
+   timer1_capture_event
+  }ADC_triggeringSource;
+
+
 /**
  * @brief Initialize the ADC peripheral
- * 
  */
 void ADC_init(void);
 
 /**
  * @brief Start Synchronous conversion from a specific channel, the  value of the conversion is 
  * stored in the memory location addressed by `reading`
- * 
  * @param channel 
  * @param reading 
  */
-void ADC_StartSynchConversion(uint8_t channel, uint16_t *reading);
+void ADC_startSynchConversion(ADC_channel channel, uint16_t * const reading);
 
 /**
  * @brief Start Asynchronous conversion from a specific channel, the value of the conversion is
  * stored in a memory location addressed ny `reading`
- * @note After the conversion, the function addressed by `callBackFunction` will be executed
- * 
  * @param channel 
  * @param reading 
  * @param callBackFunction 
+ * @note After the conversion, the function addressed by `callBackFunction` will be executed
  */
-void ADC_StartAsynchConversion(uint8_t channel, uint16_t *reading, void (*callBackFunction)(void));
+void ADC_startAsynchConversion(ADC_channel channel, uint16_t * const reading, void (*callBackFunction)(void));
+
+
+
+void ADC_autoTrigger(ADC_channel channel, ADC_triggeringSource source, uint16_t * const reading);
+
 
-/**
- * @addtogroup ADC_PRESCALERS
- * @{
- */ 
 #define DIV_BY_2      1
 #define DIV_BY_4      2
 #define DIV_BY_8      3
 #define DIV_BY_16     4
 #define DIV_BY_32     5
 #define DIV_BY_64     6
 #define DIV_BY_128    7
-/* @}*/
 
-#endif /* _ADC_INTERFACE_H_ */
 
+#endif /* _ADC_INTERFACE_H_ */
 
 
-/* @}@}*/

MCAL/ADC/ADC_program.c

@@ -7,19 +7,17 @@
 
 
 static uint8_t ADC_BusyState=IDLE;
+static uint16_t *ptrToReading=NULL;
+static void (*ADC_callBackFunction)(void)=NULL;
 
-void ADC_init(void)
-{
 
-  /*AVCC with external capacitor at AREF pin >> MADE: ADMUX_REFS0= 1 &ADMUX_REFS1= 0 */
-  
-  /*AREF, Internal Vref turned off*/
-  CLEAR_BIT(ADMUX, ADMUX_REFS0);
-  CLEAR_BIT(ADMUX, ADMUX_REFS0);
 
-  /*Activate Left Adjust Result*/
-  //SET_BIT(ADMUX, ADMUX_ADLAR);
+void ADC_init(void)
+{
 
+  /*AVCC, With external capacitor at AREF pin*/
+  SET_BIT(ADMUX, ADMUX_REFS0);
+  CLEAR_BIT(ADMUX, ADMUX_REFS1);
 
   /*Set Prescaler to divide by 128*/
   ADCSRA&=0b11111000;
@@ -31,15 +29,22 @@ void ADC_init(void)
 }
 
 
-void ADC_StartSynchConversion(uint8_t channel, uint16_t *reading)
+
+void ADC_selectChannel(ADC_channel channel)
+{
+  /*CLEAR the MUX bits in ADMUX register and Specify a Channel*/
+  ADMUX &=0b11100000;
+  ADMUX |=channel;  
+}
+
+void ADC_startSynchConversion(ADC_channel channel, uint16_t * const reading)
 {
   if(ADC_BusyState==BUSY)
     return;
   ADC_BusyState=BUSY;
-  
-  /*CLEAR the MUX bits in ADMUX register and Specify a Channel*/
-  ADMUX &=0b11100000;
-  ADMUX |=channel;
+
+  /*Select the desired channel */
+  ADC_selectChannel(channel) ;
 
   /*Start Conversion*/
   SET_BIT(ADCSRA, ADCSRA_ADSC);
@@ -54,9 +59,7 @@ void ADC_StartSynchConversion(uint8_t channel, uint16_t *reading)
   ADC_BusyState=IDLE;
 }
 
-static uint16_t *ptrToReading=NULL;
-static void (*ADC_callBackFunction)(void)=NULL;
-void ADC_StartAsynchConversion(uint8_t channel, uint16_t *reading, void (*callBackFunction)(void))
+void ADC_startAsynchConversion(ADC_channel channel, uint16_t * const reading, void (*callBackFunction)(void))
 {
   if(ADC_BusyState==BUSY)
     return;
@@ -70,9 +73,8 @@ void ADC_StartAsynchConversion(uint8_t channel, uint16_t *reading, void (*callBa
   ptrToReading=reading;
   ADC_callBackFunction=callBackFunction;
 
-  /*CLEAR the MUX bits in ADMUX register and Specify a Channel*/
-  ADMUX &=0b11100000;
-  ADMUX |=channel;
+  /*Select the desired channel */
+  ADC_selectChannel(channel) ;
 
   /*Start Conversion*/         
   SET_BIT(ADCSRA, ADCSRA_ADSC);
@@ -85,7 +87,8 @@ void ADC_StartAsynchConversion(uint8_t channel, uint16_t *reading, void (*callBa
 void __vector_16(void) __attribute__((signal));
 void __vector_16(void)
 {
-  *ptrToReading=ADC; /*This assigns the reading of the ADC to the `*reading` in the `ADC_StartAsynchConversion`*/
+  /*This assigns the reading of the ADC to the `*reading` in the `ADC_StartAsynchConversion`*/
+  *ptrToReading=ADC;
 
   /*Invoke the callbackfunction*/
   ADC_callBackFunction();

tests/ADC_output.gif

@@ -0,0 +1,35 @@
+/**
+ *
+ * @file       ADC_test.c
+ * @brief      Contains test for ADC
+ * @author     Abdulrahman Aboghanima
+ * @date       Fri Aug 26 17:18:26 2022
+ * @copyright  Copyright (c) 2022
+ * @version    0.1
+ * 
+ */
+
+#include "../MCAL/ADC/ADC_interface.h"
+#include "../MCAL/DIO/DIO_interface.h"
+#include <util/delay.h>
+
+int main()
+{
+  /*Setting the Pin0 of the PORTA to ne input for the ADC*/
+  DIO_SetPinDirection(DIO_PORTA, DIO_PIN0, DIO_PIN_INPUT);
+  /*Setting both PORT C, D as the output of the converted analog value*/
+  DIO_SetPortDirection(DIO_PORTC, DIO_PORT_OUTPUT);
+  DIO_SetPortDirection(DIO_PORTD, DIO_PORT_OUTPUT);
+  
+  ADC_init();
+
+  uint16_t reading;
+
+  while(1){
+    ADC_startSynchConversion(adc0, &reading);
+    DIO_SetPortValue(DIO_PORTC, reading);
+    DIO_SetPortValue(DIO_PORTD, reading>>8);  
+    _delay_ms(500);
+  }
+  return 0;
+}