From 369c257b9ae0320621b43ca75b38ff66cc13f37b Mon Sep 17 00:00:00 2001 From: yash1112 Date: Mon, 19 Jun 2017 05:40:46 +0530 Subject: 1.3 new scilab-arduino functions added2. all functions have been tested on hardware 3. 5 i2c library functions added 4. Now generates code for 27 Boards(arduino and lilypad). 5. New GUI --- macros/CCodeGeneration/C_FinalizeCode.bin | Bin 0 -> 18232 bytes macros/CCodeGeneration/C_ForExpression.bin | Bin 0 -> 32208 bytes macros/CCodeGeneration/C_Funcall.bin | Bin 0 -> 73176 bytes macros/CCodeGeneration/C_GenDeclarations.bin | Bin 0 -> 22004 bytes macros/CCodeGeneration/C_GenerateFunName.bin | Bin 0 -> 7776 bytes macros/CCodeGeneration/C_GenerateLaunchScript.bin | Bin 0 -> 17232 bytes macros/CCodeGeneration/C_GenerateMakefile.bin | Bin 0 -> 32632 bytes macros/CCodeGeneration/C_GenerateMakefile_msvc.bin | Bin 0 -> 29868 bytes macros/CCodeGeneration/C_GenerateMkfle_arduino.bin | Bin 0 -> 3104 bytes macros/CCodeGeneration/C_GenerateMkfle_arduino.sci | 12 ++++++++++++ macros/CCodeGeneration/C_GenerateSCI2CHeader.bin | Bin 0 -> 1936 bytes macros/CCodeGeneration/C_IfElseBlocks.bin | Bin 0 -> 8516 bytes macros/CCodeGeneration/C_IfExpression.bin | Bin 0 -> 10612 bytes macros/CCodeGeneration/C_IndentBlanks.bin | Bin 0 -> 3184 bytes macros/CCodeGeneration/C_InitHeader.bin | Bin 0 -> 14140 bytes macros/CCodeGeneration/C_MemAllocOutTempVars.bin | Bin 0 -> 12996 bytes macros/CCodeGeneration/C_SCI2CHeader.bin | Bin 0 -> 7268 bytes macros/CCodeGeneration/C_Type.bin | Bin 0 -> 6816 bytes macros/CCodeGeneration/C_WhileExpression.bin | Bin 0 -> 13196 bytes macros/CCodeGeneration/GenCFunDatFiles.bin | Bin 0 -> 9348 bytes macros/CCodeGeneration/GetClsFileName.bin | Bin 0 -> 13340 bytes macros/CCodeGeneration/GetSymbolDimension.bin | Bin 0 -> 8944 bytes macros/CCodeGeneration/GetWhileCondVariable.bin | Bin 0 -> 10228 bytes macros/CCodeGeneration/JoinDeclarAndCcode.bin | Bin 0 -> 22776 bytes macros/CCodeGeneration/Sci2AnnotationFile.bin | Bin 0 -> 7400 bytes macros/CCodeGeneration/lib | Bin 2449 -> 1044 bytes macros/CCodeGeneration/names | 1 + 27 files changed, 13 insertions(+) create mode 100644 macros/CCodeGeneration/C_FinalizeCode.bin create mode 100644 macros/CCodeGeneration/C_ForExpression.bin create mode 100644 macros/CCodeGeneration/C_Funcall.bin create mode 100644 macros/CCodeGeneration/C_GenDeclarations.bin create mode 100644 macros/CCodeGeneration/C_GenerateFunName.bin create mode 100644 macros/CCodeGeneration/C_GenerateLaunchScript.bin create mode 100644 macros/CCodeGeneration/C_GenerateMakefile.bin create mode 100644 macros/CCodeGeneration/C_GenerateMakefile_msvc.bin create mode 100644 macros/CCodeGeneration/C_GenerateMkfle_arduino.bin create mode 100644 macros/CCodeGeneration/C_GenerateMkfle_arduino.sci create mode 100644 macros/CCodeGeneration/C_GenerateSCI2CHeader.bin create mode 100644 macros/CCodeGeneration/C_IfElseBlocks.bin create mode 100644 macros/CCodeGeneration/C_IfExpression.bin create mode 100644 macros/CCodeGeneration/C_IndentBlanks.bin create mode 100644 macros/CCodeGeneration/C_InitHeader.bin create mode 100644 macros/CCodeGeneration/C_MemAllocOutTempVars.bin create mode 100644 macros/CCodeGeneration/C_SCI2CHeader.bin create mode 100644 macros/CCodeGeneration/C_Type.bin create mode 100644 macros/CCodeGeneration/C_WhileExpression.bin create mode 100644 macros/CCodeGeneration/GenCFunDatFiles.bin create mode 100644 macros/CCodeGeneration/GetClsFileName.bin create mode 100644 macros/CCodeGeneration/GetSymbolDimension.bin create mode 100644 macros/CCodeGeneration/GetWhileCondVariable.bin create mode 100644 macros/CCodeGeneration/JoinDeclarAndCcode.bin create mode 100644 macros/CCodeGeneration/Sci2AnnotationFile.bin (limited to 'macros/CCodeGeneration') diff --git a/macros/CCodeGeneration/C_FinalizeCode.bin b/macros/CCodeGeneration/C_FinalizeCode.bin new file mode 100644 index 00000000..b4005914 Binary files /dev/null and b/macros/CCodeGeneration/C_FinalizeCode.bin differ diff --git a/macros/CCodeGeneration/C_ForExpression.bin b/macros/CCodeGeneration/C_ForExpression.bin new file mode 100644 index 00000000..1c3f6747 Binary files /dev/null and b/macros/CCodeGeneration/C_ForExpression.bin differ diff --git a/macros/CCodeGeneration/C_Funcall.bin b/macros/CCodeGeneration/C_Funcall.bin new file mode 100644 index 00000000..80fda7c4 Binary files /dev/null and b/macros/CCodeGeneration/C_Funcall.bin differ diff --git a/macros/CCodeGeneration/C_GenDeclarations.bin b/macros/CCodeGeneration/C_GenDeclarations.bin new file mode 100644 index 00000000..c3b36009 Binary files /dev/null and b/macros/CCodeGeneration/C_GenDeclarations.bin differ diff --git a/macros/CCodeGeneration/C_GenerateFunName.bin b/macros/CCodeGeneration/C_GenerateFunName.bin new file mode 100644 index 00000000..1b723f16 Binary files /dev/null and b/macros/CCodeGeneration/C_GenerateFunName.bin differ diff --git a/macros/CCodeGeneration/C_GenerateLaunchScript.bin b/macros/CCodeGeneration/C_GenerateLaunchScript.bin new file mode 100644 index 00000000..587c1547 Binary files /dev/null and b/macros/CCodeGeneration/C_GenerateLaunchScript.bin differ diff --git a/macros/CCodeGeneration/C_GenerateMakefile.bin b/macros/CCodeGeneration/C_GenerateMakefile.bin new file mode 100644 index 00000000..cea86411 Binary files /dev/null and b/macros/CCodeGeneration/C_GenerateMakefile.bin differ diff --git a/macros/CCodeGeneration/C_GenerateMakefile_msvc.bin b/macros/CCodeGeneration/C_GenerateMakefile_msvc.bin new file mode 100644 index 00000000..838c674e Binary files /dev/null and b/macros/CCodeGeneration/C_GenerateMakefile_msvc.bin differ diff --git a/macros/CCodeGeneration/C_GenerateMkfle_arduino.bin b/macros/CCodeGeneration/C_GenerateMkfle_arduino.bin new file mode 100644 index 00000000..ce25219f Binary files /dev/null and b/macros/CCodeGeneration/C_GenerateMkfle_arduino.bin differ diff --git a/macros/CCodeGeneration/C_GenerateMkfle_arduino.sci b/macros/CCodeGeneration/C_GenerateMkfle_arduino.sci new file mode 100644 index 00000000..b43eb442 --- /dev/null +++ b/macros/CCodeGeneration/C_GenerateMkfle_arduino.sci @@ -0,0 +1,12 @@ +function C_GenerateMkfle_arduino(FileInfo,SharedInfo) + + PrintStringInfo('ARDUINO_DIR = /usr/share/arduino',FileInfo.MakefileFilename,'file','y','y'); + PrintStringInfo('ARDMK_DIR = /usr/share/arduino',FileInfo.MakefileFilename,'file','y','y'); + PrintStringInfo('AVR_TOOLS_DIR = /usr',FileInfo.MakefileFilename,'file','y','y'); + PrintStringInfo('BOARD_TAG = ' + SharedInfo.Board_name ,FileInfo.MakefileFilename,'file','y','y'); + PrintStringInfo('USER_LIB_PATH = ../',FileInfo.MakefileFilename,'file','y','y'); + PrintStringInfo('ARDUINO_LIBS = ../src/c ../includes ../interfaces ../ Wire',FileInfo.MakefileFilename,'file','y','y'); + PrintStringInfo('ARDUINO_PORT = /dev/ttyACM0',FileInfo.MakefileFilename,'file','y','y'); + PrintStringInfo('include /usr/share/arduino/Arduino.mk',FileInfo.MakefileFilename,'file','y','y'); + +endfunction diff --git a/macros/CCodeGeneration/C_GenerateSCI2CHeader.bin b/macros/CCodeGeneration/C_GenerateSCI2CHeader.bin new file mode 100644 index 00000000..2e02cae4 Binary files /dev/null and b/macros/CCodeGeneration/C_GenerateSCI2CHeader.bin differ diff --git a/macros/CCodeGeneration/C_IfElseBlocks.bin b/macros/CCodeGeneration/C_IfElseBlocks.bin new file mode 100644 index 00000000..332e89bf Binary files /dev/null and b/macros/CCodeGeneration/C_IfElseBlocks.bin differ diff --git a/macros/CCodeGeneration/C_IfExpression.bin b/macros/CCodeGeneration/C_IfExpression.bin new file mode 100644 index 00000000..c6cda7bd Binary files /dev/null and b/macros/CCodeGeneration/C_IfExpression.bin differ diff --git a/macros/CCodeGeneration/C_IndentBlanks.bin b/macros/CCodeGeneration/C_IndentBlanks.bin new file mode 100644 index 00000000..77bfaebc Binary files /dev/null and b/macros/CCodeGeneration/C_IndentBlanks.bin differ diff --git a/macros/CCodeGeneration/C_InitHeader.bin b/macros/CCodeGeneration/C_InitHeader.bin new file mode 100644 index 00000000..567822c0 Binary files /dev/null and b/macros/CCodeGeneration/C_InitHeader.bin differ diff --git a/macros/CCodeGeneration/C_MemAllocOutTempVars.bin b/macros/CCodeGeneration/C_MemAllocOutTempVars.bin new file mode 100644 index 00000000..443ad3c1 Binary files /dev/null and b/macros/CCodeGeneration/C_MemAllocOutTempVars.bin differ diff --git a/macros/CCodeGeneration/C_SCI2CHeader.bin b/macros/CCodeGeneration/C_SCI2CHeader.bin new file mode 100644 index 00000000..1d3e6182 Binary files /dev/null and b/macros/CCodeGeneration/C_SCI2CHeader.bin differ diff --git a/macros/CCodeGeneration/C_Type.bin b/macros/CCodeGeneration/C_Type.bin new file mode 100644 index 00000000..7b5bf444 Binary files /dev/null and b/macros/CCodeGeneration/C_Type.bin differ diff --git a/macros/CCodeGeneration/C_WhileExpression.bin b/macros/CCodeGeneration/C_WhileExpression.bin new file mode 100644 index 00000000..cff8f38d Binary files /dev/null and b/macros/CCodeGeneration/C_WhileExpression.bin differ diff --git a/macros/CCodeGeneration/GenCFunDatFiles.bin b/macros/CCodeGeneration/GenCFunDatFiles.bin new file mode 100644 index 00000000..6a374f5b Binary files /dev/null and b/macros/CCodeGeneration/GenCFunDatFiles.bin differ diff --git a/macros/CCodeGeneration/GetClsFileName.bin b/macros/CCodeGeneration/GetClsFileName.bin new file mode 100644 index 00000000..30b25713 Binary files /dev/null and b/macros/CCodeGeneration/GetClsFileName.bin differ diff --git a/macros/CCodeGeneration/GetSymbolDimension.bin b/macros/CCodeGeneration/GetSymbolDimension.bin new file mode 100644 index 00000000..5c73f435 Binary files /dev/null and b/macros/CCodeGeneration/GetSymbolDimension.bin differ diff --git a/macros/CCodeGeneration/GetWhileCondVariable.bin b/macros/CCodeGeneration/GetWhileCondVariable.bin new file mode 100644 index 00000000..6815fb4b Binary files /dev/null and b/macros/CCodeGeneration/GetWhileCondVariable.bin differ diff --git a/macros/CCodeGeneration/JoinDeclarAndCcode.bin b/macros/CCodeGeneration/JoinDeclarAndCcode.bin new file mode 100644 index 00000000..084ab085 Binary files /dev/null and b/macros/CCodeGeneration/JoinDeclarAndCcode.bin differ diff --git a/macros/CCodeGeneration/Sci2AnnotationFile.bin b/macros/CCodeGeneration/Sci2AnnotationFile.bin new file mode 100644 index 00000000..95fe5611 Binary files /dev/null and b/macros/CCodeGeneration/Sci2AnnotationFile.bin differ diff --git a/macros/CCodeGeneration/lib b/macros/CCodeGeneration/lib index 2db4b8c8..d0cb0a22 100644 Binary files a/macros/CCodeGeneration/lib and b/macros/CCodeGeneration/lib differ diff --git a/macros/CCodeGeneration/names b/macros/CCodeGeneration/names index efbb400a..5311c7fd 100644 --- a/macros/CCodeGeneration/names +++ b/macros/CCodeGeneration/names @@ -6,6 +6,7 @@ C_GenerateFunName C_GenerateLaunchScript C_GenerateMakefile C_GenerateMakefile_msvc +C_GenerateMkfle_arduino C_GenerateSCI2CHeader C_IfElseBlocks C_IfExpression -- cgit From fad32de9c3df04a8fb032f9c604c79c89d062154 Mon Sep 17 00:00:00 2001 From: siddhu8990 Date: Tue, 20 Jun 2017 15:26:40 +0530 Subject: Bug fixed for GSL library --- macros/CCodeGeneration/C_GenerateMakefile.sci | 19 +++++++++++++++++++ macros/CCodeGeneration/lib | 2 +- 2 files changed, 20 insertions(+), 1 deletion(-) (limited to 'macros/CCodeGeneration') diff --git a/macros/CCodeGeneration/C_GenerateMakefile.sci b/macros/CCodeGeneration/C_GenerateMakefile.sci index 7dfb4da4..893ec938 100644 --- a/macros/CCodeGeneration/C_GenerateMakefile.sci +++ b/macros/CCodeGeneration/C_GenerateMakefile.sci @@ -78,6 +78,25 @@ else PrintStringInfo('CXXFLAGS = -Wall -pedantic -g -I $(HSRCDIR) -I $(ISRCDIR) -L $(LIBDIR)',FileInfo.MakefileFilename,'file','y','y'); PrintStringInfo('LDFLAGS = -lblas -llapack -lm ',FileInfo.MakefileFilename,'file','y','y'); end + + //If ode function is used, add libgsl. + if(size(SharedInfo.Includelist) <> 0) + if((mtlb_strcmp(part(SharedInfo.Includelist(1),1:5),'odefn') == %T)) + if(target == 'RPi') + PrintStringInfo('LDFLAGS = -lgsl -lcblas',FileInfo.MakefileFilename,'file','y','y'); + else + PrintStringInfo('LDFLAGS = -lgsl',FileInfo.MakefileFilename,'file','y','y'); + end + + end + end + + if (target == 'RPi') + PrintStringInfo('LDFLAGS += -llapack -lrefblas -lgfortran -lwiringPi',FileInfo.MakefileFilename,'file','y','y'); + else + PrintStringInfo('LDFLAGS += -lblas -llapack -lm ',FileInfo.MakefileFilename,'file','y','y'); + end + if(SharedInfo.OpenCVUsed == %T) PrintStringInfo('LDFLAGS += -lopencv_calib3d -lopencv_contrib -lopencv_features2d -lopencv_flann -lopencv_gpu',FileInfo.MakefileFilename,'file','y','y'); PrintStringInfo('LDFLAGS += -lopencv_highgui -lopencv_imgproc -lopencv_legacy -lopencv_ml -lopencv_nonfree',FileInfo.MakefileFilename,'file','y','y'); diff --git a/macros/CCodeGeneration/lib b/macros/CCodeGeneration/lib index 2db4b8c8..28e3346a 100644 --- a/macros/CCodeGeneration/lib +++ b/macros/CCodeGeneration/lib @@ -6,7 +6,7 @@ - + -- cgit