summaryrefslogtreecommitdiff
path: root/2.3-1/macros/Hardware/AVR/AVRPWM2SetDuty.sci
diff options
context:
space:
mode:
Diffstat (limited to '2.3-1/macros/Hardware/AVR/AVRPWM2SetDuty.sci')
-rw-r--r--2.3-1/macros/Hardware/AVR/AVRPWM2SetDuty.sci14
1 files changed, 0 insertions, 14 deletions
diff --git a/2.3-1/macros/Hardware/AVR/AVRPWM2SetDuty.sci b/2.3-1/macros/Hardware/AVR/AVRPWM2SetDuty.sci
index 75ae8599..81d1761e 100644
--- a/2.3-1/macros/Hardware/AVR/AVRPWM2SetDuty.sci
+++ b/2.3-1/macros/Hardware/AVR/AVRPWM2SetDuty.sci
@@ -10,26 +10,17 @@
function AVRPWM2SetDuty(duty)
//Function to Set Duty cycle of PWM Output generated by Timer2 at OC2 pin.
-<<<<<<< HEAD
//
//Parameters
// duty : It holds an integer value from 0 to 100 which sets the percentage of time for which signal is active.
//
-=======
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
//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.
//
-<<<<<<< HEAD
// This is curretly dummy function. It provides no functionality but is required
// for providing support for generating C code for AVR.
-=======
-//Parameters
-// duty : It holds an integer value from 0 to 100 which sets the percentage
-// of time for which signal is active.
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
//
//Example
// AVRPWM2SetDuty(50); //Produces 2.5V at OC2 pin
@@ -41,11 +32,6 @@ function AVRPWM2SetDuty(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 AVRPWM2SetDuty function.");