diff options
24 files changed, 11 insertions, 2 deletions
diff --git a/includes/sci2clib.h b/includes/sci2clib.h index 7981df0..b887ebb 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 Binary files differindex 557abfd..fd2de29 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 Binary files differindex 7cdfa08..7ddf022 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 Binary files differindex 43e3719..b77a9af 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 Binary files differindex 458622b..8d9139d 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 Binary files differindex 8e463bb..8ba0ebd 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 Binary files differindex 7ab0790..6626be9 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 Binary files differindex 7a10c80..56b0428 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 Binary files differindex 7075572..38cd5bb 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 Binary files differindex 036d7e5..fd1298a 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 Binary files differindex 290fb65..fb6b72a 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 Binary files differindex af42502..33f96da 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 Binary files differindex c1ed0bb..1d428d2 100644 --- a/macros/ToolInitialization/ManageNextConversion.bin +++ b/macros/ToolInitialization/ManageNextConversion.bin diff --git a/macros/ToolInitialization/UpdateSCI2CInfo.bin b/macros/ToolInitialization/UpdateSCI2CInfo.bin Binary files differindex bff93a9..4bc5a55 100644 --- a/macros/ToolInitialization/UpdateSCI2CInfo.bin +++ b/macros/ToolInitialization/UpdateSCI2CInfo.bin diff --git a/macros/findDeps/getAllHeaders.bin b/macros/findDeps/getAllHeaders.bin Binary files differindex d602554..4829622 100644 --- a/macros/findDeps/getAllHeaders.bin +++ b/macros/findDeps/getAllHeaders.bin diff --git a/macros/findDeps/getAllInterfaces.bin b/macros/findDeps/getAllInterfaces.bin Binary files differindex a6a81ce..6f0781e 100644 --- a/macros/findDeps/getAllInterfaces.bin +++ b/macros/findDeps/getAllInterfaces.bin diff --git a/macros/findDeps/getAllSources.bin b/macros/findDeps/getAllSources.bin Binary files differindex 5e15387..d5a5c97 100644 --- a/macros/findDeps/getAllSources.bin +++ b/macros/findDeps/getAllSources.bin diff --git a/macros/runsci2c.sci b/macros/runsci2c.sci index 08a2700..fbdad31 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 5361fe8..4478fb0 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 d7fca53..e75c5a6 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 96fd24b..9e809aa 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 ee459d1..49739b0 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 2e2940a..cde2716 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 d6b16f8..09f5c6e 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 |