summaryrefslogtreecommitdiff
path: root/macros/Hardware/AVR/AVRDigitalIn.sci
diff options
context:
space:
mode:
authorBrijeshcr2017-07-08 20:18:17 +0530
committerGitHub2017-07-08 20:18:17 +0530
commitbd03b38be0918837e147e969c6bb2014900009db (patch)
tree2cd9b7b1c15092e1367ed15e81aa71ccc9e05190 /macros/Hardware/AVR/AVRDigitalIn.sci
parent97d1c6847a05bdb93557553a6bdcfd0f15feda99 (diff)
downloadscilab2c-bd03b38be0918837e147e969c6bb2014900009db.tar.gz
scilab2c-bd03b38be0918837e147e969c6bb2014900009db.tar.bz2
scilab2c-bd03b38be0918837e147e969c6bb2014900009db.zip
Revert "SCi2cDeps updated, Windows compatibility resolved"
Diffstat (limited to 'macros/Hardware/AVR/AVRDigitalIn.sci')
-rw-r--r--macros/Hardware/AVR/AVRDigitalIn.sci20
1 files changed, 0 insertions, 20 deletions
diff --git a/macros/Hardware/AVR/AVRDigitalIn.sci b/macros/Hardware/AVR/AVRDigitalIn.sci
index 421a4f63..7addd663 100644
--- a/macros/Hardware/AVR/AVRDigitalIn.sci
+++ b/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.");