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

---
 macros/Scilab-Arduino/GetArduinoSetupFunctions.sci | 31 ++++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 macros/Scilab-Arduino/GetArduinoSetupFunctions.sci

(limited to 'macros/Scilab-Arduino/GetArduinoSetupFunctions.sci')

diff --git a/macros/Scilab-Arduino/GetArduinoSetupFunctions.sci b/macros/Scilab-Arduino/GetArduinoSetupFunctions.sci
new file mode 100644
index 0000000..78bda03
--- /dev/null
+++ b/macros/Scilab-Arduino/GetArduinoSetupFunctions.sci
@@ -0,0 +1,31 @@
+// 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
+// Organization: FOSSEE, IIT Bombay
+// Email: toolbox@scilab.in
+
+function ArduinoSetupFunctions = GetArduinoSetupFunctions()
+// -----------------------------------------------------------------
+// Get list of Arduino setup functions supported 
+//
+// Input data:
+//    None
+//
+// Output data:
+//    List of Arduino setup functions supported
+//
+// Author: Siddhesh Wani  
+// -----------------------------------------------------------------
+
+ArduinoSetupFunctions = [
+	             "cmd_dcmotor_setup"
+                     "cmd_servo_attach"
+                     "cmd_servo_detach"
+		     "cmd_i2c_dev"];
+
+
+endfunction
-- 
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"

---
 macros/Scilab-Arduino/GetArduinoSetupFunctions.sci | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'macros/Scilab-Arduino/GetArduinoSetupFunctions.sci')

diff --git a/macros/Scilab-Arduino/GetArduinoSetupFunctions.sci b/macros/Scilab-Arduino/GetArduinoSetupFunctions.sci
index f5c64bc..d310648 100644
--- a/macros/Scilab-Arduino/GetArduinoSetupFunctions.sci
+++ b/macros/Scilab-Arduino/GetArduinoSetupFunctions.sci
@@ -25,11 +25,7 @@ ArduinoSetupFunctions = [
 	             "cmd_dcmotor_setup"
                      "cmd_servo_attach"
                      "cmd_servo_detach"
-<<<<<<< HEAD
 		     "i2c_dev"];
-=======
-		     "cmd_i2c_dev"];
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
 
 
 endfunction
-- 
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

---
 macros/Scilab-Arduino/GetArduinoSetupFunctions.sci | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'macros/Scilab-Arduino/GetArduinoSetupFunctions.sci')

diff --git a/macros/Scilab-Arduino/GetArduinoSetupFunctions.sci b/macros/Scilab-Arduino/GetArduinoSetupFunctions.sci
index d310648..78bda03 100644
--- a/macros/Scilab-Arduino/GetArduinoSetupFunctions.sci
+++ b/macros/Scilab-Arduino/GetArduinoSetupFunctions.sci
@@ -25,7 +25,7 @@ ArduinoSetupFunctions = [
 	             "cmd_dcmotor_setup"
                      "cmd_servo_attach"
                      "cmd_servo_detach"
-		     "i2c_dev"];
+		     "cmd_i2c_dev"];
 
 
 endfunction
-- 
cgit