Revert "SCi2cDeps updated, Windows compatibility resolved"

1 files changed, 0 insertions, 32 deletions

diff --git a/2.3-1/macros/Hardware/AVR/AVRPWM2Setup.sci b/2.3-1/macros/Hardware/AVR/AVRPWM2Setup.sci
index c76f3f35..11d9b019 100644
--- a/2.3-1/macros/Hardware/AVR/AVRPWM2Setup.sci
+++ b/2.3-1/macros/Hardware/AVR/AVRPWM2Setup.sci
@@ -10,20 +10,16 @@
 
 function AVRPWM2Setup(waveform_mode,output_mode)
 //Function to Setup OC2 pin for required PWM mode
-<<<<<<< HEAD
 //
 //Parameters
 //	waveform_mode: integer, from 0 to 2
 //      output_mode: integer, from 0 to 1 (or 2) depending on the waveform_mode
 //    
-=======
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
 //Description
 //	Every Micro controller has PWM pins which can generate varying voltages
 //	from 0V-5V.This function helps to use OC2 pin to produces required 
 //	output waveform by setting the waveform mode and otput mode.
 //
-<<<<<<< HEAD
 //	waveform_mode can take values-
 //	<itemizedlist>
 //      <listitem><para>0   -> for Phase correct PWM Mode</para></listitem>
@@ -48,29 +44,6 @@ function AVRPWM2Setup(waveform_mode,output_mode)
 // This is curretly dummy function. It provides no functionality but is required 
 // for providing support for generating C code for AVR.
 //
-=======
-//Parameters
-//	waveform_mode:
-//                   0 for Phase correct PWM Mode
-//                   1 for Fast PWM Mode 
-//                   2 for CTC Mode
-//output_mode:
-//      For Phase Correct PWM Mode:
-//                   0 for Clear OC2 on compare match when up-counting. Set OC2 on compare
-//                   match when down-counting.
-//                   1 for Set OC2 on compare match when up-counting. Clear OC2 on compare
-//                   match when down-counting.
-// 
-//      For Fast PWM Mode:
-//                   0 for non-inverted output i.e Clear OC2 on compare match, set OC2 at BOTTOM.
-//                   1 for inverted output i.e Set OC2 on compare match, clear OC2 at BOTTOM.
-//        
-//      For CTC Mode:
-//                   0 to Clear OC2 on compare match
-//                   1 to Set OC2 on compare match
-//                   2 to toggle OC2 on compare match
-//    
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
 //Example
 //    AVRPWM2Setup(2,0);     //This function will select CTC waveform mode and will clear OC2 on    
 //                           compare match 
@@ -80,11 +53,6 @@ function AVRPWM2Setup(waveform_mode,output_mode)
 //Authors
 //     Ashish Kamble
 //
-<<<<<<< HEAD
-=======
-//This is curretly dummy function. It provides no functionality but is required 
-//for providing support for generating C code for AVR.
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
 
 if(waveform_mode>=3) then 
 disp("Error : Invalid input argument ''waveform_mode'' in AVRPWM2Setup function.");