From d4a4045b5dff59c799ee846052152298dfe6c210 Mon Sep 17 00:00:00 2001 From: siddhu8990 Date: Mon, 7 Mar 2016 20:42:23 +0530 Subject: Errors in bit***.h files fixed --- macros/ASTManagement/AST_HandleEndGenFun.bin | Bin 81440 -> 81800 bytes macros/ASTManagement/AST_HandleEndGenFun.sci | 6 +++ macros/ASTManagement/lib | Bin 1676 -> 1680 bytes macros/FunctionAnnotation/FA_SZ_LINSPACE_ROW.bin | Bin 0 -> 408 bytes macros/FunctionAnnotation/lib | Bin 1988 -> 2132 bytes macros/FunctionAnnotation/names | 6 +++ macros/GeneralFunctions/lib | Bin 1304 -> 1308 bytes macros/Scilab-Arduino/lib | Bin 768 -> 772 bytes .../ToolInitialization/INIT_FillSCI2LibCDirs.bin | Bin 992640 -> 1074784 bytes .../ToolInitialization/INIT_FillSCI2LibCDirs.sci | 58 +++++++++++++++++---- macros/ToolInitialization/INIT_RemoveDirs.bin | Bin 11880 -> 12372 bytes macros/ToolInitialization/INIT_RemoveDirs.sci | 3 +- macros/ToolInitialization/INIT_SCI2C.bin | Bin 24408 -> 24416 bytes macros/ToolInitialization/lib | Bin 976 -> 980 bytes macros/findDeps/getAllHeaders.bin | Bin 27716 -> 28508 bytes macros/findDeps/getAllHeaders.sci | 3 +- macros/findDeps/getAllInterfaces.bin | Bin 28680 -> 29568 bytes macros/findDeps/getAllInterfaces.sci | 3 +- macros/findDeps/getAllLibraries.bin | Bin 1704 -> 1708 bytes macros/findDeps/getAllSources.bin | Bin 164944 -> 171448 bytes macros/findDeps/getAllSources.sci | 3 +- macros/lib | Bin 708 -> 712 bytes macros/runsci2c.bin | Bin 28692 -> 28568 bytes macros/runsci2c.sci | 2 +- src/c/differential_calculus/includes/ode.h | 9 ++++ src/c/differential_calculus/interfaces/int_ode.h | 9 ++++ src/c/differential_calculus/ode/ode.c | 26 +++++++++ src/c/elementaryFunctions/includes/bitand.h | 2 +- src/c/elementaryFunctions/includes/bitcmp.h | 2 +- src/c/elementaryFunctions/includes/bitget.h | 2 +- src/c/elementaryFunctions/includes/bitor.h | 2 +- src/c/elementaryFunctions/includes/bitset.h | 2 +- src/c/elementaryFunctions/includes/bitxor.h | 2 +- src/c/scilab-arduino/default_files/setup_arduino.h | 1 + 34 files changed, 120 insertions(+), 21 deletions(-) create mode 100644 macros/FunctionAnnotation/FA_SZ_LINSPACE_ROW.bin create mode 100644 src/c/differential_calculus/includes/ode.h create mode 100644 src/c/differential_calculus/interfaces/int_ode.h create mode 100644 src/c/differential_calculus/ode/ode.c diff --git a/macros/ASTManagement/AST_HandleEndGenFun.bin b/macros/ASTManagement/AST_HandleEndGenFun.bin index ce6f0d68..13eec962 100644 Binary files a/macros/ASTManagement/AST_HandleEndGenFun.bin and b/macros/ASTManagement/AST_HandleEndGenFun.bin differ diff --git a/macros/ASTManagement/AST_HandleEndGenFun.sci b/macros/ASTManagement/AST_HandleEndGenFun.sci index 696846e2..4dfaec9a 100644 --- a/macros/ASTManagement/AST_HandleEndGenFun.sci +++ b/macros/ASTManagement/AST_HandleEndGenFun.sci @@ -193,6 +193,12 @@ global STACKDEDUG FileInfo.GlobalVarFileName); end else + //Change the scope of function name from variable to string, + //as it is passed as string to C function. Also enter this function + //in conversion list also. + if(ASTFunName == 'ode') + InArg(4).Scope = 'String'; + end [InArg,SharedInfo] = ST_GetInArgInfo(InArg,NInArg,FileInfo,SharedInfo); end diff --git a/macros/ASTManagement/lib b/macros/ASTManagement/lib index 06ca43d1..36d91dec 100644 Binary files a/macros/ASTManagement/lib and b/macros/ASTManagement/lib differ diff --git a/macros/FunctionAnnotation/FA_SZ_LINSPACE_ROW.bin b/macros/FunctionAnnotation/FA_SZ_LINSPACE_ROW.bin new file mode 100644 index 00000000..0a5589ba Binary files /dev/null and b/macros/FunctionAnnotation/FA_SZ_LINSPACE_ROW.bin differ diff --git a/macros/FunctionAnnotation/lib b/macros/FunctionAnnotation/lib index 6e93fb38..a31bc1a7 100644 Binary files a/macros/FunctionAnnotation/lib and b/macros/FunctionAnnotation/lib differ diff --git a/macros/FunctionAnnotation/names b/macros/FunctionAnnotation/names index a5f862b9..4fc53d40 100644 --- a/macros/FunctionAnnotation/names +++ b/macros/FunctionAnnotation/names @@ -12,7 +12,10 @@ FA_REAL FA_SUB FA_SZ_1 FA_SZ_2 +FA_SZ_COLUMN_DIAG +FA_SZ_COL_DIAG_IN_EX FA_SZ_FROM_VAL +FA_SZ_LINSPACE_ROW FA_SZ_OPAPEX FA_SZ_OPBACKSLASH FA_SZ_OPCC @@ -37,7 +40,10 @@ FA_SZ_OPPLUSA FA_SZ_OPRC FA_SZ_OPSLASH FA_SZ_OPSTAR +FA_SZ_ROW_COLUMN FA_SZ_ROW_COLUMN_CAT +FA_SZ_ROW_DIAG +FA_SZ_ROW_DIAG_INS_EXT FA_SZ_SEL1 FA_SZ_SEL2 FA_TP_C diff --git a/macros/GeneralFunctions/lib b/macros/GeneralFunctions/lib index 8367688a..a3af87e6 100644 Binary files a/macros/GeneralFunctions/lib and b/macros/GeneralFunctions/lib differ diff --git a/macros/Scilab-Arduino/lib b/macros/Scilab-Arduino/lib index 824ce45a..bd0cb707 100644 Binary files a/macros/Scilab-Arduino/lib and b/macros/Scilab-Arduino/lib differ diff --git a/macros/ToolInitialization/INIT_FillSCI2LibCDirs.bin b/macros/ToolInitialization/INIT_FillSCI2LibCDirs.bin index a4c9a3fb..1db8f2be 100644 Binary files a/macros/ToolInitialization/INIT_FillSCI2LibCDirs.bin and b/macros/ToolInitialization/INIT_FillSCI2LibCDirs.bin differ diff --git a/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci b/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci index 3fd2ae76..07d1127c 100644 --- a/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci +++ b/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci @@ -4559,8 +4559,9 @@ PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y'); // --- Function List Class. --- ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); -PrintStringInfo('d0d0d0'+ArgSeparator+'u80',ClassFileName,'file','y'); -PrintStringInfo('d0d0u80'+ArgSeparator+'u80',ClassFileName,'file','y'); +//PrintStringInfo('d0d0d0'+ArgSeparator+'u80',ClassFileName,'file','y'); +//PrintStringInfo('d0d0u80'+ArgSeparator+'u80',ClassFileName,'file','y'); +PrintStringInfo(''+ArgSeparator+'',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. --- FunctionName = 'AVRDigitalSetup'; @@ -4585,8 +4586,9 @@ PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y'); // --- Function List Class. --- ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); -PrintStringInfo('d0d0d0'+ArgSeparator+'u80',ClassFileName,'file','y'); -PrintStringInfo('d0d0u80'+ArgSeparator+'u80',ClassFileName,'file','y'); +//PrintStringInfo('d0d0d0'+ArgSeparator+'u80',ClassFileName,'file','y'); +//PrintStringInfo('d0d0u80'+ArgSeparator+'u80',ClassFileName,'file','y'); +PrintStringInfo(''+ArgSeparator+'',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. --- FunctionName = 'AVRDigitalOut'; @@ -4610,8 +4612,9 @@ PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y'); // --- Function List Class. --- ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); -PrintStringInfo('d0d0'+ArgSeparator+'u80',ClassFileName,'file','y'); -PrintStringInfo('d0u80'+ArgSeparator+'u80',ClassFileName,'file','y'); +//PrintStringInfo('d0d0'+ArgSeparator+'u80',ClassFileName,'file','y'); +//PrintStringInfo('d0u80'+ArgSeparator+'u80',ClassFileName,'file','y'); +PrintStringInfo(''+ArgSeparator+'',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. --- FunctionName = 'AVRDigitalIn'; @@ -4637,8 +4640,8 @@ PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y'); // --- Function List Class. --- ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); -PrintStringInfo('d0d0'+ArgSeparator+'u80',ClassFileName,'file','y'); - +//PrintStringInfo('d0d0'+ArgSeparator+'u80',ClassFileName,'file','y'); +PrintStringInfo(''+ArgSeparator+'',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. --- FunctionName = 'AVRADCSetup'; @@ -4662,8 +4665,8 @@ PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y'); // --- Function List Class. --- ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); -PrintStringInfo('d0'+ArgSeparator+'u160',ClassFileName,'file','y'); - +//PrintStringInfo('d0'+ArgSeparator+'u160',ClassFileName,'file','y'); +PrintStringInfo(''+ArgSeparator+'',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. --- FunctionName = 'AVRReadADC'; @@ -4827,6 +4830,41 @@ PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file', INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun); +//------------------------------------ +//---- Class ODE --------------------- +//------------------------------------ +ClassName = 'ODE'; + +// --- Class Annotation. --- +PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y'); +ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls); + +//Arguements specified: initial value, start time, time vector, ode function +PrintStringInfo('NIN= 4',ClassFileName,'file','y'); +PrintStringInfo('NOUT= 1 ',ClassFileName,'file','y'); +PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y'); +PrintStringInfo('OUT(1).SZ(1)= IN(3).SZ(1)',ClassFileName,'file','y'); +PrintStringInfo('OUT(1).SZ(2)= IN(3).SZ(2)',ClassFileName,'file','y'); + +//Arguements specified: initial value, start time, end time, ode function +PrintStringInfo('NIN= 4',ClassFileName,'file','y'); +PrintStringInfo('NOUT= 1 ',ClassFileName,'file','y'); +PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y'); +PrintStringInfo('OUT(1).SZ(1)= IN(3).SZ(1)',ClassFileName,'file','y'); +PrintStringInfo('OUT(1).SZ(2)= IN(3).SZ(2)',ClassFileName,'file','y'); + +// --- Function List Class. --- +ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); +PrintStringInfo('d0d0d2g2'+ArgSeparator+'d0',ClassFileName,'file','y'); +PrintStringInfo('d0d0d0g2'+ArgSeparator+'d0',ClassFileName,'file','y'); +PrintStringInfo('d2d0d2g2'+ArgSeparator+'d0',ClassFileName,'file','y'); +PrintStringInfo('d2d0d0g2'+ArgSeparator+'d0',ClassFileName,'file','y'); + +// --- Annotation Function And Function List Function. --- +FunctionName = 'ode'; +PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y'); +INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun); +INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun); // //////////////////////////////////////////// // /////PARTE INTRODOTTA DA ALBERTO MOREA diff --git a/macros/ToolInitialization/INIT_RemoveDirs.bin b/macros/ToolInitialization/INIT_RemoveDirs.bin index 5b11b8dd..ac8f7085 100644 Binary files a/macros/ToolInitialization/INIT_RemoveDirs.bin and b/macros/ToolInitialization/INIT_RemoveDirs.bin differ diff --git a/macros/ToolInitialization/INIT_RemoveDirs.sci b/macros/ToolInitialization/INIT_RemoveDirs.sci index 536b909e..93ebafbf 100644 --- a/macros/ToolInitialization/INIT_RemoveDirs.sci +++ b/macros/ToolInitialization/INIT_RemoveDirs.sci @@ -39,7 +39,8 @@ if (SharedInfoRunMode == 'GenLibraryStructure' | SharedInfoRunMode == 'All') if (yesno=='y') rmdir(FileInfo.WorkingDir,'s'); // delete WorkingDir if it exists due to previous translations... mdelete(FileInfo.OutCCCodeDir+'/*.h'); // delete .h files generated in previous translations (if any). - mdelete(FileInfo.OutCCCodeDir+'/*.c'); // delete .h files generated in previous translations (if any). + mdelete(FileInfo.OutCCCodeDir+'/*.c'); // delete .c files generated in previous translations (if any). + mdelete(FileInfo.OutCCCodeDir+'/*.cpp'); // delete .cpp files generated in previous translations (if any). mdelete(FileInfo.OutCCCodeDir+'/Makefile'); // delete .h files generated in previous translations (if any). // Note I don't delete includes, interfaces and and src directories to avoid recompiling them every time // a new translation is launched. I only delete source files generated by user. diff --git a/macros/ToolInitialization/INIT_SCI2C.bin b/macros/ToolInitialization/INIT_SCI2C.bin index 91a0d91c..19402302 100644 Binary files a/macros/ToolInitialization/INIT_SCI2C.bin and b/macros/ToolInitialization/INIT_SCI2C.bin differ diff --git a/macros/ToolInitialization/lib b/macros/ToolInitialization/lib index 0b3bb8ea..6240d3dd 100644 Binary files a/macros/ToolInitialization/lib and b/macros/ToolInitialization/lib differ diff --git a/macros/findDeps/getAllHeaders.bin b/macros/findDeps/getAllHeaders.bin index 9e341beb..3c3b9374 100644 Binary files a/macros/findDeps/getAllHeaders.bin and b/macros/findDeps/getAllHeaders.bin differ diff --git a/macros/findDeps/getAllHeaders.sci b/macros/findDeps/getAllHeaders.sci index f7147662..d97d04c3 100644 --- a/macros/findDeps/getAllHeaders.sci +++ b/macros/findDeps/getAllHeaders.sci @@ -135,7 +135,8 @@ function allHeaders = getAllHeaders(Target) "src/c/signalProcessing/includes/dynlib_signalprocessing.h" "src/c/signalProcessing/includes/crossCorr.h" "src/c/implicitList/dynlib_implicitlist.h" - "src/c/implicitList/implicitList.h"]; + "src/c/implicitList/implicitList.h" + "src/c/differential_calculus/includes/ode.h"]; //Header files required for "Arduino" output Arduino_headers = [ diff --git a/macros/findDeps/getAllInterfaces.bin b/macros/findDeps/getAllInterfaces.bin index bd21bba3..b0b53347 100644 Binary files a/macros/findDeps/getAllInterfaces.bin and b/macros/findDeps/getAllInterfaces.bin differ diff --git a/macros/findDeps/getAllInterfaces.sci b/macros/findDeps/getAllInterfaces.sci index 9d29bdbb..9818071f 100644 --- a/macros/findDeps/getAllInterfaces.sci +++ b/macros/findDeps/getAllInterfaces.sci @@ -129,7 +129,8 @@ function allInterfaces = getAllInterfaces(Target) "src/c/signalProcessing/interfaces/int_fftshift.h" "src/c/signalProcessing/interfaces/int_fft.h" "src/c/signalProcessing/interfaces/int_lev.h" - "src/c/implicitList/int_OpColon.h"]; + "src/c/implicitList/int_OpColon.h" + "src/c/differential_calculus/interfaces/int_ode.h"]; //Interface files required for "Arduino" output Arduino_interfaces = [ diff --git a/macros/findDeps/getAllLibraries.bin b/macros/findDeps/getAllLibraries.bin index bad19ff3..c27e3309 100644 Binary files a/macros/findDeps/getAllLibraries.bin and b/macros/findDeps/getAllLibraries.bin differ diff --git a/macros/findDeps/getAllSources.bin b/macros/findDeps/getAllSources.bin index 0e42a660..a25aa618 100644 Binary files a/macros/findDeps/getAllSources.bin and b/macros/findDeps/getAllSources.bin differ diff --git a/macros/findDeps/getAllSources.sci b/macros/findDeps/getAllSources.sci index d03ab17a..8fc0d310 100644 --- a/macros/findDeps/getAllSources.sci +++ b/macros/findDeps/getAllSources.sci @@ -897,7 +897,8 @@ function allSources = getAllSources(Target) "src/c/implicitList/zimplicitLists.c" "src/c/implicitList/dimplicitLists.c" "src/c/implicitList/cimplicitLists.c" - "src/c/implicitList/simplicitLists.c" ]; + "src/c/implicitList/simplicitLists.c" + "src/c/differential_calculus/ode/ode.c"]; //Files to be inserted only if output format selected is 'Arduino'. Arduino_files = ["src/c/scilab-arduino/cmd_digital_out/u8cmd_digital_outs.c" diff --git a/macros/lib b/macros/lib index f3cab7db..1b718c75 100644 Binary files a/macros/lib and b/macros/lib differ diff --git a/macros/runsci2c.bin b/macros/runsci2c.bin index 7d47f430..90bd8861 100644 Binary files a/macros/runsci2c.bin and b/macros/runsci2c.bin differ diff --git a/macros/runsci2c.sci b/macros/runsci2c.sci index 04543106..41495cb4 100644 --- a/macros/runsci2c.sci +++ b/macros/runsci2c.sci @@ -107,7 +107,7 @@ mkdir(SCI2COutputPath+"/libraries/"); 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/differential_calculus/includes/ode.h b/src/c/differential_calculus/includes/ode.h new file mode 100644 index 00000000..46220a84 --- /dev/null +++ b/src/c/differential_calculus/includes/ode.h @@ -0,0 +1,9 @@ +// FOSSEE IIT Bombay +#ifdef __INT_ODE_H__ +#define __INT_ODE_H__ + +double ODE(double initial_value, double start_time, double end_time, \ + char *ode_function, double nequs, double eps_abs, double eps_rel \ + double step_size) + +#endif /*__INT_ODE_H__*/ \ No newline at end of file diff --git a/src/c/differential_calculus/interfaces/int_ode.h b/src/c/differential_calculus/interfaces/int_ode.h new file mode 100644 index 00000000..5000ed5e --- /dev/null +++ b/src/c/differential_calculus/interfaces/int_ode.h @@ -0,0 +1,9 @@ +// FOSSEE IIT Bombay + +#ifdef __INT_ODE_H__ +#define __INT_ODE_H__ + +#define d0d0d0g2ODEd0(in1, in2, in3, in4) ODE(in1, in2, in3, in4, 1, 1.0e-2,\ + 1.0e-2, 1.0e-6) + +#endif /*__INT_ODE_H__*/ \ No newline at end of file diff --git a/src/c/differential_calculus/ode/ode.c b/src/c/differential_calculus/ode/ode.c new file mode 100644 index 00000000..b815e367 --- /dev/null +++ b/src/c/differential_calculus/ode/ode.c @@ -0,0 +1,26 @@ +// FOSSEE IIT Bombay + +#include "ODE.h" +#include "types.h" + + +double ODE(double initial_value, double start_time, double end_time, \ + char *ode_function, double nequs, double eps_abs, double eps_rel \ + double step_size) +{ + double out = 0; + int status; + //Setup ODE related parameters + gsl_odeiv2_system sys = {ode_function, NULL, 2, NULL}; + + gsl_odeiv2_step *s = gsl_odeiv2_step_alloc (gsl_odeiv2_step_rkf45, nequs); + gsl_odeiv2_control *c = gsl_odeiv2_control_y_new (eps_abs, eps_rel); + gsl_odeiv2_evolve *e = gsl_odeiv2_evolve_alloc (nequs); + + status = gsl_odeiv2_evolve_apply_fixed_step (e, c, s, &sys, &t, stepsize, x_dot); + + if (status == GSL_SUCCESS) { + return out; + } + else return 0; +} diff --git a/src/c/elementaryFunctions/includes/bitand.h b/src/c/elementaryFunctions/includes/bitand.h index b7f5151e..f411e05b 100644 --- a/src/c/elementaryFunctions/includes/bitand.h +++ b/src/c/elementaryFunctions/includes/bitand.h @@ -8,7 +8,7 @@ #include "dynlib_elementaryfunctions.h" #include "types.h" -#ifdef __cpluscplus +#ifdef __cplusplus extern "C" { #endif /* bitand returns the logical AND operation diff --git a/src/c/elementaryFunctions/includes/bitcmp.h b/src/c/elementaryFunctions/includes/bitcmp.h index 8176681e..aa182659 100644 --- a/src/c/elementaryFunctions/includes/bitcmp.h +++ b/src/c/elementaryFunctions/includes/bitcmp.h @@ -8,7 +8,7 @@ #include "dynlib_elementaryfunctions.h" #include "types.h" -#ifdef __cpluscplus +#ifdef __cplusplus extern "C" { #endif /* bitcmp returns the complement diff --git a/src/c/elementaryFunctions/includes/bitget.h b/src/c/elementaryFunctions/includes/bitget.h index 0eaf57eb..47191558 100644 --- a/src/c/elementaryFunctions/includes/bitget.h +++ b/src/c/elementaryFunctions/includes/bitget.h @@ -8,7 +8,7 @@ #include "dynlib_elementaryfunctions.h" #include "types.h" -#ifdef __cpluscplus +#ifdef __cplusplus extern "C" { #endif diff --git a/src/c/elementaryFunctions/includes/bitor.h b/src/c/elementaryFunctions/includes/bitor.h index 16a6a3d1..d915ffae 100644 --- a/src/c/elementaryFunctions/includes/bitor.h +++ b/src/c/elementaryFunctions/includes/bitor.h @@ -8,7 +8,7 @@ #include "dynlib_elementaryfunctions.h" #include "types.h" -#ifdef __cpluscplus +#ifdef __cplusplus extern "C" { #endif /* bitor returns the logical OR operation diff --git a/src/c/elementaryFunctions/includes/bitset.h b/src/c/elementaryFunctions/includes/bitset.h index 862a4c80..52f9f2cf 100644 --- a/src/c/elementaryFunctions/includes/bitset.h +++ b/src/c/elementaryFunctions/includes/bitset.h @@ -8,7 +8,7 @@ #include "dynlib_elementaryfunctions.h" #include "types.h" -#ifdef __cpluscplus +#ifdef __cplusplus extern "C" { #endif diff --git a/src/c/elementaryFunctions/includes/bitxor.h b/src/c/elementaryFunctions/includes/bitxor.h index 4e276353..3bc77a2e 100644 --- a/src/c/elementaryFunctions/includes/bitxor.h +++ b/src/c/elementaryFunctions/includes/bitxor.h @@ -8,7 +8,7 @@ #include "dynlib_elementaryfunctions.h" #include "types.h" -#ifdef __cpluscplus +#ifdef __cplusplus extern "C" { #endif /* bitxor returns the logical OR operation diff --git a/src/c/scilab-arduino/default_files/setup_arduino.h b/src/c/scilab-arduino/default_files/setup_arduino.h index 9eb0ed4a..acbf8e21 100644 --- a/src/c/scilab-arduino/default_files/setup_arduino.h +++ b/src/c/scilab-arduino/default_files/setup_arduino.h @@ -24,6 +24,7 @@ ** --- SCI2C Includes. --- ** ----------------------- */ +#include "Arduino.h" #include "sci2clib.h" /* ** --------------------------- -- cgit