diff options
Diffstat (limited to '2.3-1/macros/Hardware/AVR/AVRUARTReceive.sci')
| -rw-r--r-- | 2.3-1/macros/Hardware/AVR/AVRUARTReceive.sci | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/2.3-1/macros/Hardware/AVR/AVRUARTReceive.sci b/2.3-1/macros/Hardware/AVR/AVRUARTReceive.sci index 7fdf6f05..f7502e23 100644 --- a/2.3-1/macros/Hardware/AVR/AVRUARTReceive.sci +++ b/2.3-1/macros/Hardware/AVR/AVRUARTReceive.sci @@ -10,16 +10,25 @@ function received = AVRUARTReceive() // Function to Receive Char value send to ATmega16 using UART or USART. +<<<<<<< HEAD // +======= +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // Description // This function Receives Char as 8 bit value.This value is stored in UDR at receiving // end. // +<<<<<<< HEAD // This is curretly dummy function. It provides no functionality but is required // for providing support for generating C code for AVR. // //Examples // state = AVRUARTReceive(); //This function will Receive char and return the entire value +======= +//Examples +// state = AVRUARTReceive(); //This function will Receive char and return the entire value +// +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 //See also // AVRUARTSetup // AVRUARTTransmit @@ -27,5 +36,10 @@ function received = AVRUARTReceive() // Authors // Ashish Kamble // +<<<<<<< HEAD +======= +// This is curretly dummy function. It provides no functionality but is required +// for providing support for generating C code for AVR. +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 received = 0; // received has been initialised to avoid runtime error. endfunction |