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

---
 .../scilab-arduino/default_files/sci2c_arduino.ino | 26 ++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 src/c/scilab-arduino/default_files/sci2c_arduino.ino

(limited to 'src/c/scilab-arduino/default_files/sci2c_arduino.ino')

diff --git a/src/c/scilab-arduino/default_files/sci2c_arduino.ino b/src/c/scilab-arduino/default_files/sci2c_arduino.ino
new file mode 100644
index 0000000..1d4465b
--- /dev/null
+++ b/src/c/scilab-arduino/default_files/sci2c_arduino.ino
@@ -0,0 +1,26 @@
+/* Copyright (C) 2016 - 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: Siddhesh Wani
+ Organization: FOSSEE, IIT Bombay
+ Email: toolbox@scilab.in
+*/
+
+#include "Arduino.h"
+#include "loop_arduino.h"
+#include "setup_arduino.h"
+
+void setup()
+{
+    //Please write appropriate setup functions here.
+	setup_arduino();
+}
+
+void loop()
+{
+  loop_arduino();
+}
-- 
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/default_files/sci2c_arduino.ino | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'src/c/scilab-arduino/default_files/sci2c_arduino.ino')

diff --git a/src/c/scilab-arduino/default_files/sci2c_arduino.ino b/src/c/scilab-arduino/default_files/sci2c_arduino.ino
index 5d5d101..df28950 100644
--- a/src/c/scilab-arduino/default_files/sci2c_arduino.ino
+++ b/src/c/scilab-arduino/default_files/sci2c_arduino.ino
@@ -11,13 +11,8 @@
 */
 
 #include "Arduino.h"
-<<<<<<< HEAD
 #include <loop_arduino.h>
 #include <setup_arduino.h>
-=======
-#include "loop_arduino.h"
-#include "setup_arduino.h"
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
 
 void setup()
 {
-- 
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/default_files/sci2c_arduino.ino | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/c/scilab-arduino/default_files/sci2c_arduino.ino')

diff --git a/src/c/scilab-arduino/default_files/sci2c_arduino.ino b/src/c/scilab-arduino/default_files/sci2c_arduino.ino
index df28950..1d4465b 100644
--- a/src/c/scilab-arduino/default_files/sci2c_arduino.ino
+++ b/src/c/scilab-arduino/default_files/sci2c_arduino.ino
@@ -11,8 +11,8 @@
 */
 
 #include "Arduino.h"
-#include <loop_arduino.h>
-#include <setup_arduino.h>
+#include "loop_arduino.h"
+#include "setup_arduino.h"
 
 void setup()
 {
-- 
cgit