1.Sci2cDeps updated 2.Windows compatibility resolved

1 files changed, 20 insertions, 0 deletions

diff --git a/macros/Hardware/AVR/AVRDigitalIn.sci b/macros/Hardware/AVR/AVRDigitalIn.sci
index 7addd663..421a4f63 100644
--- a/macros/Hardware/AVR/AVRDigitalIn.sci
+++ b/macros/Hardware/AVR/AVRDigitalIn.sci
@@ -18,6 +18,11 @@ function state = AVRDigitalIn(port,pin)
 // Parameters
 //     port : port of microcontroller to be used
 //     pin : pin of port (mentioned above) to be used
+<<<<<<< HEAD
+=======
+//   Returns  
+//     state : state of an input pin (HIGH\LOW)
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
 //
 // Description
 //     Each AVR microcontroller has pins which can be configured as digital
@@ -25,6 +30,7 @@ function state = AVRDigitalIn(port,pin)
 //     User has to select one of these port and which pin of that port as 
 //     digital input.      
 //
+<<<<<<< HEAD
 // This is curretly dummy function. It provides no functionality but is required 
 // for providing support for generating C code for AVR.
 //
@@ -37,6 +43,20 @@ function state = AVRDigitalIn(port,pin)
 //     Siddhesh Wani
 //     Ashish Kamble
 //
+=======
+// Examples
+//     pinA0 = AVRDigitalIn(1,0)   //To read state on pin 0 of port A
+//
+// See also
+//     AVRDigitalOut AVRDigitalSetup
+//
+//
+// Authors
+//     Siddhesh Wani Ashish Kamble
+//
+// This is curretly dummy function. It provides no functionality but is required 
+// for providing support for generating C code for AVR.
+>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
 
 if((port==0)|(port>=5)) then 
 disp("Error : Inavalid input argument ''port'' in AVRDigitalIn function.");