From ee5bf4d90f78673d1e4d5a9dd304ee53c503c085 Mon Sep 17 00:00:00 2001 From: imushir Date: Tue, 9 Feb 2016 16:38:27 +0530 Subject: Support for Servo motor for Arduino. Support for'diag' in c --- macros/ASTManagement/AST2Ccode.bin | Bin 31992 -> 31996 bytes macros/ASTManagement/AST2Ccode.sci | 1 + macros/ASTManagement/AST_HandleEndGenFun.bin | Bin 81440 -> 81536 bytes macros/ASTManagement/AST_HandleEndGenFun.sci | 5 +- macros/ASTManagement/lib | Bin 1680 -> 1676 bytes macros/CCodeGeneration/C_GenerateMakefile.bin | Bin 23080 -> 24368 bytes macros/CCodeGeneration/lib | Bin 1184 -> 1180 bytes macros/FunctionAnnotation/FA_GetOutArgInfo.bin | Bin 16712 -> 16720 bytes macros/FunctionAnnotation/FA_GetOutArgInfo.sci | 2 + macros/FunctionAnnotation/FA_SZ_1.bin | Bin 2604 -> 2608 bytes macros/FunctionAnnotation/FA_SZ_1.sci | 1 + macros/FunctionAnnotation/FA_SZ_2.bin | Bin 2612 -> 2616 bytes macros/FunctionAnnotation/FA_SZ_2.sci | 1 + macros/FunctionAnnotation/FA_SZ_COLUMN_DIAG.bin | Bin 0 -> 3116 bytes macros/FunctionAnnotation/FA_SZ_COLUMN_DIAG.sci | 28 +++++ .../FA_SZ_COLUMN_DIAG_INS_EXT.bin | Bin 0 -> 3364 bytes macros/FunctionAnnotation/FA_SZ_COL_DIAG_IN_EX.bin | Bin 0 -> 5068 bytes macros/FunctionAnnotation/FA_SZ_COL_DIAG_IN_EX.sci | 30 ++++++ macros/FunctionAnnotation/FA_SZ_FROM_VAL.bin | Bin 3448 -> 3448 bytes macros/FunctionAnnotation/FA_SZ_FROM_VAL.sci | 22 ++-- macros/FunctionAnnotation/FA_SZ_ROW_COLUMN.bin | Bin 0 -> 10920 bytes macros/FunctionAnnotation/FA_SZ_ROW_COLUMN.sci | 85 +++++++++++++++ macros/FunctionAnnotation/FA_SZ_ROW_COLUMN_CAT.bin | Bin 0 -> 2812 bytes macros/FunctionAnnotation/FA_SZ_ROW_DIAG.bin | Bin 0 -> 3164 bytes macros/FunctionAnnotation/FA_SZ_ROW_DIAG.sci | 26 +++++ .../FunctionAnnotation/FA_SZ_ROW_DIAG_INS_EXT.bin | Bin 0 -> 16296 bytes .../FunctionAnnotation/FA_SZ_ROW_DIAG_INS_EXT.sci | 72 +++++++++++++ macros/FunctionAnnotation/lib | Bin 1964 -> 2104 bytes macros/FunctionAnnotation/names | 6 ++ macros/FunctionList/lib | Bin 764 -> 760 bytes macros/GeneralFunctions/SCI2COpenFileRead.bin | Bin 3424 -> 3424 bytes macros/GeneralFunctions/SCI2COpenFileRead.sci | 2 +- macros/GeneralFunctions/lib | Bin 1308 -> 1304 bytes macros/Hardware/AVR/AVRUARTSetup.bin | Bin 0 -> 3480 bytes macros/Hardware/AVR/lib | Bin 932 -> 952 bytes macros/Hardware/AVR/names | 1 + macros/Scilab-Arduino/GenerateSetupFunction.bin | Bin 4288 -> 4540 bytes macros/Scilab-Arduino/GetArduinoFunctions.bin | Bin 1832 -> 2100 bytes macros/Scilab-Arduino/GetArduinoFunctions.sci | 15 +-- macros/Scilab-Arduino/GetArduinoSetupFunctions.bin | Bin 1456 -> 1640 bytes macros/Scilab-Arduino/GetArduinoSetupFunctions.sci | 4 +- macros/Scilab-Arduino/InsertSetupInList.bin | Bin 6068 -> 6320 bytes macros/Scilab-Arduino/InsertSetupInList.sci | 118 +++++++++++---------- macros/Scilab-Arduino/lib | Bin 772 -> 768 bytes .../ToolInitialization/INIT_FillSCI2LibCDirs.bin | Bin 0 -> 1036128 bytes .../ToolInitialization/INIT_FillSCI2LibCDirs.sci | 75 +++++++++++++ macros/ToolInitialization/INIT_SCI2C.bin | Bin 24408 -> 24416 bytes macros/ToolInitialization/INIT_SCI2C.sci | 2 + macros/ToolInitialization/SCI2CInputParameters.bkp | 87 --------------- macros/ToolInitialization/UpdateSCI2CInfo.bin | Bin 37748 -> 38684 bytes macros/ToolInitialization/lib | Bin 980 -> 976 bytes macros/findDeps/getAllHeaders.bin | Bin 24908 -> 26936 bytes macros/findDeps/getAllHeaders.sci | 1 + macros/findDeps/getAllInterfaces.bin | Bin 26044 -> 28004 bytes macros/findDeps/getAllInterfaces.sci | 1 + macros/findDeps/getAllSources.bin | Bin 153272 -> 167148 bytes macros/findDeps/getAllSources.sci | 30 ++++++ macros/findDeps/lib | Bin 748 -> 744 bytes macros/lib | Bin 712 -> 708 bytes macros/runsci2c.bin | Bin 26392 -> 26964 bytes 60 files changed, 452 insertions(+), 163 deletions(-) create mode 100644 macros/FunctionAnnotation/FA_SZ_COLUMN_DIAG.bin create mode 100644 macros/FunctionAnnotation/FA_SZ_COLUMN_DIAG.sci create mode 100644 macros/FunctionAnnotation/FA_SZ_COLUMN_DIAG_INS_EXT.bin create mode 100644 macros/FunctionAnnotation/FA_SZ_COL_DIAG_IN_EX.bin create mode 100644 macros/FunctionAnnotation/FA_SZ_COL_DIAG_IN_EX.sci create mode 100644 macros/FunctionAnnotation/FA_SZ_ROW_COLUMN.bin create mode 100644 macros/FunctionAnnotation/FA_SZ_ROW_COLUMN.sci create mode 100644 macros/FunctionAnnotation/FA_SZ_ROW_COLUMN_CAT.bin create mode 100644 macros/FunctionAnnotation/FA_SZ_ROW_DIAG.bin create mode 100644 macros/FunctionAnnotation/FA_SZ_ROW_DIAG.sci create mode 100644 macros/FunctionAnnotation/FA_SZ_ROW_DIAG_INS_EXT.bin create mode 100644 macros/FunctionAnnotation/FA_SZ_ROW_DIAG_INS_EXT.sci create mode 100644 macros/Hardware/AVR/AVRUARTSetup.bin create mode 100644 macros/ToolInitialization/INIT_FillSCI2LibCDirs.bin delete mode 100644 macros/ToolInitialization/SCI2CInputParameters.bkp (limited to 'macros') diff --git a/macros/ASTManagement/AST2Ccode.bin b/macros/ASTManagement/AST2Ccode.bin index 8a4fc960..5f8c96b5 100644 Binary files a/macros/ASTManagement/AST2Ccode.bin and b/macros/ASTManagement/AST2Ccode.bin differ diff --git a/macros/ASTManagement/AST2Ccode.sci b/macros/ASTManagement/AST2Ccode.sci index 7c95572e..275aadf4 100644 --- a/macros/ASTManagement/AST2Ccode.sci +++ b/macros/ASTManagement/AST2Ccode.sci @@ -60,6 +60,7 @@ STACKDEDUG = 0; // 1 -> Every Pop and Push operation on the stack, the stack con ASTFileName = FileInfo.Funct(nxtscifunnumber).ASTFileName; + // ----------------------- // --- Initialization. --- // ----------------------- diff --git a/macros/ASTManagement/AST_HandleEndGenFun.bin b/macros/ASTManagement/AST_HandleEndGenFun.bin index d5d2e4ab..bfb9f7fe 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 f6ae58e7..7d940b84 100644 --- a/macros/ASTManagement/AST_HandleEndGenFun.sci +++ b/macros/ASTManagement/AST_HandleEndGenFun.sci @@ -209,7 +209,7 @@ global STACKDEDUG if ((InArg(cntin).Dimension > 0)) // if ((InArg(cntin).Dimension > 0) & (InArg(cntin).Scope ~= 'Global')) InArg(cntin).Size(1) = '__'+InArg(cntin).Name+'Size[0]'; - InArg(cntin).Size(2) = '__'+InArg(cntin).Name+'Size[1]'; + InArg(cntin).Size(2) = '__'+InArg(cntin).Name+'Size[1]';s end //#RNUREM_MERNU vedi se la seguente fa casino l'ho aggiunta in modo che agia=ones(1,3) sia generata come realloc ma non ho verificato. tmpscope = InArg(cntin).Scope; @@ -356,7 +356,8 @@ global STACKDEDUG //#RNU_RES_E CFunName = C_GenerateFunName(ASTFunName,InArg,NInArg,OutArg,NOutArg); - //#RNU_RES_B + + //#RNU_RES_B PrintStringInfo(' C Function Name: '+CFunName,ReportFileName,'file','y'); if(IsArduinoFunction(ASTFunName)) if(IsArduinoSetupFunction(ASTFunName)) diff --git a/macros/ASTManagement/lib b/macros/ASTManagement/lib index 36d91dec..06ca43d1 100644 Binary files a/macros/ASTManagement/lib and b/macros/ASTManagement/lib differ diff --git a/macros/CCodeGeneration/C_GenerateMakefile.bin b/macros/CCodeGeneration/C_GenerateMakefile.bin index cf4ea0e4..d5648f44 100644 Binary files a/macros/CCodeGeneration/C_GenerateMakefile.bin and b/macros/CCodeGeneration/C_GenerateMakefile.bin differ diff --git a/macros/CCodeGeneration/lib b/macros/CCodeGeneration/lib index 9007df7e..f91bc268 100644 Binary files a/macros/CCodeGeneration/lib and b/macros/CCodeGeneration/lib differ diff --git a/macros/FunctionAnnotation/FA_GetOutArgInfo.bin b/macros/FunctionAnnotation/FA_GetOutArgInfo.bin index 1deaff60..39d97b24 100644 Binary files a/macros/FunctionAnnotation/FA_GetOutArgInfo.bin and b/macros/FunctionAnnotation/FA_GetOutArgInfo.bin differ diff --git a/macros/FunctionAnnotation/FA_GetOutArgInfo.sci b/macros/FunctionAnnotation/FA_GetOutArgInfo.sci index 84640dfc..37e6d091 100644 --- a/macros/FunctionAnnotation/FA_GetOutArgInfo.sci +++ b/macros/FunctionAnnotation/FA_GetOutArgInfo.sci @@ -27,6 +27,8 @@ SCI2CNInArgCheck(argn(2),9,9); // ----------------------- // --- Initialization. --- // ----------------------- + + UpdatedOutArg = OutArg; for cntin = 1:NInArg IN(cntin).TP = InArg(cntin).Type; diff --git a/macros/FunctionAnnotation/FA_SZ_1.bin b/macros/FunctionAnnotation/FA_SZ_1.bin index 91cd951d..c01ff59d 100644 Binary files a/macros/FunctionAnnotation/FA_SZ_1.bin and b/macros/FunctionAnnotation/FA_SZ_1.bin differ diff --git a/macros/FunctionAnnotation/FA_SZ_1.sci b/macros/FunctionAnnotation/FA_SZ_1.sci index d9a481ce..3d20b992 100644 --- a/macros/FunctionAnnotation/FA_SZ_1.sci +++ b/macros/FunctionAnnotation/FA_SZ_1.sci @@ -17,4 +17,5 @@ function outsize = FA_SZ_1(insize) // ----------------------------------------------------------------- outsize = insize(1); + endfunction diff --git a/macros/FunctionAnnotation/FA_SZ_2.bin b/macros/FunctionAnnotation/FA_SZ_2.bin index 099f1d66..00834df4 100644 Binary files a/macros/FunctionAnnotation/FA_SZ_2.bin and b/macros/FunctionAnnotation/FA_SZ_2.bin differ diff --git a/macros/FunctionAnnotation/FA_SZ_2.sci b/macros/FunctionAnnotation/FA_SZ_2.sci index 64fdac10..164cab3f 100644 --- a/macros/FunctionAnnotation/FA_SZ_2.sci +++ b/macros/FunctionAnnotation/FA_SZ_2.sci @@ -17,4 +17,5 @@ function outsize = FA_SZ_2(insize) // ----------------------------------------------------------------- outsize = insize(2); + endfunction diff --git a/macros/FunctionAnnotation/FA_SZ_COLUMN_DIAG.bin b/macros/FunctionAnnotation/FA_SZ_COLUMN_DIAG.bin new file mode 100644 index 00000000..68d6a37c Binary files /dev/null and b/macros/FunctionAnnotation/FA_SZ_COLUMN_DIAG.bin differ diff --git a/macros/FunctionAnnotation/FA_SZ_COLUMN_DIAG.sci b/macros/FunctionAnnotation/FA_SZ_COLUMN_DIAG.sci new file mode 100644 index 00000000..df129f97 --- /dev/null +++ b/macros/FunctionAnnotation/FA_SZ_COLUMN_DIAG.sci @@ -0,0 +1,28 @@ +function outsize = FA_SZ_COLUMN_DIAG(insize) + // function outsize = FA_SZ_1(insize) + // ----------------------------------------------------------------- + // Returns the first element of the size array. + // + // Input data: + // insize: size of input argument. It is an array of 2 strings. + // The first string specifies the number of rows. + // The second string specifies the number of columns. + // + // Output data: + // outsize: first element of the insize array. + // + // Status: + // 08-Dec-2007 -- Raffaele Nutricato: Author. + // 08-Dec-2007 -- Alberto Morea: Test Ok. + // ----------------------------------------------------------------- + + if(insize(2)=='1') then + outsize = insize(1); + + elseif(insize(1) == insize(2)) + outsize = '1'; + else + outsize = insize(2); + + end +endfunction diff --git a/macros/FunctionAnnotation/FA_SZ_COLUMN_DIAG_INS_EXT.bin b/macros/FunctionAnnotation/FA_SZ_COLUMN_DIAG_INS_EXT.bin new file mode 100644 index 00000000..6d883096 Binary files /dev/null and b/macros/FunctionAnnotation/FA_SZ_COLUMN_DIAG_INS_EXT.bin differ diff --git a/macros/FunctionAnnotation/FA_SZ_COL_DIAG_IN_EX.bin b/macros/FunctionAnnotation/FA_SZ_COL_DIAG_IN_EX.bin new file mode 100644 index 00000000..e39a0be3 Binary files /dev/null and b/macros/FunctionAnnotation/FA_SZ_COL_DIAG_IN_EX.bin differ diff --git a/macros/FunctionAnnotation/FA_SZ_COL_DIAG_IN_EX.sci b/macros/FunctionAnnotation/FA_SZ_COL_DIAG_IN_EX.sci new file mode 100644 index 00000000..45d74c3a --- /dev/null +++ b/macros/FunctionAnnotation/FA_SZ_COL_DIAG_IN_EX.sci @@ -0,0 +1,30 @@ +function outsize =FA_SZ_COL_DIAG_IN_EX(insize,val) + +///////////////////////////////COLUMN SIZE FOR INSERT POSITION////////////////// + + + + if((insize(1) == '1')) // If ROW size is 1 + if(val == '0') then //For Oth position + outsize = insize(2); //COLUMN size is equal to COLUMN size + else // For ...-2,-1,1,2... position + outsize = string(eval(insize(2))+abs(eval(val)));// COLUMN size is equal to COLUMN size + absolute value of position(for 1*3 matrix and 2nd postion COLUMN size is (3+2)=5 + end + elseif((insize(2) == '1')) // If COLUMN size is 1 + if(val == '0') then //For Oth position + outsize = insize(1); //COLUMNS size is equal to ROW size + else // For ...-2,-1,1,2.... position + outsize = string(eval(insize(1))+abs(eval(val)));// COLUMN size is equal to ROW size + absolute value of position(for 3*1 matrix and 1st postion COLUMN size is (3+1)=4 + end +//////////////////////////////////////////////////////////////////////////////// + + +////////////////////////////COLUMN SIZE FOR EXTRACT POSITION//////////////////// + + else + outsize = '1'; // For extract condition COLUMN size is always ONE. + end + +//////////////////////////////////////////////////////////////////////////////// + +endfunction diff --git a/macros/FunctionAnnotation/FA_SZ_FROM_VAL.bin b/macros/FunctionAnnotation/FA_SZ_FROM_VAL.bin index 9a39d12a..a06f3b16 100644 Binary files a/macros/FunctionAnnotation/FA_SZ_FROM_VAL.bin and b/macros/FunctionAnnotation/FA_SZ_FROM_VAL.bin differ diff --git a/macros/FunctionAnnotation/FA_SZ_FROM_VAL.sci b/macros/FunctionAnnotation/FA_SZ_FROM_VAL.sci index c3cae536..bb02b985 100644 --- a/macros/FunctionAnnotation/FA_SZ_FROM_VAL.sci +++ b/macros/FunctionAnnotation/FA_SZ_FROM_VAL.sci @@ -15,20 +15,20 @@ SCI2CNInArgCheck(argn(2),2,2); if (isnum(in1)) - in1num = eval(in1) ; - if isnan(in1num) - opout = '__SCI2CNANSIZE'; - elseif ( in1num < 0 ) - opout= '0' ; - else - opout = string ( floor (abs(in1num))) ; - - end + in1num = eval(in1) ; + if isnan(in1num) + opout = '__SCI2CNANSIZE'; + elseif ( in1num < 0 ) + opout= '0' ; + else + opout = string ( floor (abs(in1num))) ; + end else - opout = in2+"0floor"+in2+"0"+"("+in1+")"; - opout = in2+"0abs"+in2+"0"+"("+opout+")"; + opout = in2+"0floor"+in2+"0"+"("+in1+")"; + opout = in2+"0abs"+in2+"0"+"("+opout+")"; + end diff --git a/macros/FunctionAnnotation/FA_SZ_ROW_COLUMN.bin b/macros/FunctionAnnotation/FA_SZ_ROW_COLUMN.bin new file mode 100644 index 00000000..edba674a Binary files /dev/null and b/macros/FunctionAnnotation/FA_SZ_ROW_COLUMN.bin differ diff --git a/macros/FunctionAnnotation/FA_SZ_ROW_COLUMN.sci b/macros/FunctionAnnotation/FA_SZ_ROW_COLUMN.sci new file mode 100644 index 00000000..ca1d2627 --- /dev/null +++ b/macros/FunctionAnnotation/FA_SZ_ROW_COLUMN.sci @@ -0,0 +1,85 @@ +function opoutsize = FA_SZ_ROW_COLUMN(in1size,in2size) +// function opoutsize = FA_SZ_OPPLUSA(in1size,in2size) +// ----------------------------------------------------------------- +// Returns the size of the output computed by OPPLUS operator +// restricted to arithmetic operations (string operations not supported.) +// +// Assuming: +// size(in1) = [in1r,in1c] +// size(in2) = [in2r,in2c] +// size(out) = [outr,outc] +// +// we have the following combinations: +// in1 in2 outr outc +// ----------------------- +// S S in2r in2c +// S M in2r in2c +// M S in1r in1c +// M M in1r in1c +// +// Where S means that the input is a scalar +// and M means that the input is a matrix. +// There is also the case related to the string catenation! +// This is the main difference between - and + operators. +// +// Input data: +// in1size: size of input number 1. It is an array of 2 strings. +// The first string specifies the number of rows. +// The second string specifies the number of columns. +// +// in2size: size of input number 2. It is an array of 2 strings. +// The first string specifies the number of rows. +// The second string specifies the number of columns. +// +// Output data: +// opoutsize: size of output. It is an array of 2 strings. +// The first string specifies the number of rows. +// The second string specifies the number of columns. +// +// Status: +// 18-Mar-2008 -- Raffaele Nutricato: Author. +// 18-Mar-2008 -- Alberto Morea: Test Ok. +// +// Copyright 2008 Raffaele Nutricato & Alberto Morea. +// Contact: raffaele.nutricato@tiscali.it +// ----------------------------------------------------------------- + +// ------------------------------ +// --- Check input arguments. --- +// ------------------------------ +SCI2CNInArgCheck(argn(2),2,2); + +// ------------------------ +// --- Generate Output. --- +// ------------------------ +// --- Get dimensions of input arguments. --- +in1size = string(in1size); +in2size = string(in2size); +in1type = string(in1type); +in2type = string(in2type); +in1dim = GetSymbolDimension(in1size); +in2dim = GetSymbolDimension(in2size); +if (isnum(in2size(2))) then + if(in2size(2) == '3') then + in1num_c = eval(in1size(2)); + in1num_r = eval(in2size(1)); + opoutsize(1) = string(in1num_r); + opoutsize(2) = string(in1num_c); + else + + in2num_r = eval(in1size(1)); + in2num_c = eval(in2size(1)); + opoutsize(1) = string(in2num_r); + opoutsize(2) = string(in2num_c); + end +else + if(in2size(2) == 3) + opoutsize(2) = '('+string(in1size(2))+')'; + + else + opoutsize(1) = '('+string(in1size(1))+')'; + + end +end + +endfunction diff --git a/macros/FunctionAnnotation/FA_SZ_ROW_COLUMN_CAT.bin b/macros/FunctionAnnotation/FA_SZ_ROW_COLUMN_CAT.bin new file mode 100644 index 00000000..2373b813 Binary files /dev/null and b/macros/FunctionAnnotation/FA_SZ_ROW_COLUMN_CAT.bin differ diff --git a/macros/FunctionAnnotation/FA_SZ_ROW_DIAG.bin b/macros/FunctionAnnotation/FA_SZ_ROW_DIAG.bin new file mode 100644 index 00000000..7fc7dcc8 Binary files /dev/null and b/macros/FunctionAnnotation/FA_SZ_ROW_DIAG.bin differ diff --git a/macros/FunctionAnnotation/FA_SZ_ROW_DIAG.sci b/macros/FunctionAnnotation/FA_SZ_ROW_DIAG.sci new file mode 100644 index 00000000..687a89e4 --- /dev/null +++ b/macros/FunctionAnnotation/FA_SZ_ROW_DIAG.sci @@ -0,0 +1,26 @@ +function outsize = FA_SZ_ROW_DIAG(insize) +// function outsize = FA_SZ_1(insize) +// ----------------------------------------------------------------- +// Returns the first element of the size array. +// +// Input data: +// insize: size of input argument. It is an array of 2 strings. +// The first string specifies the number of rows. +// The second string specifies the number of columns. +// +// Output data: +// outsize: first element of the insize array. +// +// Status: +// 08-Dec-2007 -- Raffaele Nutricato: Author. +// 08-Dec-2007 -- Alberto Morea: Test Ok. +// ----------------------------------------------------------------- + +if(insize(1)=='1') then + outsize = insize(2); +elseif(insize(1) == insize(2)) + outsize = insize(1); +else + outsize = insize(1); +end +endfunction diff --git a/macros/FunctionAnnotation/FA_SZ_ROW_DIAG_INS_EXT.bin b/macros/FunctionAnnotation/FA_SZ_ROW_DIAG_INS_EXT.bin new file mode 100644 index 00000000..046b4b78 Binary files /dev/null and b/macros/FunctionAnnotation/FA_SZ_ROW_DIAG_INS_EXT.bin differ diff --git a/macros/FunctionAnnotation/FA_SZ_ROW_DIAG_INS_EXT.sci b/macros/FunctionAnnotation/FA_SZ_ROW_DIAG_INS_EXT.sci new file mode 100644 index 00000000..1ec720a9 --- /dev/null +++ b/macros/FunctionAnnotation/FA_SZ_ROW_DIAG_INS_EXT.sci @@ -0,0 +1,72 @@ +function outsize = FA_SZ_ROW_DIAG_INS_EXT(insize,val) + + // val ==> Position value ...,-2,-1,0,1,2.... + //insize ==> insize(1) will give ROW size and insize(2) will give COLUMN size. + insize = string(insize); + row_num = eval(insize(1)); + col_num = eval(insize(2)); + val_num = eval(val); + /////////////////////////////////////////////// FOR INSERT CONDITION //////////////////////////////////////////// + + + + if(row_num == 1) + if(val_num == 0) then // For 0th position + outsize = string(col_num);// ROW size is equal to COLUMN size + + else // For ....-2,-1,1,2... positions + outsize = string(col_num+abs(val_num)); //ROW is equal to COLUMN SIZE + position value (i.e for 1*4 matrix and insert position 1 then ROW size is 4+1 = 5 ) + + end + elseif(col_num == 1) // if Column size is one + if(val_num == 0) then // For Oth position + outsize = string(row_num); // ROW size is equal to ROW size + + else // ....-2,-1,1,2... positions. + outsize = string(row_num + abs(val_num));//ROW is equal to ROW SIZE + position value (i.e for 4*1 matrix and insert position 1 then ROW size is 4+1 = 5 ) + + end + + /////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + + + ///////////////////////////////////////// FOR EXTRACT CONDITION ///////////////////////////////////////////////// + + elseif(row_num == col_num) // For no. of rows equal to no. of column (R == C) + if(val_num == 0) then //For 0th position + outsize = string(col_num); // No. of row is equal to column size + else //For ....-2,-1,1,2... Positions + outsize = string(col_num-abs(val_num)); //row value is equal to subtraction of column size and absolute value of position (i.e +ve and -ve both position values) + end + elseif(row_num > col_num) // for no. of rows greater than no. of column (R > C) + if(val_num == 0) then // if 0th position + outsize = string(col_num); // No. of row is equal to column size + elseif(val_num > 0) then // For +ve positions i.e 1,2,3..... + outsize = string(col_num-abs(val_num)); // No. of row is equal to subtraction of column size and absolute value of +ve postion + + elseif(val_num < 0 ) then // For -ve positions i.e -1,-2,-3 + temp_outsize1 = row_num-abs(val_num); //In this row values are varying for 4*3 matrix there is no repetition of same row values,for 5*3 matrix there is (5-3 = 2) two same row size(i.e 3 and 3) for -1,-2 position and for 6*3 matrix there is (6-3 = 3) three same row size(i.e 3 ,3,3) for -1,-2,-3 position + if(temp_outsize1 >= col_num) // if temp_outsize1 is greater than equal to column size then + outsize = string(col_num); // row size is equal to column + else + outsize = string(row_num-abs(val_num)); // else row size is substractio of row and abosulte value of position(i.e -1,-2,-3) + end + end + elseif(row_num < col_num) // for no. of rows less than no. of column size + if(val_num == 0) then // if 0th position + outsize = string(row_num); // No. of row is equal to row size + elseif(val_num > 0) then // for +ve positions i.e 1,2 3..... + temp_outsize2 = col_num-abs(val_num);// In this column values are varying for 3*4 matrix there is no repetition of same row values,for 3*5 matrix there is (5-3 =2) two same row size (i.e 3, 3 ) for 1 ,2 position and for 3*6 matrix there is (6-3 = 3) three row size (i.e 3 ,3 ,3) for 1,2 3 position + if(temp_outsize2 >= row_num) // if temp_outsize2 is greater than equal to row size then + outsize = string(row_num); // row size is equal to row size + else + outsize = string(col_num-abs(val_num)); // else row size substractio of column and absolute value + end + elseif(val_num < 0) then // for -ve positions i.e -1,-2,-3 .. positions + outsize = string(row_num-abs(val_num)); // row size is substraction of row size and absolute value of position values(-1,-2,-3) + end + + ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + end + +endfunction diff --git a/macros/FunctionAnnotation/lib b/macros/FunctionAnnotation/lib index c2025c87..11e8b990 100644 Binary files a/macros/FunctionAnnotation/lib and b/macros/FunctionAnnotation/lib differ diff --git a/macros/FunctionAnnotation/names b/macros/FunctionAnnotation/names index d9300d20..2df2ed28 100644 --- a/macros/FunctionAnnotation/names +++ b/macros/FunctionAnnotation/names @@ -12,6 +12,8 @@ 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_OPAPEX FA_SZ_OPBACKSLASH @@ -37,6 +39,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/FunctionList/lib b/macros/FunctionList/lib index 32c92be8..74542a2a 100644 Binary files a/macros/FunctionList/lib and b/macros/FunctionList/lib differ diff --git a/macros/GeneralFunctions/SCI2COpenFileRead.bin b/macros/GeneralFunctions/SCI2COpenFileRead.bin index 7d5f101b..f3f6a5e3 100644 Binary files a/macros/GeneralFunctions/SCI2COpenFileRead.bin and b/macros/GeneralFunctions/SCI2COpenFileRead.bin differ diff --git a/macros/GeneralFunctions/SCI2COpenFileRead.sci b/macros/GeneralFunctions/SCI2COpenFileRead.sci index 1ad60ce5..8e54738c 100644 --- a/macros/GeneralFunctions/SCI2COpenFileRead.sci +++ b/macros/GeneralFunctions/SCI2COpenFileRead.sci @@ -24,7 +24,7 @@ SCI2CNInArgCheck(argn(2),1,1); // --- Open the .sci file (read only). --- [fidnumber,fiderror] = mopen(filename,'r'); if (fiderror < 0) - SCI2Cerror(['Cannot open (in read mode): '+filename]); + error(['Cannot open (in read mode): '+filename]); end endfunction diff --git a/macros/GeneralFunctions/lib b/macros/GeneralFunctions/lib index a3af87e6..8367688a 100644 Binary files a/macros/GeneralFunctions/lib and b/macros/GeneralFunctions/lib differ diff --git a/macros/Hardware/AVR/AVRUARTSetup.bin b/macros/Hardware/AVR/AVRUARTSetup.bin new file mode 100644 index 00000000..4a49b861 Binary files /dev/null and b/macros/Hardware/AVR/AVRUARTSetup.bin differ diff --git a/macros/Hardware/AVR/lib b/macros/Hardware/AVR/lib index b1986824..4931fea0 100644 Binary files a/macros/Hardware/AVR/lib and b/macros/Hardware/AVR/lib differ diff --git a/macros/Hardware/AVR/names b/macros/Hardware/AVR/names index 126da77a..624fee8a 100644 --- a/macros/Hardware/AVR/names +++ b/macros/Hardware/AVR/names @@ -7,6 +7,7 @@ AVRPWMSetDuty AVRPWMSetup AVRReadADC AVRTimerSetup +AVRUARTSetup GetAVRSupportFunctions GetPeripheral InsertPeripheralInList diff --git a/macros/Scilab-Arduino/GenerateSetupFunction.bin b/macros/Scilab-Arduino/GenerateSetupFunction.bin index 7a5052dc..ea2bdec3 100644 Binary files a/macros/Scilab-Arduino/GenerateSetupFunction.bin and b/macros/Scilab-Arduino/GenerateSetupFunction.bin differ diff --git a/macros/Scilab-Arduino/GetArduinoFunctions.bin b/macros/Scilab-Arduino/GetArduinoFunctions.bin index 82b0d456..fe9e2040 100644 Binary files a/macros/Scilab-Arduino/GetArduinoFunctions.bin and b/macros/Scilab-Arduino/GetArduinoFunctions.bin differ diff --git a/macros/Scilab-Arduino/GetArduinoFunctions.sci b/macros/Scilab-Arduino/GetArduinoFunctions.sci index 19d59ca4..1af351b6 100644 --- a/macros/Scilab-Arduino/GetArduinoFunctions.sci +++ b/macros/Scilab-Arduino/GetArduinoFunctions.sci @@ -12,11 +12,14 @@ function ArduinoFunctions = GetArduinoFunctions() // ----------------------------------------------------------------- ArduinoFunctions = [ - "cmd_digital_out" - "cmd_digital_in" - "cmd_analog_out" - "cmd_analog_in" - "cmd_dcmotor_setup" - "cmd_dcmotor_run"]; + "cmd_digital_out" + "cmd_digital_in" + "cmd_analog_out" + "cmd_analog_in" + "cmd_dcmotor_setup" + "cmd_dcmotor_run" + "cmd_servo_attach" + "cmd_servo_detach" + "cmd_servo_move"]; endfunction diff --git a/macros/Scilab-Arduino/GetArduinoSetupFunctions.bin b/macros/Scilab-Arduino/GetArduinoSetupFunctions.bin index 048da7d7..67f9fada 100644 Binary files a/macros/Scilab-Arduino/GetArduinoSetupFunctions.bin and b/macros/Scilab-Arduino/GetArduinoSetupFunctions.bin differ diff --git a/macros/Scilab-Arduino/GetArduinoSetupFunctions.sci b/macros/Scilab-Arduino/GetArduinoSetupFunctions.sci index f377d385..c992057b 100644 --- a/macros/Scilab-Arduino/GetArduinoSetupFunctions.sci +++ b/macros/Scilab-Arduino/GetArduinoSetupFunctions.sci @@ -12,6 +12,8 @@ function ArduinoSetupFunctions = GetArduinoSetupFunctions() // ----------------------------------------------------------------- ArduinoSetupFunctions = [ - "cmd_dcmotor_setup"]; + "cmd_dcmotor_setup" + "cmd_servo_attach" + "cmd_servo_detach"]; endfunction diff --git a/macros/Scilab-Arduino/InsertSetupInList.bin b/macros/Scilab-Arduino/InsertSetupInList.bin index 41c1a3fe..44e688c6 100644 Binary files a/macros/Scilab-Arduino/InsertSetupInList.bin and b/macros/Scilab-Arduino/InsertSetupInList.bin differ diff --git a/macros/Scilab-Arduino/InsertSetupInList.sci b/macros/Scilab-Arduino/InsertSetupInList.sci index 5c6be8bb..b73910f2 100644 --- a/macros/Scilab-Arduino/InsertSetupInList.sci +++ b/macros/Scilab-Arduino/InsertSetupInList.sci @@ -1,58 +1,66 @@ function InsertSetupInList(FunName,InArg,NInArg,SetupListFile,FunType) -load(SetupListFile,'SetupList'); - -//Check first if current input function already exists in the list -nelements = size(SetupList); -found=%F; - -if(FunType=='Setup') - for i=1:nelements - if(SetupList(i)(1) == FunName) - for j=1:NInArg - if(SetupList(i)(j+1) ~= InArg(j).Name) - found = %F - break; - else - found = %T; - end - end - end - if (found == %T) - break; //One match found. No need to check further. - end - end - - if(found == %F) - temp = list(FunName); - for i=1:NInArg - temp($+1) = InArg(i).Name; - end - end - SetupList($+1) = temp; -elseif((FunType=='Init')&((FunName=='cmd_digital_out')|(FunName=='cmd_analog_out')|(FunName=='cmd_digital_in'))) - for i=1:nelements - if(SetupList(i)(1) == FunName) - if(SetupList(i)(2) == InArg(2).Name) - found = %T - break; - else - found = %F; - end - end - end - - if(found == %F) - temp = list('pinMode'); - temp($+1) = InArg(2).Name; - if ((FunName=='cmd_digital_out')|(FunName=='cmd_analog_out')) - temp($+1) = 'OUTPUT'; - elseif (FunName == 'cmd_digital_in') - temp($+1) = 'INPUT'; - end - end - SetupList($+1) = temp; -end - -save(SetupListFile,'SetupList'); + load(SetupListFile,'SetupList'); + + //Check first if current input function already exists in the list + nelements = size(SetupList); + + found=%F; + if(FunType=='Setup') + for i=1:nelements + if(SetupList(i)(1) == FunName) + for j=1:NInArg + if(SetupList(i)(j+1) ~= InArg(j).Name) + found = %F + break; + else + found = %T; + end + end + end + if (found == %T) + break; //One match found. No need to check further. + end + end + + if(found == %F) + temp = list(FunName); + for i=1:NInArg + temp($+1) = InArg(i).Name; + end + end + SetupList($+1) = temp; + elseif((FunType=='Init')&((FunName=='cmd_digital_out')|(FunName=='cmd_analog_out')|(FunName=='cmd_digital_in'))) + for i=1:nelements + if(SetupList(i)(1) == "pinMode") + if(SetupList(i)(2) == InArg(2).Name) + found = %T + break; + else + found = %F; + end + else + + found = %F; + + end + + end + + if(found == %F) + temp = list('pinMode'); + temp($+1) = InArg(2).Name; + if ((FunName=='cmd_digital_out')|(FunName=='cmd_analog_out')) + temp($+1) = 'OUTPUT'; + elseif ((FunName == 'cmd_digital_in') | (FunName=='cmd_analog_in')) + temp($+1) = 'INPUT'; + end + SetupList($+1) = temp; + + end + + + end + save(SetupListFile,'SetupList'); + endfunction diff --git a/macros/Scilab-Arduino/lib b/macros/Scilab-Arduino/lib index bd0cb707..824ce45a 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 new file mode 100644 index 00000000..05adc1fb Binary files /dev/null and b/macros/ToolInitialization/INIT_FillSCI2LibCDirs.bin differ diff --git a/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci b/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci index e832b83c..69fd0573 100644 --- a/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci +++ b/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci @@ -1009,6 +1009,72 @@ INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,Ex +// -------------------- +// --- Class Diag. --- +// -------------------- +ClassName = 'diag'; + +// --- Class Annotation. --- +PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y'); +ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls); + +PrintStringInfo('NIN= 1',ClassFileName,'file','y'); +PrintStringInfo('NOUT= 1',ClassFileName,'file','y'); + +PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y'); +PrintStringInfo('OUT(1).SZ(1)= FA_SZ_ROW_DIAG(IN(1).SZ)',ClassFileName,'file','y'); +PrintStringInfo('OUT(1).SZ(2)= FA_SZ_COLUMN_DIAG(IN(1).SZ)',ClassFileName,'file','y'); + +PrintStringInfo('NIN= 2',ClassFileName,'file','y'); +PrintStringInfo('NOUT= 1',ClassFileName,'file','y'); + +PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y'); +PrintStringInfo('OUT(1).SZ(1)= FA_SZ_ROW_DIAG_INS_EXT(IN(1).SZ,IN(2).VAL)',ClassFileName,'file','y'); +PrintStringInfo('OUT(1).SZ(2)= FA_SZ_COL_DIAG_IN_EX(IN(1).SZ,IN(2).VAL)',ClassFileName,'file','y'); + +// ---Function List Class.---- +ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); + +PrintStringInfo('d0'+ArgSeparator+'d0',ClassFileName,'file','y'); +PrintStringInfo('d0d0'+ArgSeparator+'d0',ClassFileName,'file','y'); +PrintStringInfo('d0d0'+ArgSeparator+'d2',ClassFileName,'file','y'); +PrintStringInfo('d2'+ArgSeparator+'d2',ClassFileName,'file','y'); +PrintStringInfo('d2d0'+ArgSeparator+'d2',ClassFileName,'file','y'); +PrintStringInfo('d2d0'+ArgSeparator+'d0',ClassFileName,'file','y'); +PrintStringInfo('u80'+ArgSeparator+'u80',ClassFileName,'file','y'); +PrintStringInfo('u80d0'+ArgSeparator+'u80',ClassFileName,'file','y'); +PrintStringInfo('u80d0'+ArgSeparator+'u82',ClassFileName,'file','y'); +PrintStringInfo('u82'+ArgSeparator+'u82',ClassFileName,'file','y'); +PrintStringInfo('u82d0'+ArgSeparator+'u82',ClassFileName,'file','y'); +PrintStringInfo('u82d0'+ArgSeparator+'u80',ClassFileName,'file','y'); +PrintStringInfo('u160'+ArgSeparator+'u160',ClassFileName,'file','y'); +PrintStringInfo('u160d0'+ArgSeparator+'u160',ClassFileName,'file','y'); +PrintStringInfo('u160d0'+ArgSeparator+'u162',ClassFileName,'file','y'); +PrintStringInfo('u162'+ArgSeparator+'u162',ClassFileName,'file','y'); +PrintStringInfo('u162d0'+ArgSeparator+'u162',ClassFileName,'file','y'); +PrintStringInfo('u162d0'+ArgSeparator+'u160',ClassFileName,'file','y'); +PrintStringInfo('i80'+ArgSeparator+'i80',ClassFileName,'file','y'); +PrintStringInfo('i80d0'+ArgSeparator+'i80',ClassFileName,'file','y'); +PrintStringInfo('i80d0'+ArgSeparator+'i82',ClassFileName,'file','y'); +PrintStringInfo('i82'+ArgSeparator+'i82',ClassFileName,'file','y'); +PrintStringInfo('i82d0'+ArgSeparator+'i82',ClassFileName,'file','y'); +PrintStringInfo('i82d0'+ArgSeparator+'i80',ClassFileName,'file','y'); +PrintStringInfo('i160'+ArgSeparator+'i160',ClassFileName,'file','y'); +PrintStringInfo('i160d0'+ArgSeparator+'i160',ClassFileName,'file','y'); +PrintStringInfo('i160d0'+ArgSeparator+'i162',ClassFileName,'file','y'); +PrintStringInfo('i162'+ArgSeparator+'i162',ClassFileName,'file','y'); +PrintStringInfo('i162d0'+ArgSeparator+'i162',ClassFileName,'file','y'); +PrintStringInfo('i162d0'+ArgSeparator+'i160',ClassFileName,'file','y'); + + +// --- Annotation Function And Function List Function. --- +FunctionName = 'diag'; // BJ : Done AS : Float_Done +PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y'); +INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun); +INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun); + + + //--------------------- //-----Class Rand.------ //--------------------- @@ -1160,6 +1226,7 @@ PrintStringInfo('s2g2'+ArgSeparator+'s2',ClassFileName,'file','y'); PrintStringInfo('d2g2'+ArgSeparator+'d2',ClassFileName,'file','y'); PrintStringInfo('c2g2'+ArgSeparator+'c2',ClassFileName,'file','y'); PrintStringInfo('z2g2'+ArgSeparator+'z2',ClassFileName,'file','y'); + PrintStringInfo('u80g2'+ArgSeparator+'u80',ClassFileName,'file','y'); PrintStringInfo('u82g2'+ArgSeparator+'u80',ClassFileName,'file','y'); PrintStringInfo('u82g2'+ArgSeparator+'u82',ClassFileName,'file','y'); @@ -1831,6 +1898,7 @@ PrintStringInfo('i162i162'+ArgSeparator+'i160',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. --- FunctionName = 'OpStar'; // BJ : Done AS : Float_Done + PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y'); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun); @@ -2678,6 +2746,8 @@ PrintStringInfo('NOUT= 1',ClassFileName,'file','y'); PrintStringInfo('OUT(1).TP= FA_TP_MIN_REAL(IN(1).TP,IN(2).TP)',ClassFileName,'file','y'); PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y'); + + PrintStringInfo('OUT(1).SZ(2)= FA_SZ_FROM_VAL(FA_ADD(FA_SUB(FA_REAL(IN(2).VAL,IN(2).TP),FA_REAL(IN(1).VAL,IN(1).TP)),''1''),FA_TP_REAL(IN(2).TP))',ClassFileName,'file','y'); PrintStringInfo('NIN= 3',ClassFileName,'file','y'); PrintStringInfo('NOUT= 1',ClassFileName,'file','y'); @@ -2828,6 +2898,7 @@ INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,Ex //NUT det is a little bit complex but for the moment we assume that //NUT that det works as trace function. FunctionName = 'det'; // AS : Done AS : Float_Done + PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y'); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun); @@ -3110,6 +3181,7 @@ INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,Ex // --- Class OpEqual. --- // ---------------------- ClassName = 'OpEqual'; + // --- Class Annotation. --- PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y'); ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls); @@ -3834,6 +3906,7 @@ ClassName = 'Lev'; PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y'); ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls); PrintStringInfo('NIN= 1',ClassFileName,'file','y'); + PrintStringInfo('NOUT= 1',ClassFileName,'file','y'); PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y'); PrintStringInfo('OUT(1).SZ(1)= FA_SUB(FA_ADD(IN(1).SZ(1),IN(1).SZ(2)),''2'')',ClassFileName,'file','y'); @@ -3964,6 +4037,7 @@ PrintStringInfo('d2z2'+ArgSeparator+'z2',ClassFileName,'file','y'); PrintStringInfo('z2d2'+ArgSeparator+'z2',ClassFileName,'file','y'); PrintStringInfo('z2z2'+ArgSeparator+'z2',ClassFileName,'file','y'); + // --- Annotation Function And Function List Function. --- FunctionName = 'OpBackSlash'; PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y'); @@ -4469,6 +4543,7 @@ 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'); diff --git a/macros/ToolInitialization/INIT_SCI2C.bin b/macros/ToolInitialization/INIT_SCI2C.bin index c6141d61..72f9e1df 100644 Binary files a/macros/ToolInitialization/INIT_SCI2C.bin and b/macros/ToolInitialization/INIT_SCI2C.bin differ diff --git a/macros/ToolInitialization/INIT_SCI2C.sci b/macros/ToolInitialization/INIT_SCI2C.sci index 6dde05de..167b2ee4 100644 --- a/macros/ToolInitialization/INIT_SCI2C.sci +++ b/macros/ToolInitialization/INIT_SCI2C.sci @@ -74,6 +74,8 @@ SharedInfo = INIT_GenSharedInfo(RunMode,UserScilabMainFile, ... // --- Initialize FileInfo. --- // ---------------------------- FileInfo = INIT_GenFileInfo(WorkingDir,OutCCCodeDir,UserSciFilesPaths); + + PrintStepInfo('SCI2C hArtes/POLIBA Tool!!!',FileInfo.GeneralReport,'stdout'); // ---------------------------------------------------- diff --git a/macros/ToolInitialization/SCI2CInputParameters.bkp b/macros/ToolInitialization/SCI2CInputParameters.bkp deleted file mode 100644 index 7af3343c..00000000 --- a/macros/ToolInitialization/SCI2CInputParameters.bkp +++ /dev/null @@ -1,87 +0,0 @@ -// ----------------------------------------------------------------- -// === hArtes/PoliBa/GAP SCI2C tool === -// === Authors: === -// === Raffaele Nutricato === -// === raffaele.nutricato@tiscali.it === -// === Alberto Morea === -// === === -// === *************** === -// === USER PARAMETERS === -// === *************** === -// === === -// -// Copyright 2007 Raffaele Nutricato. -// Contact: raffaele.nutricato@tiscali.it -// ----------------------------------------------------------------- - - -// ------------------------------------------ -// --- Specify Paths of User Scilab code. --- -// ------------------------------------------ -UserSciCodeMainDir = 'C:\SCI2CTests\RegressionTests\test999'; - -// --- Path + filename of the .sci main file of the code to be translated. --- -// It is the entry point. -UserScilabMainFile = fullfile(UserSciCodeMainDir,'scilabcode\mainfun.sci'); - -// --- List of the paths containing the .sci files written by the user. --- -UserSciFilesPaths = ... - [... - fullfile(UserSciCodeMainDir,'scilabcode');... - ]; - -// -------------------------- -// --- End Specify paths. --- -// -------------------------- - - -// ---------------------------- -// --- Select the run mode. --- -// ---------------------------- -//RunMode = 'GenLibraryStructure'; -//RunMode = 'Translate'; -RunMode = 'All'; - -// --- Select one of the following options. --- - -// 'GenLibraryStructure'; -// Generates the library structure and exits. It is very -// useful when the user wants to manually change the files stored in that structure -// before running the translation. 'GenLibraryStructure' option forces SCI2C to remove -// the already existing WorkingDir and OutCCCodeDir directories. - -// 'Translate'; -// Performs the translation without generating the library structure. It means that the library -// structure must be already existing. This is useful when the user doesn't want to spend time -// to generate again that structure or when he wants to force the SCI2C tool to access to -// a manually-changed library structure. 'Translate' option forces SCI2C to don't remove -// the already existing WorkingDir. Only OutCCCodeDir directory will be removed. - -// 'All'; -// Performs all the actions listed above. - -// -------------------------------- -// --- End Select the run mode. --- -// -------------------------------- - - -// ---------------------------- -// --- Translation Options. --- -// ---------------------------- -// --- Enable (1) / Disable (0) copy of Scilab code into C code. --- -// If 1 the Scilab code will be copied into the C code in order to show -// how each Scilab code line has been translated into C code. -CopySciCodeIntoCCode = 1; - -// --- Select the path style for the C code. --- -// It can be: -// windows -// unix -// cygwin -CCompilerPathStyle = 'cygwin'; - -// --- Path + File name of the main SCI2C library header file. -Sci2CLibMainHeaderFName = 'C:\Nutricato\OpenProjects\FP6_hArtes\WP2_SCI2C\Software\Scilab2C\CFiles\sci2cincludes\sci2clib.h'; -// -------------------------------- -// --- End Translation Options. --- -// -------------------------------- diff --git a/macros/ToolInitialization/UpdateSCI2CInfo.bin b/macros/ToolInitialization/UpdateSCI2CInfo.bin index 16e99c9a..af1ae435 100644 Binary files a/macros/ToolInitialization/UpdateSCI2CInfo.bin and b/macros/ToolInitialization/UpdateSCI2CInfo.bin differ diff --git a/macros/ToolInitialization/lib b/macros/ToolInitialization/lib index 6240d3dd..0b3bb8ea 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 4ed973e7..fd56a811 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 2678d9e9..ca022cf1 100644 --- a/macros/findDeps/getAllHeaders.sci +++ b/macros/findDeps/getAllHeaders.sci @@ -63,6 +63,7 @@ function allHeaders = getAllHeaders(OutFormat) "src/c/matrixOperations/includes/matrixTranspose.h" "src/c/matrixOperations/includes/determ.h" "src/c/matrixOperations/includes/matrixMultiplication.h" + "src/c/matrixOperations/includes/diag.h" "src/c/elementaryFunctions/includes/cos.h" "src/c/elementaryFunctions/includes/fix.h" "src/c/elementaryFunctions/includes/exp.h" diff --git a/macros/findDeps/getAllInterfaces.bin b/macros/findDeps/getAllInterfaces.bin index 368b84ab..b9449d4e 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 649210b8..b7c04bb1 100644 --- a/macros/findDeps/getAllInterfaces.sci +++ b/macros/findDeps/getAllInterfaces.sci @@ -51,6 +51,7 @@ function allInterfaces = getAllInterfaces(OutFormat) "src/c/matrixOperations/interfaces/int_dist.h" "src/c/matrixOperations/interfaces/int_fill.h" "src/c/matrixOperations/interfaces/int_expm.h" + "src/c/matrixOperations/interfaces/int_diag.h" "src/c/elementaryFunctions/interfaces/int_asinh.h" "src/c/elementaryFunctions/interfaces/int_atanh.h" "src/c/elementaryFunctions/interfaces/int_sinh.h" diff --git a/macros/findDeps/getAllSources.bin b/macros/findDeps/getAllSources.bin index a81e474e..85caa0c7 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 0dc0fdea..b6e85565 100644 --- a/macros/findDeps/getAllSources.sci +++ b/macros/findDeps/getAllSources.sci @@ -244,6 +244,36 @@ function allSources = getAllSources(OutFormat) "src/c/matrixOperations/squaredMagnitude/zsquMagns.c" "src/c/matrixOperations/squaredMagnitude/csquMagna.c" "src/c/matrixOperations/squaredMagnitude/csquMagns.c" + "src/c/matrixOperations/diag/ddiags.c" + "src/c/matrixOperations/diag/ddiaga.c" + "src/c/matrixOperations/diag/ddiagina.c" + "src/c/matrixOperations/diag/ddiagins.c" + "src/c/matrixOperations/diag/ddiagexa.c" + "src/c/matrixOperations/diag/ddiagexs.c" + "src/c/matrixOperations/diag/u8diags.c" + "src/c/matrixOperations/diag/u8diaga.c" + "src/c/matrixOperations/diag/u8diagina.c" + "src/c/matrixOperations/diag/u8diagins.c" + "src/c/matrixOperations/diag/u8diagexa.c" + "src/c/matrixOperations/diag/u8diagexs.c" + "src/c/matrixOperations/diag/u16diags.c" + "src/c/matrixOperations/diag/u16diaga.c" + "src/c/matrixOperations/diag/u16diagina.c" + "src/c/matrixOperations/diag/u16diagins.c" + "src/c/matrixOperations/diag/u16diagexa.c" + "src/c/matrixOperations/diag/u16diagexs.c" + "src/c/matrixOperations/diag/i8diags.c" + "src/c/matrixOperations/diag/i8diaga.c" + "src/c/matrixOperations/diag/i8diagina.c" + "src/c/matrixOperations/diag/i8diagins.c" + "src/c/matrixOperations/diag/i8diagexa.c" + "src/c/matrixOperations/diag/i8diagexs.c" + "src/c/matrixOperations/diag/i16diags.c" + "src/c/matrixOperations/diag/i16diaga.c" + "src/c/matrixOperations/diag/i16diagina.c" + "src/c/matrixOperations/diag/i16diagins.c" + "src/c/matrixOperations/diag/i16diagexa.c" + "src/c/matrixOperations/diag/i16diagexs.c" "src/c/elementaryFunctions/cos/dcosa.c" "src/c/elementaryFunctions/cos/dcoss.c" "src/c/elementaryFunctions/cos/scosa.c" diff --git a/macros/findDeps/lib b/macros/findDeps/lib index 8d3728f0..17f4d7f6 100644 Binary files a/macros/findDeps/lib and b/macros/findDeps/lib differ diff --git a/macros/lib b/macros/lib index 1b718c75..f3cab7db 100644 Binary files a/macros/lib and b/macros/lib differ diff --git a/macros/runsci2c.bin b/macros/runsci2c.bin index 6c09823e..854f774a 100644 Binary files a/macros/runsci2c.bin and b/macros/runsci2c.bin differ -- cgit