diff options
| author | yash1112 | 2017-07-07 22:03:16 +0530 |
|---|---|---|
| committer | yash1112 | 2017-07-07 22:03:16 +0530 |
| commit | 69c573fe2e59236f063aaa94dcd44b556f945cbc (patch) | |
| tree | 08fa381bec620e38c7a3d2a34448d30160d861eb /src/c/scilab-arduino/cmd_i2c_read | |
| parent | 87823db220f4c3b8bee16c0b2e08027704de1efe (diff) | |
| parent | 3f52712f806fbd80d66dfdcaff401e5cf94dcca4 (diff) | |
| download | scilab2c-69c573fe2e59236f063aaa94dcd44b556f945cbc.tar.gz scilab2c-69c573fe2e59236f063aaa94dcd44b556f945cbc.tar.bz2 scilab2c-69c573fe2e59236f063aaa94dcd44b556f945cbc.zip | |
Scilab2C Arduino Updated
Diffstat (limited to 'src/c/scilab-arduino/cmd_i2c_read')
| -rw-r--r-- | src/c/scilab-arduino/cmd_i2c_read/u8cmd_i2c_reads.cpp | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/src/c/scilab-arduino/cmd_i2c_read/u8cmd_i2c_reads.cpp b/src/c/scilab-arduino/cmd_i2c_read/u8cmd_i2c_reads.cpp index 8f02a87e..78ef0ce1 100644 --- a/src/c/scilab-arduino/cmd_i2c_read/u8cmd_i2c_reads.cpp +++ b/src/c/scilab-arduino/cmd_i2c_read/u8cmd_i2c_reads.cpp @@ -1,3 +1,20 @@ +<<<<<<< HEAD +======= +/* Copyright (C) 2017 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Yash Pratap Singh Tomar + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ + + +//This function reads data from I2C bus. +>>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 #include "cmd_i2c_read.h" #include "Arduino.h" #include "Wire.h" |