summaryrefslogtreecommitdiff
path: root/2.3-1/macros/Hardware/AVR/AVRDigitalIn.sci
diff options
context:
space:
mode:
Diffstat (limited to '2.3-1/macros/Hardware/AVR/AVRDigitalIn.sci')
-rw-r--r--2.3-1/macros/Hardware/AVR/AVRDigitalIn.sci20
1 files changed, 0 insertions, 20 deletions
diff --git a/2.3-1/macros/Hardware/AVR/AVRDigitalIn.sci b/2.3-1/macros/Hardware/AVR/AVRDigitalIn.sci
index 421a4f63..7addd663 100644
--- a/2.3-1/macros/Hardware/AVR/AVRDigitalIn.sci
+++ b/2.3-1/macros/Hardware/AVR/AVRDigitalIn.sci
@@ -18,11 +18,6 @@ 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
@@ -30,7 +25,6 @@ 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.
//
@@ -43,20 +37,6 @@ 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.");