Intermediate commit

15 files changed, 36 insertions, 34 deletions

diff --git a/2.3-1/includes/sci2clib.h b/2.3-1/includes/sci2clib.h
index c52f0d67..5f019308 100644
--- a/2.3-1/includes/sci2clib.h
+++ b/2.3-1/includes/sci2clib.h
@@ -374,10 +374,10 @@
 #include "cmd_dcmotor_setup.h"
 #include "int_sleep.h"
 #include "sleep.h"
-#include "cmd_servo_attach.h"
-#include "cmd_servo_detach.h"
-#include "cmd_servo_move.h"
-#include "int_cmd_servo.h"
+//#include "cmd_servo_attach.h"
+//#include "cmd_servo_detach.h"
+//#include "cmd_servo_move.h"
+//#include "int_cmd_servo.h"
 #endif
 
 /*AVR*/
diff --git a/2.3-1/macros/CCodeGeneration/C_GenerateMakefile.bin b/2.3-1/macros/CCodeGeneration/C_GenerateMakefile.bin
index feff05f8..43de2290 100644
--- a/2.3-1/macros/CCodeGeneration/C_GenerateMakefile.bin
+++ b/2.3-1/macros/CCodeGeneration/C_GenerateMakefile.bin
diff --git a/2.3-1/macros/CCodeGeneration/C_GenerateMakefile.sci b/2.3-1/macros/CCodeGeneration/C_GenerateMakefile.sci
index 1ef5a411..4817af1e 100644
--- a/2.3-1/macros/CCodeGeneration/C_GenerateMakefile.sci
+++ b/2.3-1/macros/CCodeGeneration/C_GenerateMakefile.sci
@@ -56,25 +56,26 @@ PrintStringInfo('LIBDIR     = '+makelibdir,FileInfo.MakefileFilename,'file','y',
 PrintStringInfo('SCI2CDIR    = .',FileInfo.MakefileFilename,'file','y','y');
 
 if getos() == 'Windows' then   
-
-    // Compiler definition
-if (target == 'RPi')
-	PrintStringInfo('CC     = arm-linux-gnueabihf-gcc ',FileInfo.MakefileFilename,'file','y','y');
-else
-	PrintStringInfo('CC     = gcc',FileInfo.MakefileFilename,'file','y','y');
-end 
-PrintStringInfo('CFLAGS = -Wall -pedantic -g -I $(HSRCDIR) -I $(ISRCDIR) -L $(LIBDIR)',FileInfo.MakefileFilename,'file','y','y');
-if (target == 'RPi')
-	PrintStringInfo('LDFLAGS = -llapack -lrefblas -lgfortran -lm -lbcm2835',FileInfo.MakefileFilename,'file','y','y');
-else
-	PrintStringInfo('LDFLAGS = -lblas -llapack -lm ',FileInfo.MakefileFilename,'file','y','y');
-end
-else 
+  
      // Compiler definition
-    PrintStringInfo('CC     = gcc',FileInfo.MakefileFilename,'file','y','y');
-    PrintStringInfo('CFLAGS = -Wall -pedantic -g -I $(HSRCDIR) -I $(ISRCDIR)',FileInfo.MakefileFilename,'file','y','y');
-    PrintStringInfo('LDFLAGS = -lblas -llapack -lm',FileInfo.MakefileFilename,'file','y','y');
+     PrintStringInfo('CC     = gcc',FileInfo.MakefileFilename,'file','y','y');
+     PrintStringInfo('CFLAGS = -Wall -pedantic -g -I $(HSRCDIR) -I $(ISRCDIR)',FileInfo.MakefileFilename,'file','y','y');
+     PrintStringInfo('LDFLAGS = -L./ -lblasplus -llapack -lm',FileInfo.MakefileFilename,'file','y','y');   //Added -L./ and -lblasplus(previously it was -lblas)
+     
+else 
+	if (target == 'RPi')
+		PrintStringInfo('CC     = arm-linux-gnueabihf-gcc ',FileInfo.MakefileFilename,'file','y','y');
+	else
+		PrintStringInfo('CC     = gcc',FileInfo.MakefileFilename,'file','y','y');
+	end 
+	PrintStringInfo('CFLAGS = -Wall -pedantic -g -I $(HSRCDIR) -I $(ISRCDIR) -L $(LIBDIR)',FileInfo.MakefileFilename,'file','y','y');
+	if (target == 'RPi')
+		PrintStringInfo('LDFLAGS = -llapack -lrefblas -lgfortran -lm -lbcm2835',FileInfo.MakefileFilename,'file','y','y');
+	else
+		PrintStringInfo('LDFLAGS = -lblas -llapack -lm ',FileInfo.MakefileFilename,'file','y','y');
+	end
 end
+
 // Binary definition
 PrintStringInfo('EXEFILENAME = mytest.exe',FileInfo.MakefileFilename,'file','y','y');
 PrintStringInfo('EXEFILE = $(SCI2CDIR)/$(EXEFILENAME)', FileInfo.MakefileFilename,'file','y','y');
diff --git a/2.3-1/macros/Scilab-Arduino/GenerateSetupFunction.bin b/2.3-1/macros/Scilab-Arduino/GenerateSetupFunction.bin
index ee4b6f95..ea2bdec3 100644
--- a/2.3-1/macros/Scilab-Arduino/GenerateSetupFunction.bin
+++ b/2.3-1/macros/Scilab-Arduino/GenerateSetupFunction.bin
diff --git a/2.3-1/macros/findDeps/getAllHeaders.bin b/2.3-1/macros/findDeps/getAllHeaders.bin
index 0dbfba5e..9e341beb 100644
--- a/2.3-1/macros/findDeps/getAllHeaders.bin
+++ b/2.3-1/macros/findDeps/getAllHeaders.bin
diff --git a/2.3-1/macros/findDeps/getAllHeaders.sci b/2.3-1/macros/findDeps/getAllHeaders.sci
index 4061c04c..4709a15c 100644
--- a/2.3-1/macros/findDeps/getAllHeaders.sci
+++ b/2.3-1/macros/findDeps/getAllHeaders.sci
@@ -142,9 +142,9 @@ function allHeaders = getAllHeaders(Target)
       "src/c/scilab-arduino/includes/cmd_analog_in.h"
       "src/c/scilab-arduino/includes/cmd_dcmotor_setup.h"
       "src/c/scilab-arduino/includes/cmd_dcmotor_run.h"
-      "src/c/scilab-arduino/includes/cmd_servo_attach.h"
-      "src/c/scilab-arduino/includes/cmd_servo_detach.h"
-      "src/c/scilab-arduino/includes/cmd_servo_move.h"
+//      "src/c/scilab-arduino/includes/cmd_servo_attach.h"
+//      "src/c/scilab-arduino/includes/cmd_servo_detach.h"
+//      "src/c/scilab-arduino/includes/cmd_servo_move.h"
       "src/c/scilab-arduino/includes/sleep.h"];
 
   AVR_headers = [
diff --git a/2.3-1/macros/findDeps/getAllInterfaces.bin b/2.3-1/macros/findDeps/getAllInterfaces.bin
index 80868ed8..bd21bba3 100644
--- a/2.3-1/macros/findDeps/getAllInterfaces.bin
+++ b/2.3-1/macros/findDeps/getAllInterfaces.bin
diff --git a/2.3-1/macros/findDeps/getAllInterfaces.sci b/2.3-1/macros/findDeps/getAllInterfaces.sci
index d31376af..ae6d8692 100644
--- a/2.3-1/macros/findDeps/getAllInterfaces.sci
+++ b/2.3-1/macros/findDeps/getAllInterfaces.sci
@@ -135,7 +135,7 @@ function allInterfaces = getAllInterfaces(Target)
       "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_cmd_dcmotor.h"
-      "src/c/scilab-arduino/interfaces/int_cmd_servo.h"
+//      "src/c/scilab-arduino/interfaces/int_cmd_servo.h"
       "src/c/scilab-arduino/interfaces/int_sleep.h"];
 
   //Interface files required for "AVR" output
diff --git a/2.3-1/macros/findDeps/getAllLibraries.bin b/2.3-1/macros/findDeps/getAllLibraries.bin
index e6ddf718..bad19ff3 100644
--- a/2.3-1/macros/findDeps/getAllLibraries.bin
+++ b/2.3-1/macros/findDeps/getAllLibraries.bin
diff --git a/2.3-1/macros/findDeps/getAllLibraries.sci b/2.3-1/macros/findDeps/getAllLibraries.sci
index 1d633ea4..f309f0bf 100644
--- a/2.3-1/macros/findDeps/getAllLibraries.sci
+++ b/2.3-1/macros/findDeps/getAllLibraries.sci
@@ -12,6 +12,8 @@ function allLibraries = getAllLibraries(Target)
 
   if Target == "RPi"
   allLibraries = RPi_libs;
+  else
+  allLibraries = [];
   end
 
 endfunction
diff --git a/2.3-1/macros/findDeps/getAllSources.bin b/2.3-1/macros/findDeps/getAllSources.bin
index 82a109ac..0e42a660 100644
--- a/2.3-1/macros/findDeps/getAllSources.bin
+++ b/2.3-1/macros/findDeps/getAllSources.bin
diff --git a/2.3-1/macros/findDeps/getAllSources.sci b/2.3-1/macros/findDeps/getAllSources.sci
index 2fda7531..a0d88c79 100644
--- a/2.3-1/macros/findDeps/getAllSources.sci
+++ b/2.3-1/macros/findDeps/getAllSources.sci
@@ -872,9 +872,9 @@ function allSources = getAllSources(Target)
       "src/c/scilab-arduino/cmd_analog_in/u8cmd_analog_ins.c"
       "src/c/scilab-arduino/cmd_dcmotor_setup/u8cmd_dcmotor_setups.c"
       "src/c/scilab-arduino/cmd_dcmotor_run/u8cmd_dcmotor_runs.c"
-      "src/c/scilab-arduino/cmd_servo_attach/u8cmd_servo_attach.cpp"
-      "src/c/scilab-arduino/cmd_servo_detach/u8cmd_servo_detach.cpp"
-      "src/c/scilab-arduino/cmd_servo_move/u8cmd_servo_move.cpp"
+//      "src/c/scilab-arduino/cmd_servo_attach/u8cmd_servo_attach.cpp"
+//      "src/c/scilab-arduino/cmd_servo_detach/u8cmd_servo_detach.cpp"
+//      "src/c/scilab-arduino/cmd_servo_move/u8cmd_servo_move.cpp"
       "src/c/scilab-arduino/sleep/u16sleeps.c"];
 
   //Files to be inserted only if output format selected is 'AVR'.
diff --git a/2.3-1/macros/runsci2c.bin b/2.3-1/macros/runsci2c.bin
index f6fd2393..7d47f430 100644
--- a/2.3-1/macros/runsci2c.bin
+++ b/2.3-1/macros/runsci2c.bin
diff --git a/2.3-1/macros/runsci2c.sci b/2.3-1/macros/runsci2c.sci
index 41495cb4..04543106 100644
--- a/2.3-1/macros/runsci2c.sci
+++ b/2.3-1/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/2.3-1/src/c/elementaryFunctions/includes/bitand.h b/2.3-1/src/c/elementaryFunctions/includes/bitand.h
index 8d98d9be..b7f5151e 100644
--- a/2.3-1/src/c/elementaryFunctions/includes/bitand.h
+++ b/2.3-1/src/c/elementaryFunctions/includes/bitand.h
@@ -22,17 +22,16 @@ Bit Operation of 12 and 25
   00001000  = 8 (In decimal)
 */
 
-EXTERN_ELEMFUNCT uint8 u8bitands(uint8 in1,uint8 in2);
+uint8 u8bitands(uint8 in1,uint8 in2);
 
-EXTERN_ELEMFUNCT void u8bitanda(uint8* in1,uint8* in2,int size,uint8* out);
+void u8bitanda(uint8* in1,uint8* in2,int size,uint8* out);
 
-EXTERN_ELEMFUNCT uint16 u16bitands(uint16 in1,uint16 in2);
+uint16 u16bitands(uint16 in1,uint16 in2);
 
-EXTERN_ELEMFUNCT void u16bitanda(uint16* in1,uint16* in2,int size,uint16* out);
+void u16bitanda(uint16* in1,uint16* in2,int size,uint16* out);
 
 
 #ifdef __cplusplus
-
 } /*extern "C" */
 #endif