summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsiddhu89902015-09-07 23:06:39 +0530
committersiddhu89902015-09-07 23:06:39 +0530
commit895d4d14a2b7e71435c4257cbd4f2253550a0b82 (patch)
treeaa7fc22b1b4e4dc1c9229389457317777e759dbb
parenta6bf6562c74bb0117cc2f59f34cf49a24b6cb6b9 (diff)
parent0bdaec9811b3e463514393aa1d3da6c3a96891a1 (diff)
downloadscilab2c-895d4d14a2b7e71435c4257cbd4f2253550a0b82.tar.gz
scilab2c-895d4d14a2b7e71435c4257cbd4f2253550a0b82.tar.bz2
scilab2c-895d4d14a2b7e71435c4257cbd4f2253550a0b82.zip
Scilab to arduino conversion working with some tweaks
-rw-r--r--includes/sci2clib.h4
-rw-r--r--macros/CCodeGeneration/C_GenerateMakefile.binbin17792 -> 17792 bytes
-rw-r--r--macros/CCodeGeneration/C_Type.binbin9600 -> 9600 bytes
-rw-r--r--macros/ToolInitialization/INIT_CreateDirs.binbin9600 -> 9600 bytes
-rw-r--r--macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci102
-rw-r--r--macros/ToolInitialization/INIT_GenAnnFLFunctions.binbin9600 -> 9600 bytes
-rw-r--r--macros/ToolInitialization/INIT_GenFileInfo.binbin13696 -> 13696 bytes
-rw-r--r--macros/ToolInitialization/INIT_GenLibraries.binbin9600 -> 9600 bytes
-rw-r--r--macros/ToolInitialization/INIT_GenSharedInfo.binbin13696 -> 13696 bytes
-rw-r--r--macros/ToolInitialization/INIT_LoadLibraries.binbin9600 -> 9600 bytes
-rw-r--r--macros/ToolInitialization/INIT_RemoveDirs.binbin13696 -> 13696 bytes
-rw-r--r--macros/ToolInitialization/INIT_SCI2C.binbin21152 -> 21152 bytes
-rw-r--r--macros/ToolInitialization/INIT_SharedInfoEqual.binbin9600 -> 9600 bytes
-rw-r--r--macros/ToolInitialization/ManageNextConversion.binbin13696 -> 13696 bytes
-rw-r--r--macros/ToolInitialization/UpdateSCI2CInfo.binbin30256 -> 30256 bytes
-rw-r--r--macros/findDeps/getAllHeaders.binbin13696 -> 13696 bytes
-rw-r--r--macros/findDeps/getAllHeaders.sci6
-rw-r--r--macros/findDeps/getAllInterfaces.binbin13696 -> 13696 bytes
-rw-r--r--macros/findDeps/getAllInterfaces.sci6
-rw-r--r--macros/findDeps/getAllSources.binbin89072 -> 89136 bytes
-rw-r--r--macros/findDeps/getAllSources.sci6
-rw-r--r--macros/runsci2c.sci2
-rw-r--r--src/c/operations/interfaces/int_OpLogOr.h32
-rw-r--r--src/c/scilab-arduino/cmd_analog_in/u8cmd_analog_ins.c19
-rw-r--r--src/c/scilab-arduino/cmd_analog_out/u8cmd_analog_outs.c20
-rw-r--r--src/c/scilab-arduino/cmd_digital_in/u8cmd_digital_ins.c19
-rw-r--r--src/c/scilab-arduino/cmd_digital_out/u8cmd_digital_outs.c3
-rw-r--r--src/c/scilab-arduino/includes/cmd_analog_in.h29
-rw-r--r--src/c/scilab-arduino/includes/cmd_analog_out.h29
-rw-r--r--src/c/scilab-arduino/includes/cmd_digital_in.h29
-rw-r--r--src/c/scilab-arduino/includes/cmd_digital_out.h2
-rw-r--r--src/c/scilab-arduino/includes/sleep.h29
-rw-r--r--src/c/scilab-arduino/interfaces/int_cmd_analog_in.h30
-rw-r--r--src/c/scilab-arduino/interfaces/int_cmd_analog_out.h30
-rw-r--r--src/c/scilab-arduino/interfaces/int_cmd_digital_in.h30
-rw-r--r--src/c/scilab-arduino/interfaces/int_cmd_digital_out.h2
-rw-r--r--src/c/scilab-arduino/interfaces/int_sleep.h29
-rw-r--r--src/c/scilab-arduino/sleep/u16sleeps.c20
38 files changed, 453 insertions, 25 deletions
diff --git a/includes/sci2clib.h b/includes/sci2clib.h
index eac578fa..7981df01 100644
--- a/includes/sci2clib.h
+++ b/includes/sci2clib.h
@@ -329,4 +329,8 @@
#include "types.h"
+/*Scilab-arduino toolbox*/
+#include "int_cmd_digital_out.h"
+#include "cmd_digital_out.h"
+
#endif /* !__SCI2CLIB_H__ */
diff --git a/macros/CCodeGeneration/C_GenerateMakefile.bin b/macros/CCodeGeneration/C_GenerateMakefile.bin
index 59529769..557abfda 100644
--- a/macros/CCodeGeneration/C_GenerateMakefile.bin
+++ b/macros/CCodeGeneration/C_GenerateMakefile.bin
Binary files differ
diff --git a/macros/CCodeGeneration/C_Type.bin b/macros/CCodeGeneration/C_Type.bin
index a18a4112..7cdfa084 100644
--- a/macros/CCodeGeneration/C_Type.bin
+++ b/macros/CCodeGeneration/C_Type.bin
Binary files differ
diff --git a/macros/ToolInitialization/INIT_CreateDirs.bin b/macros/ToolInitialization/INIT_CreateDirs.bin
index 2d1a99bd..43e37190 100644
--- a/macros/ToolInitialization/INIT_CreateDirs.bin
+++ b/macros/ToolInitialization/INIT_CreateDirs.bin
Binary files differ
diff --git a/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci b/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci
index 44907b8f..eafc416a 100644
--- a/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci
+++ b/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci
@@ -3753,6 +3753,31 @@ INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,Ex
//------------------------------------
+//---- Class cmd_digital_out ---------
+//------------------------------------
+ClassName = 'cmd_digital_out';
+
+// --- 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+'u80',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);
+
+
+//------------------------------------
//---- Class cmd_digital_in ----------
//------------------------------------
ClassName = 'cmd_digital_in';
@@ -3760,6 +3785,30 @@ ClassName = 'cmd_digital_in';
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
+PrintStringInfo('NIN= 2',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('d0d0'+ArgSeparator+'u80',ClassFileName,'file','y');
+
+// --- Annotation Function And Function List Function. ---
+FunctionName = 'cmd_digital_in';
+PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
+
+//------------------------------------
+//---- Class cmd_analog_out ----------
+//------------------------------------
+ClassName = 'cmd_analog_out';
+
+// --- 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');
@@ -3768,10 +3817,59 @@ PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
// --- Function List Class. ---
ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
-PrintStringInfo('d0d0d0'+ArgSeparator+'d0',ClassFileName,'file','y');
+PrintStringInfo('d0d0d0'+ArgSeparator+'u80',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
-FunctionName = 'cmd_digital_out';
+FunctionName = 'cmd_analog_out';
+PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
+
+//------------------------------------
+//---- Class cmd_analog_in -----------
+//------------------------------------
+ClassName = 'cmd_analog_in';
+
+// --- Class Annotation. ---
+PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
+ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
+PrintStringInfo('NIN= 2',ClassFileName,'file','y');
+PrintStringInfo('NOUT= 1 ',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).TP= ''u16''',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('d0d0'+ArgSeparator+'u160',ClassFileName,'file','y');
+
+// --- Annotation Function And Function List Function. ---
+FunctionName = 'cmd_analog_in';
+PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
+
+
+//------------------------------------
+//---- Class Sleep -------------------
+//------------------------------------
+ClassName = 'sleep';
+
+// --- Class Annotation. ---
+PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
+ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
+PrintStringInfo('NIN= 1',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('d0'+ArgSeparator+'u80',ClassFileName,'file','y');
+
+// --- Annotation Function And Function List Function. ---
+FunctionName = 'sleep';
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 5a434384..458622b6 100644
--- a/macros/ToolInitialization/INIT_GenAnnFLFunctions.bin
+++ b/macros/ToolInitialization/INIT_GenAnnFLFunctions.bin
Binary files differ
diff --git a/macros/ToolInitialization/INIT_GenFileInfo.bin b/macros/ToolInitialization/INIT_GenFileInfo.bin
index 771bad76..8e463bb4 100644
--- a/macros/ToolInitialization/INIT_GenFileInfo.bin
+++ b/macros/ToolInitialization/INIT_GenFileInfo.bin
Binary files differ
diff --git a/macros/ToolInitialization/INIT_GenLibraries.bin b/macros/ToolInitialization/INIT_GenLibraries.bin
index e5a6dd8e..7ab0790d 100644
--- a/macros/ToolInitialization/INIT_GenLibraries.bin
+++ b/macros/ToolInitialization/INIT_GenLibraries.bin
Binary files differ
diff --git a/macros/ToolInitialization/INIT_GenSharedInfo.bin b/macros/ToolInitialization/INIT_GenSharedInfo.bin
index 08a1b5af..7a10c806 100644
--- a/macros/ToolInitialization/INIT_GenSharedInfo.bin
+++ b/macros/ToolInitialization/INIT_GenSharedInfo.bin
Binary files differ
diff --git a/macros/ToolInitialization/INIT_LoadLibraries.bin b/macros/ToolInitialization/INIT_LoadLibraries.bin
index fef3558e..70755727 100644
--- a/macros/ToolInitialization/INIT_LoadLibraries.bin
+++ b/macros/ToolInitialization/INIT_LoadLibraries.bin
Binary files differ
diff --git a/macros/ToolInitialization/INIT_RemoveDirs.bin b/macros/ToolInitialization/INIT_RemoveDirs.bin
index e8c2a050..036d7e56 100644
--- a/macros/ToolInitialization/INIT_RemoveDirs.bin
+++ b/macros/ToolInitialization/INIT_RemoveDirs.bin
Binary files differ
diff --git a/macros/ToolInitialization/INIT_SCI2C.bin b/macros/ToolInitialization/INIT_SCI2C.bin
index acf8236c..290fb65b 100644
--- a/macros/ToolInitialization/INIT_SCI2C.bin
+++ b/macros/ToolInitialization/INIT_SCI2C.bin
Binary files differ
diff --git a/macros/ToolInitialization/INIT_SharedInfoEqual.bin b/macros/ToolInitialization/INIT_SharedInfoEqual.bin
index 72dbd5b7..af425024 100644
--- a/macros/ToolInitialization/INIT_SharedInfoEqual.bin
+++ b/macros/ToolInitialization/INIT_SharedInfoEqual.bin
Binary files differ
diff --git a/macros/ToolInitialization/ManageNextConversion.bin b/macros/ToolInitialization/ManageNextConversion.bin
index ba4cf85f..c1ed0bb9 100644
--- a/macros/ToolInitialization/ManageNextConversion.bin
+++ b/macros/ToolInitialization/ManageNextConversion.bin
Binary files differ
diff --git a/macros/ToolInitialization/UpdateSCI2CInfo.bin b/macros/ToolInitialization/UpdateSCI2CInfo.bin
index 8b62bd72..bff93a9d 100644
--- a/macros/ToolInitialization/UpdateSCI2CInfo.bin
+++ b/macros/ToolInitialization/UpdateSCI2CInfo.bin
Binary files differ
diff --git a/macros/findDeps/getAllHeaders.bin b/macros/findDeps/getAllHeaders.bin
index 7d24b150..d6025544 100644
--- a/macros/findDeps/getAllHeaders.bin
+++ b/macros/findDeps/getAllHeaders.bin
Binary files differ
diff --git a/macros/findDeps/getAllHeaders.sci b/macros/findDeps/getAllHeaders.sci
index 07bb8baf..9ae5b257 100644
--- a/macros/findDeps/getAllHeaders.sci
+++ b/macros/findDeps/getAllHeaders.sci
@@ -125,5 +125,9 @@ function allHeaders = getAllHeaders()
"src/c/signalProcessing/includes/crossCorr.h"
"src/c/implicitList/dynlib_implicitlist.h"
"src/c/implicitList/implicitList.h"
- "src/c/scilab-arduino/includes/cmd_digital_out.h"];
+ "src/c/scilab-arduino/includes/cmd_digital_out.h"
+ "src/c/scilab-arduino/includes/cmd_digital_in.h"
+ "src/c/scilab-arduino/includes/cmd_analog_out.h"
+ "src/c/scilab-arduino/includes/cmd_analog_in.h"
+ "src/c/scilab-arduino/includes/sleep.h"];
endfunction
diff --git a/macros/findDeps/getAllInterfaces.bin b/macros/findDeps/getAllInterfaces.bin
index e9133b65..a6a81ce5 100644
--- a/macros/findDeps/getAllInterfaces.bin
+++ b/macros/findDeps/getAllInterfaces.bin
Binary files differ
diff --git a/macros/findDeps/getAllInterfaces.sci b/macros/findDeps/getAllInterfaces.sci
index d6be456a..b32f9d5f 100644
--- a/macros/findDeps/getAllInterfaces.sci
+++ b/macros/findDeps/getAllInterfaces.sci
@@ -119,5 +119,9 @@ function allInterfaces = getAllInterfaces()
"src/c/signalProcessing/interfaces/int_fft.h"
"src/c/signalProcessing/interfaces/int_lev.h"
"src/c/implicitList/int_OpColon.h"
- "src/c/scilab-arduino/interfaces/int_cmd_digital_out.h"];
+ "src/c/scilab-arduino/interfaces/int_cmd_digital_out.h"
+ "src/c/scilab-arduino/interfaces/int_cmd_digital_in.h"
+ "src/c/scilab-arduino/interfaces/int_cmd_analog_out.h"
+ "src/c/scilab-arduino/interfaces/int_cmd_analog_in.h"
+ "src/c/scilab-arduino/interfaces/int_sleep.h"];
endfunction
diff --git a/macros/findDeps/getAllSources.bin b/macros/findDeps/getAllSources.bin
index 1d756fb2..5e153872 100644
--- a/macros/findDeps/getAllSources.bin
+++ b/macros/findDeps/getAllSources.bin
Binary files differ
diff --git a/macros/findDeps/getAllSources.sci b/macros/findDeps/getAllSources.sci
index e0f849c0..c33346f5 100644
--- a/macros/findDeps/getAllSources.sci
+++ b/macros/findDeps/getAllSources.sci
@@ -815,5 +815,9 @@ function allSources = getAllSources()
"src/c/implicitList/dimplicitLists.c"
"src/c/implicitList/cimplicitLists.c"
"src/c/implicitList/simplicitLists.c"
- "src/c/scialb-arduino/cmd_digital_out/u8cmd_digital_outs.c"];
+ "src/c/scilab-arduino/cmd_digital_out/u8cmd_digital_outs.c"
+ "src/c/scilab-arduino/cmd_digital_in/u8cmd_digital_ins.c"
+ "src/c/scilab-arduino/cmd_analog_out/u8cmd_analog_outs.c"
+ "src/c/scilab-arduino/cmd_analog_in/u8cmd_analog_ins.c"
+ "src/c/scilab-arduino/sleep/u16sleeps.c"];
endfunction
diff --git a/macros/runsci2c.sci b/macros/runsci2c.sci
index fbdad316..08a2700b 100644
--- a/macros/runsci2c.sci
+++ b/macros/runsci2c.sci
@@ -104,7 +104,7 @@ mkdir(SCI2COutputPath+"/interfaces/");
PrintStepInfo('Copying sources', FileInfo.GeneralReport,'both');
for i = 1:size(allSources, "*")
// DEBUG only
- //disp("Copying "+allSources(i)+" in "+SCI2COutputPath+"/src/c/");
+ disp("Copying "+allSources(i)+" in "+SCI2COutputPath+"/src/c/");
copyfile(allSources(i), SCI2COutputPath+"/src/c/");
end
diff --git a/src/c/operations/interfaces/int_OpLogOr.h b/src/c/operations/interfaces/int_OpLogOr.h
index 07039d1e..5618ff63 100644
--- a/src/c/operations/interfaces/int_OpLogOr.h
+++ b/src/c/operations/interfaces/int_OpLogOr.h
@@ -45,13 +45,13 @@
#define z0d0OpLogOrd0(in1, in2) Bool2Double((zreals(in1) != 0.0 || zimags(in1) != 0.0) && in2 != 0.0)
-#define u80u80OpLogAndu80(in1, in2) Bool2Uint8(in1 != 0 || in2 != 0)
+#define u80u80OpLogOru80(in1, in2) Bool2Uint8(in1 != 0 || in2 != 0)
-#define i80i80OpLogAndi80(in1, in2) Bool2Int8(in1 != 0 || in2 != 0)
+#define i80i80OpLogOri80(in1, in2) Bool2Int8(in1 != 0 || in2 != 0)
-#define u160u160OpLogAndu160(in1, in2) Bool2Uint16(in1 != 0 || in2 != 0)
+#define u160u160OpLogOru160(in1, in2) Bool2Uint16(in1 != 0 || in2 != 0)
-#define i160i160OpLogAndi160(in1, in2) Bool2Int16(in1 != 0 || in2 != 0)
+#define i160i160OpLogOri160(in1, in2) Bool2Int16(in1 != 0 || in2 != 0)
/*matrix or scalar */
@@ -79,16 +79,16 @@
#define z2d0OpLogOrd2(in1, size1, in2, out) {int i = 0 ;\
for (i = 0 ; i < size1[0]*size1[1] ; i++ ) out[i] = Bool2Double((zreals(in1[i]) != 0.0 || zimags(in1[i]) != 0.0) && in2 != 0.0);}
-#define i82i80OpLogAndi82(in1, size1, in2, out) {int i = 0 ;\
+#define i82i80OpLogOri82(in1, size1, in2, out) {int i = 0 ;\
for (i = 0 ; i < size1[0]*size1[1] ; i++ ) out[i] = Bool2Int8(in1[i] != 0 || in2 != 0);}
-#define u82u80OpLogAndu82(in1, size1, in2, out) {int i = 0 ;\
+#define u82u80OpLogOru82(in1, size1, in2, out) {int i = 0 ;\
for (i = 0 ; i < size1[0]*size1[1] ; i++ ) out[i] = Bool2Uint8(in1[i] != 0 || in2 != 0);}
-#define u162u160OpLogAndu162(in1, size1, in2, out) {int i = 0 ;\
+#define u162u160OpLogOru162(in1, size1, in2, out) {int i = 0 ;\
for (i = 0 ; i < size1[0]*size1[1] ; i++ ) out[i] = Bool2Uint16(in1[i] != 0 || in2 != 0);}
-#define i162i160OpLogAndi162(in1, size1, in2, out) {int i = 0 ;\
+#define i162i160OpLogOri162(in1, size1, in2, out) {int i = 0 ;\
for (i = 0 ; i < size1[0]*size1[1] ; i++ ) out[i] = Bool2Int16(in1[i] != 0 || in2 != 0);}
@@ -118,16 +118,16 @@
#define z0d2OpLogOrd2(in1, in2, size2, out) {int i = 0 ;\
for (i = 0 ; i < size2[0]*size2[1] ; i++ ) out[i] = Bool2Double((zreals(in1) != 0.2 || zimags(in1) != 0.2) && in2[i] != 0.2);}
-#define u80u82OpLogAndu82(in1, in2, size2, out) {int i = 0 ;\
+#define u80u82OpLogOru82(in1, in2, size2, out) {int i = 0 ;\
for (i = 0 ; i < size2[0]*size2[1] ; i++ ) out[i] = Bool2Uint8(in1 != 0 || in2[i] != 0);}
-#define i80i82OpLogAndi82(in1, in2, size2, out) {int i = 0 ;\
+#define i80i82OpLogOri82(in1, in2, size2, out) {int i = 0 ;\
for (i = 0 ; i < size2[0]*size2[1] ; i++ ) out[i] = Bool2Int8(in1 != 0 || in2[i] != 0);}
-#define u160u162OpLogAndu162(in1, in2, size2, out) {int i = 0 ;\
+#define u160u162OpLogOru162(in1, in2, size2, out) {int i = 0 ;\
for (i = 0 ; i < size2[0]*size2[1] ; i++ ) out[i] = Bool2Uint16(in1 != 0 || in2[i] != 0);}
-#define i160i162OpLogAndi162(in1, in2, size2, out) {int i = 0 ;\
+#define i160i162OpLogOri162(in1, in2, size2, out) {int i = 0 ;\
for (i = 0 ; i < size2[0]*size2[1] ; i++ ) out[i] = Bool2Int16(in1 != 0 || in2[i] != 0);}
/*matrix or matrix */
@@ -156,16 +156,16 @@
#define z2d2OpLogOrd2(in1, size1, in2, size2, out) {int i = 0 ;\
for (i = 0 ; i < size2[0]*size2[1] ; i++ ) out[i] = Bool2Double((zreals(in1[i]) != 0.2 || zimags(in1[i]) != 0.2) && in2[i] != 0.2);}
-#define u82u82OpLogAndu82(in1, size1, in2, size2, out) {int i = 0 ;\
+#define u82u82OpLogOru82(in1, size1, in2, size2, out) {int i = 0 ;\
for (i = 0 ; i < size2[0]*size2[1] ; i++ ) out[i] = Bool2Uint8(in1[i] != 0 || in2[i] != 0);}
-#define i82i82OpLogAndi82(in1, size1, in2, size2, out) {int i = 0 ;\
+#define i82i82OpLogOri82(in1, size1, in2, size2, out) {int i = 0 ;\
for (i = 0 ; i < size2[0]*size2[1] ; i++ ) out[i] = Bool2Int8(in1[i] != 0 || in2[i] != 0);}
-#define u162u162OpLogAndu162(in1, size1, in2, size2, out) {int i = 0 ;\
+#define u162u162OpLogOru162(in1, size1, in2, size2, out) {int i = 0 ;\
for (i = 0 ; i < size2[0]*size2[1] ; i++ ) out[i] = Bool2Uint16(in1[i] != 0 || in2[i] != 0);}
-#define i162i162OpLogAndi162(in1, size1, in2, size2, out) {int i = 0 ;\
+#define i162i162OpLogOri162(in1, size1, in2, size2, out) {int i = 0 ;\
for (i = 0 ; i < size2[0]*size2[1] ; i++ ) out[i] = Bool2Int16(in1[i] != 0 || in2[i] != 0);}
#endif /* !__INT_OPLOGOR_H__ */
diff --git a/src/c/scilab-arduino/cmd_analog_in/u8cmd_analog_ins.c b/src/c/scilab-arduino/cmd_analog_in/u8cmd_analog_ins.c
new file mode 100644
index 00000000..ebfad618
--- /dev/null
+++ b/src/c/scilab-arduino/cmd_analog_in/u8cmd_analog_ins.c
@@ -0,0 +1,19 @@
+/*
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2008 - INRIA - Arnaud TORSET
+ *
+ * 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
+ *
+ */
+
+#include "cmd_analog_in.h"
+
+uint16 u8cmd_analog_ins(uint8 board_no, uint8 pin)
+{
+ return((uint16)analogRead(pin));
+}
+
diff --git a/src/c/scilab-arduino/cmd_analog_out/u8cmd_analog_outs.c b/src/c/scilab-arduino/cmd_analog_out/u8cmd_analog_outs.c
new file mode 100644
index 00000000..94d51f6f
--- /dev/null
+++ b/src/c/scilab-arduino/cmd_analog_out/u8cmd_analog_outs.c
@@ -0,0 +1,20 @@
+/*
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2008 - INRIA - Arnaud TORSET
+ *
+ * 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
+ *
+ */
+
+#include "cmd_analog_out.h"
+
+uint8 u8cmd_analog_outs(uint8 board_no, uint8 pin, uint8 value)
+{
+ analogWrite(pin,value);
+ return 0;
+}
+
diff --git a/src/c/scilab-arduino/cmd_digital_in/u8cmd_digital_ins.c b/src/c/scilab-arduino/cmd_digital_in/u8cmd_digital_ins.c
new file mode 100644
index 00000000..1d0036a4
--- /dev/null
+++ b/src/c/scilab-arduino/cmd_digital_in/u8cmd_digital_ins.c
@@ -0,0 +1,19 @@
+/*
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2008 - INRIA - Arnaud TORSET
+ *
+ * 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
+ *
+ */
+
+#include "cmd_digital_in.h"
+
+uint8 u8cmd_digital_ins(uint8 board_no, uint8 pin)
+{
+ return((uint8)digitalRead(pin));
+}
+
diff --git a/src/c/scilab-arduino/cmd_digital_out/u8cmd_digital_outs.c b/src/c/scilab-arduino/cmd_digital_out/u8cmd_digital_outs.c
index 0d43b867..09dffd62 100644
--- a/src/c/scilab-arduino/cmd_digital_out/u8cmd_digital_outs.c
+++ b/src/c/scilab-arduino/cmd_digital_out/u8cmd_digital_outs.c
@@ -12,8 +12,9 @@
#include "cmd_digital_out.h"
-void u8cmd_digital_outs(uint8 board_no, uint8 pin, uint8 value)
+uint8 u8cmd_digital_outs(uint8 board_no, uint8 pin, uint8 value)
{
digitalWrite(pin,value);
+ return 0;
}
diff --git a/src/c/scilab-arduino/includes/cmd_analog_in.h b/src/c/scilab-arduino/includes/cmd_analog_in.h
new file mode 100644
index 00000000..5361fe80
--- /dev/null
+++ b/src/c/scilab-arduino/includes/cmd_analog_in.h
@@ -0,0 +1,29 @@
+/*
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2008 - INRIA - Arnaud TORSET
+ *
+ * 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
+ *
+ */
+
+
+#ifndef __CMD_ANALOG_IN_H__
+#define __CMD_ANALOG_IN_H__
+
+#include "types.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+uint16 u8cmd_analog_ins(uint8 board_no, uint8 pin);
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /* __CMD_DIGITAL_IN_H__ */
diff --git a/src/c/scilab-arduino/includes/cmd_analog_out.h b/src/c/scilab-arduino/includes/cmd_analog_out.h
new file mode 100644
index 00000000..d7fca535
--- /dev/null
+++ b/src/c/scilab-arduino/includes/cmd_analog_out.h
@@ -0,0 +1,29 @@
+/*
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2008 - INRIA - Arnaud TORSET
+ *
+ * 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
+ *
+ */
+
+
+#ifndef __CMD_ANALOG_OUT_H__
+#define __CMD_ANALOG_OUT_H__
+
+#include "types.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+uint8 u8cmd_analog_outs(uint8 board_no, uint8 pin, uint8 value);
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /* __CMD_ANALOG_OUT_H__ */
diff --git a/src/c/scilab-arduino/includes/cmd_digital_in.h b/src/c/scilab-arduino/includes/cmd_digital_in.h
new file mode 100644
index 00000000..96fd24bb
--- /dev/null
+++ b/src/c/scilab-arduino/includes/cmd_digital_in.h
@@ -0,0 +1,29 @@
+/*
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2008 - INRIA - Arnaud TORSET
+ *
+ * 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
+ *
+ */
+
+
+#ifndef __CMD_DIGITAL_IN_H__
+#define __CMD_DIGITAL_IN_H__
+
+#include "types.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+uint8 u8cmd_digital_ins(uint8 board_no, uint8 pin);
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /* __CMD_DIGITAL_IN_H__ */
diff --git a/src/c/scilab-arduino/includes/cmd_digital_out.h b/src/c/scilab-arduino/includes/cmd_digital_out.h
index 2d8b0b4a..ee459d18 100644
--- a/src/c/scilab-arduino/includes/cmd_digital_out.h
+++ b/src/c/scilab-arduino/includes/cmd_digital_out.h
@@ -20,7 +20,7 @@
extern "C" {
#endif
-void u8cmd_digital_ins(uint8 board_no, uint8 pin, uint8 value);
+uint8 u8cmd_digital_outs(uint8 board_no, uint8 pin, uint8 value);
#ifdef __cplusplus
} /* extern "C" */
diff --git a/src/c/scilab-arduino/includes/sleep.h b/src/c/scilab-arduino/includes/sleep.h
new file mode 100644
index 00000000..2e2940a3
--- /dev/null
+++ b/src/c/scilab-arduino/includes/sleep.h
@@ -0,0 +1,29 @@
+/*
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2008 - INRIA - Arnaud TORSET
+ *
+ * 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
+ *
+ */
+
+
+#ifndef __SLEEP_H__
+#define __SLEEP_H__
+
+#include "types.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+uint8 u16sleeps(uint16 delay_ms);
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /* __CMD_DIGITAL_OUT_H__ */
diff --git a/src/c/scilab-arduino/interfaces/int_cmd_analog_in.h b/src/c/scilab-arduino/interfaces/int_cmd_analog_in.h
new file mode 100644
index 00000000..0df8fcbf
--- /dev/null
+++ b/src/c/scilab-arduino/interfaces/int_cmd_analog_in.h
@@ -0,0 +1,30 @@
+/*
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2008 - INRIA - Arnaud TORSET
+ *
+ * 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
+ *
+ */
+
+
+#ifndef __INT_CMD_ANALOG_IN_H__
+#define __INT_CMD_ANALOG_IN_H__
+
+#include "types.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define d0d0cmd_analog_inu160(in1,in2) u8cmd_analog_ins((uint8)in1,\
+ (uint8)in2)
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /* __INT_CMD_ANALOG_IN_H__ */
diff --git a/src/c/scilab-arduino/interfaces/int_cmd_analog_out.h b/src/c/scilab-arduino/interfaces/int_cmd_analog_out.h
new file mode 100644
index 00000000..d6b16f81
--- /dev/null
+++ b/src/c/scilab-arduino/interfaces/int_cmd_analog_out.h
@@ -0,0 +1,30 @@
+/*
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2008 - INRIA - Arnaud TORSET
+ *
+ * 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
+ *
+ */
+
+
+#ifndef __INT_CMD_ANALOG_OUT_H__
+#define __INT_CMD_ANALOG_OUT_H__
+
+#include "types.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define d0d0d0cmd_digital_outu80(in1,in2,in3) u8cmd_analog_outs((uint8)in1,\
+ (uint8)in2,(uint8)in3)
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /* __INT_CMD_DIGITAL_OUT_H__ */
diff --git a/src/c/scilab-arduino/interfaces/int_cmd_digital_in.h b/src/c/scilab-arduino/interfaces/int_cmd_digital_in.h
new file mode 100644
index 00000000..04b773c6
--- /dev/null
+++ b/src/c/scilab-arduino/interfaces/int_cmd_digital_in.h
@@ -0,0 +1,30 @@
+/*
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2008 - INRIA - Arnaud TORSET
+ *
+ * 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
+ *
+ */
+
+
+#ifndef __INT_CMD_DIGITAL_IN_H__
+#define __INT_CMD_DIGITAL_IN_H__
+
+#include "types.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define d0d0cmd_digital_inu80(in1,in2) u8cmd_digital_ins((uint8)in1,\
+ (uint8)in2)
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /* __INT_CMD_DIGITAL_IN_H__ */
diff --git a/src/c/scilab-arduino/interfaces/int_cmd_digital_out.h b/src/c/scilab-arduino/interfaces/int_cmd_digital_out.h
index 7e630e32..a3d1eabd 100644
--- a/src/c/scilab-arduino/interfaces/int_cmd_digital_out.h
+++ b/src/c/scilab-arduino/interfaces/int_cmd_digital_out.h
@@ -20,7 +20,7 @@
extern "C" {
#endif
-#define d0d0d0cmd_digital_outd0(in1,in2,in3) u8cmd_digital_outs((uint8)in1,\
+#define d0d0d0cmd_digital_outu80(in1,in2,in3) u8cmd_digital_outs((uint8)in1,\
(uint8)in2,(uint8)in3)
#ifdef __cplusplus
diff --git a/src/c/scilab-arduino/interfaces/int_sleep.h b/src/c/scilab-arduino/interfaces/int_sleep.h
new file mode 100644
index 00000000..8e2d0824
--- /dev/null
+++ b/src/c/scilab-arduino/interfaces/int_sleep.h
@@ -0,0 +1,29 @@
+/*
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2008 - INRIA - Arnaud TORSET
+ *
+ * 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
+ *
+ */
+
+
+#ifndef __INT_SLEEP_H__
+#define __INT_sLEEP_H__
+
+#include "types.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define d0sleepu80(in1) u16sleeps((uint16)in1)
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /* __INT_SLEEP_H__ */
diff --git a/src/c/scilab-arduino/sleep/u16sleeps.c b/src/c/scilab-arduino/sleep/u16sleeps.c
new file mode 100644
index 00000000..14da0ba9
--- /dev/null
+++ b/src/c/scilab-arduino/sleep/u16sleeps.c
@@ -0,0 +1,20 @@
+/*
+ * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+ * Copyright (C) 2008 - INRIA - Arnaud TORSET
+ *
+ * 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
+ *
+ */
+
+#include "sleep.h"
+
+uint8 u16sleeps(uint16 delay_ms)
+{
+ delay(delay_ms);
+ return 0;
+}
+