From 3f52712f806fbd80d66dfdcaff401e5cf94dcca4 Mon Sep 17 00:00:00 2001
From: yash1112
Date: Fri, 7 Jul 2017 21:20:49 +0530
Subject: sci2c arduino updated

---
 src/c/scilab-arduino/includes/cmd_i2c_write.h | 28 +++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 src/c/scilab-arduino/includes/cmd_i2c_write.h

(limited to 'src/c/scilab-arduino/includes/cmd_i2c_write.h')

diff --git a/src/c/scilab-arduino/includes/cmd_i2c_write.h b/src/c/scilab-arduino/includes/cmd_i2c_write.h
new file mode 100644
index 0000000..128f1af
--- /dev/null
+++ b/src/c/scilab-arduino/includes/cmd_i2c_write.h
@@ -0,0 +1,28 @@
+/* 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
+*/
+
+#ifndef __CMD_I2C_WRITE_H__
+#define __CMD_I2C_WRITE_H__
+ 
+#include "types.h"
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
+	
+void u8cmd_i2c_writes(uint8 address, uint8 data);
+
+#ifdef  __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /* __CMD_I2C_WRITE_H__ */
-- 
cgit 


From bd03b38be0918837e147e969c6bb2014900009db Mon Sep 17 00:00:00 2001
From: Brijeshcr
Date: Sat, 8 Jul 2017 20:18:17 +0530
Subject: Revert "SCi2cDeps updated, Windows compatibility resolved"

---
 src/c/scilab-arduino/includes/cmd_i2c_write.h | 15 ---------------
 1 file changed, 15 deletions(-)

(limited to 'src/c/scilab-arduino/includes/cmd_i2c_write.h')

diff --git a/src/c/scilab-arduino/includes/cmd_i2c_write.h b/src/c/scilab-arduino/includes/cmd_i2c_write.h
index 58667c7..6a57222 100644
--- a/src/c/scilab-arduino/includes/cmd_i2c_write.h
+++ b/src/c/scilab-arduino/includes/cmd_i2c_write.h
@@ -1,18 +1,3 @@
-<<<<<<< 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
-*/
-
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
 #ifndef __CMD_I2C_WRITE_H__
 #define __CMD_I2C_WRITE_H__
  
-- 
cgit 


From 49d8281d2da2f4c6bf0e62d148a8a7328d3bf970 Mon Sep 17 00:00:00 2001
From: yash1112
Date: Mon, 10 Jul 2017 17:08:48 +0530
Subject: Arduino toolbox error Resolved

---
 src/c/scilab-arduino/includes/cmd_i2c_write.h | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'src/c/scilab-arduino/includes/cmd_i2c_write.h')

diff --git a/src/c/scilab-arduino/includes/cmd_i2c_write.h b/src/c/scilab-arduino/includes/cmd_i2c_write.h
index 6a57222..128f1af 100644
--- a/src/c/scilab-arduino/includes/cmd_i2c_write.h
+++ b/src/c/scilab-arduino/includes/cmd_i2c_write.h
@@ -1,3 +1,15 @@
+/* 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
+*/
+
 #ifndef __CMD_I2C_WRITE_H__
 #define __CMD_I2C_WRITE_H__
  
-- 
cgit