summaryrefslogtreecommitdiff
path: root/macros/Hardware/AVR/AVRDigitalOut.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/AVRDigitalOut.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/AVRDigitalOut.sci')
-rw-r--r--macros/Hardware/AVR/AVRDigitalOut.sci15
1 files changed, 0 insertions, 15 deletions
diff --git a/macros/Hardware/AVR/AVRDigitalOut.sci b/macros/Hardware/AVR/AVRDigitalOut.sci
index a80aff0f..0efc927b 100644
--- a/macros/Hardware/AVR/AVRDigitalOut.sci
+++ b/macros/Hardware/AVR/AVRDigitalOut.sci
@@ -26,7 +26,6 @@ function AVRDigitalOut(port,pin,state)
// digital output. Also, desired output state must be specified as
// 'HIGH' or 'LOW'.
//
-<<<<<<< HEAD
// This is curretly dummy function. It provides no functionality but is required
// for providing support for generating C code for AVR.
//
@@ -39,20 +38,6 @@ function AVRDigitalOut(port,pin,state)
// Siddhesh Wani
// Ashish Kamble
//
-=======
-// Examples
-// AVRDigitalOut('A',0,HIGH)
-//
-// See also
-// AVRDigitalIn
-//
-//
-// 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>=8)) then
disp("Error : Inavalid input argument ''port'' in AVRDigitalOut function.");