From de14a5628ad439e20770d10733ebdac46562a860 Mon Sep 17 00:00:00 2001 From: Jorawar Singh Date: Fri, 7 Jul 2017 13:00:37 +0530 Subject: Raspberry Pi function changes and minor gui changes --- macros/ASTManagement/AST2Ccode.sci | 2 -- macros/ASTManagement/AST_HandleEndGenFun.sci | 10 ++++---- macros/ASTManagement/lib | Bin 1896 -> 0 bytes macros/CCodeGeneration/C_GenerateMakefile.sci | 2 +- macros/CCodeGeneration/GetClsFileName.sci | 1 - macros/CCodeGeneration/lib | Bin 992 -> 0 bytes macros/ErrorMessages/lib | Bin 456 -> 0 bytes macros/FunctionAnnotation/lib | Bin 4090 -> 0 bytes macros/FunctionList/lib | Bin 524 -> 0 bytes macros/GeneralFunctions/lib | Bin 1068 -> 0 bytes macros/Hardware/AVR/lib | Bin 908 -> 0 bytes macros/Hardware/RasberryPi/lib | Bin 912 -> 0 bytes macros/ImageProcessing/core/lib | Bin 460 -> 0 bytes macros/ImageProcessing/highgui/lib | Bin 520 -> 0 bytes macros/ImageProcessing/imgproc/lib | Bin 688 -> 0 bytes macros/Scilab-Arduino/lib | Bin 652 -> 0 bytes macros/SymbolTable/lib | Bin 688 -> 0 bytes .../ToolInitialization/INIT_FillSCI2LibCDirs.sci | 26 +++++++++++++++++++++ macros/ToolInitialization/lib | Bin 1199 -> 0 bytes macros/findDeps/lib | Bin 847 -> 0 bytes macros/lib | Bin 472 -> 0 bytes macros/sci2c_gui.sci | 4 ++-- 22 files changed, 35 insertions(+), 10 deletions(-) delete mode 100644 macros/ASTManagement/lib delete mode 100644 macros/CCodeGeneration/lib delete mode 100644 macros/ErrorMessages/lib delete mode 100644 macros/FunctionAnnotation/lib delete mode 100644 macros/FunctionList/lib delete mode 100644 macros/GeneralFunctions/lib delete mode 100644 macros/Hardware/AVR/lib delete mode 100644 macros/Hardware/RasberryPi/lib delete mode 100644 macros/ImageProcessing/core/lib delete mode 100644 macros/ImageProcessing/highgui/lib delete mode 100644 macros/ImageProcessing/imgproc/lib delete mode 100644 macros/Scilab-Arduino/lib delete mode 100644 macros/SymbolTable/lib delete mode 100644 macros/ToolInitialization/lib delete mode 100644 macros/findDeps/lib delete mode 100644 macros/lib (limited to 'macros') diff --git a/macros/ASTManagement/AST2Ccode.sci b/macros/ASTManagement/AST2Ccode.sci index 563f3133..6fe190ec 100644 --- a/macros/ASTManagement/AST2Ccode.sci +++ b/macros/ASTManagement/AST2Ccode.sci @@ -145,7 +145,6 @@ while ~meof(fidAST) [disp_isthere,FileInfo,SharedInfo] = AST_HandleEndGenFun(disp_isthere,FileInfo,SharedInfo,'Operation'); case 'EndFuncall' then [disp_isthere,FileInfo,SharedInfo] = AST_HandleEndGenFun(disp_isthere,FileInfo,SharedInfo,'Funcall'); - disp(disp_isthere); // -------------- // --- Equal. --- @@ -174,7 +173,6 @@ while ~meof(fidAST) SharedInfo.Equal.Enabled = 1; // 1 means enabled -> we are inside an equal AST block. AST_PushASTStack(treeline); case 'Lhs :' then - disp(disp_isthere); if rc_count > 0 & cc_count == 0 SharedInfo.Equal.Lhs = 1; [EqualInArgName,EqualInArgScope,EqualNInArg] = AST_HandleRC(FileInfo,SharedInfo); diff --git a/macros/ASTManagement/AST_HandleEndGenFun.sci b/macros/ASTManagement/AST_HandleEndGenFun.sci index 96830aa9..41caa2ae 100644 --- a/macros/ASTManagement/AST_HandleEndGenFun.sci +++ b/macros/ASTManagement/AST_HandleEndGenFun.sci @@ -127,8 +127,10 @@ NOutArg_mod = NOutArg PrintStringInfo(' ',ReportFileName,'both','y'); error(9999, 'SCI2CERROR: Unexpected number of output arguments for global function.'); end - elseif(ASTFunName == 'raspi' | ASTFunName == 'raspi_close') - SharedInfo.SkipNextFun = 1; + //To skip the functions for Raspberry Pi connections + elseif(ASTFunName == 'raspi' | ASTFunName == 'raspi_close' | ASTFunName == 'i2cdetect') + disp_isthere=1; // Skips the corresponding Lhs argument declaration + return // Skips the function call end // #RNU_RES_B @@ -142,8 +144,8 @@ NOutArg_mod = NOutArg if ASTFunName == '%sn' ASTFunName='modsn'; - end - + end + if (ASTFunName == 'OpEqual') FunTypeAnnot = ''; FunSizeAnnot = ''; diff --git a/macros/ASTManagement/lib b/macros/ASTManagement/lib deleted file mode 100644 index 51b54f6f..00000000 Binary files a/macros/ASTManagement/lib and /dev/null differ diff --git a/macros/CCodeGeneration/C_GenerateMakefile.sci b/macros/CCodeGeneration/C_GenerateMakefile.sci index 3b977bd6..dbdae9d3 100644 --- a/macros/CCodeGeneration/C_GenerateMakefile.sci +++ b/macros/CCodeGeneration/C_GenerateMakefile.sci @@ -70,7 +70,7 @@ else PrintStringInfo('CXX = arm-linux-gnueabihf-g++ ',FileInfo.MakefileFilename,'file','y','y'); PrintStringInfo('CFLAGS = -Wall -pedantic -g -I $(HSRCDIR) -I $(ISRCDIR) -L $(LIBDIR)',FileInfo.MakefileFilename,'file','y','y'); PrintStringInfo('CXXFLAGS = -Wall -pedantic -g -I $(HSRCDIR) -I $(ISRCDIR) -L $(LIBDIR)',FileInfo.MakefileFilename,'file','y','y'); - PrintStringInfo('LDFLAGS = -llapack -lrefblas -lgfortran -lwiringPi -lwiringPiDev -lrt -lpthread',FileInfo.MakefileFilename,'file','y','y'); + PrintStringInfo('LDFLAGS = -llapack -lrefblas -lgfortran -lwiringPi -lwiringPiDev -lrt -lpthread -lRPIwfi',FileInfo.MakefileFilename,'file','y','y'); else PrintStringInfo('CC = gcc',FileInfo.MakefileFilename,'file','y','y'); PrintStringInfo('CXX = g++',FileInfo.MakefileFilename,'file','y','y'); diff --git a/macros/CCodeGeneration/GetClsFileName.sci b/macros/CCodeGeneration/GetClsFileName.sci index d92a431c..42204108 100644 --- a/macros/CCodeGeneration/GetClsFileName.sci +++ b/macros/CCodeGeneration/GetClsFileName.sci @@ -78,7 +78,6 @@ elseif (SCI2Cfileexist(FileInfo.SCI2CLibSCIAnnFun,tmpannfilename)) SCI2CClassName = FL_GetFunctionClass(AnnFileName,SCI2CClassSpecifier,ReportFileName); SCI2CClassFileName = fullfile(FileInfo.SCI2CLibSCIAnnCls,SCI2CClassName+'.acls'); end - if (FlagFoundAnnFile == 0) [FlagFoundAnnFile,fullpathscifilename] = SCI2CFindFile(FileInfo.UserSciFilesPaths,FunName+'.sci'); if (FlagFoundAnnFile == 0) diff --git a/macros/CCodeGeneration/lib b/macros/CCodeGeneration/lib deleted file mode 100644 index 4ee8cb6c..00000000 Binary files a/macros/CCodeGeneration/lib and /dev/null differ diff --git a/macros/ErrorMessages/lib b/macros/ErrorMessages/lib deleted file mode 100644 index 2994abce..00000000 Binary files a/macros/ErrorMessages/lib and /dev/null differ diff --git a/macros/FunctionAnnotation/lib b/macros/FunctionAnnotation/lib deleted file mode 100644 index 0e229452..00000000 Binary files a/macros/FunctionAnnotation/lib and /dev/null differ diff --git a/macros/FunctionList/lib b/macros/FunctionList/lib deleted file mode 100644 index 8f8320c2..00000000 Binary files a/macros/FunctionList/lib and /dev/null differ diff --git a/macros/GeneralFunctions/lib b/macros/GeneralFunctions/lib deleted file mode 100644 index 7fe75a20..00000000 Binary files a/macros/GeneralFunctions/lib and /dev/null differ diff --git a/macros/Hardware/AVR/lib b/macros/Hardware/AVR/lib deleted file mode 100644 index a3d9e10c..00000000 Binary files a/macros/Hardware/AVR/lib and /dev/null differ diff --git a/macros/Hardware/RasberryPi/lib b/macros/Hardware/RasberryPi/lib deleted file mode 100644 index ac87d042..00000000 Binary files a/macros/Hardware/RasberryPi/lib and /dev/null differ diff --git a/macros/ImageProcessing/core/lib b/macros/ImageProcessing/core/lib deleted file mode 100644 index efaf5182..00000000 Binary files a/macros/ImageProcessing/core/lib and /dev/null differ diff --git a/macros/ImageProcessing/highgui/lib b/macros/ImageProcessing/highgui/lib deleted file mode 100644 index 722a1503..00000000 Binary files a/macros/ImageProcessing/highgui/lib and /dev/null differ diff --git a/macros/ImageProcessing/imgproc/lib b/macros/ImageProcessing/imgproc/lib deleted file mode 100644 index 1f0925a0..00000000 Binary files a/macros/ImageProcessing/imgproc/lib and /dev/null differ diff --git a/macros/Scilab-Arduino/lib b/macros/Scilab-Arduino/lib deleted file mode 100644 index 64a3fce4..00000000 Binary files a/macros/Scilab-Arduino/lib and /dev/null differ diff --git a/macros/SymbolTable/lib b/macros/SymbolTable/lib deleted file mode 100644 index 2c57d672..00000000 Binary files a/macros/SymbolTable/lib and /dev/null differ diff --git a/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci b/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci index 325f4d5b..ead59a28 100644 --- a/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci +++ b/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci @@ -5817,6 +5817,7 @@ PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y'); // --- Function List Class. --- ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); PrintStringInfo('u80'+ArgSeparator+'',ClassFileName,'file','y'); +PrintStringInfo('d0'+ArgSeparator+'',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. --- FunctionName = 'RPI_digitalWriteByte'; @@ -5869,6 +5870,7 @@ PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y'); // --- Function List Class. --- ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); PrintStringInfo('u160'+ArgSeparator+'',ClassFileName,'file','y'); +PrintStringInfo('d0'+ArgSeparator+'',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. --- FunctionName = 'RPI_pwmClock'; @@ -5893,6 +5895,7 @@ PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y'); // --- Function List Class. --- ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); PrintStringInfo('u320'+ArgSeparator+'',ClassFileName,'file','y'); +PrintStringInfo('d0'+ArgSeparator+'',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. --- FunctionName = 'RPI_pwmRange'; @@ -5949,6 +5952,7 @@ PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y'); // --- Function List Class. --- ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); PrintStringInfo('u80'+ArgSeparator+'i80',ClassFileName,'file','y'); +PrintStringInfo('d0'+ArgSeparator+'i80',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. --- FunctionName = 'RPI_I2CSetup'; @@ -5981,6 +5985,7 @@ PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y'); // --- Function List Class. --- ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); PrintStringInfo('u160'+ArgSeparator+'i80',ClassFileName,'file','y'); +PrintStringInfo('d0'+ArgSeparator+'i80',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. --- FunctionName = 'RPI_I2CRead'; @@ -6037,6 +6042,7 @@ PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y'); // --- Function List Class. --- ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); PrintStringInfo('u80'+ArgSeparator+'u80',ClassFileName,'file','y'); +PrintStringInfo('d0'+ArgSeparator+'u80',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. --- FunctionName = 'RPI_getAlt'; @@ -6073,6 +6079,7 @@ PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y'); // --- Function List Class. --- ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); PrintStringInfo('u160'+ArgSeparator+'u160',ClassFileName,'file','y'); +PrintStringInfo('d0'+ArgSeparator+'u160',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. --- FunctionName = 'RPI_gertboardAnalogRead'; @@ -6097,6 +6104,7 @@ PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y'); // --- Function List Class. --- ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); PrintStringInfo('u80'+ArgSeparator+'g2',ClassFileName,'file','y'); +PrintStringInfo('d0'+ArgSeparator+'g2',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. --- FunctionName = 'RPI_serialGetchar'; @@ -6118,6 +6126,7 @@ PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y'); // --- Function List Class. --- ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); PrintStringInfo('u80u80'+ArgSeparator+'',ClassFileName,'file','y'); +PrintStringInfo('d0d0'+ArgSeparator+'',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. --- FunctionName = 'RPI_pinModeAlt'; @@ -6182,6 +6191,7 @@ PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y'); // --- Function List Class. --- ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); PrintStringInfo('u80u160'+ArgSeparator+'',ClassFileName,'file','y'); +PrintStringInfo('d0d0'+ArgSeparator+'',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. --- FunctionName = 'RPI_pwmWrite'; @@ -6214,6 +6224,7 @@ PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y'); // --- Function List Class. --- ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); PrintStringInfo('u160u160'+ArgSeparator+'',ClassFileName,'file','y'); +PrintStringInfo('d0d0'+ArgSeparator+'',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. --- FunctionName = 'RPI_gertboardAnalogWrite'; @@ -6238,6 +6249,7 @@ PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y'); // --- Function List Class. --- ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); PrintStringInfo('u80g2'+ArgSeparator+'',ClassFileName,'file','y'); +PrintStringInfo('d0g2'+ArgSeparator+'',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. --- FunctionName = 'RPI_pinMode'; @@ -6282,6 +6294,7 @@ PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y'); // --- Function List Class. --- ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); PrintStringInfo('u80u320'+ArgSeparator+'',ClassFileName,'file','y'); +PrintStringInfo('d0d0'+ArgSeparator+'',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. --- FunctionName = 'RPI_softToneWrite'; @@ -6306,6 +6319,7 @@ PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y'); // --- Function List Class. --- ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); PrintStringInfo('u80i160'+ArgSeparator+'i80',ClassFileName,'file','y'); +PrintStringInfo('d0d0'+ArgSeparator+'i80',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. --- FunctionName = 'RPI_waitForInterrupt'; @@ -6330,6 +6344,7 @@ PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y'); // --- Function List Class. --- ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); PrintStringInfo('u160u160'+ArgSeparator+'i80',ClassFileName,'file','y'); +PrintStringInfo('d0d0'+ArgSeparator+'i80',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. --- FunctionName = 'RPI_I2CWrite'; @@ -6362,6 +6377,7 @@ PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y'); // --- Function List Class. --- ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); PrintStringInfo('g2u320'+ArgSeparator+'i80',ClassFileName,'file','y'); +PrintStringInfo('g2d0'+ArgSeparator+'i80',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. --- FunctionName = 'RPI_serialOpen'; @@ -6386,6 +6402,7 @@ PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y'); // --- Function List Class. --- ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); PrintStringInfo('u160u80'+ArgSeparator+'u80',ClassFileName,'file','y'); +PrintStringInfo('d0d0'+ArgSeparator+'u80',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. --- FunctionName = 'RPI_pcf8574Setup'; @@ -6423,6 +6440,7 @@ PrintStringInfo('NOUT= 1',ClassFileName,'file','y'); // --- Function List Class. --- ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); PrintStringInfo('u80u80u80'+ArgSeparator+'',ClassFileName,'file','y'); +PrintStringInfo('d0d0d0'+ArgSeparator+'',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. --- FunctionName = 'RPI_lcdPosition'; @@ -6448,6 +6466,7 @@ PrintStringInfo('NOUT= 1',ClassFileName,'file','y'); // --- Function List Class. --- ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); PrintStringInfo('u160u160u160'+ArgSeparator+'i80',ClassFileName,'file','y'); +PrintStringInfo('d0d0d0'+ArgSeparator+'i80',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. --- FunctionName = 'RPI_I2CWriteReg8'; @@ -6473,6 +6492,7 @@ PrintStringInfo('NOUT= 1',ClassFileName,'file','y'); // --- Function List Class. --- ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); PrintStringInfo('u80u80u80'+ArgSeparator+'u80',ClassFileName,'file','y'); +PrintStringInfo('d0d0d0'+ArgSeparator+'u80',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. --- FunctionName = 'RPI_shiftIn'; @@ -6497,6 +6517,7 @@ PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y'); // --- Function List Class. --- ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); PrintStringInfo('u80u160u160'+ArgSeparator+'u80',ClassFileName,'file','y'); +PrintStringInfo('d0d0d0'+ArgSeparator+'u80',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. --- FunctionName = 'RPI_softPwmCreate'; @@ -6521,6 +6542,7 @@ PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y'); // --- Function List Class. --- ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); PrintStringInfo('u160u160u160'+ArgSeparator+'u80',ClassFileName,'file','y'); +PrintStringInfo('d0d0d0'+ArgSeparator+'u80',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. --- FunctionName = 'RPI_mcp23s08Setup'; @@ -6549,6 +6571,7 @@ PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y'); // --- Function List Class. --- ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); PrintStringInfo('u80u80u80u80'+ArgSeparator+'',ClassFileName,'file','y'); +PrintStringInfo('d0d0d0d0'+ArgSeparator+'',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. --- FunctionName = 'RPI_shiftOut'; @@ -6573,6 +6596,7 @@ PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y'); // --- Function List Class. --- ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); PrintStringInfo('u160u80u80u80u80'+ArgSeparator+'i80',ClassFileName,'file','y'); +PrintStringInfo('d0d0d0d0d0'+ArgSeparator+'i80',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. --- FunctionName = 'RPI_sr595Setup'; @@ -6597,6 +6621,7 @@ PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y'); // --- Function List Class. --- ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); PrintStringInfo('u80u80u80u80u80u80u80u80u80u80'+ArgSeparator+'',ClassFileName,'file','y'); +PrintStringInfo('d0d0d0d0d0d0d0d0d0d0'+ArgSeparator+'',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. --- FunctionName = 'RPI_lcdCharDef'; @@ -6621,6 +6646,7 @@ PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y'); // --- Function List Class. --- ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); PrintStringInfo('u80u80u80u80u80u80u80u80u80u80u80u80u80'+ArgSeparator+'u80',ClassFileName,'file','y'); +PrintStringInfo('d0d0d0d0d0d0d0d0d0d0d0d0d0'+ArgSeparator+'u80',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. --- FunctionName = 'RPI_lcdInit'; diff --git a/macros/ToolInitialization/lib b/macros/ToolInitialization/lib deleted file mode 100644 index 113aba04..00000000 Binary files a/macros/ToolInitialization/lib and /dev/null differ diff --git a/macros/findDeps/lib b/macros/findDeps/lib deleted file mode 100644 index 4157ab8f..00000000 Binary files a/macros/findDeps/lib and /dev/null differ diff --git a/macros/lib b/macros/lib deleted file mode 100644 index 3c96eeb4..00000000 Binary files a/macros/lib and /dev/null differ diff --git a/macros/sci2c_gui.sci b/macros/sci2c_gui.sci index bee6fe43..cad8b247 100644 --- a/macros/sci2c_gui.sci +++ b/macros/sci2c_gui.sci @@ -216,7 +216,7 @@ outformatlabel = uicontrol("parent", sci2cfig,... outformatradiostalone = uicontrol("parent", sci2cfig,... "style", "radiobutton",... "string", gettext("Stand-alone"),... - "position",[2*margin+widgetLabelWidth outformaty 2*radiow widgeth],... + "position",[2*margin+widgetLabelWidth outformaty 2*radiow-10 widgeth],... "horizontalalignment", "left",... "fontname", defaultfont,... "fontunits", "points",... @@ -309,7 +309,7 @@ runradiotranslate = uicontrol("parent", sci2cfig,... runradiogenlib = uicontrol("parent", sci2cfig,... "style", "radiobutton",... "string", gettext("Generate library"),... - "position",[2*margin+widgetLabelWidth+2*radiow runy 120 widgeth],... + "position",[2*margin+widgetLabelWidth+2*radiow+20 runy 150 widgeth],... "horizontalalignment", "left",... "fontname", defaultfont,... "fontunits", "points",... -- cgit From 6e81efbdcf96e8ce2d393f5641a56783adeaf61c Mon Sep 17 00:00:00 2001 From: Jorawar Singh Date: Fri, 7 Jul 2017 15:54:07 +0530 Subject: Added deprecated functions for lapack library for RPi compiler --- macros/cb_sci2c_gui.sci | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to 'macros') diff --git a/macros/cb_sci2c_gui.sci b/macros/cb_sci2c_gui.sci index 2267c6cc..bf77c25f 100644 --- a/macros/cb_sci2c_gui.sci +++ b/macros/cb_sci2c_gui.sci @@ -200,12 +200,17 @@ elseif get(gcbo, "tag")=="convertbtn" then // -*- DEBUG ONLY -*- - //mprintf("UserScilabMainFile = {%s}\n", UserScilabMainFile); - //mprintf("UserSciFilesPaths = {%s}\n", UserSciFilesPaths); - //mprintf("UserSciCodeMainDir = {%s}\n", UserSciCodeMainDir); - //mprintf("RunMode = {%s}\n", RunMode); - //mprintf("CopySciCodeIntoCCode = {%d}\n", bool2s(CopySciCodeIntoCCode)); - //mprintf("NativeBuild = {%s}\n", NativeBuild); + mprintf("UserScilabMainFile = {%s}\n", UserScilabMainFile); + mprintf("UserSciFilesPaths = {%s}\n", UserSciFilesPaths); + mprintf("UserSciCodeMainDir = {%s}\n", UserSciCodeMainDir); + mprintf("RunMode = {%s}\n", RunMode); + mprintf("CopySciCodeIntoCCode = {%d}\n", bool2s(CopySciCodeIntoCCode)); + mprintf("NativeBuild = {%s}\n", NativeBuild); + mprintf("Target = {%s}\n", Target); + mprintf("Board Name = {%s}\n", Board_name); +// disp("Variable Names:") +// disp(UserScilabMainFile, UserSciCodeMainDir, UserSciFilesPaths, RunMode, NativeBuild,Target,Board_name) +// disp("Done") scilab2c(UserScilabMainFile, UserSciCodeMainDir, UserSciFilesPaths, RunMode, NativeBuild,Target,Board_name); // // --- sci2c help --- -- cgit