1 files changed, 20 insertions, 0 deletions
diff --git a/2.3-1/macros/Hardware/AVR/AVRADCSetup.sci b/2.3-1/macros/Hardware/AVR/AVRADCSetup.sci
index 603873b3..5299058c 100644
--- a/2.3-1/macros/Hardware/AVR/AVRADCSetup.sci
+++ b/2.3-1/macros/Hardware/AVR/AVRADCSetup.sci
@@ -17,6 +17,7 @@ function AVRADCSetup(prescaler,adc_ref)
 // Parameters
 //     prescaler: prescaler to be used for generating ADC clock (0-7)
 //     adc_ref	: reference voltage to be used for ADC conversion
+<<<<<<< HEAD
 //
 // Description
 //     This function initialises ADc of AVR with given parameters. 'prescaler' is needed for deciding ADC clock. ADC clock should be between 50KHz and 200KHz and it given as (MCU clock/2^prescaler). Select appropriate prescaler depending on MCU clock. 'adc_ref' selects one of the available reference voltage sources available.
@@ -30,15 +31,34 @@ function AVRADCSetup(prescaler,adc_ref)
 //
 //     This is curretly dummy function. It provides no functionality but is required for providing support for generating C code for AVR.
 //
+=======
+//              0 -> Voltage on VREF pin
+//              1 -> Voltage on AVCC pin
+//              2 -> Internal 2.56 reference voltage       
+//
+// Description
+//     This function initialises ADc of AVR with given parameters. 'prescaler' is 
+//     needed for deciding ADC clock. ADC clock should be between 50KHz and 200KHz
+//     and it given as (MCU clock/2^prescaler). Select appropriate prescaler depending
+//     on MCU clock. 'adc_ref' selects one of the available reference voltage sources
+//     available
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
 // Examples
 //     AVRADCSetup(128,0)
 // See also
 //     AVRReadADC
 //
 // Authors
+<<<<<<< HEAD
 //     Siddhesh Wani 
 //     Ashish Kamble
 //
+=======
+//     Siddhesh Wani Ashish Kamble
+//
+// This is curretly dummy function. It provides no functionality but is required 
+// for providing support for generating C code for AVR.
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
 
 if(prescaler>=8)
 disp("Error : Invalid input argument ''prescaler'' in AVRADCSetup function.");