From 6a320264c2de3d6dd8cc1d1327b3c30df4c8cb26 Mon Sep 17 00:00:00 2001
From: Siddhesh Wani
Date: Mon, 25 May 2015 14:46:31 +0530
Subject: Original Version

---
 2.3-1/macros/scilab2c.sci | 135 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 135 insertions(+)
 create mode 100644 2.3-1/macros/scilab2c.sci

(limited to '2.3-1/macros/scilab2c.sci')

diff --git a/2.3-1/macros/scilab2c.sci b/2.3-1/macros/scilab2c.sci
new file mode 100644
index 00000000..d922e0b1
--- /dev/null
+++ b/2.3-1/macros/scilab2c.sci
@@ -0,0 +1,135 @@
+//
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2009-2010 - DIGITEO - Bruno JOFRET
+//
+// 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
+//
+//
+
+function scilab2c(varargin)
+  [lhs, rhs] = argn();
+
+  select rhs
+//
+// scilab2c()
+//
+   case 0
+    sci2c_gui();
+    return
+//
+// scilab2c(UserScilabMainFile, CCodeOutputDir)
+//
+   case 2
+    for i = 1:2
+      if typeof(varargin(i)) <> "string"
+		error(msprintf(gettext("%s: Wrong type for input argument #%d: String expected.\n"),"scilab2c",i));
+		return
+      end
+    end
+    UserScilabMainFile = varargin(1);
+    CCodeOutputDir = varargin(2);
+    UserSciFilesPaths = [];
+    RunMode = 'All';
+	BuildTool = getNativeBuildTool();
+    //
+// scilab2c(UserScilabMainFile, CCodeOutputDir, UserSciFilesPaths)
+//
+   case 3
+    for i = 1:3
+      if typeof(varargin(i)) <> "string"
+		error(msprintf(gettext("%s: Wrong type for input argument #%d: String expected.\n"),"scilab2c",i));
+		return
+      end
+    end
+    UserScilabMainFile = varargin(1);
+    CCodeOutputDir = varargin(2);
+    if varargin(3) == ""
+      UserSciFilesPaths = [];
+    else
+      UserSciFilesPaths = varargin(3);
+    end
+    RunMode = "All";
+	BuildTool = getNativeBuildTool();
+	//
+// scilab2c(UserScilabMainFile, CCodeOutputDir, UserSciFilesPaths, RunMode)
+//
+   case 4
+    for i = 1:4
+      if typeof(varargin(i)) <> "string"
+		error(msprintf(gettext("%s: Wrong type for input argument #%d: String expected.\n"),"scilab2c",i));
+		return
+      end
+    end
+    if varargin(4) <> "All" & varargin(4) <> "Translate" & varargin(4) <> "GenLibraryStructure"
+	  error(msprintf(gettext("%s: argument #%d must be: ""All"", ""Translate"" or ""GenLibraryStructure"".\n"),"scilab2c",4));
+      return
+    end
+    UserScilabMainFile = varargin(1);
+    CCodeOutputDir = varargin(2);
+    if varargin(3) == ""
+      UserSciFilesPaths = [];
+    else
+      UserSciFilesPaths = varargin(3);
+    end
+    RunMode = varargin(4);
+	BuildTool = getNativeBuildTool();
+   case 5
+	for i = 1:4
+      if typeof(varargin(i)) <> "string"
+		error(msprintf(gettext("%s: Wrong type for input argument #%d: String expected.\n"),"scilab2c",i));
+		return
+      end
+    end
+    if varargin(4) <> "All" & varargin(4) <> "Translate" & varargin(4) <> "GenLibraryStructure"
+	  error(msprintf(gettext("%s: argument #%d must be: ""All"", ""Translate"" or ""GenLibraryStructure"".\n"),"scilab2c",4));
+      return
+    end
+	if varargin(5) <> "make" & varargin(5) <> "nmake"
+	  error(msprintf(gettext("%s: argument #%d must be: ""make"" or ""nmake"".\n"),"scilab2c",5));
+      return
+    end
+	UserScilabMainFile = varargin(1);
+    CCodeOutputDir = varargin(2);
+    if varargin(3) == ""
+      UserSciFilesPaths = [];
+    else
+      UserSciFilesPaths = varargin(3);
+    end
+    RunMode = varargin(4);
+	BuildTool = varargin(5);
+  else
+//
+// Calling scilab2c with more than understood values
+//
+error(msprintf(gettext("%s: Wrong number of input argument(s): %d expected.\n"),"scilab2c",2));
+  end
+
+
+// --- LAUNCH USER SCI CODE TO TEST IT BEFORE TRANSLATING IT!!! ---
+  runscicode(UserScilabMainFile, UserSciFilesPaths);
+// --- ASK USER FOR CONTINUATION. ---
+
+  // Do not open confirmation box if we are not in STD mode.
+  if(getscilabmode() == "STD")
+    userchoice = messagebox("Exection Succesfull. Start translation ?", "modal", "info", ["Yes" "No"])
+  else
+    userchoice = 1
+  end
+  if (userchoice == 1)
+// --- LAUNCH SCI2C ---
+	runsci2c(UserScilabMainFile, UserSciFilesPaths, CCodeOutputDir, RunMode, BuildTool);
+  end
+
+endfunction
+
+function BuildTool = getNativeBuildTool()
+  if getos() == "Windows"
+	BuildTool = "nmake"
+  else
+	BuildTool = "make"
+  end
+endfunction
\ No newline at end of file
-- 
cgit 


From 3704cdf7eb9551353ac9175aa10be444755b8e22 Mon Sep 17 00:00:00 2001
From: siddhu8990
Date: Thu, 3 Sep 2015 02:06:47 +0530
Subject: Intermediate commit. Not to be used

---
 2.3-1/macros/scilab2c.sci | 43 +++++++++++++++++++++++++++++++++++++------
 1 file changed, 37 insertions(+), 6 deletions(-)

(limited to '2.3-1/macros/scilab2c.sci')

diff --git a/2.3-1/macros/scilab2c.sci b/2.3-1/macros/scilab2c.sci
index d922e0b1..82b64da3 100644
--- a/2.3-1/macros/scilab2c.sci
+++ b/2.3-1/macros/scilab2c.sci
@@ -34,7 +34,8 @@ function scilab2c(varargin)
     CCodeOutputDir = varargin(2);
     UserSciFilesPaths = [];
     RunMode = 'All';
-	BuildTool = getNativeBuildTool();
+    BuildTool = getNativeBuildTool();
+    OutputFormat = 'StandAlone';
     //
 // scilab2c(UserScilabMainFile, CCodeOutputDir, UserSciFilesPaths)
 //
@@ -53,7 +54,8 @@ function scilab2c(varargin)
       UserSciFilesPaths = varargin(3);
     end
     RunMode = "All";
-	BuildTool = getNativeBuildTool();
+    BuildTool = getNativeBuildTool();
+    OutputFormat = 'StandAlone';
 	//
 // scilab2c(UserScilabMainFile, CCodeOutputDir, UserSciFilesPaths, RunMode)
 //
@@ -76,7 +78,9 @@ function scilab2c(varargin)
       UserSciFilesPaths = varargin(3);
     end
     RunMode = varargin(4);
-	BuildTool = getNativeBuildTool();
+    BuildTool = getNativeBuildTool();
+    OutputFormat = 'StandAlone';
+
    case 5
 	for i = 1:4
       if typeof(varargin(i)) <> "string"
@@ -100,7 +104,34 @@ function scilab2c(varargin)
       UserSciFilesPaths = varargin(3);
     end
     RunMode = varargin(4);
-	BuildTool = varargin(5);
+    BuildTool = varargin(5);
+    OutputFormat = 'StandAlone';
+
+   case 6
+	for i = 1:4
+      if typeof(varargin(i)) <> "string"
+		error(msprintf(gettext("%s: Wrong type for input argument #%d: String expected.\n"),"scilab2c",i));
+		return
+      end
+    end
+    if varargin(4) <> "All" & varargin(4) <> "Translate" & varargin(4) <> "GenLibraryStructure"
+	  error(msprintf(gettext("%s: argument #%d must be: ""All"", ""Translate"" or ""GenLibraryStructure"".\n"),"scilab2c",4));
+      return
+    end
+	if varargin(5) <> "make" & varargin(5) <> "nmake"
+	  error(msprintf(gettext("%s: argument #%d must be: ""make"" or ""nmake"".\n"),"scilab2c",5));
+      return
+    end
+	UserScilabMainFile = varargin(1);
+    CCodeOutputDir = varargin(2);
+    if varargin(3) == ""
+      UserSciFilesPaths = [];
+    else
+      UserSciFilesPaths = varargin(3);
+    end
+    RunMode = varargin(4);
+    BuildTool = varargin(5);
+    OutputFormat = varargin(6);
   else
 //
 // Calling scilab2c with more than understood values
@@ -121,7 +152,7 @@ error(msprintf(gettext("%s: Wrong number of input argument(s): %d expected.\n"),
   end
   if (userchoice == 1)
 // --- LAUNCH SCI2C ---
-	runsci2c(UserScilabMainFile, UserSciFilesPaths, CCodeOutputDir, RunMode, BuildTool);
+	runsci2c(UserScilabMainFile, UserSciFilesPaths, CCodeOutputDir, RunMode, BuildTool, OutputFormat);
   end
 
 endfunction
@@ -132,4 +163,4 @@ function BuildTool = getNativeBuildTool()
   else
 	BuildTool = "make"
   end
-endfunction
\ No newline at end of file
+endfunction
-- 
cgit 


From d9d5e15f5b836cecaebe68f823318ed6637554b4 Mon Sep 17 00:00:00 2001
From: siddhu8990
Date: Mon, 7 Sep 2015 22:28:38 +0530
Subject: Gui restored to working state

---
 2.3-1/macros/scilab2c.sci | 43 ++++++-------------------------------------
 1 file changed, 6 insertions(+), 37 deletions(-)

(limited to '2.3-1/macros/scilab2c.sci')

diff --git a/2.3-1/macros/scilab2c.sci b/2.3-1/macros/scilab2c.sci
index 82b64da3..d922e0b1 100644
--- a/2.3-1/macros/scilab2c.sci
+++ b/2.3-1/macros/scilab2c.sci
@@ -34,8 +34,7 @@ function scilab2c(varargin)
     CCodeOutputDir = varargin(2);
     UserSciFilesPaths = [];
     RunMode = 'All';
-    BuildTool = getNativeBuildTool();
-    OutputFormat = 'StandAlone';
+	BuildTool = getNativeBuildTool();
     //
 // scilab2c(UserScilabMainFile, CCodeOutputDir, UserSciFilesPaths)
 //
@@ -54,8 +53,7 @@ function scilab2c(varargin)
       UserSciFilesPaths = varargin(3);
     end
     RunMode = "All";
-    BuildTool = getNativeBuildTool();
-    OutputFormat = 'StandAlone';
+	BuildTool = getNativeBuildTool();
 	//
 // scilab2c(UserScilabMainFile, CCodeOutputDir, UserSciFilesPaths, RunMode)
 //
@@ -78,9 +76,7 @@ function scilab2c(varargin)
       UserSciFilesPaths = varargin(3);
     end
     RunMode = varargin(4);
-    BuildTool = getNativeBuildTool();
-    OutputFormat = 'StandAlone';
-
+	BuildTool = getNativeBuildTool();
    case 5
 	for i = 1:4
       if typeof(varargin(i)) <> "string"
@@ -104,34 +100,7 @@ function scilab2c(varargin)
       UserSciFilesPaths = varargin(3);
     end
     RunMode = varargin(4);
-    BuildTool = varargin(5);
-    OutputFormat = 'StandAlone';
-
-   case 6
-	for i = 1:4
-      if typeof(varargin(i)) <> "string"
-		error(msprintf(gettext("%s: Wrong type for input argument #%d: String expected.\n"),"scilab2c",i));
-		return
-      end
-    end
-    if varargin(4) <> "All" & varargin(4) <> "Translate" & varargin(4) <> "GenLibraryStructure"
-	  error(msprintf(gettext("%s: argument #%d must be: ""All"", ""Translate"" or ""GenLibraryStructure"".\n"),"scilab2c",4));
-      return
-    end
-	if varargin(5) <> "make" & varargin(5) <> "nmake"
-	  error(msprintf(gettext("%s: argument #%d must be: ""make"" or ""nmake"".\n"),"scilab2c",5));
-      return
-    end
-	UserScilabMainFile = varargin(1);
-    CCodeOutputDir = varargin(2);
-    if varargin(3) == ""
-      UserSciFilesPaths = [];
-    else
-      UserSciFilesPaths = varargin(3);
-    end
-    RunMode = varargin(4);
-    BuildTool = varargin(5);
-    OutputFormat = varargin(6);
+	BuildTool = varargin(5);
   else
 //
 // Calling scilab2c with more than understood values
@@ -152,7 +121,7 @@ error(msprintf(gettext("%s: Wrong number of input argument(s): %d expected.\n"),
   end
   if (userchoice == 1)
 // --- LAUNCH SCI2C ---
-	runsci2c(UserScilabMainFile, UserSciFilesPaths, CCodeOutputDir, RunMode, BuildTool, OutputFormat);
+	runsci2c(UserScilabMainFile, UserSciFilesPaths, CCodeOutputDir, RunMode, BuildTool);
   end
 
 endfunction
@@ -163,4 +132,4 @@ function BuildTool = getNativeBuildTool()
   else
 	BuildTool = "make"
   end
-endfunction
+endfunction
\ No newline at end of file
-- 
cgit 


From ed0947602f9b92489be97219e36eb284804dab0a Mon Sep 17 00:00:00 2001
From: siddhu8990
Date: Fri, 11 Sep 2015 02:28:56 +0530
Subject: Changes made for making directory 'arduino' in output folder'

---
 2.3-1/macros/scilab2c.sci | 45 +++++++++++++++++++++++++++++++++++++++------
 1 file changed, 39 insertions(+), 6 deletions(-)

(limited to '2.3-1/macros/scilab2c.sci')

diff --git a/2.3-1/macros/scilab2c.sci b/2.3-1/macros/scilab2c.sci
index d922e0b1..25fc06ac 100644
--- a/2.3-1/macros/scilab2c.sci
+++ b/2.3-1/macros/scilab2c.sci
@@ -34,7 +34,8 @@ function scilab2c(varargin)
     CCodeOutputDir = varargin(2);
     UserSciFilesPaths = [];
     RunMode = 'All';
-	BuildTool = getNativeBuildTool();
+    BuildTool = getNativeBuildTool();
+    OutFormat = "StandAlone"
     //
 // scilab2c(UserScilabMainFile, CCodeOutputDir, UserSciFilesPaths)
 //
@@ -53,7 +54,8 @@ function scilab2c(varargin)
       UserSciFilesPaths = varargin(3);
     end
     RunMode = "All";
-	BuildTool = getNativeBuildTool();
+    BuildTool = getNativeBuildTool();
+    OutFormat = "StandAlone"
 	//
 // scilab2c(UserScilabMainFile, CCodeOutputDir, UserSciFilesPaths, RunMode)
 //
@@ -76,7 +78,8 @@ function scilab2c(varargin)
       UserSciFilesPaths = varargin(3);
     end
     RunMode = varargin(4);
-	BuildTool = getNativeBuildTool();
+    BuildTool = getNativeBuildTool();
+    OutFormat = "StandAlone"
    case 5
 	for i = 1:4
       if typeof(varargin(i)) <> "string"
@@ -100,7 +103,37 @@ function scilab2c(varargin)
       UserSciFilesPaths = varargin(3);
     end
     RunMode = varargin(4);
-	BuildTool = varargin(5);
+    BuildTool = varargin(5);
+    OutFormat = "StandAlone"
+   case 6
+      for i = 1:4
+      if typeof(varargin(i)) <> "string"
+		error(msprintf(gettext("%s: Wrong type for input argument #%d: String expected.\n"),"scilab2c",i));
+		return
+      end
+    end
+    if varargin(4) <> "All" & varargin(4) <> "Translate" & varargin(4) <> "GenLibraryStructure"
+	  error(msprintf(gettext("%s: argument #%d must be: ""All"", ""Translate"" or ""GenLibraryStructure"".\n"),"scilab2c",4));
+      return
+    end
+    if varargin(5) <> "make" & varargin(5) <> "nmake"
+	  error(msprintf(gettext("%s: argument #%d must be: ""make"" or ""nmake"".\n"),"scilab2c",5));
+      return
+    end
+    if varargin(6) <> "StandAlone" & varargin(6) <> "Arduino"
+	  error(msprintf(gettext("%s: argument #%d must be: ""StandAlone"" or ""Arduino"".\n"),"scilab2c",5));
+      return
+    end
+    UserScilabMainFile = varargin(1);
+    CCodeOutputDir = varargin(2);
+    if varargin(3) == ""
+      UserSciFilesPaths = [];
+    else
+      UserSciFilesPaths = varargin(3);
+    end
+    RunMode = varargin(4);
+    BuildTool = varargin(5);
+    OutFormat = varargin(6);
   else
 //
 // Calling scilab2c with more than understood values
@@ -121,7 +154,7 @@ error(msprintf(gettext("%s: Wrong number of input argument(s): %d expected.\n"),
   end
   if (userchoice == 1)
 // --- LAUNCH SCI2C ---
-	runsci2c(UserScilabMainFile, UserSciFilesPaths, CCodeOutputDir, RunMode, BuildTool);
+	runsci2c(UserScilabMainFile, UserSciFilesPaths, CCodeOutputDir, RunMode, BuildTool,OutFormat);
   end
 
 endfunction
@@ -132,4 +165,4 @@ function BuildTool = getNativeBuildTool()
   else
 	BuildTool = "make"
   end
-endfunction
\ No newline at end of file
+endfunction
-- 
cgit 


From 3bcc8ce62560f36eaaab0e064b169b0118f354f3 Mon Sep 17 00:00:00 2001
From: siddhu8990
Date: Mon, 28 Sep 2015 14:10:44 +0530
Subject: Extension compatible with both - standalone and Arduino outputs.

---
 2.3-1/macros/scilab2c.sci | 2 ++
 1 file changed, 2 insertions(+)

(limited to '2.3-1/macros/scilab2c.sci')

diff --git a/2.3-1/macros/scilab2c.sci b/2.3-1/macros/scilab2c.sci
index 25fc06ac..1d4675e3 100644
--- a/2.3-1/macros/scilab2c.sci
+++ b/2.3-1/macros/scilab2c.sci
@@ -143,7 +143,9 @@ error(msprintf(gettext("%s: Wrong number of input argument(s): %d expected.\n"),
 
 
 // --- LAUNCH USER SCI CODE TO TEST IT BEFORE TRANSLATING IT!!! ---
+  if OutFormat == "StandAlone"
   runscicode(UserScilabMainFile, UserSciFilesPaths);
+  end
 // --- ASK USER FOR CONTINUATION. ---
 
   // Do not open confirmation box if we are not in STD mode.
-- 
cgit 


From 128638e88ce6d8414c9e1061faa96008be9bcda5 Mon Sep 17 00:00:00 2001
From: siddhu8990
Date: Sat, 28 Nov 2015 11:01:40 +0530
Subject: Intermediate commit aith support added for AVR (GPIO,ADC). Does not
 support other targets.

---
 2.3-1/macros/scilab2c.sci | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to '2.3-1/macros/scilab2c.sci')

diff --git a/2.3-1/macros/scilab2c.sci b/2.3-1/macros/scilab2c.sci
index 1d4675e3..64d5753f 100644
--- a/2.3-1/macros/scilab2c.sci
+++ b/2.3-1/macros/scilab2c.sci
@@ -143,9 +143,9 @@ error(msprintf(gettext("%s: Wrong number of input argument(s): %d expected.\n"),
 
 
 // --- LAUNCH USER SCI CODE TO TEST IT BEFORE TRANSLATING IT!!! ---
-  if OutFormat == "StandAlone"
-  runscicode(UserScilabMainFile, UserSciFilesPaths);
-  end
+//  if OutFormat == "StandAlone"
+//  runscicode(UserScilabMainFile, UserSciFilesPaths);
+//  end
 // --- ASK USER FOR CONTINUATION. ---
 
   // Do not open confirmation box if we are not in STD mode.
@@ -156,7 +156,7 @@ error(msprintf(gettext("%s: Wrong number of input argument(s): %d expected.\n"),
   end
   if (userchoice == 1)
 // --- LAUNCH SCI2C ---
-	runsci2c(UserScilabMainFile, UserSciFilesPaths, CCodeOutputDir, RunMode, BuildTool,OutFormat);
+	runsci2c(UserScilabMainFile, UserSciFilesPaths, CCodeOutputDir, RunMode, BuildTool,'AVR');
   end
 
 endfunction
-- 
cgit 


From 87e2de9869a72ab2058f4b3ca60d5a6e6d8d6035 Mon Sep 17 00:00:00 2001
From: siddhu8990
Date: Tue, 8 Dec 2015 11:43:14 +0530
Subject: Modified so that code for all three output formats can be generated

---
 2.3-1/macros/scilab2c.sci | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

(limited to '2.3-1/macros/scilab2c.sci')

diff --git a/2.3-1/macros/scilab2c.sci b/2.3-1/macros/scilab2c.sci
index 64d5753f..3eab16ee 100644
--- a/2.3-1/macros/scilab2c.sci
+++ b/2.3-1/macros/scilab2c.sci
@@ -120,8 +120,8 @@ function scilab2c(varargin)
 	  error(msprintf(gettext("%s: argument #%d must be: ""make"" or ""nmake"".\n"),"scilab2c",5));
       return
     end
-    if varargin(6) <> "StandAlone" & varargin(6) <> "Arduino"
-	  error(msprintf(gettext("%s: argument #%d must be: ""StandAlone"" or ""Arduino"".\n"),"scilab2c",5));
+    if varargin(6) <> "StandAlone" & varargin(6) <> "Arduino" & varargin(6) <> "AVR"
+	  error(msprintf(gettext("%s: argument #%d must be: ""StandAlone"" or ""Arduino"" or ""AVR"".\n"),"scilab2c",5));
       return
     end
     UserScilabMainFile = varargin(1);
@@ -143,20 +143,24 @@ error(msprintf(gettext("%s: Wrong number of input argument(s): %d expected.\n"),
 
 
 // --- LAUNCH USER SCI CODE TO TEST IT BEFORE TRANSLATING IT!!! ---
-//  if OutFormat == "StandAlone"
-//  runscicode(UserScilabMainFile, UserSciFilesPaths);
-//  end
-// --- ASK USER FOR CONTINUATION. ---
+// If OutFormat choosen is 'Standalone' then only execute the code, otherwise directly start conversion.  
+  if OutFormat == "StandAlone"
+  runscicode(UserScilabMainFile, UserSciFilesPaths);
+  
+ // --- ASK USER FOR CONTINUATION. ---
 
   // Do not open confirmation box if we are not in STD mode.
-  if(getscilabmode() == "STD")
-    userchoice = messagebox("Exection Succesfull. Start translation ?", "modal", "info", ["Yes" "No"])
+	  if(getscilabmode() == "STD")
+		userchoice = messagebox("Exection Succesfull. Start translation ?", "modal", "info", ["Yes" "No"])
+	  else
+		userchoice = 1
+	  end
   else
-    userchoice = 1
+	userchoice = 1;
   end
   if (userchoice == 1)
 // --- LAUNCH SCI2C ---
-	runsci2c(UserScilabMainFile, UserSciFilesPaths, CCodeOutputDir, RunMode, BuildTool,'AVR');
+	runsci2c(UserScilabMainFile, UserSciFilesPaths, CCodeOutputDir, RunMode, BuildTool,OutFormat);
   end
 
 endfunction
-- 
cgit 


From 3425c4fedbdbc7e1a3440df7502d9af93f466b84 Mon Sep 17 00:00:00 2001
From: siddhu8990
Date: Mon, 1 Feb 2016 11:05:35 +0530
Subject: Support for RPi gpios added

---
 2.3-1/macros/scilab2c.sci | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to '2.3-1/macros/scilab2c.sci')

diff --git a/2.3-1/macros/scilab2c.sci b/2.3-1/macros/scilab2c.sci
index 3eab16ee..118232ea 100644
--- a/2.3-1/macros/scilab2c.sci
+++ b/2.3-1/macros/scilab2c.sci
@@ -35,7 +35,7 @@ function scilab2c(varargin)
     UserSciFilesPaths = [];
     RunMode = 'All';
     BuildTool = getNativeBuildTool();
-    OutFormat = "StandAlone"
+    Target = "StandAlone"
     //
 // scilab2c(UserScilabMainFile, CCodeOutputDir, UserSciFilesPaths)
 //
@@ -55,7 +55,7 @@ function scilab2c(varargin)
     end
     RunMode = "All";
     BuildTool = getNativeBuildTool();
-    OutFormat = "StandAlone"
+    Target = "StandAlone"
 	//
 // scilab2c(UserScilabMainFile, CCodeOutputDir, UserSciFilesPaths, RunMode)
 //
@@ -79,7 +79,7 @@ function scilab2c(varargin)
     end
     RunMode = varargin(4);
     BuildTool = getNativeBuildTool();
-    OutFormat = "StandAlone"
+    Target = "StandAlone"
    case 5
 	for i = 1:4
       if typeof(varargin(i)) <> "string"
@@ -104,7 +104,7 @@ function scilab2c(varargin)
     end
     RunMode = varargin(4);
     BuildTool = varargin(5);
-    OutFormat = "StandAlone"
+    Target = "StandAlone"
    case 6
       for i = 1:4
       if typeof(varargin(i)) <> "string"
@@ -120,7 +120,7 @@ function scilab2c(varargin)
 	  error(msprintf(gettext("%s: argument #%d must be: ""make"" or ""nmake"".\n"),"scilab2c",5));
       return
     end
-    if varargin(6) <> "StandAlone" & varargin(6) <> "Arduino" & varargin(6) <> "AVR"
+    if varargin(6) <> "StandAlone" & varargin(6) <> "Arduino" & varargin(6) <> "AVR" & varargin(6) <> "RPi"
 	  error(msprintf(gettext("%s: argument #%d must be: ""StandAlone"" or ""Arduino"" or ""AVR"".\n"),"scilab2c",5));
       return
     end
@@ -133,7 +133,7 @@ function scilab2c(varargin)
     end
     RunMode = varargin(4);
     BuildTool = varargin(5);
-    OutFormat = varargin(6);
+    Target = varargin(6);
   else
 //
 // Calling scilab2c with more than understood values
@@ -143,8 +143,8 @@ error(msprintf(gettext("%s: Wrong number of input argument(s): %d expected.\n"),
 
 
 // --- LAUNCH USER SCI CODE TO TEST IT BEFORE TRANSLATING IT!!! ---
-// If OutFormat choosen is 'Standalone' then only execute the code, otherwise directly start conversion.  
-  if OutFormat == "StandAlone"
+// If Target choosen is 'Standalone' then only execute the code, otherwise directly start conversion.  
+  if Target == "StandAlone"
   runscicode(UserScilabMainFile, UserSciFilesPaths);
   
  // --- ASK USER FOR CONTINUATION. ---
@@ -160,7 +160,7 @@ error(msprintf(gettext("%s: Wrong number of input argument(s): %d expected.\n"),
   end
   if (userchoice == 1)
 // --- LAUNCH SCI2C ---
-	runsci2c(UserScilabMainFile, UserSciFilesPaths, CCodeOutputDir, RunMode, BuildTool,OutFormat);
+	runsci2c(UserScilabMainFile, UserSciFilesPaths, CCodeOutputDir, RunMode, BuildTool,Target);
   end
 
 endfunction
-- 
cgit 


From d0dae962944e7fdb42bca7d0aa80055c44881b45 Mon Sep 17 00:00:00 2001
From: siddhu8990
Date: Tue, 29 Mar 2016 22:11:40 +0530
Subject: Function conversion using scilab2c call (not working)

---
 2.3-1/macros/scilab2c.sci | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to '2.3-1/macros/scilab2c.sci')

diff --git a/2.3-1/macros/scilab2c.sci b/2.3-1/macros/scilab2c.sci
index 118232ea..f352d1c5 100644
--- a/2.3-1/macros/scilab2c.sci
+++ b/2.3-1/macros/scilab2c.sci
@@ -66,8 +66,8 @@ function scilab2c(varargin)
 		return
       end
     end
-    if varargin(4) <> "All" & varargin(4) <> "Translate" & varargin(4) <> "GenLibraryStructure"
-	  error(msprintf(gettext("%s: argument #%d must be: ""All"", ""Translate"" or ""GenLibraryStructure"".\n"),"scilab2c",4));
+    if varargin(4) <> "All" & varargin(4) <> "Translate" & varargin(4) <> "GenLibraryStructure" & varargin(4) <> "FunCall" 
+	  error(msprintf(gettext("%s: argument #%d must be: ""All"", ""Translate"",""GenLibraryStructure"" or ""FunCall"".\n"),"scilab2c",4));
       return
     end
     UserScilabMainFile = varargin(1);
@@ -87,8 +87,8 @@ function scilab2c(varargin)
 		return
       end
     end
-    if varargin(4) <> "All" & varargin(4) <> "Translate" & varargin(4) <> "GenLibraryStructure"
-	  error(msprintf(gettext("%s: argument #%d must be: ""All"", ""Translate"" or ""GenLibraryStructure"".\n"),"scilab2c",4));
+    if varargin(4) <> "All" & varargin(4) <> "Translate" & varargin(4) <> "GenLibraryStructure" & varargin(4) <> "FunCall" 
+	  error(msprintf(gettext("%s: argument #%d must be: ""All"", ""Translate"",""GenLibraryStructure"" or ""FunCall"".\n"),"scilab2c",4));
       return
     end
 	if varargin(5) <> "make" & varargin(5) <> "nmake"
@@ -112,8 +112,8 @@ function scilab2c(varargin)
 		return
       end
     end
-    if varargin(4) <> "All" & varargin(4) <> "Translate" & varargin(4) <> "GenLibraryStructure"
-	  error(msprintf(gettext("%s: argument #%d must be: ""All"", ""Translate"" or ""GenLibraryStructure"".\n"),"scilab2c",4));
+    if varargin(4) <> "All" & varargin(4) <> "Translate" & varargin(4) <> "GenLibraryStructure" & varargin(4) <> "FunCall" 
+	  error(msprintf(gettext("%s: argument #%d must be: ""All"", ""Translate"" ,""GenLibraryStructure"" or ""FunCall"".\n"),"scilab2c",4));
       return
     end
     if varargin(5) <> "make" & varargin(5) <> "nmake"
-- 
cgit 


From d7d53dc95a7cb9878a4e49bdd06e626e981b0eb2 Mon Sep 17 00:00:00 2001
From: siddhu8990
Date: Mon, 27 Jun 2016 19:16:41 +0530
Subject: test commit

---
 2.3-1/macros/scilab2c.sci | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to '2.3-1/macros/scilab2c.sci')

diff --git a/2.3-1/macros/scilab2c.sci b/2.3-1/macros/scilab2c.sci
index f352d1c5..19b1f2b4 100644
--- a/2.3-1/macros/scilab2c.sci
+++ b/2.3-1/macros/scilab2c.sci
@@ -121,7 +121,7 @@ function scilab2c(varargin)
       return
     end
     if varargin(6) <> "StandAlone" & varargin(6) <> "Arduino" & varargin(6) <> "AVR" & varargin(6) <> "RPi"
-	  error(msprintf(gettext("%s: argument #%d must be: ""StandAlone"" or ""Arduino"" or ""AVR"".\n"),"scilab2c",5));
+	  error(msprintf(gettext("%s: argument #%d must be: ""StandAlone"" or ""Arduino"" or ""AVR"" or ""RPi"".\n"),"scilab2c",5));
       return
     end
     UserScilabMainFile = varargin(1);
@@ -144,7 +144,7 @@ error(msprintf(gettext("%s: Wrong number of input argument(s): %d expected.\n"),
 
 // --- LAUNCH USER SCI CODE TO TEST IT BEFORE TRANSLATING IT!!! ---
 // If Target choosen is 'Standalone' then only execute the code, otherwise directly start conversion.  
-  if Target == "StandAlone"
+  if ((Target == "StandAlone") | (Target == "RPi"))
   runscicode(UserScilabMainFile, UserSciFilesPaths);
   
  // --- ASK USER FOR CONTINUATION. ---
-- 
cgit 


From 21ab4886b202a52189b398bd9d3137e2a567d62a Mon Sep 17 00:00:00 2001
From: siddhu8990
Date: Mon, 25 Jul 2016 15:59:40 +0530
Subject: WiringPi used for RaspberryPi (Gpio, serial, Threads, ISRs)

---
 2.3-1/macros/scilab2c.sci | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to '2.3-1/macros/scilab2c.sci')

diff --git a/2.3-1/macros/scilab2c.sci b/2.3-1/macros/scilab2c.sci
index 19b1f2b4..8bdb667c 100644
--- a/2.3-1/macros/scilab2c.sci
+++ b/2.3-1/macros/scilab2c.sci
@@ -12,7 +12,6 @@
 
 function scilab2c(varargin)
   [lhs, rhs] = argn();
-
   select rhs
 //
 // scilab2c()
@@ -144,7 +143,7 @@ error(msprintf(gettext("%s: Wrong number of input argument(s): %d expected.\n"),
 
 // --- LAUNCH USER SCI CODE TO TEST IT BEFORE TRANSLATING IT!!! ---
 // If Target choosen is 'Standalone' then only execute the code, otherwise directly start conversion.  
-  if ((Target == "StandAlone") | (Target == "RPi"))
+  if ((Target == "StandAlone"))// | (Target == "RPi"))
   runscicode(UserScilabMainFile, UserSciFilesPaths);
   
  // --- ASK USER FOR CONTINUATION. ---
-- 
cgit 


From cdd9bf519d594b87c07193d2770b81a07829a50c Mon Sep 17 00:00:00 2001
From: siddhu8990
Date: Tue, 18 Oct 2016 10:31:23 +0530
Subject: Suppressed declaration of not required variables and functions

---
 2.3-1/macros/scilab2c.sci | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to '2.3-1/macros/scilab2c.sci')

diff --git a/2.3-1/macros/scilab2c.sci b/2.3-1/macros/scilab2c.sci
index 8bdb667c..4fccb075 100644
--- a/2.3-1/macros/scilab2c.sci
+++ b/2.3-1/macros/scilab2c.sci
@@ -65,8 +65,8 @@ function scilab2c(varargin)
 		return
       end
     end
-    if varargin(4) <> "All" & varargin(4) <> "Translate" & varargin(4) <> "GenLibraryStructure" & varargin(4) <> "FunCall" 
-	  error(msprintf(gettext("%s: argument #%d must be: ""All"", ""Translate"",""GenLibraryStructure"" or ""FunCall"".\n"),"scilab2c",4));
+    if varargin(4) <> "All" & varargin(4) <> "Translate" & varargin(4) <> "GenLibraryStructure" 
+	  error(msprintf(gettext("%s: argument #%d must be: ""All"", ""Translate"",""GenLibraryStructure"".\n"),"scilab2c",4));
       return
     end
     UserScilabMainFile = varargin(1);
-- 
cgit 


From 586db6343e7b472d8dc3e63a82f4c73f99cdcbd7 Mon Sep 17 00:00:00 2001
From: siddhu8990
Date: Wed, 19 Apr 2017 14:28:34 +0530
Subject: Merged Ashish's work

---
 2.3-1/macros/scilab2c.sci | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '2.3-1/macros/scilab2c.sci')

diff --git a/2.3-1/macros/scilab2c.sci b/2.3-1/macros/scilab2c.sci
index 4fccb075..41494eac 100644
--- a/2.3-1/macros/scilab2c.sci
+++ b/2.3-1/macros/scilab2c.sci
@@ -143,7 +143,7 @@ error(msprintf(gettext("%s: Wrong number of input argument(s): %d expected.\n"),
 
 // --- LAUNCH USER SCI CODE TO TEST IT BEFORE TRANSLATING IT!!! ---
 // If Target choosen is 'Standalone' then only execute the code, otherwise directly start conversion.  
-  if ((Target == "StandAlone"))// | (Target == "RPi"))
+  if (Target == "StandAlone" |Target == "AVR") 
   runscicode(UserScilabMainFile, UserSciFilesPaths);
   
  // --- ASK USER FOR CONTINUATION. ---
-- 
cgit 


From 3121a1f5a8203bfd14d46f71930ac5cd22afdf7d Mon Sep 17 00:00:00 2001
From: yash1112
Date: Mon, 19 Jun 2017 05:40:46 +0530
Subject: 1.3 new scilab-arduino functions added2. all functions have been
 tested on hardware 3. 5 i2c library functions added 4. Now generates code for
 27 Boards(arduino and lilypad). 5. New GUI

---
 2.3-1/macros/scilab2c.sci | 36 +++++++++++++++++++++++++++++++++++-
 1 file changed, 35 insertions(+), 1 deletion(-)

(limited to '2.3-1/macros/scilab2c.sci')

diff --git a/2.3-1/macros/scilab2c.sci b/2.3-1/macros/scilab2c.sci
index 41494eac..69d95541 100644
--- a/2.3-1/macros/scilab2c.sci
+++ b/2.3-1/macros/scilab2c.sci
@@ -133,6 +133,40 @@ function scilab2c(varargin)
     RunMode = varargin(4);
     BuildTool = varargin(5);
     Target = varargin(6);
+   case 7
+      for i = 1:4
+      if typeof(varargin(i)) <> "string"
+		error(msprintf(gettext("%s: Wrong type for input argument #%d: String expected.\n"),"scilab2c",i));
+		return
+      end
+    end
+    if varargin(4) <> "All" & varargin(4) <> "Translate" & varargin(4) <> "GenLibraryStructure" & varargin(4) <> "FunCall" 
+	  error(msprintf(gettext("%s: argument #%d must be: ""All"", ""Translate"" ,""GenLibraryStructure"" or ""FunCall"".\n"),"scilab2c",4));
+      return
+    end
+    if varargin(5) <> "make" & varargin(5) <> "nmake"
+	  error(msprintf(gettext("%s: argument #%d must be: ""make"" or ""nmake"".\n"),"scilab2c",5));
+      return
+    end
+    if varargin(6) <> "StandAlone" & varargin(6) <> "Arduino" & varargin(6) <> "AVR" & varargin(6) <> "RPi"
+	  error(msprintf(gettext("%s: argument #%d must be: ""StandAlone"" or ""Arduino"" or ""AVR"" or ""RPi"".\n"),"scilab2c",5));
+      return
+    end
+    //if varargin(7) <> "uno" & varargin(7) <> "mega" & varargin(7) <> "mega2560" & varargin(7) <> "micro" & varargin(7) <> "nano" & varargin(7) <> "mini"
+	//  error(msprintf(gettext("%s: argument #%d must be: ""uno"" or ""mega"" or ""micro"" or ""nano"" or ""mini"".\n"),"scilab2c",7));
+      //return
+    //end
+    UserScilabMainFile = varargin(1);
+    CCodeOutputDir = varargin(2);
+    if varargin(3) == ""
+      UserSciFilesPaths = [];
+    else
+      UserSciFilesPaths = varargin(3);
+    end
+    RunMode = varargin(4);
+    BuildTool = varargin(5);
+    Target = varargin(6);
+    Board_name = varargin(7);
   else
 //
 // Calling scilab2c with more than understood values
@@ -159,7 +193,7 @@ error(msprintf(gettext("%s: Wrong number of input argument(s): %d expected.\n"),
   end
   if (userchoice == 1)
 // --- LAUNCH SCI2C ---
-	runsci2c(UserScilabMainFile, UserSciFilesPaths, CCodeOutputDir, RunMode, BuildTool,Target);
+	runsci2c(UserScilabMainFile, UserSciFilesPaths, CCodeOutputDir, RunMode, BuildTool,Target,Board_name);
   end
 
 endfunction
-- 
cgit