Arduino digital and analog out working

24 files changed, 11 insertions, 2 deletions

diff --git a/includes/sci2clib.h b/includes/sci2clib.h
index 7981df01..b887ebbe 100644
--- a/includes/sci2clib.h
+++ b/includes/sci2clib.h
@@ -332,5 +332,9 @@
 /*Scilab-arduino toolbox*/
 #include "int_cmd_digital_out.h"
 #include "cmd_digital_out.h"
+#include "int_cmd_analog_out.h"
+#include "cmd_analog_out.h"
+#include "int_sleep.h"
+#include "sleep.h"
 
 #endif /* !__SCI2CLIB_H__ */
diff --git a/macros/CCodeGeneration/C_GenerateMakefile.bin b/macros/CCodeGeneration/C_GenerateMakefile.bin
index 557abfda..fd2de293 100644
--- a/macros/CCodeGeneration/C_GenerateMakefile.bin
+++ b/macros/CCodeGeneration/C_GenerateMakefile.bin
diff --git a/macros/CCodeGeneration/C_Type.bin b/macros/CCodeGeneration/C_Type.bin
index 7cdfa084..7ddf022c 100644
--- a/macros/CCodeGeneration/C_Type.bin
+++ b/macros/CCodeGeneration/C_Type.bin
diff --git a/macros/ToolInitialization/INIT_CreateDirs.bin b/macros/ToolInitialization/INIT_CreateDirs.bin
index 43e37190..b77a9afd 100644
--- a/macros/ToolInitialization/INIT_CreateDirs.bin
+++ b/macros/ToolInitialization/INIT_CreateDirs.bin
diff --git a/macros/ToolInitialization/INIT_GenAnnFLFunctions.bin b/macros/ToolInitialization/INIT_GenAnnFLFunctions.bin
index 458622b6..8d9139da 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 8e463bb4..8ba0ebd6 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 7ab0790d..6626be92 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 7a10c806..56b0428c 100644
--- a/macros/ToolInitialization/INIT_GenSharedInfo.bin
+++ b/macros/ToolInitialization/INIT_GenSharedInfo.bin
diff --git a/macros/ToolInitialization/INIT_LoadLibraries.bin b/macros/ToolInitialization/INIT_LoadLibraries.bin
index 70755727..38cd5bbf 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 036d7e56..fd1298ad 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 290fb65b..fb6b72ac 100644
--- a/macros/ToolInitialization/INIT_SCI2C.bin
+++ b/macros/ToolInitialization/INIT_SCI2C.bin
diff --git a/macros/ToolInitialization/INIT_SharedInfoEqual.bin b/macros/ToolInitialization/INIT_SharedInfoEqual.bin
index af425024..33f96da6 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 c1ed0bb9..1d428d26 100644
--- a/macros/ToolInitialization/ManageNextConversion.bin
+++ b/macros/ToolInitialization/ManageNextConversion.bin
diff --git a/macros/ToolInitialization/UpdateSCI2CInfo.bin b/macros/ToolInitialization/UpdateSCI2CInfo.bin
index bff93a9d..4bc5a55e 100644
--- a/macros/ToolInitialization/UpdateSCI2CInfo.bin
+++ b/macros/ToolInitialization/UpdateSCI2CInfo.bin
diff --git a/macros/findDeps/getAllHeaders.bin b/macros/findDeps/getAllHeaders.bin
index d6025544..48296225 100644
--- a/macros/findDeps/getAllHeaders.bin
+++ b/macros/findDeps/getAllHeaders.bin
diff --git a/macros/findDeps/getAllInterfaces.bin b/macros/findDeps/getAllInterfaces.bin
index a6a81ce5..6f0781e2 100644
--- a/macros/findDeps/getAllInterfaces.bin
+++ b/macros/findDeps/getAllInterfaces.bin
diff --git a/macros/findDeps/getAllSources.bin b/macros/findDeps/getAllSources.bin
index 5e153872..d5a5c970 100644
--- a/macros/findDeps/getAllSources.bin
+++ b/macros/findDeps/getAllSources.bin
diff --git a/macros/runsci2c.sci b/macros/runsci2c.sci
index 08a2700b..fbdad316 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/scilab-arduino/includes/cmd_analog_in.h b/src/c/scilab-arduino/includes/cmd_analog_in.h
index 5361fe80..4478fb09 100644
--- a/src/c/scilab-arduino/includes/cmd_analog_in.h
+++ b/src/c/scilab-arduino/includes/cmd_analog_in.h
@@ -15,6 +15,7 @@
 #define __CMD_ANALOG_IN_H__
  
 #include "types.h"
+#include "Arduino.h"
 
 #ifdef  __cplusplus
 extern "C" {
diff --git a/src/c/scilab-arduino/includes/cmd_analog_out.h b/src/c/scilab-arduino/includes/cmd_analog_out.h
index d7fca535..e75c5a66 100644
--- a/src/c/scilab-arduino/includes/cmd_analog_out.h
+++ b/src/c/scilab-arduino/includes/cmd_analog_out.h
@@ -15,6 +15,7 @@
 #define __CMD_ANALOG_OUT_H__
  
 #include "types.h"
+#include "Arduino.h"
 
 #ifdef  __cplusplus
 extern "C" {
diff --git a/src/c/scilab-arduino/includes/cmd_digital_in.h b/src/c/scilab-arduino/includes/cmd_digital_in.h
index 96fd24bb..9e809aa4 100644
--- a/src/c/scilab-arduino/includes/cmd_digital_in.h
+++ b/src/c/scilab-arduino/includes/cmd_digital_in.h
@@ -15,6 +15,7 @@
 #define __CMD_DIGITAL_IN_H__
  
 #include "types.h"
+#include "Arduino.h"
 
 #ifdef  __cplusplus
 extern "C" {
diff --git a/src/c/scilab-arduino/includes/cmd_digital_out.h b/src/c/scilab-arduino/includes/cmd_digital_out.h
index ee459d18..49739b0c 100644
--- a/src/c/scilab-arduino/includes/cmd_digital_out.h
+++ b/src/c/scilab-arduino/includes/cmd_digital_out.h
@@ -15,6 +15,7 @@
 #define __CMD_DIGITAL_OUT_H__
  
 #include "types.h"
+#include "Arduino.h"
 
 #ifdef  __cplusplus
 extern "C" {
diff --git a/src/c/scilab-arduino/includes/sleep.h b/src/c/scilab-arduino/includes/sleep.h
index 2e2940a3..cde27164 100644
--- a/src/c/scilab-arduino/includes/sleep.h
+++ b/src/c/scilab-arduino/includes/sleep.h
@@ -15,6 +15,7 @@
 #define __SLEEP_H__
  
 #include "types.h"
+#include "Arduino.h"
 
 #ifdef  __cplusplus
 extern "C" {
diff --git a/src/c/scilab-arduino/interfaces/int_cmd_analog_out.h b/src/c/scilab-arduino/interfaces/int_cmd_analog_out.h
index d6b16f81..09f5c6ea 100644
--- a/src/c/scilab-arduino/interfaces/int_cmd_analog_out.h
+++ b/src/c/scilab-arduino/interfaces/int_cmd_analog_out.h
@@ -20,7 +20,7 @@
 extern "C" {
 #endif
 
-#define d0d0d0cmd_digital_outu80(in1,in2,in3) u8cmd_analog_outs((uint8)in1,\
+#define d0d0d0cmd_analog_outu80(in1,in2,in3) u8cmd_analog_outs((uint8)in1,\
 						(uint8)in2,(uint8)in3)	
 
 #ifdef  __cplusplus