summaryrefslogtreecommitdiff
path: root/2.3-1/macros/Hardware/AVR/AVRSleep.sci
diff options
context:
space:
mode:
Diffstat (limited to '2.3-1/macros/Hardware/AVR/AVRSleep.sci')
-rw-r--r--2.3-1/macros/Hardware/AVR/AVRSleep.sci21
1 files changed, 21 insertions, 0 deletions
diff --git a/2.3-1/macros/Hardware/AVR/AVRSleep.sci b/2.3-1/macros/Hardware/AVR/AVRSleep.sci
index a1b6add2..005fe4ed 100644
--- a/2.3-1/macros/Hardware/AVR/AVRSleep.sci
+++ b/2.3-1/macros/Hardware/AVR/AVRSleep.sci
@@ -1,4 +1,25 @@
function AVRSleep(delay)
+<<<<<<< HEAD
+// Function to pause the execution for the given time.
+//
+// Parameter
+// delay : The time, in milliseconds, for which the execution is to be paused
+//
+// Description
+// This function causes the execution to stop for the given amount of time.
+//
+// This is curretly dummy function. It provides no functionality but is required
+// for providing support for generating C code for AVR.
+//
+//Examples
+// AVRSleep(5000);
+//See also
+//
+// Authors
+// Jorawar Singh
+//
+=======
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
endfunction