summaryrefslogtreecommitdiff
path: root/macros/Hardware/AVR/AVRPWM0Setup.sci
diff options
context:
space:
mode:
Diffstat (limited to 'macros/Hardware/AVR/AVRPWM0Setup.sci')
-rw-r--r--macros/Hardware/AVR/AVRPWM0Setup.sci35
1 files changed, 0 insertions, 35 deletions
diff --git a/macros/Hardware/AVR/AVRPWM0Setup.sci b/macros/Hardware/AVR/AVRPWM0Setup.sci
index 19d91a2a..c391f71e 100644
--- a/macros/Hardware/AVR/AVRPWM0Setup.sci
+++ b/macros/Hardware/AVR/AVRPWM0Setup.sci
@@ -10,20 +10,16 @@
function AVRPWM0Setup(waveform_mode,output_mode)
//Function to Setup OC0 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 OC0 pin to produce 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>
@@ -50,43 +46,12 @@ function AVRPWM0Setup(waveform_mode,output_mode)
//
//Examples
// AVRPWM0Setup(2,0); //This function will select CTC waveform mode and will clear OC0 on compare match
-=======
-//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 OC0 on compare match when up-counting. Set OC0 on compare
-// match when down-counting.
-// 1 for Set OC0 on compare match when up-counting. Clear OC0 on compare
-// match when down-counting.
-//
-// For Fast PWM Mode:
-// 0 for non-inverted output i.e Clear OC0 on compare match, set OC0 at BOTTOM.
-// 1 for inverted output i.e Set OC0 on compare match, clear OC0 at BOTTOM.
-//
-// For CTC Mode:
-// 0 to Clear OC0 on compare match
-// 1 to Set OC0 on compare match
-// 2 to toggle OC0 on compare match
-//
-//Example
-// AVRPWM0Setup(2,0); //This function will select CTC waveform mode and will clear OC0 on
-// compare match
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
//See also
// AVRPWM0SetDuty
//
//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 AVRPWM0Setup function.");