summaryrefslogtreecommitdiff
path: root/2.3-1/macros/Hardware/AVR/AVRPWM0SetDuty.sci
diff options
context:
space:
mode:
Diffstat (limited to '2.3-1/macros/Hardware/AVR/AVRPWM0SetDuty.sci')
-rw-r--r--2.3-1/macros/Hardware/AVR/AVRPWM0SetDuty.sci17
1 files changed, 0 insertions, 17 deletions
diff --git a/2.3-1/macros/Hardware/AVR/AVRPWM0SetDuty.sci b/2.3-1/macros/Hardware/AVR/AVRPWM0SetDuty.sci
index f1faebef..c3815d10 100644
--- a/2.3-1/macros/Hardware/AVR/AVRPWM0SetDuty.sci
+++ b/2.3-1/macros/Hardware/AVR/AVRPWM0SetDuty.sci
@@ -9,7 +9,6 @@
// Email: toolbox@scilab.in
function AVRPWM0SetDuty(duty)
-<<<<<<< HEAD
//Function to Set Duty cycle of PWM Output generated by Timer0 at OC0 pin.
//
//Parameters
@@ -22,17 +21,6 @@ function AVRPWM0SetDuty(duty)
// This is curretly dummy function. It provides no functionality but is required for providing support for generating C code for AVR.
//
//Examples
-=======
-//Function to Set Duty cycle of PWM Output generated by Timer0 at OC0 pin.
-//Parameters
-// duty : It holds an integer value from 0 to 100 which sets the percentage
-// of time for which signal is active.
-//Description
-// Each Micro controller has PWM output pins which can generate varying voltage
-// from 0V-5V.In this function by varying the duty cycle, varying voltage can be
-// produced.
-//Example
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// AVRPWM0SetDuty(50); //Produces 2.5V at OC0 pin
// AVRPWM0SetDuty(0); //Produces 0V at OC0 pin
//See also
@@ -41,11 +29,6 @@ function AVRPWM0SetDuty(duty)
//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(duty>100) then
disp("Error : Invalid input argument ''duty'' in AVRPWM0SetDuty function.");