Intermediate commit. Not to be used

17 files changed, 87 insertions, 23 deletions

diff --git a/macros/ToolInitialization/.fuse_hidden0000024a00000003 b/macros/ToolInitialization/.fuse_hidden0000024a00000003
deleted file mode 100644
index 82e80fa..0000000
--- a/macros/ToolInitialization/.fuse_hidden0000024a00000003
+++ /dev/null
diff --git a/macros/ToolInitialization/.fuse_hidden0000220800000001 b/macros/ToolInitialization/.fuse_hidden0000220800000001
deleted file mode 100644
index f402986..0000000
--- a/macros/ToolInitialization/.fuse_hidden0000220800000001
+++ /dev/null
diff --git a/macros/ToolInitialization/INIT_CreateDirs.bin b/macros/ToolInitialization/INIT_CreateDirs.bin
index b898c3c..88208c9 100644
--- a/macros/ToolInitialization/INIT_CreateDirs.bin
+++ b/macros/ToolInitialization/INIT_CreateDirs.bin
diff --git a/macros/ToolInitialization/INIT_FillSCI2LibCDirs.bin b/macros/ToolInitialization/INIT_FillSCI2LibCDirs.bin
index 38319ca..68968b5 100644
--- a/macros/ToolInitialization/INIT_FillSCI2LibCDirs.bin
+++ b/macros/ToolInitialization/INIT_FillSCI2LibCDirs.bin
diff --git a/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci b/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci
index ba8da6c..44907b8 100644
--- a/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci
+++ b/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci
@@ -483,26 +483,6 @@ PrintStringInfo('      Adding Function: '+FunctionName+'.',GeneralReport,'file',
 INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);

 INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);

 

-FunctionName = 'ceil'; //BJ : Done AS : Float_Done

-PrintStringInfo('      Adding Function: '+FunctionName+'.',GeneralReport,'file','y');

-INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);

-INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);

-

-FunctionName = 'fix'; //BJ : Done AS : Float_Done

-PrintStringInfo('      Adding Function: '+FunctionName+'.',GeneralReport,'file','y');

-INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);

-INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);

-

-FunctionName = 'floor'; //BJ : Done AS : Float_Done

-PrintStringInfo('      Adding Function: '+FunctionName+'.',GeneralReport,'file','y');

-INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);

-INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);

-

-FunctionName = 'round'; //BJ : Done AS : Float_Done

-PrintStringInfo('      Adding Function: '+FunctionName+'.',GeneralReport,'file','y');

-INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);

-INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);

-

 FunctionName = 'int'; //BJ : Done AS : Float_Done

 PrintStringInfo('      Adding Function: '+FunctionName+'.',GeneralReport,'file','y');

 INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);

@@ -557,6 +537,25 @@ PrintStringInfo('      Adding Function: '+FunctionName+'.',GeneralReport,'file',
 INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);

 INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);

 

+FunctionName = 'ceil'; //BJ : Done AS : Float_Done

+PrintStringInfo('      Adding Function: '+FunctionName+'.',GeneralReport,'file','y');

+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);

+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);

+

+FunctionName = 'fix'; //BJ : Done AS : Float_Done

+PrintStringInfo('      Adding Function: '+FunctionName+'.',GeneralReport,'file','y');

+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);

+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);

+

+FunctionName = 'floor'; //BJ : Done AS : Float_Done

+PrintStringInfo('      Adding Function: '+FunctionName+'.',GeneralReport,'file','y');

+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);

+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);

+

+FunctionName = 'round'; //BJ : Done AS : Float_Done

+PrintStringInfo('      Adding Function: '+FunctionName+'.',GeneralReport,'file','y');

+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);

+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);

 

 // ------------------

 // --- Class Sign ---

@@ -1199,21 +1198,37 @@ PrintStringInfo('s0s0'+ArgSeparator+'s0',ClassFileName,'file','y');
 PrintStringInfo('d0d0'+ArgSeparator+'d0',ClassFileName,'file','y');

 PrintStringInfo('c0c0'+ArgSeparator+'c0',ClassFileName,'file','y');

 PrintStringInfo('z0z0'+ArgSeparator+'z0',ClassFileName,'file','y');

+PrintStringInfo('u80u80'+ArgSeparator+'u80',ClassFileName,'file','y');

+PrintStringInfo('i80i80'+ArgSeparator+'i80',ClassFileName,'file','y');

+PrintStringInfo('u160u160'+ArgSeparator+'u160',ClassFileName,'file','y');

+PrintStringInfo('i160i160'+ArgSeparator+'i160',ClassFileName,'file','y');

 

 PrintStringInfo('s2s0'+ArgSeparator+'s2',ClassFileName,'file','y');

 PrintStringInfo('d2d0'+ArgSeparator+'d2',ClassFileName,'file','y');

 PrintStringInfo('c2c0'+ArgSeparator+'c2',ClassFileName,'file','y');

 PrintStringInfo('z2z0'+ArgSeparator+'z2',ClassFileName,'file','y');

+PrintStringInfo('u82u80'+ArgSeparator+'u82',ClassFileName,'file','y');

+PrintStringInfo('i82i80'+ArgSeparator+'i82',ClassFileName,'file','y');

+PrintStringInfo('u162u160'+ArgSeparator+'u162',ClassFileName,'file','y');

+PrintStringInfo('i162i160'+ArgSeparator+'i162',ClassFileName,'file','y');

 

 PrintStringInfo('s0s2'+ArgSeparator+'s2',ClassFileName,'file','y');

 PrintStringInfo('d0d2'+ArgSeparator+'d2',ClassFileName,'file','y');

 PrintStringInfo('c0c2'+ArgSeparator+'c2',ClassFileName,'file','y');

 PrintStringInfo('z0z2'+ArgSeparator+'z2',ClassFileName,'file','y');

+PrintStringInfo('u80u82'+ArgSeparator+'u82',ClassFileName,'file','y');

+PrintStringInfo('i80i82'+ArgSeparator+'i82',ClassFileName,'file','y');

+PrintStringInfo('u160u162'+ArgSeparator+'u162',ClassFileName,'file','y');

+PrintStringInfo('i160i162'+ArgSeparator+'i162',ClassFileName,'file','y');

 

 PrintStringInfo('s2s2'+ArgSeparator+'s2',ClassFileName,'file','y');

 PrintStringInfo('d2d2'+ArgSeparator+'d2',ClassFileName,'file','y');

 PrintStringInfo('c2c2'+ArgSeparator+'c2',ClassFileName,'file','y');

 PrintStringInfo('z2z2'+ArgSeparator+'z2',ClassFileName,'file','y');

+PrintStringInfo('u82u82'+ArgSeparator+'u82',ClassFileName,'file','y');

+PrintStringInfo('i82i82'+ArgSeparator+'i82',ClassFileName,'file','y');

+PrintStringInfo('u162u162'+ArgSeparator+'u162',ClassFileName,'file','y');

+PrintStringInfo('i162i162'+ArgSeparator+'i162',ClassFileName,'file','y');

 

 PrintStringInfo('s2c0'+ArgSeparator+'c2',ClassFileName,'file','y');

 PrintStringInfo('d2z0'+ArgSeparator+'z2',ClassFileName,'file','y');

@@ -1301,6 +1316,10 @@ PrintStringInfo('c0c0'+ArgSeparator+'s0',ClassFileName,'file','y');
 PrintStringInfo('z0z0'+ArgSeparator+'d0',ClassFileName,'file','y');

 PrintStringInfo('g0g0'+ArgSeparator+'s0',ClassFileName,'file','y');

 PrintStringInfo('g0g0'+ArgSeparator+'d0',ClassFileName,'file','y');

+PrintStringInfo('u80u80'+ArgSeparator+'u80',ClassFileName,'file','y');

+PrintStringInfo('i80i80'+ArgSeparator+'i80',ClassFileName,'file','y');

+PrintStringInfo('u160u160'+ArgSeparator+'u160',ClassFileName,'file','y');

+PrintStringInfo('i160i160'+ArgSeparator+'i160',ClassFileName,'file','y');

 

 PrintStringInfo('s2s0'+ArgSeparator+'s2',ClassFileName,'file','y');

 PrintStringInfo('d2d0'+ArgSeparator+'d2',ClassFileName,'file','y');

@@ -1308,6 +1327,10 @@ PrintStringInfo('c2c0'+ArgSeparator+'s2',ClassFileName,'file','y');
 PrintStringInfo('z2z0'+ArgSeparator+'d2',ClassFileName,'file','y');

 PrintStringInfo('g2g0'+ArgSeparator+'s2',ClassFileName,'file','y');

 PrintStringInfo('g2g0'+ArgSeparator+'d2',ClassFileName,'file','y');

+PrintStringInfo('u82u80'+ArgSeparator+'u82',ClassFileName,'file','y');

+PrintStringInfo('i82i80'+ArgSeparator+'i82',ClassFileName,'file','y');

+PrintStringInfo('u162u160'+ArgSeparator+'u162',ClassFileName,'file','y');

+PrintStringInfo('i162i160'+ArgSeparator+'i162',ClassFileName,'file','y');

 

 PrintStringInfo('s0s2'+ArgSeparator+'s2',ClassFileName,'file','y');

 PrintStringInfo('d0d2'+ArgSeparator+'d2',ClassFileName,'file','y');

@@ -1315,6 +1338,10 @@ PrintStringInfo('c0c2'+ArgSeparator+'s2',ClassFileName,'file','y');
 PrintStringInfo('z0z2'+ArgSeparator+'d2',ClassFileName,'file','y');

 PrintStringInfo('g0g2'+ArgSeparator+'s2',ClassFileName,'file','y');

 PrintStringInfo('g0g2'+ArgSeparator+'d2',ClassFileName,'file','y');

+PrintStringInfo('u80u82'+ArgSeparator+'u82',ClassFileName,'file','y');

+PrintStringInfo('i80i82'+ArgSeparator+'i82',ClassFileName,'file','y');

+PrintStringInfo('u160u162'+ArgSeparator+'u162',ClassFileName,'file','y');

+PrintStringInfo('i160i162'+ArgSeparator+'i162',ClassFileName,'file','y');

 

 PrintStringInfo('s2s2'+ArgSeparator+'s2',ClassFileName,'file','y');

 PrintStringInfo('d2d2'+ArgSeparator+'d2',ClassFileName,'file','y');

@@ -1322,6 +1349,10 @@ PrintStringInfo('c2c2'+ArgSeparator+'s2',ClassFileName,'file','y');
 PrintStringInfo('z2z2'+ArgSeparator+'d2',ClassFileName,'file','y');

 PrintStringInfo('g2g2'+ArgSeparator+'s2',ClassFileName,'file','y');

 PrintStringInfo('g2g2'+ArgSeparator+'d2',ClassFileName,'file','y');

+PrintStringInfo('u82u82'+ArgSeparator+'u82',ClassFileName,'file','y');

+PrintStringInfo('i82i82'+ArgSeparator+'i82',ClassFileName,'file','y');

+PrintStringInfo('u162u162'+ArgSeparator+'u162',ClassFileName,'file','y');

+PrintStringInfo('i162i162'+ArgSeparator+'i162',ClassFileName,'file','y');

 

 //mixed types

 PrintStringInfo('c2s0'+ArgSeparator+'s2',ClassFileName,'file','y');

@@ -3716,7 +3747,34 @@ PrintStringInfo('      Adding Function: '+FunctionName+'.',GeneralReport,'file',
 INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);

 INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);

 

+//------------------------------------

+//---Functions for Scilab-arduino ----

+//------------------------------------

+

+

+//------------------------------------

+//---- Class cmd_digital_in ----------

+//------------------------------------

+ClassName = 'cmd_digital_in';

+

+// --- Class Annotation. ---

+PrintStringInfo('   Adding Class: '+ClassName+'.',GeneralReport,'file','y');

+ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);

+PrintStringInfo('NIN=          3',ClassFileName,'file','y');

+PrintStringInfo('NOUT=         1       ',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).TP=    ''u8''',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');

+

+// --- Function List Class. ---

+ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);

+PrintStringInfo('d0d0d0'+ArgSeparator+'d0',ClassFileName,'file','y');

 

+// --- Annotation Function And Function List Function. ---

+FunctionName = 'cmd_digital_out'; 

+PrintStringInfo('      Adding Function: '+FunctionName+'.',GeneralReport,'file','y');

+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);

+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);

 

 

 // ////////////////////////////////////////////

diff --git a/macros/ToolInitialization/INIT_GenAnnFLFunctions.bin b/macros/ToolInitialization/INIT_GenAnnFLFunctions.bin
index 0445033..29f9d38 100644
--- a/macros/ToolInitialization/INIT_GenAnnFLFunctions.bin
+++ b/macros/ToolInitialization/INIT_GenAnnFLFunctions.bin
diff --git a/macros/ToolInitialization/INIT_GenFileInfo.bin b/macros/ToolInitialization/INIT_GenFileInfo.bin
index 1de53d3..4b0e030 100644
--- a/macros/ToolInitialization/INIT_GenFileInfo.bin
+++ b/macros/ToolInitialization/INIT_GenFileInfo.bin
diff --git a/macros/ToolInitialization/INIT_GenLibraries.bin b/macros/ToolInitialization/INIT_GenLibraries.bin
index 103aec2..d46d5be 100644
--- a/macros/ToolInitialization/INIT_GenLibraries.bin
+++ b/macros/ToolInitialization/INIT_GenLibraries.bin
diff --git a/macros/ToolInitialization/INIT_GenSharedInfo.bin b/macros/ToolInitialization/INIT_GenSharedInfo.bin
index 413a6c6..607948c 100644
--- a/macros/ToolInitialization/INIT_GenSharedInfo.bin
+++ b/macros/ToolInitialization/INIT_GenSharedInfo.bin
diff --git a/macros/ToolInitialization/INIT_GenSharedInfo.sci b/macros/ToolInitialization/INIT_GenSharedInfo.sci
index 7b8826c..9731af3 100644
--- a/macros/ToolInitialization/INIT_GenSharedInfo.sci
+++ b/macros/ToolInitialization/INIT_GenSharedInfo.sci
@@ -1,4 +1,4 @@
-function SharedInfo = INIT_GenSharedInfo(RunMode,UserScilabMainFile,TotTempScalarVars,EnableTempVarsReuse,Sci2CLibMainHeaderFName,CopySciCodeIntoCCode)

+function SharedInfo = INIT_GenSharedInfo(RunMode,UserScilabMainFile,TotTempScalarVars,EnableTempVarsReuse,Sci2CLibMainHeaderFName,CopySciCodeIntoCCode,OutputFormat)

 // function SharedInfo = INIT_GenSharedInfo(WorkingDir,OutCCCodeDir,UserSciFilesPaths,...

 //    RunMode,UserScilabMainFile,TotTempScalarVars,EnableTempVarsReuse,Sci2CLibMainHeaderFName)

 // -----------------------------------------------------------------

@@ -115,4 +115,10 @@ SharedInfo.Extension.FuncListClasses     = '.lcls';  // Stands for list class
 // --- Resize Approach. ---

 // ------------------------

 SharedInfo.ResizeApproach = 'NO_RESIZE'; // 'NO_RESIZE', 'RESIZE_ALL', 'RESIZE_TEMP', 'RESIZE_LOCAL', 'RESIZE_GLOBAL', 'REALLOC_ALL_RESIZE_ALL'

+

+//-------------------------

+//--- Output format -------

+//-------------------------

+SharedInfo.OutputFormat = OutputFormat;

+

 endfunction

diff --git a/macros/ToolInitialization/INIT_LoadLibraries.bin b/macros/ToolInitialization/INIT_LoadLibraries.bin
index 52c501f..7cad539 100644
--- a/macros/ToolInitialization/INIT_LoadLibraries.bin
+++ b/macros/ToolInitialization/INIT_LoadLibraries.bin
diff --git a/macros/ToolInitialization/INIT_RemoveDirs.bin b/macros/ToolInitialization/INIT_RemoveDirs.bin
index 81e058a..884ac56 100644
--- a/macros/ToolInitialization/INIT_RemoveDirs.bin
+++ b/macros/ToolInitialization/INIT_RemoveDirs.bin
diff --git a/macros/ToolInitialization/INIT_SCI2C.bin b/macros/ToolInitialization/INIT_SCI2C.bin
index dd405d0..0ff35b1 100644
--- a/macros/ToolInitialization/INIT_SCI2C.bin
+++ b/macros/ToolInitialization/INIT_SCI2C.bin
diff --git a/macros/ToolInitialization/INIT_SCI2C.sci b/macros/ToolInitialization/INIT_SCI2C.sci
index 8b3e5b2..99d0f0f 100644
--- a/macros/ToolInitialization/INIT_SCI2C.sci
+++ b/macros/ToolInitialization/INIT_SCI2C.sci
@@ -1,5 +1,5 @@
 function [FileInfoDatFile,SharedInfoDatFile] = ...

-    INIT_SCI2C(UserScilabMainFile, UserSciFilesPaths, SCI2COutputDir, RunMode)

+    INIT_SCI2C(UserScilabMainFile, UserSciFilesPaths, SCI2COutputDir, RunMode, OutputFormat)

 // function [FileInfoDatFile,SharedInfoDatFile] = INIT_SCI2C(SCI2CInputPrmFile)

 // -----------------------------------------------------------------

 // #RNU_RES_B

@@ -68,7 +68,7 @@ OutCCCodeDir = SCI2CResultDir;
 

 //-- FIXME : MainLibHeader and Verbose mode are (?) configurable

 SharedInfo = INIT_GenSharedInfo(RunMode,UserScilabMainFile, ...

-				TotTempScalarVars,EnableTempVarsReuse,"sci2clib.h", %t);

+				TotTempScalarVars,EnableTempVarsReuse,"sci2clib.h", %t,OutputFormat);

 

 // ----------------------------

 // --- Initialize FileInfo. ---

diff --git a/macros/ToolInitialization/INIT_SharedInfoEqual.bin b/macros/ToolInitialization/INIT_SharedInfoEqual.bin
index bcbedb4..46781bd 100644
--- a/macros/ToolInitialization/INIT_SharedInfoEqual.bin
+++ b/macros/ToolInitialization/INIT_SharedInfoEqual.bin
diff --git a/macros/ToolInitialization/ManageNextConversion.bin b/macros/ToolInitialization/ManageNextConversion.bin
index 01b88f4..8fd0220 100644
--- a/macros/ToolInitialization/ManageNextConversion.bin
+++ b/macros/ToolInitialization/ManageNextConversion.bin
diff --git a/macros/ToolInitialization/UpdateSCI2CInfo.bin b/macros/ToolInitialization/UpdateSCI2CInfo.bin
index 41b07bb..c916b2e 100644
--- a/macros/ToolInitialization/UpdateSCI2CInfo.bin
+++ b/macros/ToolInitialization/UpdateSCI2CInfo.bin