From 7c5fc74b8ea4a27dac0b44d681d36e46ac08d8fa Mon Sep 17 00:00:00 2001 From: siddhu8990 Date: Wed, 2 Mar 2016 14:20:36 +0530 Subject: Intermediate commit --- macros/CCodeGeneration/C_GenerateMakefile.bin | Bin 24940 -> 26144 bytes macros/CCodeGeneration/C_GenerateMakefile.sci | 35 ++++++++++++------------ macros/Scilab-Arduino/GenerateSetupFunction.bin | Bin 4296 -> 4540 bytes macros/findDeps/getAllHeaders.bin | Bin 25820 -> 27716 bytes macros/findDeps/getAllHeaders.sci | 6 ++-- macros/findDeps/getAllInterfaces.bin | Bin 27108 -> 28680 bytes macros/findDeps/getAllInterfaces.sci | 2 +- macros/findDeps/getAllLibraries.bin | Bin 1648 -> 1704 bytes macros/findDeps/getAllLibraries.sci | 2 ++ macros/findDeps/getAllSources.bin | Bin 158532 -> 164944 bytes macros/findDeps/getAllSources.sci | 6 ++-- macros/runsci2c.bin | Bin 27996 -> 28692 bytes macros/runsci2c.sci | 2 +- 13 files changed, 28 insertions(+), 25 deletions(-) (limited to 'macros') diff --git a/macros/CCodeGeneration/C_GenerateMakefile.bin b/macros/CCodeGeneration/C_GenerateMakefile.bin index feff05f8..43de2290 100644 Binary files a/macros/CCodeGeneration/C_GenerateMakefile.bin and b/macros/CCodeGeneration/C_GenerateMakefile.bin differ diff --git a/macros/CCodeGeneration/C_GenerateMakefile.sci b/macros/CCodeGeneration/C_GenerateMakefile.sci index 1ef5a411..4817af1e 100644 --- a/macros/CCodeGeneration/C_GenerateMakefile.sci +++ b/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/macros/Scilab-Arduino/GenerateSetupFunction.bin b/macros/Scilab-Arduino/GenerateSetupFunction.bin index ee4b6f95..ea2bdec3 100644 Binary files a/macros/Scilab-Arduino/GenerateSetupFunction.bin and b/macros/Scilab-Arduino/GenerateSetupFunction.bin differ diff --git a/macros/findDeps/getAllHeaders.bin b/macros/findDeps/getAllHeaders.bin index 0dbfba5e..9e341beb 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 4061c04c..4709a15c 100644 --- a/macros/findDeps/getAllHeaders.sci +++ b/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/macros/findDeps/getAllInterfaces.bin b/macros/findDeps/getAllInterfaces.bin index 80868ed8..bd21bba3 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 d31376af..ae6d8692 100644 --- a/macros/findDeps/getAllInterfaces.sci +++ b/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/macros/findDeps/getAllLibraries.bin b/macros/findDeps/getAllLibraries.bin index e6ddf718..bad19ff3 100644 Binary files a/macros/findDeps/getAllLibraries.bin and b/macros/findDeps/getAllLibraries.bin differ diff --git a/macros/findDeps/getAllLibraries.sci b/macros/findDeps/getAllLibraries.sci index 1d633ea4..f309f0bf 100644 --- a/macros/findDeps/getAllLibraries.sci +++ b/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/macros/findDeps/getAllSources.bin b/macros/findDeps/getAllSources.bin index 82a109ac..0e42a660 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 2fda7531..a0d88c79 100644 --- a/macros/findDeps/getAllSources.sci +++ b/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/macros/runsci2c.bin b/macros/runsci2c.bin index f6fd2393..7d47f430 100644 Binary files a/macros/runsci2c.bin and b/macros/runsci2c.bin differ diff --git a/macros/runsci2c.sci b/macros/runsci2c.sci index 41495cb4..04543106 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 -- cgit