diff options
Diffstat (limited to '2.3-1')
167 files changed, 28 insertions, 6433 deletions
diff --git a/2.3-1/builder.sce b/2.3-1/builder.sce index 9fe9f9f1..050f6090 100644 --- a/2.3-1/builder.sce +++ b/2.3-1/builder.sce @@ -27,15 +27,10 @@ TOOLBOX_TITLE = 'Scilab 2 C Converter'; toolbox_dir = get_absolute_file_path('builder.sce'); tbx_builder_macros(toolbox_dir); -<<<<<<< HEAD tbx_build_localization(TOOLBOX_NAME, toolbox_dir); tbx_builder_help(toolbox_dir); tbx_build_loader(TOOLBOX_NAME, toolbox_dir); tbx_build_cleaner(TOOLBOX_NAME, toolbox_dir); -======= -//tbx_builder_help(toolbox_dir); -tbx_build_loader(TOOLBOX_NAME, toolbox_dir); ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 clear toolbox_dir TOOLBOX_NAME TOOLBOX_TITLE; // ==================================================================== diff --git a/2.3-1/demos/analog_in_out_volt.dem.sce b/2.3-1/demos/analog_in_out_volt.dem.sce deleted file mode 100644 index ca6da611..00000000 --- a/2.3-1/demos/analog_in_out_volt.dem.sce +++ /dev/null @@ -1,7 +0,0 @@ -lines(0); - -global SCI2CHOME - -scilab2c(SCI2CHOME+"/tests/unit_tests/testArduino/analog_in_check_volt.sci", TMPDIR, SCI2CHOME+"/tests/unit_tests/testArduino", "All", "make" ,"Arduino", "uno"); - -editor([TMPDIR+"/setup_arduino.cpp";TMPDIR+"/loop_arduino.cpp"]); diff --git a/2.3-1/demos/analog_out.dem.sce b/2.3-1/demos/analog_out.dem.sce deleted file mode 100644 index 65a1e279..00000000 --- a/2.3-1/demos/analog_out.dem.sce +++ /dev/null @@ -1,7 +0,0 @@ -lines(0); - -global SCI2CHOME - -scilab2c(SCI2CHOME+"/tests/unit_tests/testArduino/analog_check.sci", TMPDIR, SCI2CHOME+"/tests/unit_tests/testArduino", "All", "make" ,"Arduino", "uno"); - -editor([TMPDIR+"/setup_arduino.cpp";TMPDIR+"/loop_arduino.cpp"]); diff --git a/2.3-1/demos/blink.dem.sce b/2.3-1/demos/blink.dem.sce deleted file mode 100644 index b01d3dae..00000000 --- a/2.3-1/demos/blink.dem.sce +++ /dev/null @@ -1,7 +0,0 @@ -lines(0); - -global SCI2CHOME - -scilab2c(SCI2CHOME+"/tests/unit_tests/testArduino/blink_13.sci", TMPDIR, SCI2CHOME+"/tests/unit_tests/testArduino", "All", "make" ,"Arduino", "uno"); - -editor([TMPDIR+"/setup_arduino.cpp";TMPDIR+"/loop_arduino.cpp"]); diff --git a/2.3-1/demos/dc_motor.dem.sce b/2.3-1/demos/dc_motor.dem.sce deleted file mode 100644 index 36c0badd..00000000 --- a/2.3-1/demos/dc_motor.dem.sce +++ /dev/null @@ -1,7 +0,0 @@ -lines(0); - -global SCI2CHOME - -scilab2c(SCI2CHOME+"/tests/unit_tests/testArduino/board_test_release2.sci", TMPDIR, SCI2CHOME+"/tests/unit_tests/testArduino", "All", "make" ,"Arduino", "uno"); - -editor([TMPDIR+"/setup_arduino.cpp";TMPDIR+"/loop_arduino.cpp"]); diff --git a/2.3-1/demos/digital_in.dem.sce b/2.3-1/demos/digital_in.dem.sce deleted file mode 100644 index 2eb4c3a0..00000000 --- a/2.3-1/demos/digital_in.dem.sce +++ /dev/null @@ -1,7 +0,0 @@ -lines(0); - -global SCI2CHOME - -scilab2c(SCI2CHOME+"/tests/unit_tests/testArduino/digital_in_check.sci", TMPDIR, SCI2CHOME+"/tests/unit_tests/testArduino", "All", "make" ,"Arduino", "uno"); - -editor([TMPDIR+"/setup_arduino.cpp";TMPDIR+"/loop_arduino.cpp"]); diff --git a/2.3-1/demos/master_write.dem.sce b/2.3-1/demos/master_write.dem.sce deleted file mode 100644 index cdf522db..00000000 --- a/2.3-1/demos/master_write.dem.sce +++ /dev/null @@ -1,7 +0,0 @@ -lines(0); - -global SCI2CHOME - -scilab2c(SCI2CHOME+"/tests/unit_tests/testArduino/i2c_master.sci", TMPDIR, SCI2CHOME+"/tests/unit_tests/testArduino", "All", "make" ,"Arduino", "uno"); - -editor([TMPDIR+"/setup_arduino.cpp";TMPDIR+"/loop_arduino.cpp"]); diff --git a/2.3-1/demos/scilab2c.dem.gateway.sce b/2.3-1/demos/scilab2c.dem.gateway.sce index 1c57d18c..a9fb0fbf 100644 --- a/2.3-1/demos/scilab2c.dem.gateway.sce +++ b/2.3-1/demos/scilab2c.dem.gateway.sce @@ -22,13 +22,6 @@ subdemolist = ["Trigonometric Identity" , "TrigonometricIdentity.dem.sce"; "Inverse Cosine Transform" , "test_idct.dem.sce"; "String Functions","string.dem.sce"; "Filter Responses","FilterResponse.dem.sce"; - - "Arduino blink", "blink.dem.sce"; - "Arduino digital input", "digital_in.dem.sce"; - "Arduino analog voltage i/o", "analog_in_out_volt.dem.sce"; - "Arduino analog output", "analog_out.dem.sce"; - "Arduino DC motor", "dc_motor.dem.sce"; - "Arduino Master write", "master_write.dem.sce"; "Singular Value Decomposition", "SVD.dem.sce"; "Singular Value Approximation", "SVA.dem.sce"; "SQROOT", "SQROOT.dem.sce"; @@ -43,4 +36,3 @@ subdemolist = ["Trigonometric Identity" , "TrigonometricIdentity.dem.sce"; ]; subdemolist(:,2) = demopath + subdemolist(:,2); - diff --git a/2.3-1/etc/scilab2c.start b/2.3-1/etc/scilab2c.start index ff243e98..91a5861e 100644 --- a/2.3-1/etc/scilab2c.start +++ b/2.3-1/etc/scilab2c.start @@ -20,21 +20,12 @@ sci2c_GenFunctionslib = lib(pathmacros + "GeneralFunctions" + filesep()); sci2c_SymbolTablelib = lib(pathmacros + "SymbolTable" + filesep()); sci2c_ToolInitlib = lib(pathmacros + "ToolInitialization" + filesep()); sci2c_finDeps = lib(pathmacros + "findDeps" + filesep()); -<<<<<<< HEAD sci2c_AVRlib = lib(pathmacros + "Hardware\AVR" + filesep()); sci2c_RPilib = lib(pathmacros + "Hardware\RasberryPi"+ filesep()); sci2c_ScilabArduinolib = lib(pathmacros + "Scilab-Arduino" + filesep()); sci2c_CVCorelib = lib(pathmacros + "ImageProcessing\core" + filesep()); sci2c_CVHighguilib = lib(pathmacros + "ImageProcessing\highgui" + filesep()); sci2c_CVImgproclib = lib(pathmacros + "ImageProcessing\imgproc" + filesep()); -======= -sci2c_AVRlib = lib(pathmacros + "Hardware\AVR" + filesep()); -sci2c_RPilib = lib(pathmacros + "Hardware\RasberryPi"+ filesep()); -sci2c_ScilabArduinolib = lib(pathmacros + "Scilab-Arduino" + filesep()); -sci2c_CVCorelib = lib(pathmacros + "ImageProcessing\core" + filesep()); -sci2c_CVHighguilib = lib(pathmacros + "ImageProcessing\highgui" + filesep()); -sci2c_CVImgproclib = lib(pathmacros + "ImageProcessing\imgproc" + filesep()); ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 clear pathmacros; // Load and add help chapter diff --git a/2.3-1/includes/lapack.h b/2.3-1/includes/lapack.h index c5e4e680..d3f6cb32 100644 --- a/2.3-1/includes/lapack.h +++ b/2.3-1/includes/lapack.h @@ -186,7 +186,6 @@ extern int dggbal_(char*,int*,double*,int*,double*,int*,int*,int*,double*, \ double*,double*,int*); extern int dgebak_(char*,char*,int*,int*,int*,double*,int*,double*,int*,int*); -<<<<<<< HEAD /*Used in SVD */ extern double dgesvd_(char*,char*,int*,int*,double*,int*,double*,double*,int*,\ double*,int*,double *,int*,int*); diff --git a/2.3-1/includes/sci2clib.h b/2.3-1/includes/sci2clib.h index 80af0fe3..fcaac7d7 100644 --- a/2.3-1/includes/sci2clib.h +++ b/2.3-1/includes/sci2clib.h @@ -18,7 +18,6 @@ extern "C" { /* interfacing lapack */ #include "lapack.h" -<<<<<<< HEAD #include "sva.h" #include "int_sva.h" @@ -28,8 +27,6 @@ extern "C" { #include "int_svd.h" -======= ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 /* AUXILIARY FUNCTIONS */ /* interfacing abs */ @@ -77,7 +74,6 @@ extern "C" { #include "rand.h" #include "int_rand.h" -<<<<<<< HEAD /* INTERPOLATION FUNCTIONS*/ /*interfacing interp1*/ @@ -94,10 +90,6 @@ extern "C" { /* interfacing isreal*/ #include "isreal.h" #include "int_isreal.h" -======= -/* ELEMENTARY FUNCTIONS */ - ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 /* interfacing atand */ #include "atand.h" #include "int_atand.h" @@ -220,15 +212,12 @@ extern "C" { /* interfacing int16 */ #include "int16.h" #include "int_int16.h" -<<<<<<< HEAD /* interfacing uint32 */ #include "uint32.h" #include "int_uint32.h" /* interfacing int32 */ #include "int32.h" #include "int_int32.h" -======= ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 /*interfacing bitand */ #include "bitand.h" @@ -344,7 +333,6 @@ extern "C" { #include "factor.h" #include "int_factor.h" -<<<<<<< HEAD /*interfacing gcd*/ #include "gcd.h" #include "int_gcd.h" @@ -354,8 +342,6 @@ extern "C" { #include "int_lcm.h" -======= ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 /* IMPLICIT LISTS */ /* interfacing implicitList/OpColon */ #include "implicitList.h" @@ -425,11 +411,7 @@ extern "C" { /* interfacing ones */ #include "ones.h" #include "int_ones.h" -<<<<<<< HEAD /* Linear Algebra - spec */ -======= -/* interfacing spec */ ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 #include "spec.h" #include "int_spec.h" /* interfacing trace */ @@ -473,7 +455,6 @@ extern "C" { /* SIGNAL PROCESSING */ -<<<<<<< HEAD #include "modk.h" @@ -486,8 +467,6 @@ extern "C" { //#include "dct.h" //#include "int_dct.h" -======= ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 /* interfacing convol */ #include "conv.h" #include "conv2d.h" @@ -507,7 +486,6 @@ extern "C" { #include "lev.h" #include "int_lev.h" -<<<<<<< HEAD /* interfacing zpbutt */ #include "zpbutt.h" #include "int_zpbutt.h" @@ -567,9 +545,6 @@ extern "C" { /* interfacing amell */ #include "amell.h" #include "int_amell.h" -======= - ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 /* STATISTICS FUNCTIONS */ @@ -638,7 +613,6 @@ extern "C" { #include "strrchr.h" #include "int_strrchr.h" -<<<<<<< HEAD /*interfacing strchr*/ #include "strchr.h" #include "int_strchr.h" @@ -659,8 +633,6 @@ extern "C" { #include "strncpy.h" #include "int_strncpy.h" -======= ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 /*Functions related to strings*/ #include "convstr.h" #include "int_convstr.h" @@ -684,7 +656,6 @@ extern "C" { #include "balanc.h" #include "int_balanc.h" -<<<<<<< HEAD #include "svd.h" /*Linear Alegbra - Singular value decompostion */ #include "int_svd.h" @@ -813,20 +784,6 @@ extern "C" { #include "int_RPIPeripheralSoft.h" #include "RPIPeripheralTiming.h" #include "int_RPIPeripheralTiming.h" -======= -#include "int_RPIPeripheralDigital.h" -#include "RPIPeripheralDigital.h" -#include "int_RPIPeripheralTiming.h" -#include "RPIPeripheralTiming.h" -#include "int_RPIPeripheralSerial.h" -#include "RPIPeripheralSerial.h" -#include "int_RPIPeripheralThreading.h" -#include "RPIPeripheralThreading.h" -#include "int_RPIPeripheralPinISR.h" -#include "RPIPeripheralPinISR.h" -#include "int_RPIPeripheralPWM.h" -#include "RPIPeripheralPWM.h" ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 #endif #ifdef __cplusplus diff --git a/2.3-1/macros/ASTManagement/%equal_string.sci b/2.3-1/macros/ASTManagement/%equal_string.sci index 29e8cb6b..041fb84a 100644 --- a/2.3-1/macros/ASTManagement/%equal_string.sci +++ b/2.3-1/macros/ASTManagement/%equal_string.sci @@ -13,8 +13,4 @@ function txt=%equal_string(e) ' '+objectlist2string(e.lhs) 'EndEqual' ] -<<<<<<< HEAD endfunction -======= -endfunction ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 diff --git a/2.3-1/macros/ASTManagement/%funcall_string.sci b/2.3-1/macros/ASTManagement/%funcall_string.sci index 449cc744..fc4b929b 100644 --- a/2.3-1/macros/ASTManagement/%funcall_string.sci +++ b/2.3-1/macros/ASTManagement/%funcall_string.sci @@ -8,17 +8,13 @@ function txt=%funcall_string(F) // Modified By: Ukasha Noor -<<<<<<< HEAD if F.name <> 'disp' -======= ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 txt=['Funcall : '+F.name ' #lhs : '+string(F.lhsnb) ' Rhs : ' ' '+objectlist2string(F.rhs) 'EndFuncall' ] -<<<<<<< HEAD else txt=['Funcall : '+F.name ' #lhs : '+'0' @@ -27,6 +23,4 @@ txt=['Funcall : '+F.name 'EndFuncall' ] end -======= ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 endfunction diff --git a/2.3-1/macros/ASTManagement/%operatio_string.sci b/2.3-1/macros/ASTManagement/%operatio_string.sci index 2a3554dc..cc18e919 100644 --- a/2.3-1/macros/ASTManagement/%operatio_string.sci +++ b/2.3-1/macros/ASTManagement/%operatio_string.sci @@ -4,17 +4,13 @@ function txt=%operatio_string(O) //fields: // operands: a list // operator: a string -<<<<<<< HEAD if O.operator <> 'rc' & O.operator <> 'cc' -======= ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 txt=['Operation' ' Operands:' ' '+objectlist2string(O.operands) ' Operator: '+O.operator 'EndOperation' ] -<<<<<<< HEAD elseif O.operator == 'rc' txt=[' Operands:' ' '+objectlist2string(O.operands) @@ -27,6 +23,3 @@ elseif O.operator == 'cc' ] end endfunction -======= -endfunction ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 diff --git a/2.3-1/macros/ASTManagement/%operation_string.sci b/2.3-1/macros/ASTManagement/%operation_string.sci index 2de021d9..c9282f67 100644 --- a/2.3-1/macros/ASTManagement/%operation_string.sci +++ b/2.3-1/macros/ASTManagement/%operation_string.sci @@ -10,8 +10,4 @@ function txt=%operation_string(O) ' Operator: '+O.operator 'EndOperation' ] -<<<<<<< HEAD endfunction -======= -endfunction ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 diff --git a/2.3-1/macros/ASTManagement/AST2Ccode.sci b/2.3-1/macros/ASTManagement/AST2Ccode.sci index 136c5a18..516291a8 100644 --- a/2.3-1/macros/ASTManagement/AST2Ccode.sci +++ b/2.3-1/macros/ASTManagement/AST2Ccode.sci @@ -44,9 +44,6 @@ nxtscifunname = SharedInfo.NextSCIFunName; nxtscifunnumber = SharedInfo.NextSCIFunNumber; ReportFileName = FileInfo.Funct(nxtscifunnumber).ReportFileName; -SharedInfo.Function_list = []; -SharedInfo.Function_list_index = 1; - // --------------------------------- // --- Parameter Initialization. --- // --------------------------------- @@ -165,7 +162,6 @@ while ~meof(fidAST) //NUT: per fare in modo di coprire le ins, anche se ci puo' essere qualche rischio quando //NUT: ho miste ins e variabili, per esempio [c(1,1), a] = twooutfun(); //NUT: in questo caso solo una delle due equal va scartata. - if rc_count > 0 & cc_count == 0 [FileInfo,SharedInfo] = AST_HandleFunRC(FName,FileInfo,SharedInfo); rc_count = 0; @@ -186,7 +182,6 @@ while ~meof(fidAST) SharedInfo.Equal.Enabled = 1; // 1 means enabled -> we are inside an equal AST block. AST_PushASTStack(treeline); case 'Lhs :' then - if rc_count > 0 & cc_count == 0 SharedInfo.Equal.Lhs = 1; [EqualInArgName,EqualInArgScope,EqualNInArg] = AST_HandleRC(FileInfo,SharedInfo); @@ -254,7 +249,6 @@ while ~meof(fidAST) // ----------------- case 'EndProgram' SharedInfo = AST_HandleEndProgram(FileInfo,SharedInfo); - disp_isthere = 0; //NUT: per essere precisi si puo' pensare di mettere un check //NUT: alla fine dell'albero per accertarsi che c'e' end program li' dove ce lo aspettiamo @@ -305,19 +299,6 @@ while ~meof(fidAST) AST_PushASTStack(treeline); end end -// ------------------------------------ -// -----List of functions Used-------- -// ------------------------------------- - -SharedInfo.Function_list_index = SharedInfo.Function_list_index - 2; -SharedInfo.Function_list = SharedInfo.Function_list(1:SharedInfo.Function_list_index); -//To remove function repeatedly used---------- -x = size(unique(SharedInfo.Function_list)); -SharedInfo.Function_list_index = x(1); -SharedInfo.Function_list = unique(SharedInfo.Function_list); - -SharedInfo.Function_list = SharedInfo.Function_list(1:SharedInfo.Function_list_index); - // -------------------------------------- // --- End main loop to read the AST. --- // -------------------------------------- diff --git a/2.3-1/macros/ASTManagement/AST_HandleEndGenFun.sci b/2.3-1/macros/ASTManagement/AST_HandleEndGenFun.sci index fad638a3..e191f106 100644 --- a/2.3-1/macros/ASTManagement/AST_HandleEndGenFun.sci +++ b/2.3-1/macros/ASTManagement/AST_HandleEndGenFun.sci @@ -1,7 +1,4 @@ - function [disp_isthere,FileInfo,SharedInfo] = AST_HandleEndGenFun(disp_isthere,FileInfo,SharedInfo,ASTFunType) -function [FileInfo,SharedInfo] = AST_HandleEndGenFun(FileInfo,SharedInfo,ASTFunType) - // function [FileInfo,SharedInfo] = AST_HandleEndGenFun(FileInfo,SharedInfo,ASTFunType) // ----------------------------------------------------------------- // #RNU_RES_B @@ -40,7 +37,6 @@ function [FileInfo,SharedInfo] = AST_HandleEndGenFun(FileInfo,SharedInfo,ASTFunT // ------------------------------ // --- Check input arguments. --- // ------------------------------ - SCI2CNInArgCheck(argn(2),4,4); // ----------------------- @@ -93,11 +89,6 @@ NOutArg_mod = NOutArg disp_isthere = 1; end -if (ASTFunType=='Funcall') -SharedInfo.Function_list(SharedInfo.Function_list_index) = ASTFunName; -SharedInfo.Function_list_index = SharedInfo.Function_list_index + 1; -end -NOutArg_mod = NOutArg if(mtlb_strcmp(part(ASTFunName,1:2),'CV') == %T) SharedInfo.OpenCVUsed = %T; end @@ -373,10 +364,6 @@ NOutArg_mod = NOutArg PrintStringInfo(' returning back due logical function',ReportFileName,'file','y'); return; end - - else - [OutArg,SharedInfo] = GenOutArgNames(ASTFunName,InArg,NInArg,OutArg,NOutArg,LhsArg,NLhsArg,FileInfo,SharedInfo); - end if ((ASTFunName == 'uint8') & (NInArg == 1) & (InArg(1).Dimension == 0) & (InArg(1).Scope == 'Number')) @@ -481,14 +468,6 @@ NOutArg_mod = NOutArg //#RNU_RES_B PrintStringInfo(' C Function Name: '+CFunName,ReportFileName,'file','y'); if(IsArduinoFunction(ASTFunName)) - - CFunName = C_GenerateFunName(ASTFunName,InArg,NInArg,OutArg,NOutArg_mod); - - //#RNU_RES_B - PrintStringInfo(' C Function Name: '+CFunName,ReportFileName,'file','y'); - if(IsArduinoFunction(ASTFunName)) - //disp(ASTFunName) - if(IsArduinoSetupFunction(ASTFunName)) //If current function is an arduino setup function (like 'dc_motor_setup'), it //should not be converted and inserted here. It is inserted in a list now and diff --git a/2.3-1/macros/ASTManagement/AST_HandleIfElse.sci b/2.3-1/macros/ASTManagement/AST_HandleIfElse.sci index 449586f7..2b549ed6 100644 --- a/2.3-1/macros/ASTManagement/AST_HandleIfElse.sci +++ b/2.3-1/macros/ASTManagement/AST_HandleIfElse.sci @@ -74,20 +74,13 @@ global STACKDEDUG // --------------------------------------------------- //#RNU_RES_E if (ASTIfExpType~='else') -<<<<<<< HEAD [IfCondArg,NIfCondArg,Op,NOp] = AST_ParseIfExprStruct(FileInfo,SharedInfo,ASTIfExpType); -======= - [IfCondArg,NIfCondArg] = AST_ParseIfExprStruct(FileInfo,SharedInfo,ASTIfExpType); ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 else // "else" type doesn't contain any condition to test. IfCondArg = ''; NIfCondArg = 0; -<<<<<<< HEAD Op = ''; NOp = 0; -======= ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 end //#RNU_RES_B @@ -96,10 +89,6 @@ end // ----------------------------- // --- Generate the C code for if/elseif Expression. --- //#RNU_RES_E -<<<<<<< HEAD SharedInfo = C_IfExpression(IfCondArg,NIfCondArg,Op,NOp,ASTIfExpType,FileInfo,SharedInfo); -======= -SharedInfo = C_IfExpression(IfCondArg,NIfCondArg,ASTIfExpType,FileInfo,SharedInfo); ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 endfunction diff --git a/2.3-1/macros/ASTManagement/AST_HandleWhileStatem.sci b/2.3-1/macros/ASTManagement/AST_HandleWhileStatem.sci index 9b5dce15..d8c2f73c 100644 --- a/2.3-1/macros/ASTManagement/AST_HandleWhileStatem.sci +++ b/2.3-1/macros/ASTManagement/AST_HandleWhileStatem.sci @@ -36,11 +36,8 @@ global SCI2CSTACK global StackPosition; global STACKDEDUG -<<<<<<< HEAD IfCondArg = []; NIfCondArg = 0; -======= ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // ------------------------------ // --- Check input arguments. --- @@ -75,7 +72,6 @@ PrintStringInfo(' Redirecting C code to: '+FileInfo.Funct(nxtscifunnumber).CPa // --- Generate C code. --- // ------------------------ //#RNU_RES_E -<<<<<<< HEAD flagendpop = 0; IfExprField = AST_PopASTStack(); @@ -110,38 +106,6 @@ end IfCondArg = SCI2Cflipud(IfCondArg); SharedInfo = C_WhileExpression(IfCondArg,NIfCondArg,Op,NOp,FileInfo,SharedInfo); -======= -if(SharedInfo.WhileExpr.CondVar == '') - //#RNU_RES_B - // It means that we are handling something like while(a) or while(1) - // The while condition variable is generated by the HandleEndGenFun. - //#RNU_RES_E - - // --- Pop the name of the condition variable or number. --- - Pop1 = AST_PopASTStack(); - - [ArgName,ArgScope] = AST_ExtractNameAndScope(Pop1); - if (length(ArgName) == 0) - PrintStringInfo(' ',ReportFileName,'both','y'); - PrintStringInfo('SCI2CERROR: Expected while(variable) or while(number).','','stdout','y'); - PrintStringInfo('SCI2CERROR: Expected a variable or number in the AST while expression.','','stdout','y'); - PrintStringInfo('SCI2CERROR: Report this error to http://forge.scilab.org/index.php/p/scilab2c/issues/.','','stdout','y'); - PrintStringInfo(' ',ReportFileName,'both','y'); - error(9999, 'Expected a conditional variable in the while expression'); - end - - SharedInfo.WhileExpr.CondVar = ArgName; - //#RNU_RES_B - // --- Repush strings into the AST stack. --- - //#RNU_RES_E - - AST_PushASTStack(Pop1); - -elseif (SharedInfo.WhileExpr.DimCondVar > 0) - error(9999, 'Cannot manage while with matrix conditions'); -end -SharedInfo = C_WhileExpression(FileInfo,SharedInfo); ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // -------------------------- // --- Update SharedInfo. --- diff --git a/2.3-1/macros/ASTManagement/AST_ParseEqualStruct.sci b/2.3-1/macros/ASTManagement/AST_ParseEqualStruct.sci index 528ddaee..68bc3da7 100644 --- a/2.3-1/macros/ASTManagement/AST_ParseEqualStruct.sci +++ b/2.3-1/macros/ASTManagement/AST_ParseEqualStruct.sci @@ -123,11 +123,7 @@ end // ------------------------ //#RNU_RES_B PrintStringInfo('Function Name: '+FunctionName,ReportFileName,'file','y','n'); -<<<<<<< HEAD PrintStringInfo('N Input Arguments: '+string(NInArg),ReportFileName,'file','y','n'); -======= -PrintStringInfo('N Intput Arguments: '+string(NInArg),ReportFileName,'file','y','n'); ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 //#RNU_RES_E if (SharedInfo.Equal.Nins > 0) //#RNU_RES_B diff --git a/2.3-1/macros/ASTManagement/AST_ParseFuncallStruct.sci b/2.3-1/macros/ASTManagement/AST_ParseFuncallStruct.sci index ac9c4004..3c322dd5 100644 --- a/2.3-1/macros/ASTManagement/AST_ParseFuncallStruct.sci +++ b/2.3-1/macros/ASTManagement/AST_ParseFuncallStruct.sci @@ -87,13 +87,10 @@ NOutArg = eval(stripblanks(part(buffstring,10:length(buffstring)))); buffstring = AST_PopASTStack(); FunctionName = stripblanks(part(buffstring,12:length(buffstring))); -<<<<<<< HEAD //if (FunctionName == 'disp') // NOutArg = 0; //end -======= ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // ------------------------------------- // --- Generate the InArg structure. --- // ------------------------------------- diff --git a/2.3-1/macros/ASTManagement/AST_ParseIfExprStruct.sci b/2.3-1/macros/ASTManagement/AST_ParseIfExprStruct.sci index d9658e81..88ba2e9c 100644 --- a/2.3-1/macros/ASTManagement/AST_ParseIfExprStruct.sci +++ b/2.3-1/macros/ASTManagement/AST_ParseIfExprStruct.sci @@ -1,8 +1,4 @@ -<<<<<<< HEAD function [IfCondArg,NIfCondArg,Op,NOp] = AST_ParseIfExprStruct(FileInfo,SharedInfo,ASTIfExpType) -======= -function [IfCondArg,NIfCondArg] = AST_ParseIfExprStruct(FileInfo,SharedInfo,ASTIfExpType) ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // function [IfCondArg,NIfCondArg] = AST_ParseIfExprStruct(FileInfo,SharedInfo,ASTIfExpType) // ----------------------------------------------------------------- //#RNU_RES_B @@ -69,7 +65,6 @@ global STACKDEDUG // ------------------------------------ // --- Read if condition variables. --- // ------------------------------------ -<<<<<<< HEAD //OutArgOld=[]; //OutArgNew=[]; @@ -84,19 +79,12 @@ global STACKDEDUG flagendpop = 0; IfExprField = AST_PopASTStack(); PrintStringInfo(' '+IfExprField+' '+ASTIfExpType,ReportFileName,'file','y'); -======= -flagendpop = 0; -IfExprField = AST_PopASTStack(); ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 if (ASTIfExpType=='if') if (IfExprField=='Expression:') flagendpop = 1; // Pop Again the If tag from the AST. IfExprField = AST_PopASTStack(); -<<<<<<< HEAD PrintStringInfo(' '+IfExprField,ReportFileName,'file','y'); -======= ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 end elseif (ASTIfExpType=='elseif') if (IfExprField=='Else If Expression') @@ -105,18 +93,13 @@ elseif (ASTIfExpType=='elseif') else error(9999, 'Unknown ASTIfExpType ""'+ASTIfExpType+'"".'); end -<<<<<<< HEAD NOp=0; Op=[]; -======= - ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 while (flagendpop == 0) if (IfExprField~='<EOL>') if (ASTIfExpType=='if') if (IfExprField=='Expression:') flagendpop = 1; -<<<<<<< HEAD //PrintStringInfo('hello dere '+IfExprField,ReportFileName,'file','y'); // Pop Again the If tag from the AST. IfExprField = AST_PopASTStack(); @@ -133,18 +116,10 @@ while (flagendpop == 0) IfCondArg(NIfCondArg) = IfExprField; end //[IfCondArg(NIfCondArg),tmpscope] = AST_ExtractNameAndScope(IfExprField); -======= - // Pop Again the If tag from the AST. - IfExprField = AST_PopASTStack(); - else - NIfCondArg = NIfCondArg + 1; - [IfCondArg(NIfCondArg),tmpscope] = AST_ExtractNameAndScope(IfExprField); ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 end elseif (ASTIfExpType=='elseif') if (IfExprField=='Else If Expression') flagendpop = 1; -<<<<<<< HEAD //IfExprField = AST_PopASTStack(); else if (IfExprField=='&&' | IfExprField=='||') @@ -169,18 +144,6 @@ end IfCondArg = SCI2Cflipud(IfCondArg); -======= - else - NIfCondArg = NIfCondArg + 1; - IfCondArg(NIfCondArg) = IfExprField; - [IfCondArg(NIfCondArg),tmpscope] = AST_ExtractNameAndScope(IfExprField); - end - end - end - IfExprField = AST_PopASTStack(); -end - ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 //#RNU_RES_B // ------------------------------------------- // --- Print some info in the report file. --- diff --git a/2.3-1/macros/ASTManagement/AST_ParseOperStruct.sci b/2.3-1/macros/ASTManagement/AST_ParseOperStruct.sci index cc992a9e..ce0bcc72 100644 --- a/2.3-1/macros/ASTManagement/AST_ParseOperStruct.sci +++ b/2.3-1/macros/ASTManagement/AST_ParseOperStruct.sci @@ -62,7 +62,6 @@ LabelFunctName = 'Operator: '; FunctionName = stripblanks(part(buffstring,length(LabelFunctName)+1:length(buffstring))); // Generate the proper function name. FunctionName = Operator2FunName(FunctionName); -<<<<<<< HEAD PrintStringInfo(' '+FunctionName,ReportFileName,'file','y'); if (FunctionName == 'OpLogAnd' | FunctionName=='OpLogOr') @@ -74,8 +73,6 @@ if (FunctionName == 'OpLogAnd' | FunctionName=='OpLogOr') //RhsField = AST_PopASTStack(); return ; end -======= ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // ------------------------------ // --- Read input parameters. --- diff --git a/2.3-1/macros/ASTManagement/GenOutArgNames.sci b/2.3-1/macros/ASTManagement/GenOutArgNames.sci index 800b8d6d..7b62c794 100644 --- a/2.3-1/macros/ASTManagement/GenOutArgNames.sci +++ b/2.3-1/macros/ASTManagement/GenOutArgNames.sci @@ -32,15 +32,12 @@ SCI2CNInArgCheck(argn(2),9,9); nxtscifunname = SharedInfo.NextSCIFunName; nxtscifunnumber = SharedInfo.NextSCIFunNumber; ReportFileName = FileInfo.Funct(nxtscifunnumber).ReportFileName; -<<<<<<< HEAD global SCI2CSTACK global StackPosition; global STACKDEDUG -======= ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // #RNU_RES_B PrintStringInfo(' Generating Out Arg names.',ReportFileName,'file','y'); // #RNU_RES_E @@ -52,7 +49,6 @@ OutArg = OldOutArg; // --------------------------------------------------------------------------------------- // At this step only the name of the output arguments can be generated. --- //#RNU_RES_E -<<<<<<< HEAD if (FunctionName ~= 'OpLogGt' & FunctionName ~= 'OpLogLt' & FunctionName ~= 'OpLogGe' & FunctionName ~= 'OpLogLe' & FunctionName ~= 'OpLogNe' & FunctionName ~= 'OpLogEq') if (NLhsArg > 0) //#RNU_RES_B @@ -118,49 +114,4 @@ else s = AST_PopASTStack(); PrintStringInfo(' Pushing in the AST stack: ""'+s+'"".',ReportFileName,'file','y'); end -======= -if (NLhsArg > 0) - //#RNU_RES_B - // Use the equal Lhs names. - PrintStringInfo('Using Equal Lhs names.',ReportFileName,'file','y'); - //#RNU_RES_E - if (NLhsArg ~= NOutArg) - error(9999, 'NLhsArg='+string(NLhsArg)+' must be equal to NOutArg='+string(NOutArg)+'.'); - end - for counteroutputargs = 1:NOutArg - OutArg(counteroutputargs).Name=LhsArg(counteroutputargs).Name; - OutArg(counteroutputargs).Scope=LhsArg(counteroutputargs).Scope; - end -else - //#RNU_RES_B - // Generate temporary variables. - PrintStringInfo('Generating temporary variables.',ReportFileName,'file','y'); - //#RNU_RES_E - if ((sum(mtlb_strcmp(FunctionName,SharedInfo.Annotations.DataPrec)) > 0) & ... - (SharedInfo.SkipNextPrec == 1)) - //#RNU_RES_B - PrintStringInfo(' Skipping code generating because already generated in the previous function.',ReportFileName,'file','y'); - //#RNU_RES_E - for counteroutputargs = 1:NOutArg - OutArg(counteroutputargs).Name = InArg(counteroutputargs).Name; - end - elseif (mtlb_strcmp(FunctionName,'OpEqual')) - // do nothing. - //NUT: verifica questa parte di codice. e' sicuro che se ho equal gli oldoutarg contengono gia' il nome? - else - for counteroutputargs = 1:NOutArg - if ((SharedInfo.ASTReader.EnableTempVarsReuse == 1) & ... - (length(SharedInfo.ASTReader.ReusableTempVars) > 0)) - TmpOutArgName = strcat([SharedInfo.ASTReader.TempVarsName,string(SharedInfo.ASTReader.ReusableTempVars(1))]); - SharedInfo.ASTReader.ReusableTempVars = SharedInfo.ASTReader.ReusableTempVars(2:$); - else - SharedInfo.ASTReader.UsedTempVars = SharedInfo.ASTReader.UsedTempVars + 1; - TmpOutArgName = strcat([SharedInfo.ASTReader.TempVarsName,string(SharedInfo.ASTReader.UsedTempVars)]); - end - OutArg(counteroutputargs).Name=TmpOutArgName; - end - end -end - ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 endfunction diff --git a/2.3-1/macros/ASTManagement/_funcall_string.sci b/2.3-1/macros/ASTManagement/_funcall_string.sci index 5218d533..7c0b0abf 100644 --- a/2.3-1/macros/ASTManagement/_funcall_string.sci +++ b/2.3-1/macros/ASTManagement/_funcall_string.sci @@ -7,17 +7,13 @@ function txt=%funcall_string(F) // lhsnb: number, the number of function lhs // Modified By: Ukasha Noor -<<<<<<< HEAD if F.name <> 'disp' -======= ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 txt=['Funcall : '+F.name ' #lhs : '+string(F.lhsnb) ' Rhs : ' ' '+objectlist2string(F.rhs) 'EndFuncall' ] -<<<<<<< HEAD else txt=['Funcall : '+F.name ' #lhs : '+'0' @@ -26,6 +22,4 @@ txt=['Funcall : '+F.name 'EndFuncall' ] end -======= ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 endfunction diff --git a/2.3-1/macros/ASTManagement/_operatio_string.sci b/2.3-1/macros/ASTManagement/_operatio_string.sci index 76753868..e9332337 100644 --- a/2.3-1/macros/ASTManagement/_operatio_string.sci +++ b/2.3-1/macros/ASTManagement/_operatio_string.sci @@ -10,8 +10,4 @@ function txt=%operatio_string(O) ' Operator: '+O.operator 'EndOperation' ] -<<<<<<< HEAD endfunction -======= -endfunction ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 diff --git a/2.3-1/macros/ASTManagement/_operation_string.sci b/2.3-1/macros/ASTManagement/_operation_string.sci index 2de021d9..c9282f67 100644 --- a/2.3-1/macros/ASTManagement/_operation_string.sci +++ b/2.3-1/macros/ASTManagement/_operation_string.sci @@ -10,8 +10,4 @@ function txt=%operation_string(O) ' Operator: '+O.operator 'EndOperation' ] -<<<<<<< HEAD endfunction -======= -endfunction ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 diff --git a/2.3-1/macros/ASTManagement/names b/2.3-1/macros/ASTManagement/names index 3045d397..9ba83f73 100644 --- a/2.3-1/macros/ASTManagement/names +++ b/2.3-1/macros/ASTManagement/names @@ -21,10 +21,7 @@ AST_ExtractNameAndScope AST_GetASTFile AST_GetFuncallPrm AST_GetPrecAndLhsArg -<<<<<<< HEAD AST_HandleCC -======= ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 AST_HandleEOL AST_HandleEndFor AST_HandleEndGenFun @@ -32,7 +29,6 @@ AST_HandleEndProgram AST_HandleEndWhile AST_HandleFor AST_HandleForStatem -<<<<<<< HEAD AST_HandleFunCC AST_HandleFunRC AST_HandleFuncArray @@ -40,10 +36,6 @@ AST_HandleFuncArray2D AST_HandleHeader AST_HandleIfElse AST_HandleRC -======= -AST_HandleHeader -AST_HandleIfElse ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 AST_HandleWhileExpr AST_HandleWhileStatem AST_ParseEqualStruct diff --git a/2.3-1/macros/CCodeGeneration/C_GenerateMkfle_arduino.sci b/2.3-1/macros/CCodeGeneration/C_GenerateMkfle_arduino.sci index 2b9ca6c9..b43eb442 100644 --- a/2.3-1/macros/CCodeGeneration/C_GenerateMkfle_arduino.sci +++ b/2.3-1/macros/CCodeGeneration/C_GenerateMkfle_arduino.sci @@ -1,18 +1,3 @@ -<<<<<<< HEAD -======= -// Copyright (C) 2017 - IIT Bombay - FOSSEE - -// This file must be used under the terms of the CeCILL. -// This source file is licensed as described in the file COPYING, which -// you should have received as part of this distribution. The terms -// are also available at -// http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt -// Author: Yash Pratap Singh Tomar -// Organization: FOSSEE, IIT Bombay -// Email: toolbox@scilab.in - - ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 function C_GenerateMkfle_arduino(FileInfo,SharedInfo) PrintStringInfo('ARDUINO_DIR = /usr/share/arduino',FileInfo.MakefileFilename,'file','y','y'); diff --git a/2.3-1/macros/CCodeGeneration/C_IfExpression.sci b/2.3-1/macros/CCodeGeneration/C_IfExpression.sci index 17138dcd..630134e1 100644 --- a/2.3-1/macros/CCodeGeneration/C_IfExpression.sci +++ b/2.3-1/macros/CCodeGeneration/C_IfExpression.sci @@ -1,8 +1,4 @@ -<<<<<<< HEAD function SharedInfo = C_IfExpression(IfCondArg,NIfCondArg,Op,NOp,ASTIfExpType,FileInfo,SharedInfo) -======= -function SharedInfo = C_IfExpression(IfCondArg,NIfCondArg,ASTIfExpType,FileInfo,SharedInfo) ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // function SharedInfo = C_IfExpression(IfCondArg,NIfCondArg,ASTIfExpType,FileInfo,SharedInfo) // ----------------------------------------------------------------- // //NUT: add description here @@ -24,7 +20,6 @@ function SharedInfo = C_IfExpression(IfCondArg,NIfCondArg,ASTIfExpType,FileInfo, // ------------------------------ // --- Check input arguments. --- // ------------------------------ -<<<<<<< HEAD SCI2CNInArgCheck(argn(2),7,7); //global SCI2CSTACK @@ -35,14 +30,6 @@ SCI2CNInArgCheck(argn(2),7,7); //if ((NIfCondArg ~= 1) & (ASTIfExpType~='else')) // error(9999, 'Cannot manage ""if/elseif"" with a number of condition variables not equal to 1.'); //end -======= -SCI2CNInArgCheck(argn(2),5,5); - -// --- Check NIfCondArg value. --- -if ((NIfCondArg ~= 1) & (ASTIfExpType~='else')) - error(9999, 'Cannot manage ""if/elseif"" with a number of condition variables not equal to 1.'); -end ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // ----------------------- // --- Initialization. --- @@ -55,11 +42,7 @@ CPass1FileName = FileInfo.Funct(nxtscifunnumber).CPass1FileName; // #RNU_RES_B PrintStringInfo(' ',ReportFileName,'file','y'); -<<<<<<< HEAD PrintStringInfo('***Generating C code***'+ string(NIfCondArg),ReportFileName,'file','y'); -======= -PrintStringInfo('***Generating C code***',ReportFileName,'file','y'); ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // #RNU_RES_E // --------------------------- // --- End Initialization. --- @@ -88,7 +71,6 @@ if SCI2Cstrncmps1size(ASTIfExpType,'else') SharedInfo = C_IfElseBlocks(FileInfo,SharedInfo,'out'); end -<<<<<<< HEAD i=1; k=1; CCall =''; @@ -106,12 +88,6 @@ if (ASTIfExpType~='else') i = i + 1; end CCall = CCall+')'; -======= -CCall =''; -CCall = CCall+CFunName; -if (ASTIfExpType~='else') - CCall = CCall+'('+IfCondArg(1)+')'; ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 end PrintStringInfo(' '+CCall,ReportFileName,'file','y'); PrintStringInfo(C_IndentBlanks(SharedInfo.NIndent)+CCall,CPass1FileName,'file','y'); diff --git a/2.3-1/macros/CCodeGeneration/C_WhileExpression.sci b/2.3-1/macros/CCodeGeneration/C_WhileExpression.sci index 00c60059..36fcc4f2 100644 --- a/2.3-1/macros/CCodeGeneration/C_WhileExpression.sci +++ b/2.3-1/macros/CCodeGeneration/C_WhileExpression.sci @@ -1,8 +1,4 @@ -<<<<<<< HEAD function SharedInfo = C_WhileExpression(IfCondArg,NIfCondArg,Op,NOp,FileInfo,SharedInfo) -======= -function SharedInfo = C_WhileExpression(FileInfo,SharedInfo) ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // function SharedInfo = C_WhileExpression(FileInfo,SharedInfo) // ----------------------------------------------------------------- // //NUT: add description here @@ -24,11 +20,7 @@ function SharedInfo = C_WhileExpression(FileInfo,SharedInfo) // ------------------------------ // --- Check input arguments. --- // ------------------------------ -<<<<<<< HEAD SCI2CNInArgCheck(argn(2),6,6); -======= -SCI2CNInArgCheck(argn(2),2,2); ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // ----------------------- // --- Initialization. --- @@ -72,11 +64,7 @@ for cntstr = 1:NumCStrings // Epilogue if (length(C_Strings(cntstr)) == 0) C_Strings(cntstr) = ' '; // RNU for Bruno: If I don't do that I get a PrintStringInfo error related to mputstr. -<<<<<<< HEAD // Function not defined for given argument type(s), -======= - // Function not defined for given argument type(s),
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // check arguments or define function %0_mputstr for overloading. end PrintStringInfo(C_Strings(cntstr),CPass1WhileEpilFileName ,'file','y','n'); @@ -89,7 +77,6 @@ PrintStringInfo('}',CPass1WhileEpilFileName ,'file','y'); // ------------------------------ // --- Insert for expression. --- // ------------------------------ -<<<<<<< HEAD //CCall = 'while('+SharedInfo.WhileExpr.CondVar+')'; //PrintStringInfo(C_IndentBlanks(SharedInfo.NIndent)+CCall,CPass1FileName,'file','y'); @@ -111,9 +98,6 @@ CCall = CCall+'while'; CCall = CCall+')'; PrintStringInfo(' '+CCall,ReportFileName,'file','y'); -======= -CCall = 'while('+SharedInfo.WhileExpr.CondVar+')'; ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 PrintStringInfo(C_IndentBlanks(SharedInfo.NIndent)+CCall,CPass1FileName,'file','y'); // ------------------- diff --git a/2.3-1/macros/CCodeGeneration/GetClsFileName.sci b/2.3-1/macros/CCodeGeneration/GetClsFileName.sci index 619c4931..42204108 100644 --- a/2.3-1/macros/CCodeGeneration/GetClsFileName.sci +++ b/2.3-1/macros/CCodeGeneration/GetClsFileName.sci @@ -45,10 +45,7 @@ if SCI2Cfileexist(FileInfo.USER2CLibCAnnFun,tmpannfilename) // #RNU_RES_B // It is a C function of the USER2C library. // #RNU_RES_E -<<<<<<< HEAD PrintStringInfo('cUser2c',ReportFileName,'file','y'); -======= ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 FlagFoundAnnFile = 1; AnnFileName = fullfile(FileInfo.USER2CLibCAnnFun,tmpannfilename); SCI2CClassName = FL_GetFunctionClass(AnnFileName,SCI2CClassSpecifier,ReportFileName); @@ -57,10 +54,7 @@ elseif SCI2Cfileexist(FileInfo.USER2CLibSCIAnnFun,tmpannfilename) // #RNU_RES_B // It is a scilab function of the USER2C library. // #RNU_RES_E -<<<<<<< HEAD PrintStringInfo('fUser2c',ReportFileName,'file','y'); -======= ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 FlagFoundAnnFile = 1; AnnFileName = fullfile(FileInfo.USER2CLibSCIAnnFun,tmpannfilename); SCI2CClassName = FL_GetFunctionClass(AnnFileName,SCI2CClassSpecifier,ReportFileName); @@ -69,10 +63,7 @@ elseif (SCI2Cfileexist(FileInfo.SCI2CLibCAnnFun,tmpannfilename)) // #RNU_RES_B // It is a C function of the SCI2C library. // #RNU_RES_E -<<<<<<< HEAD PrintStringInfo('csci2c',ReportFileName,'file','y'); -======= ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 FlagFoundAnnFile = 1; AnnFileName = fullfile(FileInfo.SCI2CLibCAnnFun,tmpannfilename); SCI2CClassName = FL_GetFunctionClass(AnnFileName,SCI2CClassSpecifier,ReportFileName); @@ -81,10 +72,7 @@ elseif (SCI2Cfileexist(FileInfo.SCI2CLibSCIAnnFun,tmpannfilename)) // #RNU_RES_B // It is a scilab function of the SCI2C library. // #RNU_RES_E -<<<<<<< HEAD PrintStringInfo('fsci2c',ReportFileName,'file','y'); -======= ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 FlagFoundAnnFile = 1; AnnFileName = fullfile(FileInfo.SCI2CLibSCIAnnFun,tmpannfilename); SCI2CClassName = FL_GetFunctionClass(AnnFileName,SCI2CClassSpecifier,ReportFileName); diff --git a/2.3-1/macros/CCodeGeneration/JoinDeclarAndCcode.sci b/2.3-1/macros/CCodeGeneration/JoinDeclarAndCcode.sci index 4a2906c0..35607f6d 100644 --- a/2.3-1/macros/CCodeGeneration/JoinDeclarAndCcode.sci +++ b/2.3-1/macros/CCodeGeneration/JoinDeclarAndCcode.sci @@ -146,17 +146,10 @@ PrintStringInfo('** --- C code. ---',CPass2FileName,'file','y'); PrintStringInfo('** ---------------',CPass2FileName,'file','y'); PrintStringInfo('*/',CPass2FileName,'file','y'); -<<<<<<< HEAD //if((SharedInfo.Target == "RPi") & (nxtscifunname == SharedInfo.SCIMainFunName)) //Add wiringPiSetup() function as it is required // PrintStringInfo('wiringPiSetup();',CPass2FileName,'file','y'); //end -======= -if((SharedInfo.Target == "RPi") & (nxtscifunname == SharedInfo.SCIMainFunName)) - //Add wiringPiSetup() function as it is required - PrintStringInfo('wiringPiSetup();',CPass2FileName,'file','y'); -end ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // --- Copy the remaining part of V1 in V2. --- while (~meof(CPass1V1FileFid)) // #RNU_RES_B diff --git a/2.3-1/macros/CCodeGeneration/names b/2.3-1/macros/CCodeGeneration/names index 96b24bdd..56caa81d 100644 --- a/2.3-1/macros/CCodeGeneration/names +++ b/2.3-1/macros/CCodeGeneration/names @@ -2,10 +2,7 @@ C_FinalizeCode C_ForExpression C_Funcall C_GenDeclarations -<<<<<<< HEAD C_GenDeclarations_Dup -======= ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 C_GenerateFunName C_GenerateLaunchScript C_GenerateMakefile diff --git a/2.3-1/macros/FunctionAnnotation/FA_GetFunAnn.sci b/2.3-1/macros/FunctionAnnotation/FA_GetFunAnn.sci index daf012f1..3fadd1f2 100644 --- a/2.3-1/macros/FunctionAnnotation/FA_GetFunAnn.sci +++ b/2.3-1/macros/FunctionAnnotation/FA_GetFunAnn.sci @@ -52,11 +52,7 @@ FunSizeAnnot = ''; // ---------------------------------------------
// --- Open the .sci file (read only). ---
inclsfid = SCI2COpenFileRead(SCI2CClassFileName);
-<<<<<<< HEAD PrintStringInfo(' '+string(inclsfid),ReportFileName,'file','y');
-======= -
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // #RNU_RES_B
// --- Loop over the lines of the input file. ---
// Position file pointer to the desired NInArg/NOutArg section,
@@ -216,9 +212,6 @@ mclose(inclsfid); // -------------------------------------------------
// --- End Read the annotations of the function. ---
// -------------------------------------------------
-<<<<<<< HEAD PrintStringInfo(' end of annotation '+string(NOutArg_mod),ReportFileName,'file','y');
-======= ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 endfunction
diff --git a/2.3-1/macros/FunctionAnnotation/names b/2.3-1/macros/FunctionAnnotation/names index 32c8f072..423c825a 100644 --- a/2.3-1/macros/FunctionAnnotation/names +++ b/2.3-1/macros/FunctionAnnotation/names @@ -1,17 +1,11 @@ FA_ADD FA_DIV -<<<<<<< HEAD FA_FSFIRLIN_SZ -======= ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 FA_GetDefaultPrecision FA_GetFunAnn FA_GetOutArgInfo FA_GetResizeApproach -<<<<<<< HEAD FA_INSZ_RPI -======= ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 FA_INT FA_MAX FA_MIN @@ -22,10 +16,7 @@ FA_SCHUR_TP FA_SUB FA_SZ_1 FA_SZ_2 -<<<<<<< HEAD FA_SZ_AMELL -======= ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 FA_SZ_COLUMN_DIAG FA_SZ_COL_DIAG_IN_EX FA_SZ_DEC2BASE @@ -38,10 +29,7 @@ FA_SZ_FROM_VAL FA_SZ_LINSPACE_ROW FA_SZ_LQE FA_SZ_LQR -<<<<<<< HEAD FA_SZ_MODSN -======= ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 FA_SZ_OBSCNT FA_SZ_OPAPEX FA_SZ_OPBACKSLASH @@ -73,11 +61,8 @@ FA_SZ_ROW_DIAG FA_SZ_ROW_DIAG_INS_EXT FA_SZ_SEL1 FA_SZ_SEL2 -<<<<<<< HEAD FA_SZ_U_SVA FA_TP_ASCII -======= ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 FA_TP_C FA_TP_COMPLEX FA_TP_CVIMAGE @@ -87,10 +72,7 @@ FA_TP_INT16 FA_TP_INT8 FA_TP_MAX FA_TP_MIN_REAL -<<<<<<< HEAD FA_TP_MODSN -======= ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 FA_TP_REAL FA_TP_S FA_TP_UINT16 diff --git a/2.3-1/macros/GeneralFunctions/SCI2CFindFile.sci b/2.3-1/macros/GeneralFunctions/SCI2CFindFile.sci index 77116a1f..f7271e2e 100644 --- a/2.3-1/macros/GeneralFunctions/SCI2CFindFile.sci +++ b/2.3-1/macros/GeneralFunctions/SCI2CFindFile.sci @@ -20,10 +20,6 @@ function [FlagFound,SCIFileName] = SCI2CFindFile(PathList,FileName) // --- Check input arguments. ---
// ------------------------------
SCI2CNInArgCheck(argn(2),2,2);
-<<<<<<< HEAD -======= -
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 FlagFound = 0;
SCIFileName = '';
diff --git a/2.3-1/macros/Hardware/AVR/AVRADCSetup.sci b/2.3-1/macros/Hardware/AVR/AVRADCSetup.sci index 5299058c..603873b3 100644 --- a/2.3-1/macros/Hardware/AVR/AVRADCSetup.sci +++ b/2.3-1/macros/Hardware/AVR/AVRADCSetup.sci @@ -17,7 +17,6 @@ function AVRADCSetup(prescaler,adc_ref) // Parameters // prescaler: prescaler to be used for generating ADC clock (0-7) // adc_ref : reference voltage to be used for ADC conversion -<<<<<<< HEAD // // Description // This function initialises ADc of AVR with given parameters. 'prescaler' is needed for deciding ADC clock. ADC clock should be between 50KHz and 200KHz and it given as (MCU clock/2^prescaler). Select appropriate prescaler depending on MCU clock. 'adc_ref' selects one of the available reference voltage sources available. @@ -31,34 +30,15 @@ function AVRADCSetup(prescaler,adc_ref) // // This is curretly dummy function. It provides no functionality but is required for providing support for generating C code for AVR. // -======= -// 0 -> Voltage on VREF pin -// 1 -> Voltage on AVCC pin -// 2 -> Internal 2.56 reference voltage -// -// Description -// This function initialises ADc of AVR with given parameters. 'prescaler' is -// needed for deciding ADC clock. ADC clock should be between 50KHz and 200KHz -// and it given as (MCU clock/2^prescaler). Select appropriate prescaler depending -// on MCU clock. 'adc_ref' selects one of the available reference voltage sources -// available ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // Examples // AVRADCSetup(128,0) // See also // AVRReadADC // // Authors -<<<<<<< HEAD // Siddhesh Wani // Ashish Kamble // -======= -// Siddhesh Wani Ashish Kamble -// -// This is curretly dummy function. It provides no functionality but is required -// for providing support for generating C code for AVR. ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 if(prescaler>=8) disp("Error : Invalid input argument ''prescaler'' in AVRADCSetup function."); diff --git a/2.3-1/macros/Hardware/AVR/AVRDigitalIn.sci b/2.3-1/macros/Hardware/AVR/AVRDigitalIn.sci index 421a4f63..7addd663 100644 --- a/2.3-1/macros/Hardware/AVR/AVRDigitalIn.sci +++ b/2.3-1/macros/Hardware/AVR/AVRDigitalIn.sci @@ -18,11 +18,6 @@ function state = AVRDigitalIn(port,pin) // Parameters // port : port of microcontroller to be used // pin : pin of port (mentioned above) to be used -<<<<<<< HEAD -======= -// Returns -// state : state of an input pin (HIGH\LOW) ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // // Description // Each AVR microcontroller has pins which can be configured as digital @@ -30,7 +25,6 @@ function state = AVRDigitalIn(port,pin) // User has to select one of these port and which pin of that port as // digital input. // -<<<<<<< HEAD // This is curretly dummy function. It provides no functionality but is required // for providing support for generating C code for AVR. // @@ -43,20 +37,6 @@ function state = AVRDigitalIn(port,pin) // Siddhesh Wani // Ashish Kamble // -======= -// Examples -// pinA0 = AVRDigitalIn(1,0) //To read state on pin 0 of port A -// -// See also -// AVRDigitalOut AVRDigitalSetup -// -// -// Authors -// Siddhesh Wani Ashish Kamble -// -// This is curretly dummy function. It provides no functionality but is required -// for providing support for generating C code for AVR. ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 if((port==0)|(port>=5)) then disp("Error : Inavalid input argument ''port'' in AVRDigitalIn function."); diff --git a/2.3-1/macros/Hardware/AVR/AVRDigitalOut.sci b/2.3-1/macros/Hardware/AVR/AVRDigitalOut.sci index a80aff0f..0efc927b 100644 --- a/2.3-1/macros/Hardware/AVR/AVRDigitalOut.sci +++ b/2.3-1/macros/Hardware/AVR/AVRDigitalOut.sci @@ -26,7 +26,6 @@ function AVRDigitalOut(port,pin,state) // digital output. Also, desired output state must be specified as // 'HIGH' or 'LOW'. // -<<<<<<< HEAD // This is curretly dummy function. It provides no functionality but is required // for providing support for generating C code for AVR. // @@ -39,20 +38,6 @@ function AVRDigitalOut(port,pin,state) // Siddhesh Wani // Ashish Kamble // -======= -// Examples -// AVRDigitalOut('A',0,HIGH) -// -// See also -// AVRDigitalIn -// -// -// Authors -// Siddhesh Wani Ashish Kamble -// -// This is curretly dummy function. It provides no functionality but is required -// for providing support for generating C code for AVR. ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 if((port==0)|(port>=8)) then disp("Error : Inavalid input argument ''port'' in AVRDigitalOut function."); diff --git a/2.3-1/macros/Hardware/AVR/AVRDigitalPortSetup.sci b/2.3-1/macros/Hardware/AVR/AVRDigitalPortSetup.sci index 26bec8db..65e8494a 100644 --- a/2.3-1/macros/Hardware/AVR/AVRDigitalPortSetup.sci +++ b/2.3-1/macros/Hardware/AVR/AVRDigitalPortSetup.sci @@ -15,11 +15,7 @@ function AVRDigitalPortSetup(port,direction) // AVRDigitalPortSetup(port,direction) // // Parameters -<<<<<<< HEAD // port : port of microcontroller to be used(1 for PORTA, 2 for PORTB,...) -======= -// port : port of microcontroller to be used(1 for PORTA, 2 for PORTB,...) ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // direction : direction to be set for pin (0 for INPUT, 1 for OUTPUT) // // Description @@ -29,31 +25,19 @@ function AVRDigitalPortSetup(port,direction) // used as digital output/input. Also, desired direction must be specified as // 'INPUT' or 'OUTPUT'. // -<<<<<<< HEAD // This is curretly dummy function. It provides no functionality but is required // for providing support for generating C code for AVR. // -======= ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // Examples // AVRDigitalPortSetup(1,0); //This function will make PortA as input port // // See also // AVRDigitalIn AVRDigitalOut // -<<<<<<< HEAD // Authors // Siddhesh Wani // Ashish Kamble // -======= -// -// Authors -// Siddhesh Wani Ashish Kamble -// -// This is curretly dummy function. It provides no functionality but is required -// for providing support for generating C code for AVR. ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 if((port==0)|(port>=5)) then disp("Error : Invalid input argument ''port'' in AVRDigitalPortSetup function."); diff --git a/2.3-1/macros/Hardware/AVR/AVRDigitalSetup.sci b/2.3-1/macros/Hardware/AVR/AVRDigitalSetup.sci index 8e4efc7e..ed6cf306 100644 --- a/2.3-1/macros/Hardware/AVR/AVRDigitalSetup.sci +++ b/2.3-1/macros/Hardware/AVR/AVRDigitalSetup.sci @@ -15,13 +15,8 @@ function AVRDigitalSetup(port,pin,direction) // AVRDigitalSetup(port,pin,direction) // // Parameters -<<<<<<< HEAD // port : port of microcontroller to be used // pin : pin of port (mentioned above) to be used -======= -// port : port of microcontroller to be used -// pin : pin of port (mentioned above) to be used ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // direction : direction to be set for pin (INPUT\OUTPUT) // // Description @@ -31,31 +26,19 @@ function AVRDigitalSetup(port,pin,direction) // used as digital output/input. Also, desired direction must be specified as // 'INPUT' or 'OUTPUT'. // -<<<<<<< HEAD // This is curretly dummy function. It provides no functionality but is required // for providing support for generating C code for AVR. // -======= ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // Examples // AVRDigitalSetup('A',0,OUTPUT) // // See also // AVRDigitalIn AVRDigitalOut // -<<<<<<< HEAD // Authors // Siddhesh Wani // Ashish Kamble // -======= -// -// Authors -// Siddhesh Wani Ashish Kamble -// -// This is curretly dummy function. It provides no functionality but is required -// for providing support for generating C code for AVR. ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 if((port==0)|(port>=5)) then disp("Error : Invalid input argument ''port'' in AVRDigitalSetup function."); diff --git a/2.3-1/macros/Hardware/AVR/AVRGetTimerValue.sci b/2.3-1/macros/Hardware/AVR/AVRGetTimerValue.sci index 0b501448..05919b38 100644 --- a/2.3-1/macros/Hardware/AVR/AVRGetTimerValue.sci +++ b/2.3-1/macros/Hardware/AVR/AVRGetTimerValue.sci @@ -18,7 +18,6 @@ function count = AVRGetTimerValue(timer) // 2 for timer2 // // Description -<<<<<<< HEAD // This function returns the count value of a desired timer.By knowing the count value certain interrupt action can be taken. // // Timer can take the following values @@ -33,25 +32,12 @@ function count = AVRGetTimerValue(timer) // // Examples // AVRGetTimerValue(0); //returns present count of the TCNT0 counter -======= -// This function returns the count value of a desired timer.By knowing the count value -// certain interrupt action can be taken. -// -// Examples -// AVRGetTimerValue(0); //returns present count of the TCNT0 counter -// ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // See also // AVRTimerSetup // // Authors // Ashish Kamble // -<<<<<<< HEAD -======= -// This is curretly dummy function. It provides no functionality but is required -// for providing support for generating C code for AVR. ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 if(timer>=3) then disp("Error : Invalid input argument ''timer'' in AVRGetTimerValue function."); diff --git a/2.3-1/macros/Hardware/AVR/AVRPWM0SetDuty.sci b/2.3-1/macros/Hardware/AVR/AVRPWM0SetDuty.sci index f1faebef..c3815d10 100644 --- a/2.3-1/macros/Hardware/AVR/AVRPWM0SetDuty.sci +++ b/2.3-1/macros/Hardware/AVR/AVRPWM0SetDuty.sci @@ -9,7 +9,6 @@ // Email: toolbox@scilab.in function AVRPWM0SetDuty(duty) -<<<<<<< HEAD //Function to Set Duty cycle of PWM Output generated by Timer0 at OC0 pin. // //Parameters @@ -22,17 +21,6 @@ function AVRPWM0SetDuty(duty) // This is curretly dummy function. It provides no functionality but is required for providing support for generating C code for AVR. // //Examples -======= -//Function to Set Duty cycle of PWM Output generated by Timer0 at OC0 pin. -//Parameters -// duty : It holds an integer value from 0 to 100 which sets the percentage -// of time for which signal is active. -//Description -// Each Micro controller has PWM output pins which can generate varying voltage -// from 0V-5V.In this function by varying the duty cycle, varying voltage can be -// produced. -//Example ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // AVRPWM0SetDuty(50); //Produces 2.5V at OC0 pin // AVRPWM0SetDuty(0); //Produces 0V at OC0 pin //See also @@ -41,11 +29,6 @@ function AVRPWM0SetDuty(duty) //Authors // Ashish Kamble // -<<<<<<< HEAD -======= -// This is curretly dummy function. It provides no functionality but is required -// for providing support for generating C code for AVR. ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 if(duty>100) then disp("Error : Invalid input argument ''duty'' in AVRPWM0SetDuty function."); diff --git a/2.3-1/macros/Hardware/AVR/AVRPWM0Setup.sci b/2.3-1/macros/Hardware/AVR/AVRPWM0Setup.sci index 19d91a2a..c391f71e 100644 --- a/2.3-1/macros/Hardware/AVR/AVRPWM0Setup.sci +++ b/2.3-1/macros/Hardware/AVR/AVRPWM0Setup.sci @@ -10,20 +10,16 @@ function AVRPWM0Setup(waveform_mode,output_mode) //Function to Setup OC0 pin for required PWM mode -<<<<<<< HEAD // //Parameters // waveform_mode: integer, from 0 to 2 // output_mode: integer, from 0 to 1 (or 2) depending on the waveform_mode // -======= ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 //Description // Every Micro controller has PWM pins which can generate varying voltages // from 0V-5V.This function helps to use OC0 pin to produce required // output waveform by setting the waveform mode and otput mode. // -<<<<<<< HEAD // waveform_mode can take values- // <itemizedlist> // <listitem><para>0 -> for Phase correct PWM Mode</para></listitem> @@ -50,43 +46,12 @@ function AVRPWM0Setup(waveform_mode,output_mode) // //Examples // AVRPWM0Setup(2,0); //This function will select CTC waveform mode and will clear OC0 on compare match -======= -//Parameters -// waveform_mode: -// 0 for Phase correct PWM Mode -// 1 for Fast PWM Mode -// 2 for CTC Mode -// output_mode: -// For Phase Correct PWM Mode: -// 0 for Clear OC0 on compare match when up-counting. Set OC0 on compare -// match when down-counting. -// 1 for Set OC0 on compare match when up-counting. Clear OC0 on compare -// match when down-counting. -// -// For Fast PWM Mode: -// 0 for non-inverted output i.e Clear OC0 on compare match, set OC0 at BOTTOM. -// 1 for inverted output i.e Set OC0 on compare match, clear OC0 at BOTTOM. -// -// For CTC Mode: -// 0 to Clear OC0 on compare match -// 1 to Set OC0 on compare match -// 2 to toggle OC0 on compare match -// -//Example -// AVRPWM0Setup(2,0); //This function will select CTC waveform mode and will clear OC0 on -// compare match ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 //See also // AVRPWM0SetDuty // //Authors // Ashish Kamble // -<<<<<<< HEAD -======= -//This is curretly dummy function. It provides no functionality but is required -//for providing support for generating C code for AVR. ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 if(waveform_mode>=3) then disp("Error : Invalid input argument ''waveform_mode'' in AVRPWM0Setup function."); diff --git a/2.3-1/macros/Hardware/AVR/AVRPWM1SetDuty.sci b/2.3-1/macros/Hardware/AVR/AVRPWM1SetDuty.sci index 6b3e21f0..fd6e7baf 100644 --- a/2.3-1/macros/Hardware/AVR/AVRPWM1SetDuty.sci +++ b/2.3-1/macros/Hardware/AVR/AVRPWM1SetDuty.sci @@ -11,53 +11,28 @@ function AVRPWM1SetDuty(output_pin,duty,Top_Value) //Function to Set Duty cycle of PWM Output generated by Timer1 at OC1A or OC1B pin. //Parameters -<<<<<<< HEAD // ouput_pin: integer, 0 (for OC1A) or 1 (for OC1B) // // duty: It holds an integer value from 0 to 100 which sets the percentage of time for which signal is active. // // Top_Value: It holds an integer value from 0 to 65535.This value sets the Top value of the counter TCNT1 i.e ICR.(for more info refer datasheet) -======= -// ouput_pin: -// 0 for selecting OC1A as output pin -// 1 for selecting OC1B as output pin -// -// duty: It holds an integer value from 0 to 100 which sets the percentage -// of time for which signal is active. -// -// Top_Value: It holds an integer value from 0 to 65535.This value sets the Top -// value of the counter TCNT1 i.e ICR.(for more info refer datasheet) ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // //Description // Each Micro controller has PWM output pins which can generate varying voltage // from 0V-5V.This function Sets the duty cycle of output PWM signal.Also this function // decides the Top Vale of TCNT1 and the output pin to output PWM signal. // -<<<<<<< HEAD // This is curretly dummy function. It provides no functionality but is required // for providing support for generating C code for AVR. // //Example // AVRPWM1SetDuty(0,50,40000); //This function will produce PWM signal of 50% duty cycle on OC1A pin and TCNT1 will reset at 40000 instead at 65535. -======= -//Example -// AVRPWM1SetDuty(0,50,40000); //This function will produce PWM signal of 50% duty -// cycle on OC1A pin and TCNT1 will reset at 40000 instead -// at 65535. -// ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 //See also // AVRPWM1Setup // //Authors // Ashish Kamble // -<<<<<<< HEAD -======= -// This is curretly dummy function. It provides no functionality but is required -// for providing support for generating C code for AVR. ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 if(output_pin>=2) then disp("Error : Invalid input argument ''output_pin'' in AVRPWM1SetDuty function."); diff --git a/2.3-1/macros/Hardware/AVR/AVRPWM1Setup.sci b/2.3-1/macros/Hardware/AVR/AVRPWM1Setup.sci index feb40bd6..fbd96ce3 100644 --- a/2.3-1/macros/Hardware/AVR/AVRPWM1Setup.sci +++ b/2.3-1/macros/Hardware/AVR/AVRPWM1Setup.sci @@ -10,21 +10,17 @@ function AVRPWM1Setup(waveform_mode,output_mode,output_pin) //Function to Setup OC1A or OC1B pin for required PWM mode -<<<<<<< HEAD // //Parameters // waveform_mode: integer, from 0 to 2 // output_mode: integer, from 0 to 1 (or 2) depending on the waveform_mode // output_pin: 0 (for OC1A) or 1 for (OC1B) // -======= ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 //Description // Every Micro controller has PWM pins which can generate varying voltages // from 0V-5V.This function helps to use OC1A or OC1B pin to produces required // output waveform by setting the waveform mode and otput mode. // -<<<<<<< HEAD // waveform_mode can take values- // <itemizedlist> // <listitem><para>0 -> for Phase correct PWM Mode</para></listitem> @@ -48,35 +44,6 @@ function AVRPWM1Setup(waveform_mode,output_mode,output_pin) // // This is curretly dummy function. It provides no functionality but is required // for providing support for generating C code for AVR. -======= -//Parameters -// waveform_mode: -// 0 for Phase correct PWM Mode -// 1 for Fast PWM Mode -// 2 for CTC Mode -// -// output_mode: -// For Phase Correct PWM Mode: -// 0 for Clear OC1A or OC1B on compare match when up-counting. Set OC1A or OC1B -// on compare match when down-counting. -// 1 for Set OC1A or OC1B on compare match when up-counting. Clear OC1A or OC1B -// on compare match when down-counting. -// -// For Fast PWM Mode: -// 0 for non-inverted output i.e Clear OC1A or OC1B on compare match, set OC1A -// OC1B at BOTTOM. -// 1 for inverted output i.e Set OC1A or OC1B on compare match, clear OC1A or OC1B -// at BOTTOM. -// -// For CTC Mode: -// 0 to Clear OC1A or OC1B on compare match -// 1 to Set OC1A or OC1B on compare match -// 2 to toggle OC1A or OC1B on compare match -// -// output_pin: -// 0 for selecting OC1A as output pin -// 1 for selecting OC1B as output pin ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // //Example // AVRPWM1Setup(2,0,0); //This function will select CTC mode and will clear OC1A or OC1B @@ -88,11 +55,6 @@ function AVRPWM1Setup(waveform_mode,output_mode,output_pin) //Authors // Ashish Kamble // -<<<<<<< HEAD -======= -// This is curretly dummy function. It provides no functionality but is required -// for providing support for generating C code for AVR. ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 if(waveform_mode>=3) then disp("Error : Invalid input argument ''waveform_mode'' in AVRPWM1Setup function."); diff --git a/2.3-1/macros/Hardware/AVR/AVRPWM2SetDuty.sci b/2.3-1/macros/Hardware/AVR/AVRPWM2SetDuty.sci index 75ae8599..81d1761e 100644 --- a/2.3-1/macros/Hardware/AVR/AVRPWM2SetDuty.sci +++ b/2.3-1/macros/Hardware/AVR/AVRPWM2SetDuty.sci @@ -10,26 +10,17 @@ function AVRPWM2SetDuty(duty) //Function to Set Duty cycle of PWM Output generated by Timer2 at OC2 pin. -<<<<<<< HEAD // //Parameters // duty : It holds an integer value from 0 to 100 which sets the percentage of time for which signal is active. // -======= ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 //Description // Each Micro controller has PWM output pins which can generate varying voltage // from 0V-5V.In this function by varying the duty cycle, varying voltage can be // produced. // -<<<<<<< HEAD // This is curretly dummy function. It provides no functionality but is required // for providing support for generating C code for AVR. -======= -//Parameters -// duty : It holds an integer value from 0 to 100 which sets the percentage -// of time for which signal is active. ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // //Example // AVRPWM2SetDuty(50); //Produces 2.5V at OC2 pin @@ -41,11 +32,6 @@ function AVRPWM2SetDuty(duty) //Authors // Ashish Kamble // -<<<<<<< HEAD -======= -// This is curretly dummy function. It provides no functionality but is required -// for providing support for generating C code for AVR. ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 if(duty>100) then disp("Error : Invalid input argument ''duty'' in AVRPWM2SetDuty function."); diff --git a/2.3-1/macros/Hardware/AVR/AVRPWM2Setup.sci b/2.3-1/macros/Hardware/AVR/AVRPWM2Setup.sci index c76f3f35..11d9b019 100644 --- a/2.3-1/macros/Hardware/AVR/AVRPWM2Setup.sci +++ b/2.3-1/macros/Hardware/AVR/AVRPWM2Setup.sci @@ -10,20 +10,16 @@ function AVRPWM2Setup(waveform_mode,output_mode) //Function to Setup OC2 pin for required PWM mode -<<<<<<< HEAD // //Parameters // waveform_mode: integer, from 0 to 2 // output_mode: integer, from 0 to 1 (or 2) depending on the waveform_mode // -======= ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 //Description // Every Micro controller has PWM pins which can generate varying voltages // from 0V-5V.This function helps to use OC2 pin to produces required // output waveform by setting the waveform mode and otput mode. // -<<<<<<< HEAD // waveform_mode can take values- // <itemizedlist> // <listitem><para>0 -> for Phase correct PWM Mode</para></listitem> @@ -48,29 +44,6 @@ function AVRPWM2Setup(waveform_mode,output_mode) // This is curretly dummy function. It provides no functionality but is required // for providing support for generating C code for AVR. // -======= -//Parameters -// waveform_mode: -// 0 for Phase correct PWM Mode -// 1 for Fast PWM Mode -// 2 for CTC Mode -//output_mode: -// For Phase Correct PWM Mode: -// 0 for Clear OC2 on compare match when up-counting. Set OC2 on compare -// match when down-counting. -// 1 for Set OC2 on compare match when up-counting. Clear OC2 on compare -// match when down-counting. -// -// For Fast PWM Mode: -// 0 for non-inverted output i.e Clear OC2 on compare match, set OC2 at BOTTOM. -// 1 for inverted output i.e Set OC2 on compare match, clear OC2 at BOTTOM. -// -// For CTC Mode: -// 0 to Clear OC2 on compare match -// 1 to Set OC2 on compare match -// 2 to toggle OC2 on compare match -// ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 //Example // AVRPWM2Setup(2,0); //This function will select CTC waveform mode and will clear OC2 on // compare match @@ -80,11 +53,6 @@ function AVRPWM2Setup(waveform_mode,output_mode) //Authors // Ashish Kamble // -<<<<<<< HEAD -======= -//This is curretly dummy function. It provides no functionality but is required -//for providing support for generating C code for AVR. ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 if(waveform_mode>=3) then disp("Error : Invalid input argument ''waveform_mode'' in AVRPWM2Setup function."); diff --git a/2.3-1/macros/Hardware/AVR/AVRReadADC.sci b/2.3-1/macros/Hardware/AVR/AVRReadADC.sci index aa94c58d..71cafa7e 100644 --- a/2.3-1/macros/Hardware/AVR/AVRReadADC.sci +++ b/2.3-1/macros/Hardware/AVR/AVRReadADC.sci @@ -15,15 +15,7 @@ function adc_result = AVRReadADC(channel) // u8AVRReadADCs(channel) // // Parameters -<<<<<<< HEAD // channel : Select which channel is to be read. Values from 0-7 select one of the pins ADC0-ADC7. For other possible channel values refer datasheet -======= -// channel : Select which channel is to be read. Values from 0-7 select one -// of the pins ADC0-ADC7. For other possible channel values refer -// datasheet -// Returns-> -// result : Digital value for the voltage present on channel selected ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // // Description // This function returns digital value for present on adc pins. 'channel' @@ -32,7 +24,6 @@ function adc_result = AVRReadADC(channel) // voltages between some pins. For channel values for those options, please // refer datasheet. // -<<<<<<< HEAD // This is curretly dummy function. It provides no functionality but is required // for providing support for generating C code for AVR. // @@ -42,16 +33,6 @@ function adc_result = AVRReadADC(channel) // Siddhesh Wani // Ashish Kamble // -======= -// Examples -// adc_result = u8AVRReadADC(0) //Read ADC0 -// -// Authors -// Siddhesh Wani Ashish Kamble -// -// This is curretly dummy function. It provides no functionality but is required -// for providing support for generating C code for AVR. ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 if(channel>=8) then disp("Error : Inavlid input argument ''channel'' in AVRReadADC function."); diff --git a/2.3-1/macros/Hardware/AVR/AVRSleep.sci b/2.3-1/macros/Hardware/AVR/AVRSleep.sci index 005fe4ed..eec6e5a2 100644 --- a/2.3-1/macros/Hardware/AVR/AVRSleep.sci +++ b/2.3-1/macros/Hardware/AVR/AVRSleep.sci @@ -1,5 +1,4 @@ function AVRSleep(delay) -<<<<<<< HEAD // Function to pause the execution for the given time. // // Parameter @@ -18,8 +17,5 @@ function AVRSleep(delay) // Authors // Jorawar Singh // -======= - ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 endfunction diff --git a/2.3-1/macros/Hardware/AVR/AVRTimerSetup.sci b/2.3-1/macros/Hardware/AVR/AVRTimerSetup.sci index c4c4535e..55fd55fa 100644 --- a/2.3-1/macros/Hardware/AVR/AVRTimerSetup.sci +++ b/2.3-1/macros/Hardware/AVR/AVRTimerSetup.sci @@ -10,21 +10,17 @@ function AVRTimerSetup(timer,prescaler,clock_source) //Function to setup Timers in ATmega16 -<<<<<<< HEAD // //Parameters: // timer : integer, from 0 to 2 // prescaler : integer. // clock_source : integer, 0 (for internal) or 1 (for external) // -======= ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 //Descrpition: // This function tells the micro controller which clock source you will be using. // The timer value and prescaler value passed in this function setup the timer as per // your requirement. // -<<<<<<< HEAD // timer can take values- // <itemizedlist> // <listitem><para>0 -> for timer0</para></listitem> @@ -46,37 +42,12 @@ function AVRTimerSetup(timer,prescaler,clock_source) // //Example // AVRTimerSetup(0,64,0); //This function will select timer0 with timer running as per internal clock source and prescaled by 64. -======= -//Parameters: -// timer : It is an integer value. -// 0 to setup timer0 -// 1 to setup timer1 -// 2 to setup timer2 -// prescaler : It is an integer value. -// 1 for no prescaling i.e clock will run at max 16Hz frequency -// 8 for prescaling clock by 8 i.e new clock frequency will be (clk/8) -// 64 for prescaling clock by 64 i.e new clock frequency will be (clk/64) -// 256 for prescaling clock by 256 i.e new clock frequency will be (clk/256) -// 1024 for prescaling clock by 1024 i.e new clock frequency will be (clk/1024) -// clock_source : It is an integer value. -// 0 if you are using internal clock source -// 1 if you are using external clock source -//Example -// AVRTimerSetup(0,64,0); //This function will select timer0 with timer running as per -// internal clock source and prescaled by 64. -// ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 //See also // AVRGetTimerValues // //Authors // Ashish Kamble // -<<<<<<< HEAD -======= -//This is curretly dummy function. It provides no functionality but is required -//for providing support for generating C code for AVR. ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 if(timer>=3) then disp("Error : Invalid input argument ''timer'' in AVRTimerSetup function."); diff --git a/2.3-1/macros/Hardware/AVR/AVRUARTReceive.sci b/2.3-1/macros/Hardware/AVR/AVRUARTReceive.sci index f7502e23..7fdf6f05 100644 --- a/2.3-1/macros/Hardware/AVR/AVRUARTReceive.sci +++ b/2.3-1/macros/Hardware/AVR/AVRUARTReceive.sci @@ -10,25 +10,16 @@ function received = AVRUARTReceive() // Function to Receive Char value send to ATmega16 using UART or USART. -<<<<<<< HEAD // -======= ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // Description // This function Receives Char as 8 bit value.This value is stored in UDR at receiving // end. // -<<<<<<< HEAD // This is curretly dummy function. It provides no functionality but is required // for providing support for generating C code for AVR. // //Examples // state = AVRUARTReceive(); //This function will Receive char and return the entire value -======= -//Examples -// state = AVRUARTReceive(); //This function will Receive char and return the entire value -// ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 //See also // AVRUARTSetup // AVRUARTTransmit @@ -36,10 +27,5 @@ function received = AVRUARTReceive() // Authors // Ashish Kamble // -<<<<<<< HEAD -======= -// This is curretly dummy function. It provides no functionality but is required -// for providing support for generating C code for AVR. ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 received = 0; // received has been initialised to avoid runtime error. endfunction diff --git a/2.3-1/macros/Hardware/AVR/AVRUARTSetup.sci b/2.3-1/macros/Hardware/AVR/AVRUARTSetup.sci index 896674b3..6ecf2a07 100644 --- a/2.3-1/macros/Hardware/AVR/AVRUARTSetup.sci +++ b/2.3-1/macros/Hardware/AVR/AVRUARTSetup.sci @@ -10,7 +10,6 @@ function AVRUARTSetup(mode, baudrate, stopbits, parity) // Function to Setup Serial Communication i.e UART or USART in ATmega16. -<<<<<<< HEAD // // Parameters // mode : integer, from 0 to 2 @@ -39,31 +38,6 @@ function AVRUARTSetup(mode, baudrate, stopbits, parity) // This is curretly dummy function. It provides no functionality but is required // for providing support for generating C code for AVR. // -======= -// Description -// This function Setup the UART or USART for Serial Communicaion between ATmega16 -// and different micro controllers or between ATmega16 and Computer. -// -// Parameters -// mode : -// 0 for Asynchronous Normal mode -// 1 for Asynchronous Double Speed mode -// 2 for Synchronous mode -// -// baudrate : Enter one of the following available baudrates -// 2400 , 4800 , 9600 , 14400 , 19200 , 28800 , 38400 , 57600 , -// 768000 , 115200 , 230400 , 250000 , 1000000 . -// -// stopbits : -// 0 for one stopbit -// 1 for two stopbits -// -// parity : -// 0 for parity disabled -// 1 for even parity -// 2 for odd parity -// ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 //Examples // AVRUARTSetup(0,9600,0,0); //This function will enable UART Communication for ATmega16 // with 9600 as baudrate,one stop bit and parity disabled @@ -74,12 +48,7 @@ function AVRUARTSetup(mode, baudrate, stopbits, parity) // Authors // Ashish Kamble // -<<<<<<< HEAD -======= -// This is curretly dummy function. It provides no functionality but is required -// for providing support for generating C code for AVR. ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 if(mode>=3) then disp("Error : Invalid input argument ''mode'' in AVRUARTSetup function."); end diff --git a/2.3-1/macros/Hardware/AVR/AVRUARTTransmit.sci b/2.3-1/macros/Hardware/AVR/AVRUARTTransmit.sci index 150b9fe9..695c708d 100644 --- a/2.3-1/macros/Hardware/AVR/AVRUARTTransmit.sci +++ b/2.3-1/macros/Hardware/AVR/AVRUARTTransmit.sci @@ -10,7 +10,6 @@ function AVRUARTTransmit(data) // Function to Transmit data using UART or USART. -<<<<<<< HEAD // // Parameter // data : The data to be transmitted can be a Char,String,Unsigned Int,Signed Int. @@ -24,19 +23,6 @@ function AVRUARTTransmit(data) // //Examples // AVRUARTTransmit("This is example"); //This function will transmit the entered string. -======= -// Description -// This function Tranmits data over UART or USART.The data to be transmitted can -// be a Char , String , Unsigned Int, Signed Int. -// -// Parameter -// data : -// The data to be transmitted can be a Char,String,Unsigned Int,Signed Int. -// -//Examples -// AVRUARTTransmit("This is example"); //This function will transmit the entered string. -// ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 //See also // AVRUARTSetup // AVRUARTReceive @@ -44,9 +30,4 @@ function AVRUARTTransmit(data) // Authors // Ashish Kamble // -<<<<<<< HEAD -======= -// This is curretly dummy function. It provides no functionality but is required -// for providing support for generating C code for AVR. ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 endfunction diff --git a/2.3-1/macros/ImageProcessing/core/CV_CreateImage.sci b/2.3-1/macros/ImageProcessing/core/CV_CreateImage.sci index 62410c81..90b4578b 100644 --- a/2.3-1/macros/ImageProcessing/core/CV_CreateImage.sci +++ b/2.3-1/macros/ImageProcessing/core/CV_CreateImage.sci @@ -17,7 +17,6 @@ function img = CV_CreateImage(width,height,bit_depth,no_of_channels) // // Parameters // image_size: width and height of image -<<<<<<< HEAD // bit_depth: Bit depth of image elements // no_of_channels: no of channels per pixels // @@ -36,27 +35,5 @@ function img = CV_CreateImage(width,height,bit_depth,no_of_channels) // img = 0; -======= -// bit_depth: Bit depth of image elements -// no_of_channels: no of channels per pixels -// -// Description -// This function can be used to create opencv image object. For more info -// about bit depth and channels,please refer to OpenCV documentation -// Examples -// CV_CreateImage([320 240], "IPL_DEPTH_8U", 1) //to create image of the size 320*240 -// pixels with 8 bit unsigned each pixels and gray scale image -// -// See also -// CV_LoadImage -// -// -// Authors -// Siddhesh Wani -// -img = 0; -// This is curretly dummy function. It provides no functionality but is required -// for providing support for generating C code for OpenCV ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 endfunction diff --git a/2.3-1/macros/ImageProcessing/core/CV_GetImgSize.sci b/2.3-1/macros/ImageProcessing/core/CV_GetImgSize.sci index 5ebbd7dd..2b176dac 100644 --- a/2.3-1/macros/ImageProcessing/core/CV_GetImgSize.sci +++ b/2.3-1/macros/ImageProcessing/core/CV_GetImgSize.sci @@ -15,16 +15,11 @@ function imgsize = CV_GetImgSize(img) // CV_GetImgSize(img) // // Parameters -<<<<<<< HEAD // img: image whose size is to be returned -======= -// img: image whose size is to be returned ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // // Description // This function can be used for retriving size information of the image. // It returs an array with first image element as width and second as height -<<<<<<< HEAD // // This is curretly dummy function. It provides no functionality but is required // for providing support for generating C code for OpenCV @@ -32,25 +27,13 @@ function imgsize = CV_GetImgSize(img) // Examples // img = CV_LoadImage('~/test.jpg',0) // size = CV_GetImgSize(img) -======= -// Examples -// img = CV_LoadImage('~/test.jpg',0) -// size = CV_GetImgSize(img) -// ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // See also // CV_LoadImage CV_CreateImage // // Authors // Siddhesh Wani // -<<<<<<< HEAD imgsize = [0 0]; -======= -imgsize = [0 0]; -// This is curretly dummy function. It provides no functionality but is required -// for providing support for generating C code for OpenCV ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 endfunction diff --git a/2.3-1/macros/ImageProcessing/highgui/CV_LoadImage.sci b/2.3-1/macros/ImageProcessing/highgui/CV_LoadImage.sci index 48a77fa6..c420c7a1 100644 --- a/2.3-1/macros/ImageProcessing/highgui/CV_LoadImage.sci +++ b/2.3-1/macros/ImageProcessing/highgui/CV_LoadImage.sci @@ -16,7 +16,6 @@ function img = CV_LoadImage(filename,loadtype) // // Parameters // filename: name of file to be opened -<<<<<<< HEAD // loadtype: desired load method // // Description @@ -42,27 +41,5 @@ function img = CV_LoadImage(filename,loadtype) // img = 0; -======= -// loadtype: desired load method -// <0 --> image is loaded as is (with alpha channel) -// =0 --> image is loaded as greyscale -// >0 --> 3 channel color image is loaded -// -// Description -// This function can be used for loading a previously stored image -// Examples -// CV_LoadImage('~/test.jpg',0) -// -// See also -// CV_CreateImage -// -// -// Authors -// Siddhesh Wani -// -img = 0; -// This is curretly dummy function. It provides no functionality but is required -// for providing support for generating C code for OpenCV ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 endfunction diff --git a/2.3-1/macros/ImageProcessing/highgui/CV_SaveImage.sci b/2.3-1/macros/ImageProcessing/highgui/CV_SaveImage.sci index 999c634c..6c5b0bf9 100644 --- a/2.3-1/macros/ImageProcessing/highgui/CV_SaveImage.sci +++ b/2.3-1/macros/ImageProcessing/highgui/CV_SaveImage.sci @@ -15,7 +15,6 @@ function status = CV_SaveImage(filename,img) // CV_SaveImage(filename,img) // // Parameters -<<<<<<< HEAD // filename: name of file image to be saved as // img: image to be saved // @@ -29,31 +28,13 @@ function status = CV_SaveImage(filename,img) // Examples // img = CV_LoadImage('~/test.jpg',0) // CV_SaveImage('test1.png',img) -======= -// filename: name of file image to be saved as -// img: image to be saved -// -// Description -// This function can be used for saving image. File format is detected -// from file extension -// Examples -// img = CV_LoadImage('~/test.jpg',0) -// CV_SaveImage('test1.png',img) -// ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // See also // CV_LoadImage CV_CreateImage // // Authors // Siddhesh Wani // -<<<<<<< HEAD status = 0; -======= -status = 0; -// This is curretly dummy function. It provides no functionality but is required -// for providing support for generating C code for OpenCV ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 endfunction diff --git a/2.3-1/macros/ImageProcessing/highgui/CV_ShowImage.sci b/2.3-1/macros/ImageProcessing/highgui/CV_ShowImage.sci index 24621f39..2300d256 100644 --- a/2.3-1/macros/ImageProcessing/highgui/CV_ShowImage.sci +++ b/2.3-1/macros/ImageProcessing/highgui/CV_ShowImage.sci @@ -12,7 +12,6 @@ function CV_ShowImage(winname,img) // function to show an image // // Calling Sequence -<<<<<<< HEAD // CV_ShowImage(img) // CV_ShowImage(winname,img) // @@ -32,33 +31,9 @@ function CV_ShowImage(winname,img) // See also // CV_CreateImage CV_LoadImage // -======= -// CV_ShowImage(img) -// CV_ShowImage(winname,img) -// -// Parameters -// winname: name of window in which img is to be shown -// img: image to be shown already acquired (from file/camera) -// -// Description -// This function can be used for showing images -// Examples -// img = CV_LoadImage('~/test.jpg',0) -// CV_ShowImage(img) -// -// See also -// CV_CreateImage CV_LoadImage -// -// ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // Authors // Siddhesh Wani // -<<<<<<< HEAD -======= -// This is curretly dummy function. It provides no functionality but is required -// for providing support for generating C code for OpenCV ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 endfunction diff --git a/2.3-1/macros/ImageProcessing/highgui/CV_WaitKey.sci b/2.3-1/macros/ImageProcessing/highgui/CV_WaitKey.sci index 858ca7a3..46fd91f1 100644 --- a/2.3-1/macros/ImageProcessing/highgui/CV_WaitKey.sci +++ b/2.3-1/macros/ImageProcessing/highgui/CV_WaitKey.sci @@ -15,7 +15,6 @@ function CV_WaitKey(delay) // CV_WaitKey(delay) // // Parameters -<<<<<<< HEAD // delay: waiting delay, if 0 then wait till keypress // // Description @@ -32,30 +31,9 @@ function CV_WaitKey(delay) // See also // CV_LoadImage CV_ShowImage // -======= -// delay: waiting delay, if 0 then wait till keypress -// -// Description -// This function can be used for inseting some delay. This function must -// follow CV_ShowImage to display image. -// Examples -// img = CV_LoadImage('~/test.jpg',0) -// CV_ShowImage('',img) -// CV_WaitKey(0); -// -// See also -// CV_LoadImage CV_ShowImage -// -// ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // Authors // Siddhesh Wani // -<<<<<<< HEAD -======= -// This is curretly dummy function. It provides no functionality but is required -// for providing support for generating C code for OpenCV ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 endfunction diff --git a/2.3-1/macros/ImageProcessing/imgproc/CV_AdaptiveThreshold.sci b/2.3-1/macros/ImageProcessing/imgproc/CV_AdaptiveThreshold.sci index ff6731a4..e594f372 100644 --- a/2.3-1/macros/ImageProcessing/imgproc/CV_AdaptiveThreshold.sci +++ b/2.3-1/macros/ImageProcessing/imgproc/CV_AdaptiveThreshold.sci @@ -8,7 +8,6 @@ // Organization: FOSSEE, IIT Bombay // Email: toolbox@scilab.in -<<<<<<< HEAD function cvtimg = CV_AdaptiveThreshold(srcimg,max_value,adaptive_method,thresh_type, block_size, C) // function to adaptively threshold input image // @@ -29,30 +28,6 @@ function cvtimg = CV_AdaptiveThreshold(srcimg,max_value,adaptive_method,thresh_t // This is curretly dummy function. It provides no functionality but is required // for providing support for generating C code for OpenCV // -======= -function cvtimg = CV_AdaptiveThreshold(srcimg,max_value,adaptive_method, ... - thresh_type, block_size, C) -// function to adaptively threshold input image -// -// Calling Sequence -// dst = CV_AdaptiveThreshold(srcimg,max_value,adaptive_method, ... -// thresh_type,blk_size,c) -// -// Parameters -// src -> Source 8-bit single-channel image. -// max_value -> Non-zero value assigned to the pixels for which the -// condition is satisfied. See the details below. -// adaptive_method -> Adaptive thresholding algorithm to use, -// ADAPTIVE_THRESH_MEAN_C or ADAPTIVE_THRESH_GAUSSIAN_C . -// thresh_type -> Thresholding type that must be either THRESH_BINARY -// or THRESH_BINARY_INV . -// blockSize -> Size of a pixel neighborhood that is used to calculate -// a threshold value for the pixel: 3, 5, 7, and so on. -// C -> Constant subtracted from the mean or weighted mean.Normally, -// it is positive but may be zero or negative as well. -// Description -// This function can be used for adaptively threshold given image ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // Examples // img = CV_LoadImage('~/test.jpg',0) // dst = CV_AdaptiveThreshold(img,255,"ADAPTIVE_THRESH_MEAN_C", ... @@ -64,13 +39,7 @@ function cvtimg = CV_AdaptiveThreshold(srcimg,max_value,adaptive_method, ... // Authors // Siddhesh Wani // -<<<<<<< HEAD cvtimg = 0 -======= -cvtimg = 0 -// This is curretly dummy function. It provides no functionality but is required -// for providing support for generating C code for OpenCV ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 endfunction diff --git a/2.3-1/macros/ImageProcessing/imgproc/CV_Blur.sci b/2.3-1/macros/ImageProcessing/imgproc/CV_Blur.sci index 9a163963..784e4c96 100644 --- a/2.3-1/macros/ImageProcessing/imgproc/CV_Blur.sci +++ b/2.3-1/macros/ImageProcessing/imgproc/CV_Blur.sci @@ -8,7 +8,6 @@ // Organization: FOSSEE, IIT Bombay // Email: toolbox@scilab.in -<<<<<<< HEAD function cvtimg = CV_Blur(srcimg,ksize_width,ksize_height,anchor_x,anchor_y,border_type) // function to blur image using normalised box filter // @@ -37,30 +36,6 @@ function cvtimg = CV_Blur(srcimg,ksize_width,ksize_height,anchor_x,anchor_y,bord // This is curretly dummy function. It provides no functionality but is required // for providing support for generating C code for OpenCV // -======= -function cvtimg = CV_Blur(srcimg,ksize_width,ksize_height,anchor_x,anchor_y, ... - border_type) -// function to blur image using normalised box filter -// -// Calling Sequence -// dst = CV_Blur(srcimg,ksize_width,ksize_height,anchor_x,anchor_y, ... -// border_type) -// -// Parameters -// srcimg -> Source image. -// ksize_width, ksize_height -> blurring kernel size. -// anchor_x, anchor_y -> x,y coordinates of anchor point -// borderType -> border mode used to extrapolate pixels outside of the -// image. Can be : -// BORDER_REPLICATE: aaaaaa|abcdefgh|hhhhhhh -// BORDER_REFLECT: fedcba|abcdefgh|hgfedcb -// BORDER_REFLECT_101: gfedcb|abcdefgh|gfedcba -// BORDER_WRAP: cdefgh|abcdefgh|abcdefg -// BORDER_CONSTANT: iiiiii|abcdefgh|iiiiiii -// Description -// This function can be used for blurring image using normalised box -// filter. Image can be of any depth and have any no of channels. ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // Examples // img = CV_LoadImage('~/test.jpg',0) // dst = CV_Blur(img,3,3,-1,-1,"BORDER_CONSTANT") @@ -71,13 +46,7 @@ function cvtimg = CV_Blur(srcimg,ksize_width,ksize_height,anchor_x,anchor_y, ... // Authors // Siddhesh Wani // -<<<<<<< HEAD cvtimg = 0 -======= -cvtimg = 0 -// This is curretly dummy function. It provides no functionality but is required -// for providing support for generating C code for OpenCV ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 endfunction diff --git a/2.3-1/macros/ImageProcessing/imgproc/CV_Canny.sci b/2.3-1/macros/ImageProcessing/imgproc/CV_Canny.sci index 1adb11ec..be1c2ccb 100644 --- a/2.3-1/macros/ImageProcessing/imgproc/CV_Canny.sci +++ b/2.3-1/macros/ImageProcessing/imgproc/CV_Canny.sci @@ -15,7 +15,6 @@ function edges = CV_Canny(srcimg,threhold1,threshold2,aperture_size,L2gradient) // edges = CV_Canny(srcimg,threhold1,threshold2,aperture_size,L2gradient) // // Parameters -<<<<<<< HEAD // srcimg : single-channel 8-bit input image. // threshold1 : first threshold for the hysteresis procedure. // threshold2 : second threshold for the hysteresis procedure. @@ -36,40 +35,13 @@ function edges = CV_Canny(srcimg,threhold1,threshold2,aperture_size,L2gradient) // img = CV_LoadImage('~/test.jpg',0) // dst = CV_CvtColor(img,"CV_RGB2GRAY"); // edge = CV_Canny(dst,50,100,3,0); -======= -// srcimg -> single-channel 8-bit input image. -// threshold1 -> first threshold for the hysteresis procedure. -// threshold2 -> second threshold for the hysteresis procedure. -// aperture_size -> aperture size for the Sobel() operator. -// L2gradient -> a flag, indicating whether a more accurate -// L_2 norm =sqrt{(dI/dx)^2 + (dI/dy)^2} should be used to -// calculate the image gradient magnitude ( L2gradient=1 ), -// or whether the default L_1 norm =|dI/dx|+|dI/dy| is enough -// ( L2gradient=0). -// Description -// This function can be used for finding edes in single channel 8 bit -// image. 'aperture_size' and 'L2gradient' are optionals. By default, -// aperture_size is 3 and L2gradient is false. -// -// Examples -// img = CV_LoadImage('~/test.jpg',0) -// dst = CV_CvtColor(img,"CV_RGB2GRAY"); -// edge = CV_Canny(dst,50,100,3,0); -// ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // See also // CV_LoadImage CV_CvtColor // // Authors // Siddhesh Wani // -<<<<<<< HEAD edges = 0 -======= -edges = 0 -// This is curretly dummy function. It provides no functionality but is required -// for providing support for generating C code for OpenCV ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 endfunction diff --git a/2.3-1/macros/ImageProcessing/imgproc/CV_CornerHarris.sci b/2.3-1/macros/ImageProcessing/imgproc/CV_CornerHarris.sci index 741dc2ba..ccb83cb7 100644 --- a/2.3-1/macros/ImageProcessing/imgproc/CV_CornerHarris.sci +++ b/2.3-1/macros/ImageProcessing/imgproc/CV_CornerHarris.sci @@ -12,7 +12,6 @@ function edges = CV_CornerHarris(srcimg,blocksize,ksize,k,border_type) //Finds edges in image using Harris algorithm // // Calling Sequence -<<<<<<< HEAD // edges = CV_CornerHarris(srcimg,blocksize,ksize,k,border_type) // // Parameters @@ -41,49 +40,13 @@ function edges = CV_CornerHarris(srcimg,blocksize,ksize,k,border_type) // img = CV_LoadImage('~/test.jpg',0) // dst = CV_CvtColor(img,"CV_RGB2GRAY"); // edge = CV_CornerHarris(dst,5,3,1,"BORDER_REPLICATE"); -======= -// edges = CV_CornerHarris(srcimg,blocksize,ksize,k,border_type) -// -// Parameters -// srcimg -> Input single-channel 8-bit or floating-point image. -// blockSize -> Neighborhood size -// ksize -> Aperture parameter for the Sobel() operator. -// k -> Harris detector free parameter. -// borderType -> border mode used to extrapolate pixels outside of the -// image. It can be : -// BORDER_REPLICATE: aaaaaa|abcdefgh|hhhhhhh -// BORDER_REFLECT: fedcba|abcdefgh|hgfedcb -// BORDER_REFLECT_101: gfedcb|abcdefgh|gfedcba -// BORDER_WRAP: cdefgh|abcdefgh|abcdefg -// BORDER_CONSTANT: iiiiii|abcdefgh|iiiiiii -// Description -// The function runs the Harris edge detector on the image. For each -// pixel (x, y) it calculates a 2 * 2 gradient covariance matrix M(x,y) -// over a blockSize * blockSize neighborhood. Then, it computes the -// following characteristic: -// dst(x,y) = det(M(x,y)) - k .tr(M(x,y))^2 -// Corners in the image can be found as the local maxima of this -// response map -// -// Examples -// img = CV_LoadImage('~/test.jpg',0) -// dst = CV_CvtColor(img,"CV_RGB2GRAY"); -// edge = CV_CornerHarris(dst,5,3,1,"BORDER_REPLICATE"); -// ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // See also // CV_LoadImage CV_CvtColor // // Authors // Siddhesh Wani // -<<<<<<< HEAD edges = 0 -======= -edges = 0 -// This is curretly dummy function. It provides no functionality but is required -// for providing support for generating C code for OpenCV ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 endfunction diff --git a/2.3-1/macros/ImageProcessing/imgproc/CV_CvtColor.sci b/2.3-1/macros/ImageProcessing/imgproc/CV_CvtColor.sci index 3252c122..dcf756c0 100644 --- a/2.3-1/macros/ImageProcessing/imgproc/CV_CvtColor.sci +++ b/2.3-1/macros/ImageProcessing/imgproc/CV_CvtColor.sci @@ -15,7 +15,6 @@ function cvtimg = CV_CvtColor(srcimg,code) // CV_CvtColor(srcimg,code) // // Parameters -<<<<<<< HEAD // srcimg: source image to be converted // dstimg: destination image in which to store converted image // code: String specifying conversion type. Same as defined in OpenCV. for eg. 'CV_RGB2GRAY' for conversion from RGB image to grayscale image @@ -31,34 +30,13 @@ function cvtimg = CV_CvtColor(srcimg,code) // Examples // img = CV_LoadImage('~/test.jpg',0) // dst = CV_CvtColor(img,'CV_RGB2GRAY') -======= -// srcimg: source image to be converted -// dstimg: destination image in which to store converted image -// code: String specifying conversion type. Same as defined in OpenCV -// for eg. 'CV_RGB2GRAY' for conversion from RGB image to grayscale image -// dstCn: no of channels in destination image (0 by default) -// -// Description -// This function can be used for converting an image to other colorspace. -// Refer OpenCV documentation for list of available conversions -// Examples -// img = CV_LoadImage('~/test.jpg',0) -// dst = CV_CvtColor(img,'CV_RGB2GRAY') -// ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // See also // CV_LoadImage CV_CreateImage // // Authors // Siddhesh Wani // -<<<<<<< HEAD cvtimg = 0 -======= -cvtimg = 0 -// This is curretly dummy function. It provides no functionality but is required -// for providing support for generating C code for OpenCV ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 endfunction diff --git a/2.3-1/macros/ImageProcessing/imgproc/CV_Dilate.sci b/2.3-1/macros/ImageProcessing/imgproc/CV_Dilate.sci index 124ec897..25e2c844 100644 --- a/2.3-1/macros/ImageProcessing/imgproc/CV_Dilate.sci +++ b/2.3-1/macros/ImageProcessing/imgproc/CV_Dilate.sci @@ -8,7 +8,6 @@ // Organization: FOSSEE, IIT Bombay // Email: toolbox@scilab.in -<<<<<<< HEAD function cvtimg = CV_Dilate(srcimg,dilation_type,dilation_size,iterations,border_type,border_value) // dilates an image by using a specific structuring element. // @@ -40,52 +39,13 @@ function cvtimg = CV_Dilate(srcimg,dilation_type,dilation_size,iterations,border // Examples // img = CV_LoadImage('~/test.jpg',0) // dst = CV_Erode(img,"MORPH_RECT",3,1,"BORDER_CONSTANT",0); -======= -function cvtimg = CV_Dilate(srcimg,dilation_type,dilation_size,iterations, ... - border_type,border_value) -// dilates an image by using a specific structuring element. -// -// Calling Sequence -// cvtimg = CV_Dilate(srcimg,dilation_type,dilation_size,[iterations, ... -// border_type,border_value]) -// Parameters -// src -> input image; the number of channels can be arbitrary, but the -// depth should be one of CV_8U, CV_16U, CV_16S, CV_32F or CV_64F. -// dilation_type -> can be one of : MORPH_RECT, MORPH_CROSS, -// MORPH_ELLIPSE -// dilation_size -> size of kernel to be used for erosion. Must be odd -// iterations -> number of times erosion is applied. -// border_type -> pixel extrapolation method. It can be: -// BORDER_REPLICATE: aaaaaa|abcdefgh|hhhhhhh -// BORDER_REFLECT: fedcba|abcdefgh|hgfedcb -// BORDER_REFLECT_101: gfedcb|abcdefgh|gfedcba -// BORDER_WRAP: cdefgh|abcdefgh|abcdefg -// BORDER_CONSTANT: iiiiii|abcdefgh|iiiiiii -// border_value -> border value in case of a constant border -// Description -// This function can be used for eroding an image. Kernel used for erosion -// is decided by type and size. Size must always be odd. Anchor pint of -// kernel is always center of kernel. Input arguements 'iterations(1), -// border_type(BORDER_CONSTANT) and border_value' are optionals. Whwn not -// specified, default values as as mentioned in brackets. -// Examples -// img = CV_LoadImage('~/test.jpg',0) -// dst = CV_Erode(img,"MORPH_RECT",3,1,"BORDER_CONSTANT",0); -// ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // See also // CV_LoadImage CV_Erode // // Authors // Siddhesh Wani // -<<<<<<< HEAD cvtimg = 0 -======= -cvtimg = 0 -// This is curretly dummy function. It provides no functionality but is required -// for providing support for generating C code for OpenCV ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 endfunction diff --git a/2.3-1/macros/ImageProcessing/imgproc/CV_DistanceTransform.sci b/2.3-1/macros/ImageProcessing/imgproc/CV_DistanceTransform.sci index 811d8f42..1f304a68 100644 --- a/2.3-1/macros/ImageProcessing/imgproc/CV_DistanceTransform.sci +++ b/2.3-1/macros/ImageProcessing/imgproc/CV_DistanceTransform.sci @@ -15,7 +15,6 @@ function dstimg = CV_DistanceTransform(srcimg,distance_type,mask_size) // dst = CV_DistanceTransform(srcimg,distance_type,mask_size) // // Parameters -<<<<<<< HEAD // srcimg : Source 8-bit single-channel image. // distance_type : Type of distance. It can be CV_DIST_L1, CV_DIST_L2 , or CV_DIST_C // mask_size : Size of the distance transform mask @@ -29,33 +28,13 @@ function dstimg = CV_DistanceTransform(srcimg,distance_type,mask_size) // Examples // img = CV_LoadImage('~/test.jpg',0) // dst = CV_DistanceTransform(img,"CV_DIST_L1",3) -======= -// srcimg -> Source 8-bit single-channel image. -// distance_type -> Type of distance. It can be -// CV_DIST_L1, CV_DIST_L2 , or CV_DIST_C -// mask_size -> Size of the distance transform mask -// Description -// This function can be used to calculate distance to closest zero -// pixel for each pixel of the source image. Output is 32 bit floating -// point, single channel image of the same size as that of source image. -// Examples -// img = CV_LoadImage('~/test.jpg',0) -// dst = CV_DistanceTransform(img,"CV_DIST_L1",3) -// ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // See also // CV_LoadImage CV_CreateImage CV_CvtColor // // Authors // Siddhesh Wani // -<<<<<<< HEAD dstimg = 0 -======= -dstimg = 0 -// This is curretly dummy function. It provides no functionality but is required -// for providing support for generating C code for OpenCV ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 endfunction diff --git a/2.3-1/macros/ImageProcessing/imgproc/CV_Erode.sci b/2.3-1/macros/ImageProcessing/imgproc/CV_Erode.sci index 8ae8ca58..73f3ee59 100644 --- a/2.3-1/macros/ImageProcessing/imgproc/CV_Erode.sci +++ b/2.3-1/macros/ImageProcessing/imgproc/CV_Erode.sci @@ -8,7 +8,6 @@ // Organization: FOSSEE, IIT Bombay // Email: toolbox@scilab.in -<<<<<<< HEAD function cvtimg = CV_Erode(srcimg,erosion_type,erosion_size,iterations,border_type,border_value) // Erodes an image by using a specific structuring element. // @@ -40,51 +39,13 @@ function cvtimg = CV_Erode(srcimg,erosion_type,erosion_size,iterations,border_ty // Examples // img = CV_LoadImage('~/test.jpg',0) // dst = CV_Erode(img,"MORPH_RECT",3,1,"BORDER_CONSTANT",0); -======= -function cvtimg = CV_Erode(srcimg,erosion_type,erosion_size,iterations, ... - border_type,border_value) -// Erodes an image by using a specific structuring element. -// -// Calling Sequence -// cvtimg = CV_Erode(srcimg,erosion_type,erosion_size,[iterations, ... -// border_type,border_value]) -// Parameters -// src -> input image; the number of channels can be arbitrary, but the -// depth should be one of CV_8U, CV_16U, CV_16S, CV_32F or CV_64F. -// erosion_type -> can be one of : MORPH_RECT, MORPH_CROSS, MORPH_ELLIPSE -// erosion_size -> size of kernel to be used for erosion. Must be odd -// iterations -> number of times erosion is applied. -// border_type -> pixel extrapolation method. It can be: -// BORDER_REPLICATE: aaaaaa|abcdefgh|hhhhhhh -// BORDER_REFLECT: fedcba|abcdefgh|hgfedcb -// BORDER_REFLECT_101: gfedcb|abcdefgh|gfedcba -// BORDER_WRAP: cdefgh|abcdefgh|abcdefg -// BORDER_CONSTANT: iiiiii|abcdefgh|iiiiiii -// border_value -> border value in case of a constant border -// Description -// This function can be used for eroding an image. Kernel used for erosion -// is decided by type and size. Size must always be odd. Anchor pint of -// kernel is always center of kernel. Input arguements 'iterations(1), -// border_type(BORDER_CONSTANT) and border_value' are optionals. Whwn not -// specified, default values as as mentioned in brackets. -// Examples -// img = CV_LoadImage('~/test.jpg',0) -// dst = CV_Erode(img,"MORPH_RECT",3,1,"BORDER_CONSTANT",0); -// ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // See also // CV_LoadImage CV_Dilate // // Authors // Siddhesh Wani // -<<<<<<< HEAD cvtimg = 0 -======= -cvtimg = 0 -// This is curretly dummy function. It provides no functionality but is required -// for providing support for generating C code for OpenCV ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 endfunction diff --git a/2.3-1/macros/ImageProcessing/imgproc/CV_GaussianBlur.sci b/2.3-1/macros/ImageProcessing/imgproc/CV_GaussianBlur.sci index 99ba008a..814355e0 100644 --- a/2.3-1/macros/ImageProcessing/imgproc/CV_GaussianBlur.sci +++ b/2.3-1/macros/ImageProcessing/imgproc/CV_GaussianBlur.sci @@ -8,7 +8,6 @@ // Organization: FOSSEE, IIT Bombay // Email: toolbox@scilab.in -<<<<<<< HEAD function cvtimg = CV_GaussianBlur(srcimg,ksize_width,ksize_height,sigma_x,sigma_y,border_type) // function to blur image using gaussian filter // @@ -42,51 +41,13 @@ function cvtimg = CV_GaussianBlur(srcimg,ksize_width,ksize_height,sigma_x,sigma_ // Examples // img = CV_LoadImage('~/test.jpg',0) // dst = CV_GaussianBlur(img,3,3,0,0,"BORDER_CONSTANT") -======= -function cvtimg = CV_GaussianBlur(srcimg,ksize_width,ksize_height,sigma_x,sigma_y, ... - border_type) -// function to blur image using gaussian filter -// -// Calling Sequence -// dst = CV_Blur(srcimg,ksize_width,ksize_height,anchor_x,anchor_y, ... -// border_type) -// -// Parameters -// srcimg -> Source image. -// ksize_width, ksize_height -> blurring kernel size. must be odd. -// sigmaX -> Gaussian kernel standard deviation in X direction. -// sigmaY -> Gaussian kernel standard deviation in Y direction; -// if sigmaY is zero, it is set to be equal to sigmaX, -// if both sigmas are zeros, they are computed from -// ksize.width and ksize.height , respectively -// borderType -> border mode used to extrapolate pixels outside of the -// image. Can be : -// BORDER_REPLICATE: aaaaaa|abcdefgh|hhhhhhh -// BORDER_REFLECT: fedcba|abcdefgh|hgfedcb -// BORDER_REFLECT_101: gfedcb|abcdefgh|gfedcba -// BORDER_WRAP: cdefgh|abcdefgh|abcdefg -// BORDER_CONSTANT: iiiiii|abcdefgh|iiiiiii -// Description -// This function can be used for blurring image using gaussian -// filter. Image can be of any depth and have any no of channels. -// Examples -// img = CV_LoadImage('~/test.jpg',0) -// dst = CV_GaussianBlur(img,3,3,0,0,"BORDER_CONSTANT") -// ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // See also // CV_LoadImage CV_Blur, CV_CvtColor // // Authors // Siddhesh Wani // -<<<<<<< HEAD cvtimg = 0 -======= -cvtimg = 0 -// This is curretly dummy function. It provides no functionality but is required -// for providing support for generating C code for OpenCV ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 endfunction diff --git a/2.3-1/macros/ImageProcessing/imgproc/CV_MedianBlur.sci b/2.3-1/macros/ImageProcessing/imgproc/CV_MedianBlur.sci index eb20f53f..5f6069a7 100644 --- a/2.3-1/macros/ImageProcessing/imgproc/CV_MedianBlur.sci +++ b/2.3-1/macros/ImageProcessing/imgproc/CV_MedianBlur.sci @@ -12,7 +12,6 @@ function cvtimg = CV_MedianBlur(srcimg,ksize) // function to blur image using median filter // // Calling Sequence -<<<<<<< HEAD // cvtimg = CV_MedianBlur(srcimg,ksize) // // Parameters @@ -31,37 +30,11 @@ function cvtimg = CV_MedianBlur(srcimg,ksize) // dst = CV_MedianBlur(img,3) // See also // CV_GaussianBlur, CV_Blur, CV_CvtColor -======= -// dst = CV_Blur(srcimg,ksize_width,ksize_height,anchor_x,anchor_y, ... -// border_type) -// -// Parameters -// srcimg -> input 1-, 3-, or 4-channel image; when ksize is 3 or 5, -// the image depth should be CV_8U, CV_16U, or CV_32F, for -// larger aperture sizes, it can only be CV_8U. -// ksize_width -> aperture linear size; it must be odd and greater than 1, -// for example: 3, 5, 7 ... -// Description -// This function can be used for blurring image using median -// filter. Image can be of any depth and have any no of channels. -// Examples -// img = CV_LoadImage('~/test.jpg',0) -// dst = CV_MedianBlur(img,3) -// -// See also -// CV_GaussianBlur CV_Blur, CV_CvtColor ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // // Authors // Siddhesh Wani // -<<<<<<< HEAD cvtimg = 0 -======= -cvtimg = 0 -// This is curretly dummy function. It provides no functionality but is required -// for providing support for generating C code for OpenCV ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 endfunction diff --git a/2.3-1/macros/ImageProcessing/imgproc/CV_Threshold.sci b/2.3-1/macros/ImageProcessing/imgproc/CV_Threshold.sci index 2364e2e5..0563c360 100644 --- a/2.3-1/macros/ImageProcessing/imgproc/CV_Threshold.sci +++ b/2.3-1/macros/ImageProcessing/imgproc/CV_Threshold.sci @@ -16,7 +16,6 @@ function cvtimg = CV_Threshold(srcimg,threshold,max_value,thresh_type) // // Parameters // srcimg: source image to be converted -<<<<<<< HEAD // threshold: threshold value // max_value: maximum value to be used with THRESH_BINARY and THRESH_BINARY_INV // thresh_type: Type for threshold. It can one of the following: THRESH_BINARY, THRESH_BINARY_INV, THRESH_TRUNC, THRESH_TOZERO, THRESH_TOZERO_INV @@ -31,33 +30,13 @@ function cvtimg = CV_Threshold(srcimg,threshold,max_value,thresh_type) // Examples // img = CV_LoadImage('~/test.jpg',0) // dst = CV_Threshold(img,100,255,'THRESH_BINARY') -======= -// threshold: threshold value -// max_value: maximum value to be used with THRESH_BINARY and THRESH_BINARY_INV -// thresh_type: Type for threshold. It can one of the following: -// THRESH_BINARY, THRESH_BINARY_INV, THRESH_TRUNC, -// THRESH_TOZERO, THRESH_TOZERO_INV -// Description -// This function can be used for converting an image to other colorspace. -// Refer OpenCV documentation for list of available conversions -// Examples -// img = CV_LoadImage('~/test.jpg',0) -// dst = CV_Threshold(img,100,255,'THRESH_BINARY') -// ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // See also // CV_LoadImage CV_CreateImage // // Authors // Siddhesh Wani // -<<<<<<< HEAD cvtimg = 0 -======= -cvtimg = 0 -// This is curretly dummy function. It provides no functionality but is required -// for providing support for generating C code for OpenCV ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 endfunction diff --git a/2.3-1/macros/Scilab-Arduino/GetArduinoFunctions.sci b/2.3-1/macros/Scilab-Arduino/GetArduinoFunctions.sci index bd532374..eff61fe6 100644 --- a/2.3-1/macros/Scilab-Arduino/GetArduinoFunctions.sci +++ b/2.3-1/macros/Scilab-Arduino/GetArduinoFunctions.sci @@ -31,10 +31,6 @@ ArduinoFunctions = [ "cmd_servo_attach" "cmd_servo_detach" "cmd_servo_move" -<<<<<<< HEAD "i2c_dev"]; -======= - "cmd_i2c_dev"]; ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 endfunction diff --git a/2.3-1/macros/Scilab-Arduino/GetArduinoSetupFunctions.sci b/2.3-1/macros/Scilab-Arduino/GetArduinoSetupFunctions.sci index f5c64bc9..d310648e 100644 --- a/2.3-1/macros/Scilab-Arduino/GetArduinoSetupFunctions.sci +++ b/2.3-1/macros/Scilab-Arduino/GetArduinoSetupFunctions.sci @@ -25,11 +25,7 @@ ArduinoSetupFunctions = [ "cmd_dcmotor_setup" "cmd_servo_attach" "cmd_servo_detach" -<<<<<<< HEAD "i2c_dev"]; -======= - "cmd_i2c_dev"]; ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 endfunction diff --git a/2.3-1/macros/SymbolTable/ST_AnalyzeScope.sci b/2.3-1/macros/SymbolTable/ST_AnalyzeScope.sci index f3b041a0..8389c09a 100644 --- a/2.3-1/macros/SymbolTable/ST_AnalyzeScope.sci +++ b/2.3-1/macros/SymbolTable/ST_AnalyzeScope.sci @@ -84,10 +84,6 @@ for cntout = 1:NOutArg // #RNU_RES_E
OutArg(cntout).Scope = 'Local';
end
-<<<<<<< HEAD -======= -
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // #RNU_RES_B
// --- Check in global symbol table. ---
// #RNU_RES_E
diff --git a/2.3-1/macros/SymbolTable/names b/2.3-1/macros/SymbolTable/names index 2ce0db05..c2efc843 100644 --- a/2.3-1/macros/SymbolTable/names +++ b/2.3-1/macros/SymbolTable/names @@ -6,10 +6,7 @@ ST_GetInArgInfo ST_GetSymbolInfo ST_InsForCntVars ST_InsOutArg -<<<<<<< HEAD ST_InsOutArg_Dup -======= ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 ST_Load ST_MatchSymbol ST_Save diff --git a/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci b/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci index 67051512..7269e98f 100644 --- a/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci +++ b/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci @@ -437,7 +437,6 @@ PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file', INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-<<<<<<< HEAD
// ---------------------
// --- Class Uint32. ---
@@ -514,8 +513,6 @@ PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file', INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-=======
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// ------------------
// --- Class Sin. ---
// ------------------
@@ -923,7 +920,6 @@ INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,E INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
// -------------------
-<<<<<<< HEAD
// --- Class Isreal. ---
// -------------------
ClassName = 'Isreal';
@@ -1130,8 +1126,6 @@ INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,Ex // -------------------
-=======
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Sqrt. ---
// -------------------
ClassName = 'Sqrt';
@@ -1491,13 +1485,9 @@ ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); PrintStringInfo('d0d0d0'+ArgSeparator+'d2',ClassFileName,'file','y');
-<<<<<<< HEAD
PrintStringInfo('s0s0s0'+ArgSeparator+'s2',ClassFileName,'file','y');
PrintStringInfo('d2d2d0'+ArgSeparator+'d2',ClassFileName,'file','y');
PrintStringInfo('s2s2s0'+ArgSeparator+'s2',ClassFileName,'file','y');
-=======
-PrintStringInfo('d2d2d0'+ArgSeparator+'d2',ClassFileName,'file','y');
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Annotation Function And Function List Function. ---
@@ -4609,7 +4599,6 @@ PrintStringInfo('OUT(2).TP= FA_TP_COMPLEX(IN(1).TP)',ClassFileName,'file','y' PrintStringInfo('OUT(2).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
PrintStringInfo('OUT(2).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
-<<<<<<< HEAD
// Edited by Sandeep Gupta, IITB FOSSEE Project.
PrintStringInfo('NIN= 2',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
@@ -4661,16 +4650,6 @@ PrintStringInfo('s0'+ArgSeparator+'c0',ClassFileName,'file','y'); PrintStringInfo('d0'+ArgSeparator+'z0',ClassFileName,'file','y');
PrintStringInfo('c0'+ArgSeparator+'c0',ClassFileName,'file','y');
PrintStringInfo('z0'+ArgSeparator+'z0',ClassFileName,'file','y');
-=======
-// --- Function List Class. ---
-//NUT: no mixed data types
-ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
-
-PrintStringInfo('s0'+ArgSeparator+'c0',ClassFileName,'file','y');
-PrintStringInfo('d0'+ArgSeparator+'z0',ClassFileName,'file','y');
-PrintStringInfo('c0'+ArgSeparator+'c0',ClassFileName,'file','y');
-PrintStringInfo('z0'+ArgSeparator+'z0',ClassFileName,'file','y');
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo('s2'+ArgSeparator+'s2',ClassFileName,'file','y');
PrintStringInfo('d2'+ArgSeparator+'d2',ClassFileName,'file','y');
@@ -4691,15 +4670,12 @@ PrintStringInfo('d2'+ArgSeparator+'z2z2',ClassFileName,'file','y'); PrintStringInfo('c2'+ArgSeparator+'c2c2',ClassFileName,'file','y');
PrintStringInfo('z2'+ArgSeparator+'z2z2',ClassFileName,'file','y');
-<<<<<<< HEAD
PrintStringInfo('d2d2'+ArgSeparator+'z2',ClassFileName,'file','y');
PrintStringInfo('d2d2'+ArgSeparator+'z2d2',ClassFileName,'file','y');
PrintStringInfo('d2d2'+ArgSeparator+'z2d2z2',ClassFileName,'file','y');
PrintStringInfo('d2d2'+ArgSeparator+'z2d2z2z2',ClassFileName,'file','y');
-=======
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Annotation Function And Function List Function. ---
FunctionName = 'spec'; // AS : Done AS : Float_Done
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
@@ -4894,10 +4870,6 @@ ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); PrintStringInfo('d0d0d0'+ArgSeparator+'',ClassFileName,'file','y');
PrintStringInfo('d0d0u80'+ArgSeparator+'',ClassFileName,'file','y');
-<<<<<<< HEAD
-=======
-
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Annotation Function And Function List Function. ---
FunctionName = 'cmd_analog_out';
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
@@ -5771,12 +5743,6 @@ INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,Ex -<<<<<<< HEAD
-=======
-
-
-
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
//------------------------------------
//---- Class AVRUARTReceiveChar -----------
//------------------------------------
@@ -5793,11 +5759,6 @@ PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y'); // --- Function List Class. ---
ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
-<<<<<<< HEAD
-=======
-//PrintStringInfo('d0d0d0'+ArgSeparator+'u80',ClassFileName,'file','y');
-//PrintStringInfo('d0d0u80'+ArgSeparator+'u80',ClassFileName,'file','y');
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(''+ArgSeparator+'',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
@@ -5808,52 +5769,32 @@ INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,Ex -<<<<<<< HEAD
//------------------------------------
//---- Class RPI_0IN_Void ----------
//------------------------------------
ClassName = 'RPI_0IN_Void';
-=======
-//------------------------------------
-//---- Class RPI_DigitalSetup --------
-//------------------------------------
-ClassName = 'RPI_DigitalSetup';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD
PrintStringInfo('NIN= 0',ClassFileName,'file','y');
PrintStringInfo('NOUT= 0',ClassFileName,'file','y');
-=======
-PrintStringInfo('NIN= 2',ClassFileName,'file','y');
-PrintStringInfo('NOUT= 0 ',ClassFileName,'file','y');
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo('OUT(1).TP= ''u8''',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
-<<<<<<< HEAD
-=======
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Function List Class. ---
ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
PrintStringInfo(''+ArgSeparator+'',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
-<<<<<<< HEAD
FunctionName = 'RPI_gertBoardSPISetup';
-=======
-FunctionName = 'RPI_DigitalSetup';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-<<<<<<< HEAD
//------------------------------------
//---- Class RPI_0IN_u8 ------------
//------------------------------------
@@ -5878,47 +5819,26 @@ PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file', INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
FunctionName = 'RPI_digitalReadByte';
-=======
-FunctionName = 'RPI_DigitalOut';
-PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
-INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
-INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-
-FunctionName = 'RPI_HardPWMWrite';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
//------------------------------------
-<<<<<<< HEAD
//---- Class RPI_0IN_u32 -----------
//------------------------------------
ClassName = 'RPI_0IN_u32';
-=======
-//---- Class RPI_DigitalIn -----------
-//------------------------------------
-ClassName = 'RPI_DigitalIn';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD
PrintStringInfo('NIN= 0',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= ''u32''',ClassFileName,'file','y');
-=======
-PrintStringInfo('NIN= 1',ClassFileName,'file','y');
-PrintStringInfo('NOUT= 1 ',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).TP= ''u8''',ClassFileName,'file','y');
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
// --- Function List Class. ---
ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
-<<<<<<< HEAD
PrintStringInfo(''+ArgSeparator+'u320',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
@@ -5927,19 +5847,11 @@ PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file', INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
FunctionName = 'RPI_micros';
-=======
-
-PrintStringInfo(''+ArgSeparator+'',ClassFileName,'file','y');
-
-// --- Annotation Function And Function List Function. ---
-FunctionName = 'RPI_DigitalIn';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
//------------------------------------
-<<<<<<< HEAD
//---- Class RPI_1IN_u8_Void -------
//------------------------------------
ClassName = 'RPI_1IN_u8_Void';
@@ -5949,22 +5861,10 @@ PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y'); ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 0',ClassFileName,'file','y');
-=======
-//---- Class RPI_DelayMilli ----------
-//------------------------------------
-ClassName = 'RPI_DelayMilli';
-
-//--- Class Annotation. ---
-PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
-ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-PrintStringInfo('NIN= 1',ClassFileName,'file','y');
-PrintStringInfo('NOUT= 0 ',ClassFileName,'file','y');
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo('OUT(1).TP= ''u8''',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
-<<<<<<< HEAD
// --- Function List Class. ---
ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
PrintStringInfo('u80'+ArgSeparator+'',ClassFileName,'file','y');
@@ -6000,128 +5900,51 @@ PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file', INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
FunctionName = 'RPI_softToneStop';
-=======
-//--- Function List Class. ---
-ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
-
-PrintStringInfo(''+ArgSeparator+'',ClassFileName,'file','y');
-
-// --- Annotation Function And Function List Function. ---
-FunctionName = 'RPI_DelayMilli';
-PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
-INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
-INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-
-FunctionName = 'RPI_DelayMicro';
-PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
-INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
-INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-
-FunctionName = 'RPI_SerialClose';
-PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
-INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
-INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-
-FunctionName = 'RPI_SerialFlush';
-PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
-INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
-INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-
-FunctionName = 'RPI_HardPWMSetRange';
-PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
-INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
-INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-
-FunctionName = 'RPI_HardPWMSetClock';
-PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
-INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
-INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-
-FunctionName = 'RPI_HardPWMSetMode';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
//------------------------------------
-<<<<<<< HEAD
//---- Class RPI_1IN_u16_Void ------
//------------------------------------
ClassName = 'RPI_1IN_u16_Void';
-=======
-//---- Class RPI_GetMilli ----------
-//------------------------------------
-ClassName = 'RPI_GetMilli';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 0',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= ''u8''',ClassFileName,'file','y');
-=======
-PrintStringInfo('NIN= 0',ClassFileName,'file','y');
-PrintStringInfo('NOUT= 1 ',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).TP= ''u32''',ClassFileName,'file','y');
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
// --- Function List Class. ---
ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
-<<<<<<< HEAD
PrintStringInfo('u160'+ArgSeparator+'',ClassFileName,'file','y');
PrintStringInfo('d0'+ArgSeparator+'',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'RPI_pwmClock';
-=======
-
-PrintStringInfo(''+ArgSeparator+'',ClassFileName,'file','y');
-
-// --- Annotation Function And Function List Function. ---
-FunctionName = 'RPI_GetMillis';
-PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
-INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
-INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-
-FunctionName = 'RPI_GetMicros';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
//------------------------------------
-<<<<<<< HEAD
//---- Class RPI_1IN_u32_Void ------
//------------------------------------
ClassName = 'RPI_1IN_u32_Void';
-=======
-//---- Class RPI_SetupSerial ----------
-//------------------------------------
-ClassName = 'RPI_SetupSerial';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 0',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= ''u8''',ClassFileName,'file','y');
-=======
-PrintStringInfo('NIN= 2',ClassFileName,'file','y');
-PrintStringInfo('NOUT= 1 ',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).TP= ''u16''',ClassFileName,'file','y');
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
// --- Function List Class. ---
ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
-<<<<<<< HEAD
PrintStringInfo('u320'+ArgSeparator+'',ClassFileName,'file','y');
PrintStringInfo('d0'+ArgSeparator+'',ClassFileName,'file','y');
@@ -6135,19 +5958,11 @@ PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file', INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
FunctionName = 'RPI_delayMicro';
-=======
-
-PrintStringInfo(''+ArgSeparator+'',ClassFileName,'file','y');
-
-// --- Annotation Function And Function List Function. ---
-FunctionName = 'RPI_SerialSetup';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
//------------------------------------
-<<<<<<< HEAD
//---- Class RPI_1IN_g_Void --------
//------------------------------------
ClassName = 'RPI_1IN_g_Void';
@@ -6175,59 +5990,18 @@ INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,Ex //---- Class RPI_1IN_u8_i8 ---------
//------------------------------------
ClassName = 'RPI_1IN_u8_i8';
-=======
-//---- Class RPI_SetupClose ----------
-//------------------------------------
-//ClassName = 'RPI_SetupClose';
-
-// --- 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= ''u8''',ClassFileName,'file','y');
-//PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y');
-//PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
-
-// --- Function List Class. ---
-//ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
-
-//PrintStringInfo(''+ArgSeparator+'',ClassFileName,'file','y');
-
-// --- Annotation Function And Function List Function. ---
-//FunctionName = 'RPI_SerialClose';
-//PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
-//INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
-//INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-//FunctionName = 'RPI_SerialFlush';
-//PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
-//INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
-//INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-
-//------------------------------------
-//---- Class RPI_SerialSendData ----------
-//------------------------------------
-ClassName = 'RPI_SerialSendData';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= ''i8''',ClassFileName,'file','y');
-=======
-PrintStringInfo('NIN= 2',ClassFileName,'file','y');
-PrintStringInfo('NOUT= 0 ',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).TP= ''u8''',ClassFileName,'file','y');
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
// --- Function List Class. ---
ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
-<<<<<<< HEAD
PrintStringInfo('u80'+ArgSeparator+'i80',ClassFileName,'file','y');
PrintStringInfo('d0'+ArgSeparator+'i80',ClassFileName,'file','y');
@@ -6241,58 +6015,26 @@ PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file', INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
FunctionName = 'RPI_physToGpio';
-=======
-
-PrintStringInfo('u80u80'+ArgSeparator+'u80',ClassFileName,'file','y');
-PrintStringInfo('u80i80'+ArgSeparator+'u80',ClassFileName,'file','y');
-PrintStringInfo('u80u160'+ArgSeparator+'u80',ClassFileName,'file','y');
-PrintStringInfo('u80i160'+ArgSeparator+'u80',ClassFileName,'file','y');
-PrintStringInfo('u80s0'+ArgSeparator+'u80',ClassFileName,'file','y');
-PrintStringInfo('u80d0'+ArgSeparator+'u80',ClassFileName,'file','y');
-
-PrintStringInfo('u80u82'+ArgSeparator+'u80',ClassFileName,'file','y');
-PrintStringInfo('u80i82'+ArgSeparator+'u80',ClassFileName,'file','y');
-PrintStringInfo('u80u162'+ArgSeparator+'u80',ClassFileName,'file','y');
-PrintStringInfo('u80i162'+ArgSeparator+'u80',ClassFileName,'file','y');
-PrintStringInfo('u80s2'+ArgSeparator+'u80',ClassFileName,'file','y');
-PrintStringInfo('u80d2'+ArgSeparator+'u80',ClassFileName,'file','y');
-PrintStringInfo('u80g2'+ArgSeparator+'u80',ClassFileName,'file','y');
-
-// --- Annotation Function And Function List Function. ---
-FunctionName = 'RPI_SerialSendData';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
//------------------------------------
-<<<<<<< HEAD
//---- Class RPI_1IN_u16_i8 --------
//------------------------------------
ClassName = 'RPI_1IN_u16_i8';
-=======
-//---- Class RPI_SerialDataAvail ----------
-//------------------------------------
-ClassName = 'RPI_SerialDataAvail';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
-<<<<<<< HEAD
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= ''i8''',ClassFileName,'file','y');
-=======
-PrintStringInfo('NOUT= 1 ',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).TP= ''i16''',ClassFileName,'file','y');
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
// --- Function List Class. ---
ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
-<<<<<<< HEAD
PrintStringInfo('u160'+ArgSeparator+'i80',ClassFileName,'file','y');
PrintStringInfo('d0'+ArgSeparator+'i80',ClassFileName,'file','y');
@@ -6306,95 +6048,50 @@ PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file', INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
FunctionName = 'RPI_sn3218Setup';
-=======
-
-PrintStringInfo(''+ArgSeparator+'',ClassFileName,'file','y');
-
-// --- Annotation Function And Function List Function. ---
-FunctionName = 'RPI_SerialDataAvail';
-PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
-INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
-INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-FunctionName = 'RPI_SerialGetChar';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-<<<<<<< HEAD
//------------------------------------
//---- Class RPI_1IN_g_i8 ----------
//------------------------------------
ClassName = 'RPI_1IN_g_i8';
-=======
-
-//------------------------------------
-//---- Class RPI_ThreadCreate ----------
-//------------------------------------
-ClassName = 'RPI_ThreadCreate';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
-<<<<<<< HEAD
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= ''i8''',ClassFileName,'file','y');
-=======
-PrintStringInfo('NOUT= 1 ',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).TP= ''u16''',ClassFileName,'file','y');
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
// --- Function List Class. ---
ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
-<<<<<<< HEAD
PrintStringInfo('g2'+ArgSeparator+'i80',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'RPI_pinNumbering';
-=======
-
-PrintStringInfo(''+ArgSeparator+'',ClassFileName,'file','y');
-
-// --- Annotation Function And Function List Function. ---
-FunctionName = 'RPI_ThreadCreate';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
//------------------------------------
-<<<<<<< HEAD
//---- Class RPI_1IN_u8_u8 ---------
//------------------------------------
ClassName = 'RPI_1IN_u8_u8';
-=======
-//---- Class RPI_PinISR --------------
-//------------------------------------
-ClassName = 'RPI_PinISR';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= ''u8''',ClassFileName,'file','y');
-=======
-PrintStringInfo('NIN= 3',ClassFileName,'file','y');
-PrintStringInfo('NOUT= 1 ',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).TP= ''i16''',ClassFileName,'file','y');
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
// --- Function List Class. ---
ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
-<<<<<<< HEAD
PrintStringInfo('u80'+ArgSeparator+'u80',ClassFileName,'file','y');
PrintStringInfo('d0'+ArgSeparator+'u80',ClassFileName,'file','y');
@@ -6412,32 +6109,18 @@ PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file', INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
FunctionName = 'RPI_softToneCreate';
-=======
-
-PrintStringInfo(''+ArgSeparator+'',ClassFileName,'file','y');
-
-// --- Annotation Function And Function List Function. ---
-FunctionName = 'RPI_PinISR';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
//------------------------------------
-<<<<<<< HEAD
//---- Class RPI_1IN_u16_u16 -------
//------------------------------------
ClassName = 'RPI_1IN_u16_u16';
-=======
-//---- Class ODE ---------------------
-//------------------------------------
-ClassName = 'ODE';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= ''u16''',ClassFileName,'file','y');
@@ -6451,91 +6134,18 @@ PrintStringInfo('d0'+ArgSeparator+'u160',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'RPI_gertboardAnalogRead';
-=======
-
-//Arguements specified: initial value, start time, time vector, ode function
-PrintStringInfo('NIN= 4',ClassFileName,'file','y');
-PrintStringInfo('NOUT= 1 ',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(2)= FA_MUL(IN(1).SZ(2),IN(3).SZ(2))',ClassFileName,'file','y');
-
-//Arguements specified: initial value, start time, end time, ode function
-PrintStringInfo('NIN= 4',ClassFileName,'file','y');
-PrintStringInfo('NOUT= 1 ',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(1)= IN(3).SZ(1)',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(2)= IN(3).SZ(2)',ClassFileName,'file','y');
-
-//Arguements specified: solver type, initial value, start time, end time, ode function
-PrintStringInfo('NIN= 5',ClassFileName,'file','y');
-PrintStringInfo('NOUT= 1 ',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).TP= IN(2).TP',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(2)= FA_MUL(IN(2).SZ(2),IN(4).SZ(2))',ClassFileName,'file','y');
-
-//Arguements specified: solver type, initial value, start time, end time, ode function
-PrintStringInfo('NIN= 5',ClassFileName,'file','y');
-PrintStringInfo('NOUT= 1 ',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).TP= IN(2).TP',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(1)= IN(4).SZ(1)',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(2)= IN(4).SZ(2)',ClassFileName,'file','y');
-
-//Arguements specified: initial value, start time, end time, relative tolerance,
-// absolute tolerance, ode function
-PrintStringInfo('NIN= 6',ClassFileName,'file','y');
-PrintStringInfo('NOUT= 1 ',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(2)= FA_MUL(IN(1).SZ(2),IN(3).SZ(2))',ClassFileName,'file','y');
-
-//Arguements specified: initial value, start time, end time, relative tolerance,
-// absolute tolerance, ode function
-PrintStringInfo('NIN= 6',ClassFileName,'file','y');
-PrintStringInfo('NOUT= 1 ',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(1)= IN(3).SZ(1)',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(2)= IN(3).SZ(2)',ClassFileName,'file','y');
-
-// --- Function List Class. ---
-ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
-PrintStringInfo('d0d0d0fn0'+ArgSeparator+'d0',ClassFileName,'file','y');
-PrintStringInfo('d2d0d0fn0'+ArgSeparator+'d2',ClassFileName,'file','y');
-PrintStringInfo('d0d0d2fn0'+ArgSeparator+'d2',ClassFileName,'file','y');
-PrintStringInfo('d2d0d2fn0'+ArgSeparator+'d2',ClassFileName,'file','y');
-
-PrintStringInfo('g2d0d0d0fn0'+ArgSeparator+'d0',ClassFileName,'file','y');
-PrintStringInfo('g2d2d0d0fn0'+ArgSeparator+'d2',ClassFileName,'file','y');
-PrintStringInfo('g2d0d0d2fn0'+ArgSeparator+'d2',ClassFileName,'file','y');
-PrintStringInfo('g2d2d0d2fn0'+ArgSeparator+'d2',ClassFileName,'file','y');
-
-PrintStringInfo('d0d0d0d0d0fn0'+ArgSeparator+'d0',ClassFileName,'file','y');
-PrintStringInfo('d2d0d0d0d0fn0'+ArgSeparator+'d2',ClassFileName,'file','y');
-PrintStringInfo('d0d0d2d0d0fn0'+ArgSeparator+'d2',ClassFileName,'file','y');
-PrintStringInfo('d2d0d2d0d0fn0'+ArgSeparator+'d2',ClassFileName,'file','y');
-
-// --- Annotation Function And Function List Function. ---
-FunctionName = 'ode';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
//------------------------------------
-<<<<<<< HEAD
//---- Class RPI_1IN_u8_g ------
//------------------------------------
ClassName = 'RPI_1IN_u8_g';
-=======
-//---- Class CUMSUM ---------------------
-//------------------------------------
-ClassName = 'CUMSUM';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= ''g''',ClassFileName,'file','y');
@@ -7966,81 +7576,25 @@ PrintStringInfo('g2d2d2d2d0d2'+ArgSeparator+'ss2',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'syslin';
-=======
-
-//Arguements specified: initial value, start time, time vector, ode function
-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)= IN(1).SZ(1)',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(2)',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)= IN(1).SZ(1)',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
-
-// --- Function List Class. ---
-ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
-PrintStringInfo('d0'+ArgSeparator+'d0',ClassFileName,'file','y');
-PrintStringInfo('s0'+ArgSeparator+'s0',ClassFileName,'file','y');
-PrintStringInfo('u80'+ArgSeparator+'u80',ClassFileName,'file','y');
-PrintStringInfo('i80'+ArgSeparator+'i80',ClassFileName,'file','y');
-PrintStringInfo('u160'+ArgSeparator+'u160',ClassFileName,'file','y');
-PrintStringInfo('i160'+ArgSeparator+'i160',ClassFileName,'file','y');
-
-PrintStringInfo('d2'+ArgSeparator+'d2',ClassFileName,'file','y');
-PrintStringInfo('s2'+ArgSeparator+'s2',ClassFileName,'file','y');
-PrintStringInfo('u82'+ArgSeparator+'u82',ClassFileName,'file','y');
-PrintStringInfo('i82'+ArgSeparator+'i82',ClassFileName,'file','y');
-PrintStringInfo('u162'+ArgSeparator+'u162',ClassFileName,'file','y');
-PrintStringInfo('i162'+ArgSeparator+'i162',ClassFileName,'file','y');
-
-PrintStringInfo('d2g2'+ArgSeparator+'d2',ClassFileName,'file','y');
-PrintStringInfo('s2g2'+ArgSeparator+'s2',ClassFileName,'file','y');
-PrintStringInfo('u82g2'+ArgSeparator+'u82',ClassFileName,'file','y');
-PrintStringInfo('i82g2'+ArgSeparator+'i82',ClassFileName,'file','y');
-PrintStringInfo('u162g2'+ArgSeparator+'u162',ClassFileName,'file','y');
-PrintStringInfo('i162g2'+ArgSeparator+'i162',ClassFileName,'file','y');
-// --- Annotation Function And Function List Function. ---
-FunctionName = 'cumsum';
-PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
-INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
-INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-
-FunctionName = 'cumprod';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
//------------------------------------
-<<<<<<< HEAD
//---- Class schur -------------------
//------------------------------------
ClassName = 'SCHUR';
-=======
-//---- Class TRIU ---------------------
-//------------------------------------
-ClassName = 'TRIU';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD
-=======
-//Arguements specified: initial value, start time, time vector, ode function
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
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)= IN(1).SZ(1)',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
-<<<<<<< HEAD
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 2',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
@@ -8275,57 +7829,6 @@ PrintStringInfo('ss2d2d2'+ArgSeparator+'d2d2',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'obscont';
-=======
-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)= IN(1).SZ(1)',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
-
-ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
-PrintStringInfo('d0'+ArgSeparator+'d0',ClassFileName,'file','y');
-PrintStringInfo('s0'+ArgSeparator+'s0',ClassFileName,'file','y');
-PrintStringInfo('u80'+ArgSeparator+'u80',ClassFileName,'file','y');
-PrintStringInfo('i80'+ArgSeparator+'i80',ClassFileName,'file','y');
-PrintStringInfo('u160'+ArgSeparator+'u160',ClassFileName,'file','y');
-PrintStringInfo('i160'+ArgSeparator+'i160',ClassFileName,'file','y');
-
-PrintStringInfo('d0d0'+ArgSeparator+'d0',ClassFileName,'file','y');
-PrintStringInfo('s0s0'+ArgSeparator+'s0',ClassFileName,'file','y');
-PrintStringInfo('u80u80'+ArgSeparator+'u80',ClassFileName,'file','y');
-PrintStringInfo('i80i80'+ArgSeparator+'i80',ClassFileName,'file','y');
-PrintStringInfo('u160u160'+ArgSeparator+'u160',ClassFileName,'file','y');
-PrintStringInfo('i160i160'+ArgSeparator+'i160',ClassFileName,'file','y');
-PrintStringInfo('u80d0'+ArgSeparator+'u80',ClassFileName,'file','y');
-PrintStringInfo('i80d0'+ArgSeparator+'i80',ClassFileName,'file','y');
-PrintStringInfo('u160d0'+ArgSeparator+'u160',ClassFileName,'file','y');
-PrintStringInfo('i160d0'+ArgSeparator+'i160',ClassFileName,'file','y');
-
-PrintStringInfo('d2'+ArgSeparator+'d2',ClassFileName,'file','y');
-PrintStringInfo('s2'+ArgSeparator+'s2',ClassFileName,'file','y');
-PrintStringInfo('u82'+ArgSeparator+'u82',ClassFileName,'file','y');
-PrintStringInfo('i82'+ArgSeparator+'i82',ClassFileName,'file','y');
-PrintStringInfo('u162'+ArgSeparator+'u162',ClassFileName,'file','y');
-PrintStringInfo('i162'+ArgSeparator+'i162',ClassFileName,'file','y');
-
-PrintStringInfo('d2d0'+ArgSeparator+'d2',ClassFileName,'file','y');
-PrintStringInfo('s2s0'+ArgSeparator+'s2',ClassFileName,'file','y');
-PrintStringInfo('u82u80'+ArgSeparator+'u82',ClassFileName,'file','y');
-PrintStringInfo('i82i80'+ArgSeparator+'i82',ClassFileName,'file','y');
-PrintStringInfo('u162u160'+ArgSeparator+'u162',ClassFileName,'file','y');
-PrintStringInfo('i162i160'+ArgSeparator+'i162',ClassFileName,'file','y');
-PrintStringInfo('u82d0'+ArgSeparator+'u82',ClassFileName,'file','y');
-PrintStringInfo('i82d0'+ArgSeparator+'i82',ClassFileName,'file','y');
-PrintStringInfo('u162d0'+ArgSeparator+'u162',ClassFileName,'file','y');
-PrintStringInfo('i162d0'+ArgSeparator+'i162',ClassFileName,'file','y');
-
-// --- Annotation Function And Function List Function. ---
-FunctionName = 'triu';
-PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
-INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
-INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-FunctionName = 'tril';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
@@ -8640,21 +8143,14 @@ INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,Ex //------------------------------------
-<<<<<<< HEAD
//---- Class svd ---------------------
//------------------------------------
ClassName = 'SVD';
-=======
-//---- Class KRON --------------------
-//------------------------------------
-ClassName = 'KRON';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
@@ -8757,52 +8253,20 @@ PrintStringInfo('d2d0'+ArgSeparator+'d2d2d2d0',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'svd';
-=======
-//Arguements specified: initial value, start time, time vector, ode function
-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_MUL(IN(1).SZ(1),IN(2).SZ(1))',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(2)= FA_MUL(IN(1).SZ(2),IN(2).SZ(2))',ClassFileName,'file','y');
-
-ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
-PrintStringInfo('d0d0'+ArgSeparator+'d0',ClassFileName,'file','y');
-PrintStringInfo('s0s0'+ArgSeparator+'s0',ClassFileName,'file','y');
-
-PrintStringInfo('d2d0'+ArgSeparator+'d2',ClassFileName,'file','y');
-PrintStringInfo('s2s0'+ArgSeparator+'s2',ClassFileName,'file','y');
-
-PrintStringInfo('d0d2'+ArgSeparator+'d2',ClassFileName,'file','y');
-PrintStringInfo('s0s2'+ArgSeparator+'s2',ClassFileName,'file','y');
-
-PrintStringInfo('d2d2'+ArgSeparator+'d2',ClassFileName,'file','y');
-PrintStringInfo('s2s2'+ArgSeparator+'s2',ClassFileName,'file','y');
-
-// --- Annotation Function And Function List Function. ---
-FunctionName = 'kron';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-<<<<<<< HEAD
//------------------------------------
//---- Class HESS ---------------------
//------------------------------------
ClassName = 'HESS';
-=======
-//------------------------------------
-//---- Class FLIPDIM -----------------
-//------------------------------------
-ClassName = 'FLIPDIM';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
@@ -8824,76 +8288,21 @@ PrintStringInfo('d2'+ArgSeparator+'d2d2',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'hess';
-=======
-//Arguements specified: initial value, start time, time vector, ode function
-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)= IN(1).SZ(1)',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
-
-PrintStringInfo('NIN= 3',ClassFileName,'file','y');
-PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
-
-ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
-PrintStringInfo('d0d0'+ArgSeparator+'d0',ClassFileName,'file','y');
-PrintStringInfo('s0s0'+ArgSeparator+'s0',ClassFileName,'file','y');
-PrintStringInfo('u80u80'+ArgSeparator+'u80',ClassFileName,'file','y');
-PrintStringInfo('i80i80'+ArgSeparator+'i80',ClassFileName,'file','y');
-PrintStringInfo('u160u160'+ArgSeparator+'u160',ClassFileName,'file','y');
-PrintStringInfo('i160i160'+ArgSeparator+'i160',ClassFileName,'file','y');
-
-PrintStringInfo('d2d0'+ArgSeparator+'d2',ClassFileName,'file','y');
-PrintStringInfo('s2s0'+ArgSeparator+'s2',ClassFileName,'file','y');
-PrintStringInfo('u82u80'+ArgSeparator+'u82',ClassFileName,'file','y');
-PrintStringInfo('i82i80'+ArgSeparator+'i82',ClassFileName,'file','y');
-PrintStringInfo('u162u160'+ArgSeparator+'u162',ClassFileName,'file','y');
-PrintStringInfo('i162i160'+ArgSeparator+'i162',ClassFileName,'file','y');
-PrintStringInfo('u82d0'+ArgSeparator+'u82',ClassFileName,'file','y');
-PrintStringInfo('i82d0'+ArgSeparator+'i82',ClassFileName,'file','y');
-PrintStringInfo('u162d0'+ArgSeparator+'u162',ClassFileName,'file','y');
-PrintStringInfo('i162d0'+ArgSeparator+'i162',ClassFileName,'file','y');
-
-PrintStringInfo('d2d0d0'+ArgSeparator+'d2',ClassFileName,'file','y');
-PrintStringInfo('s2s0d0'+ArgSeparator+'s2',ClassFileName,'file','y');
-PrintStringInfo('u82u80u80'+ArgSeparator+'u82',ClassFileName,'file','y');
-PrintStringInfo('i82i80u80'+ArgSeparator+'i82',ClassFileName,'file','y');
-PrintStringInfo('u162u160u160'+ArgSeparator+'u162',ClassFileName,'file','y');
-PrintStringInfo('i162i160i160'+ArgSeparator+'i162',ClassFileName,'file','y');
-PrintStringInfo('u82d0d0'+ArgSeparator+'u82',ClassFileName,'file','y');
-PrintStringInfo('i82d0d0'+ArgSeparator+'i82',ClassFileName,'file','y');
-PrintStringInfo('u162d0d0'+ArgSeparator+'u162',ClassFileName,'file','y');
-PrintStringInfo('i162d0d0'+ArgSeparator+'i162',ClassFileName,'file','y');
-
-// --- Annotation Function And Function List Function. ---
-FunctionName = 'flipdim';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-<<<<<<< HEAD
//------------------------------------
//---- Class SVA ---------------------
//------------------------------------
ClassName = 'SVA';
-=======
-//------------------------------------
-//---- Class DIFF -----------------
-//------------------------------------
-ClassName = 'DIFF';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
-<<<<<<< HEAD
PrintStringInfo('NOUT= 3',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
@@ -8923,81 +8332,21 @@ PrintStringInfo('d2d0'+ArgSeparator+'d2d2d2',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'sva';
-=======
-PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(1)= FA_SZ_1(FA_SZ_DIFF(IN(1).SZ,''1'',''0''))',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(2)= FA_SZ_2(FA_SZ_DIFF(IN(1).SZ,''1'',''0''))',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_1(FA_SZ_DIFF(IN(1).SZ,IN(2).VAL,''0''))',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(2)= FA_SZ_2(FA_SZ_DIFF(IN(1).SZ,IN(2).VAL,''0''))',ClassFileName,'file','y');
-
-PrintStringInfo('NIN= 3',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_1(FA_SZ_DIFF(IN(1).SZ,IN(2).VAL, IN(3).VAL))',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(2)= FA_SZ_2(FA_SZ_DIFF(IN(1).SZ,IN(2).VAL, IN(3).VAL))',ClassFileName,'file','y');
-
-ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
-PrintStringInfo('d2'+ArgSeparator+'d2',ClassFileName,'file','y');
-PrintStringInfo('s2'+ArgSeparator+'s2',ClassFileName,'file','y');
-PrintStringInfo('u82'+ArgSeparator+'u82',ClassFileName,'file','y');
-PrintStringInfo('i82'+ArgSeparator+'i82',ClassFileName,'file','y');
-PrintStringInfo('u162'+ArgSeparator+'u162',ClassFileName,'file','y');
-PrintStringInfo('i162'+ArgSeparator+'i162',ClassFileName,'file','y');
-
-PrintStringInfo('d2d0'+ArgSeparator+'d2',ClassFileName,'file','y');
-PrintStringInfo('s2s0'+ArgSeparator+'s2',ClassFileName,'file','y');
-PrintStringInfo('s2d0'+ArgSeparator+'s2',ClassFileName,'file','y');
-PrintStringInfo('u82u80'+ArgSeparator+'u82',ClassFileName,'file','y');
-PrintStringInfo('u82d0'+ArgSeparator+'u82',ClassFileName,'file','y');
-PrintStringInfo('i82u80'+ArgSeparator+'i82',ClassFileName,'file','y');
-PrintStringInfo('i82d0'+ArgSeparator+'i82',ClassFileName,'file','y');
-PrintStringInfo('u162u160'+ArgSeparator+'u162',ClassFileName,'file','y');
-PrintStringInfo('u162d0'+ArgSeparator+'u162',ClassFileName,'file','y');
-PrintStringInfo('i162u160'+ArgSeparator+'i162',ClassFileName,'file','y');
-PrintStringInfo('i162d0'+ArgSeparator+'i162',ClassFileName,'file','y');
-
-PrintStringInfo('d2d0d0'+ArgSeparator+'d2',ClassFileName,'file','y');
-PrintStringInfo('s2d0d0'+ArgSeparator+'s2',ClassFileName,'file','y');
-PrintStringInfo('s2s0d0'+ArgSeparator+'d2',ClassFileName,'file','y');
-PrintStringInfo('u82d0d0'+ArgSeparator+'u82',ClassFileName,'file','y');
-PrintStringInfo('u82u80d0'+ArgSeparator+'u82',ClassFileName,'file','y');
-PrintStringInfo('i82d0d0'+ArgSeparator+'i82',ClassFileName,'file','y');
-PrintStringInfo('i82u80d0'+ArgSeparator+'i82',ClassFileName,'file','y');
-PrintStringInfo('u162d0d0'+ArgSeparator+'u162',ClassFileName,'file','y');
-PrintStringInfo('u162u160d0'+ArgSeparator+'u162',ClassFileName,'file','y');
-PrintStringInfo('i162d0d0'+ArgSeparator+'i162',ClassFileName,'file','y');
-PrintStringInfo('i162u160d0'+ArgSeparator+'i162',ClassFileName,'file','y');
-
-// --- Annotation Function And Function List Function. ---
-FunctionName = 'diff';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
//------------------------------------
-<<<<<<< HEAD
//---- Class balanc ------------------
//------------------------------------
ClassName = 'BALANC';
-=======
-//---- Class NORM --------------------
-//------------------------------------
-ClassName = 'NORM';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
-<<<<<<< HEAD
PrintStringInfo('NOUT= 2',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
@@ -9027,49 +8376,14 @@ PrintStringInfo('d2d2'+ArgSeparator+'d2d2d2d2',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'balanc';
-=======
-PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(2)= ''1''',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)= ''1''',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
-
-
-ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
-PrintStringInfo('d0'+ArgSeparator+'d0',ClassFileName,'file','y');
-PrintStringInfo('d2'+ArgSeparator+'d0',ClassFileName,'file','y');
-PrintStringInfo('s0'+ArgSeparator+'s0',ClassFileName,'file','y');
-PrintStringInfo('s2'+ArgSeparator+'s0',ClassFileName,'file','y');
-
-PrintStringInfo('d2d0'+ArgSeparator+'d0',ClassFileName,'file','y');
-PrintStringInfo('s2s0'+ArgSeparator+'s0',ClassFileName,'file','y');
-PrintStringInfo('s2d0'+ArgSeparator+'s0',ClassFileName,'file','y');
-
-PrintStringInfo('d2g2'+ArgSeparator+'d0',ClassFileName,'file','y');
-PrintStringInfo('s2g2'+ArgSeparator+'s0',ClassFileName,'file','y');
-
-// --- Annotation Function And Function List Function. ---
-FunctionName = 'norm';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
//------------------------------------
-<<<<<<< HEAD
//---- Class RCOND -------------------
//------------------------------------
ClassName = 'RCOND';
-=======
-//---- Class CONVSTR --------------------
-//------------------------------------
-ClassName = 'CONVSTR';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
@@ -9077,7 +8391,6 @@ ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls); PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
-<<<<<<< HEAD
PrintStringInfo('OUT(1).TP= ''d''',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
@@ -9087,33 +8400,11 @@ PrintStringInfo('d2'+ArgSeparator+'d0',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'rcond';
-=======
-PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(2)',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)= IN(1).SZ(1)',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(1)',ClassFileName,'file','y');
-
-
-ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
-PrintStringInfo('g0'+ArgSeparator+'g0',ClassFileName,'file','y');
-PrintStringInfo('g2'+ArgSeparator+'g2',ClassFileName,'file','y');
-PrintStringInfo('g0g0'+ArgSeparator+'g0',ClassFileName,'file','y');
-PrintStringInfo('g2g0'+ArgSeparator+'g2',ClassFileName,'file','y');
-
-// --- Annotation Function And Function List Function. ---
-FunctionName = 'convstr';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
//------------------------------------
-<<<<<<< HEAD
//---- Class CONVSTR --------------------
//------------------------------------
ClassName = 'CONVSTR';
@@ -9142,47 +8433,19 @@ PrintStringInfo('g2g2'+ArgSeparator+'g2',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'convstr';
-=======
-//---- Class cvCreateImage --------------------
-//------------------------------------
-ClassName = 'CV_CreateImage';
-
-// --- Class Annotation. ---
-PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
-ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-
-PrintStringInfo('NIN= 4',ClassFileName,'file','y');
-PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).TP= ''mt''',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
-
-ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
-PrintStringInfo('d0d0g2d0'+ArgSeparator+'mt0',ClassFileName,'file','y');
-
-// --- Annotation Function And Function List Function. ---
-FunctionName = 'CV_CreateImage';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
//------------------------------------
-<<<<<<< HEAD
//---- Class STRSUBST --------------------
//------------------------------------
ClassName = 'STRSUBST';
-=======
-//---- Class cvLoadImage --------------------
-//------------------------------------
-ClassName = 'CV_LoadImage';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD
//Arguements specified: initial value, start time, time vector, ode function
PrintStringInfo('NIN= 3',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
@@ -9203,41 +8466,20 @@ PrintStringInfo('g2g2g2g2'+ArgSeparator+'g2',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'strsubst';
-=======
-PrintStringInfo('NIN= 2',ClassFileName,'file','y');
-PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).TP= ''mt''',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
-
-ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
-PrintStringInfo('g2d0'+ArgSeparator+'mt0',ClassFileName,'file','y');
-
-// --- Annotation Function And Function List Function. ---
-FunctionName = 'CV_LoadImage';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-<<<<<<< HEAD
//------------------------------------
//---- Class STRCMP --------------------
//------------------------------------
ClassName = 'STRCMP';
-=======
-//------------------------------------
-//---- Class cvShowImage -------------
-//------------------------------------
-ClassName = 'CV_ShowImage';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD
//Arguements specified: initial value, start time, time vector, ode function
PrintStringInfo('NIN= 2',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
@@ -9259,54 +8501,21 @@ PrintStringInfo('g2g2g2'+ArgSeparator+'d0',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'strcmp';
-=======
-PrintStringInfo('NIN= 2',ClassFileName,'file','y');
-PrintStringInfo('NOUT= 0',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).TP= ''u8''',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
-
-PrintStringInfo('NIN= 1',ClassFileName,'file','y');
-PrintStringInfo('NOUT= 0',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).TP= ''u8''',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
-
-ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
-PrintStringInfo('g2mt0'+ArgSeparator+'',ClassFileName,'file','y');
-PrintStringInfo('mt0'+ArgSeparator+'',ClassFileName,'file','y');
-
-// --- Annotation Function And Function List Function. ---
-FunctionName = 'CV_ShowImage';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-<<<<<<< HEAD
//------------------------------------
//---- Class STRREV --------------------
//------------------------------------
ClassName = 'STRREV';
-=======
-FunctionName = 'CV_SaveImage';
-PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
-INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
-INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-
-//------------------------------------
-//---- Class CV_WaitKey --------------
-//------------------------------------
-ClassName = 'CV_WaitKey';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD
//Arguements specified: initial value, start time, time vector, ode function
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
@@ -9331,38 +8540,11 @@ INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,Ex //---- Class STRRCHR --------------------
//------------------------------------
ClassName = 'STRRCHR';
-=======
-PrintStringInfo('NIN= 1',ClassFileName,'file','y');
-PrintStringInfo('NOUT= 0',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).TP= ''u8''',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
-
-ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
-PrintStringInfo('d0'+ArgSeparator+'',ClassFileName,'file','y');
-PrintStringInfo('s0'+ArgSeparator+'',ClassFileName,'file','y');
-PrintStringInfo('u80'+ArgSeparator+'',ClassFileName,'file','y');
-PrintStringInfo('i80'+ArgSeparator+'',ClassFileName,'file','y');
-PrintStringInfo('u160'+ArgSeparator+'',ClassFileName,'file','y');
-PrintStringInfo('i160'+ArgSeparator+'',ClassFileName,'file','y');
-
-// --- Annotation Function And Function List Function. ---
-FunctionName = 'CV_WaitKey';
-PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
-INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
-INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-
-//------------------------------------
-//---- Class CV_CvtColor -------------
-//------------------------------------
-ClassName = 'CV_CvtColor';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD
//Arguements specified: initial value, start time, time vector, ode function
PrintStringInfo('NIN= 2',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
@@ -9377,39 +8559,18 @@ PrintStringInfo('g2g2'+ArgSeparator+'g2',ClassFileName,'file','y'); FunctionName = 'strrchr';
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
-=======
-PrintStringInfo('NIN= 2',ClassFileName,'file','y');
-PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).TP= ''mt''',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
-
-ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
-PrintStringInfo('mt0g2'+ArgSeparator+'mt0',ClassFileName,'file','y');
-
-// --- Annotation Function And Function List Function. ---
-FunctionName = 'CV_CvtColor';
-PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
//------------------------------------
-<<<<<<< HEAD
//---- Class STRCHR --------------------
//------------------------------------
ClassName = 'STRCHR';
-=======
-//---- Class CV_GetImgSize -----------
-//------------------------------------
-ClassName = 'CV_GetImgSize';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD
//Arguements specified: initial value, start time, time vector, ode function
PrintStringInfo('NIN= 2',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
@@ -9433,33 +8594,11 @@ INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,Ex //---- Class STRNCPY --------------------
//------------------------------------
ClassName = 'STRNCPY';
-=======
-PrintStringInfo('NIN= 1',ClassFileName,'file','y');
-PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).TP= ''d''',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(2)= ''2''',ClassFileName,'file','y');
-
-ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
-PrintStringInfo('mt0'+ArgSeparator+'d2',ClassFileName,'file','y');
-
-// --- Annotation Function And Function List Function. ---
-FunctionName = 'CV_GetImgSize';
-PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
-INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
-INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-
-//------------------------------------
-//---- Class CV_Threshold -----------
-//------------------------------------
-ClassName = 'CV_Threshold';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD
//Arguements specified: initial value, start time, time vector, ode function
PrintStringInfo('NIN= 2',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
@@ -9483,47 +8622,19 @@ INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,Ex //---- Class STRSPN --------------------
//------------------------------------
ClassName = 'STRSPN';
-=======
-PrintStringInfo('NIN= 4',ClassFileName,'file','y');
-PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).TP= ''mt''',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
-
-ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
-PrintStringInfo('mt0d0d0g2'+ArgSeparator+'mt0',ClassFileName,'file','y');
-
-// --- Annotation Function And Function List Function. ---
-FunctionName = 'CV_Threshold';
-PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
-INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
-INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-
-//------------------------------------
-//---- Class CV_AdaptiveThreshold -----------
-//------------------------------------
-ClassName = 'CV_AdaptiveThreshold';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD
//Arguements specified: initial value, start time, time vector, ode function
PrintStringInfo('NIN= 2',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= ''u8''',ClassFileName,'file','y');
-=======
-PrintStringInfo('NIN= 6',ClassFileName,'file','y');
-PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).TP= ''mt''',ClassFileName,'file','y');
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
-<<<<<<< HEAD
PrintStringInfo('g2g2'+ArgSeparator+'u80',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
@@ -9539,40 +8650,19 @@ INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,Ex //---- Class STRCSPN --------------------
//------------------------------------
ClassName = 'STRCSPN';
-=======
-PrintStringInfo('mt0d0g2g2d0d0'+ArgSeparator+'mt0',ClassFileName,'file','y');
-
-// --- Annotation Function And Function List Function. ---
-FunctionName = 'CV_AdaptiveThreshold';
-PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
-INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
-INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-
-//------------------------------------
-//---- Class CV_DistanceTransform ----
-//------------------------------------
-ClassName = 'CV_DistanceTransform';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD
//Arguements specified: initial value, start time, time vector, ode function
PrintStringInfo('NIN= 2',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= ''u8''',ClassFileName,'file','y');
-=======
-PrintStringInfo('NIN= 3',ClassFileName,'file','y');
-PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).TP= ''mt''',ClassFileName,'file','y');
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
-<<<<<<< HEAD
PrintStringInfo('g2g2'+ArgSeparator+'u80',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
@@ -9590,26 +8680,11 @@ INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,Ex //---- Class ASCII --------------------
//------------------------------------
ClassName = 'ASCII';
-=======
-PrintStringInfo('mt0g2d0'+ArgSeparator+'mt0',ClassFileName,'file','y');
-
-// --- Annotation Function And Function List Function. ---
-FunctionName = 'CV_DistanceTransform';
-PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
-INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
-INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-
-//------------------------------------
-//---- Class CV_Blur -----------------
-//------------------------------------
-ClassName = 'CV_Blur';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD
//Arguements specified: initial value, start time, time vector, ode function
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
@@ -9640,38 +8715,11 @@ INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,Ex //---- Class DEC2BIN --------------------
//------------------------------------
ClassName = 'DEC2BIN';
-=======
-PrintStringInfo('NIN= 6',ClassFileName,'file','y');
-PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).TP= ''mt''',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
-
-ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
-PrintStringInfo('mt0d0d0d0d0g2'+ArgSeparator+'mt0',ClassFileName,'file','y');
-
-// --- Annotation Function And Function List Function. ---
-FunctionName = 'CV_Blur';
-PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
-INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
-INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-
-FunctionName = 'CV_GaussianBlur';
-PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
-INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
-INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-
-//------------------------------------
-//---- Class CV_MedianBlur -----------------
-//------------------------------------
-ClassName = 'CV_MedianBlur';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD
//Arguements specified: initial value, start time, time vector, ode function
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
@@ -9713,24 +8761,10 @@ PrintStringInfo('u162d0'+ArgSeparator+'u162',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'dec2bin';
-=======
-PrintStringInfo('NIN= 2',ClassFileName,'file','y');
-PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).TP= ''mt''',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
-
-ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
-PrintStringInfo('mt0d0'+ArgSeparator+'mt0',ClassFileName,'file','y');
-
-// --- Annotation Function And Function List Function. ---
-FunctionName = 'CV_MedianBlur';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-<<<<<<< HEAD
//------------------------------------
@@ -9769,60 +8803,19 @@ PrintStringInfo('s2d0d0'+ArgSeparator+'g2',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'dec2base';
-=======
-//------------------------------------
-//---- Class CV_Dilate ---------------
-//------------------------------------
-ClassName = 'CV_Dilate';
-
-// --- Class Annotation. ---
-PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
-ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-
-PrintStringInfo('NIN= 3',ClassFileName,'file','y');
-PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).TP= ''mt''',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
-
-PrintStringInfo('NIN= 6',ClassFileName,'file','y');
-PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).TP= ''mt''',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
-
-ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
-PrintStringInfo('mt0g2d0'+ArgSeparator+'mt0',ClassFileName,'file','y');
-PrintStringInfo('mt0g2d0d0g2d0'+ArgSeparator+'mt0',ClassFileName,'file','y');
-
-// --- Annotation Function And Function List Function. ---
-FunctionName = 'CV_Dilate';
-PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
-INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
-INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-
-FunctionName = 'CV_Erode';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
//------------------------------------
-<<<<<<< HEAD
//---- Class DEC2OCT --------------------
//------------------------------------
ClassName = 'DEC2OCT';
-=======
-//---- Class CV_Canny ----------------
-//------------------------------------
-ClassName = 'CV_Canny';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD
//Arguements specified: initial value, start time, time vector, ode function
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
@@ -9846,49 +8839,21 @@ PrintStringInfo('u162'+ArgSeparator+'u162',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'dec2oct';
-=======
-PrintStringInfo('NIN= 5',ClassFileName,'file','y');
-PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).TP= ''mt''',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
-
-PrintStringInfo('NIN= 3',ClassFileName,'file','y');
-PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).TP= ''mt''',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
-
-ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
-PrintStringInfo('mt0d0d0d0d0'+ArgSeparator+'mt0',ClassFileName,'file','y');
-PrintStringInfo('mt0d0d0'+ArgSeparator+'mt0',ClassFileName,'file','y');
-
-// --- Annotation Function And Function List Function. ---
-FunctionName = 'CV_Canny';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-<<<<<<< HEAD
//------------------------------------
//---- Class DEC2HEX --------------------
//------------------------------------
ClassName = 'DEC2HEX';
-=======
-//------------------------------------
-//---- Class CV_CornerHarris ----------------
-//------------------------------------
-ClassName = 'CV_CornerHarris';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD
//Arguements specified: initial value, start time, time vector, ode function
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
@@ -9912,48 +8877,20 @@ PrintStringInfo('u162'+ArgSeparator+'g2',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'dec2hex';
-=======
-PrintStringInfo('NIN= 5',ClassFileName,'file','y');
-PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).TP= ''mt''',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
-
-PrintStringInfo('NIN= 4',ClassFileName,'file','y');
-PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).TP= ''mt''',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
-
-ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
-PrintStringInfo('mt0d0d0d0g2'+ArgSeparator+'mt0',ClassFileName,'file','y');
-PrintStringInfo('mt0d0d0d0'+ArgSeparator+'mt0',ClassFileName,'file','y');
-
-// --- Annotation Function And Function List Function. ---
-FunctionName = 'CV_CornerHarris';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-<<<<<<< HEAD
//------------------------------------
//---- Class BIN2DEC --------------------
//------------------------------------
ClassName = 'BIN2DEC';
-=======
-//------------------------------------
-//---- Class syslin ------------------
-//------------------------------------
-ClassName = 'SYSLIN';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD
//Arguements specified: initial value, start time, time vector, ode function
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
@@ -9976,64 +8913,14 @@ PrintStringInfo('u162'+ArgSeparator+'u162',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'bin2dec';
-=======
-PrintStringInfo('NIN= 4',ClassFileName,'file','y');
-PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).TP= ''ss''',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(1)= FA_ADD(IN(2).SZ(1),IN(4).SZ(1))',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(2)= FA_ADD(FA_ADD(IN(2).SZ(2),IN(3).SZ(2)), ''2'')',ClassFileName,'file','y');
-
-PrintStringInfo('NIN= 5',ClassFileName,'file','y');
-PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).TP= ''ss''',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(1)= FA_ADD(IN(2).SZ(1),IN(4).SZ(1))',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(2)= FA_ADD(FA_ADD(IN(2).SZ(2),IN(3).SZ(2)), ''2'')',ClassFileName,'file','y');
-
-PrintStringInfo('NIN= 6',ClassFileName,'file','y');
-PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).TP= ''ss''',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(1)= FA_ADD(IN(2).SZ(1),IN(4).SZ(1))',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(2)= FA_ADD(FA_ADD(IN(2).SZ(2),IN(3).SZ(2)), ''2'')',ClassFileName,'file','y');
-
-ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
-PrintStringInfo('g2d2d2d2'+ArgSeparator+'ss2',ClassFileName,'file','y');
-PrintStringInfo('g2d2d2d2d2'+ArgSeparator+'ss2',ClassFileName,'file','y');
-PrintStringInfo('g2d2d2d2d2d2'+ArgSeparator+'ss2',ClassFileName,'file','y');
-
-PrintStringInfo('g2d0d0d0'+ArgSeparator+'ss2',ClassFileName,'file','y');
-PrintStringInfo('g2d0d2d0'+ArgSeparator+'ss2',ClassFileName,'file','y');
-PrintStringInfo('g2d0d0d2'+ArgSeparator+'ss2',ClassFileName,'file','y');
-PrintStringInfo('g2d0d2d2'+ArgSeparator+'ss2',ClassFileName,'file','y');
-
-PrintStringInfo('g2d0d0d0d0'+ArgSeparator+'ss2',ClassFileName,'file','y');
-PrintStringInfo('g2d0d2d0d2'+ArgSeparator+'ss2',ClassFileName,'file','y');
-PrintStringInfo('g2d0d0d2d2'+ArgSeparator+'ss2',ClassFileName,'file','y');
-PrintStringInfo('g2d0d2d2d2'+ArgSeparator+'ss2',ClassFileName,'file','y');
-PrintStringInfo('g2d2d2d2d0'+ArgSeparator+'ss2',ClassFileName,'file','y');
-
-PrintStringInfo('g2d0d0d0d0d0'+ArgSeparator+'ss2',ClassFileName,'file','y');
-PrintStringInfo('g2d0d2d0d2d0'+ArgSeparator+'ss2',ClassFileName,'file','y');
-PrintStringInfo('g2d0d0d2d2d0'+ArgSeparator+'ss2',ClassFileName,'file','y');
-PrintStringInfo('g2d0d2d2d2d0'+ArgSeparator+'ss2',ClassFileName,'file','y');
-PrintStringInfo('g2d2d2d2d0d2'+ArgSeparator+'ss2',ClassFileName,'file','y');
-
-// --- Annotation Function And Function List Function. ---
-FunctionName = 'syslin';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
//------------------------------------
-<<<<<<< HEAD
//---- Class SVD -------------------
//------------------------------------
ClassName = 'SVD';
-=======
-//---- Class schur -------------------
-//------------------------------------
-ClassName = 'SCHUR';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
@@ -10042,7 +8929,6 @@ 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');
-<<<<<<< HEAD
PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
@@ -10105,57 +8991,10 @@ PrintStringInfo('NOUT= 4',ClassFileName,'file','y'); PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(1)',ClassFileName,'file','y');
-=======
-PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
-
-PrintStringInfo('NIN= 1',ClassFileName,'file','y');
-PrintStringInfo('NOUT= 2',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
-PrintStringInfo('OUT(2).TP= IN(1).TP',ClassFileName,'file','y');
-PrintStringInfo('OUT(2).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
-PrintStringInfo('OUT(2).SZ(2)= IN(1).SZ(2)',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)= IN(1).SZ(1)',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
-
-PrintStringInfo('NIN= 2',ClassFileName,'file','y');
-PrintStringInfo('NOUT= 2',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
-PrintStringInfo('OUT(2).TP= FA_SCHUR_TP(IN(2).TP)',ClassFileName,'file','y');
-PrintStringInfo('OUT(2).SZ(1)= FA_SCHUR_SZ(IN(2).TP,IN(1).SZ(1))',ClassFileName,'file','y');
-PrintStringInfo('OUT(2).SZ(2)= FA_SCHUR_SZ(IN(2).TP,IN(1).SZ(1))',ClassFileName,'file','y');
-
-PrintStringInfo('NIN= 2',ClassFileName,'file','y');
-PrintStringInfo('NOUT= 3',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
-PrintStringInfo('OUT(2).TP= ''d''',ClassFileName,'file','y');
-PrintStringInfo('OUT(2).SZ(1)= ''1''',ClassFileName,'file','y');
-PrintStringInfo('OUT(2).SZ(2)= ''1''',ClassFileName,'file','y');
-PrintStringInfo('OUT(3).TP= IN(1).TP',ClassFileName,'file','y');
-PrintStringInfo('OUT(3).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
-PrintStringInfo('OUT(3).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
-
-PrintStringInfo('NIN= 2',ClassFileName,'file','y');
-PrintStringInfo('NOUT= 4',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo('OUT(2).TP= IN(1).TP',ClassFileName,'file','y');
PrintStringInfo('OUT(2).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
PrintStringInfo('OUT(2).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
PrintStringInfo('OUT(3).TP= IN(1).TP',ClassFileName,'file','y');
-<<<<<<< HEAD
PrintStringInfo('OUT(3).SZ(1)= IN(1).SZ(2)',ClassFileName,'file','y');
PrintStringInfo('OUT(3).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
PrintStringInfo('OUT(4).TP= IN(1).TP',ClassFileName,'file','y');
@@ -10229,112 +9068,21 @@ PrintStringInfo('d2d0'+ArgSeparator+'d2d2d2',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'sva';
-=======
-PrintStringInfo('OUT(3).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
-PrintStringInfo('OUT(3).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
-PrintStringInfo('OUT(4).TP= IN(1).TP',ClassFileName,'file','y');
-PrintStringInfo('OUT(4).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
-PrintStringInfo('OUT(4).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
-
-PrintStringInfo('NIN= 3',ClassFileName,'file','y');
-PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).TP= ''d''',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
-
-PrintStringInfo('NIN= 3',ClassFileName,'file','y');
-PrintStringInfo('NOUT= 2',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
-PrintStringInfo('OUT(2).TP= ''d''',ClassFileName,'file','y');
-PrintStringInfo('OUT(2).SZ(1)= ''1''',ClassFileName,'file','y');
-PrintStringInfo('OUT(2).SZ(2)= ''1''',ClassFileName,'file','y');
-
-PrintStringInfo('NIN= 3',ClassFileName,'file','y');
-PrintStringInfo('NOUT= 3',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
-PrintStringInfo('OUT(2).TP= IN(1).TP',ClassFileName,'file','y');
-PrintStringInfo('OUT(2).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
-PrintStringInfo('OUT(2).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
-PrintStringInfo('OUT(3).TP= ''d''',ClassFileName,'file','y');
-PrintStringInfo('OUT(3).SZ(1)= ''1''',ClassFileName,'file','y');
-PrintStringInfo('OUT(3).SZ(2)= ''1''',ClassFileName,'file','y');
-
-PrintStringInfo('NIN= 3',ClassFileName,'file','y');
-PrintStringInfo('NOUT= 4',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
-PrintStringInfo('OUT(2).TP= IN(1).TP',ClassFileName,'file','y');
-PrintStringInfo('OUT(2).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
-PrintStringInfo('OUT(2).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
-PrintStringInfo('OUT(3).TP= IN(1).TP',ClassFileName,'file','y');
-PrintStringInfo('OUT(3).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
-PrintStringInfo('OUT(3).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
-PrintStringInfo('OUT(4).TP= ''d''',ClassFileName,'file','y');
-PrintStringInfo('OUT(4).SZ(1)= ''1''',ClassFileName,'file','y');
-PrintStringInfo('OUT(4).SZ(2)= ''1''',ClassFileName,'file','y');
-
-PrintStringInfo('NIN= 3',ClassFileName,'file','y');
-PrintStringInfo('NOUT= 5',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
-PrintStringInfo('OUT(2).TP= IN(1).TP',ClassFileName,'file','y');
-PrintStringInfo('OUT(2).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
-PrintStringInfo('OUT(2).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
-PrintStringInfo('OUT(3).TP= IN(1).TP',ClassFileName,'file','y');
-PrintStringInfo('OUT(3).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
-PrintStringInfo('OUT(3).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
-PrintStringInfo('OUT(4).TP= IN(1).TP',ClassFileName,'file','y');
-PrintStringInfo('OUT(4).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
-PrintStringInfo('OUT(4).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
-PrintStringInfo('OUT(5).TP= ''d''',ClassFileName,'file','y');
-PrintStringInfo('OUT(5).SZ(1)= ''1''',ClassFileName,'file','y');
-PrintStringInfo('OUT(5).SZ(2)= ''1''',ClassFileName,'file','y');
-
-ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
-PrintStringInfo('d2'+ArgSeparator+'d2',ClassFileName,'file','y');
-PrintStringInfo('d2'+ArgSeparator+'d2d2',ClassFileName,'file','y');
-PrintStringInfo('d2g2'+ArgSeparator+'d2',ClassFileName,'file','y');
-PrintStringInfo('d2g2'+ArgSeparator+'d2d0',ClassFileName,'file','y');
-PrintStringInfo('d2g2'+ArgSeparator+'d2d0d2',ClassFileName,'file','y');
-PrintStringInfo('d2d2'+ArgSeparator+'d2d2',ClassFileName,'file','y');
-PrintStringInfo('d2d2'+ArgSeparator+'d2d2d2d2',ClassFileName,'file','y');
-PrintStringInfo('d2d2g2'+ArgSeparator+'d0',ClassFileName,'file','y');
-PrintStringInfo('d2d2g2'+ArgSeparator+'d2d0',ClassFileName,'file','y');
-PrintStringInfo('d2d2g2'+ArgSeparator+'d2d2d0',ClassFileName,'file','y');
-PrintStringInfo('d2d2g2'+ArgSeparator+'d2d2d2d0',ClassFileName,'file','y');
-PrintStringInfo('d2d2g2'+ArgSeparator+'d2d2d2d2d0',ClassFileName,'file','y');
-// --- Annotation Function And Function List Function. ---
-FunctionName = 'schur';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-<<<<<<< HEAD
//------------------------------------
//---- Class OCT2DEC --------------------
//------------------------------------
ClassName = 'OCT2DEC';
-=======
-//------------------------------------
-//---- Class lqr ---------------------
-//------------------------------------
-ClassName = 'LQR';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD
//Arguements specified: initial value, start time, time vector, ode function
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
@@ -10357,42 +9105,19 @@ PrintStringInfo('u162'+ArgSeparator+'u162',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'oct2dec';
-=======
-PrintStringInfo('NIN= 1',ClassFileName,'file','y');
-PrintStringInfo('NOUT= 2',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).TP= ''d''',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(1)= FA_SZ_1(FA_SZ_LQR(IN(1).VAL))',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(2)= FA_SZ_1(FA_SZ_LQR(IN(1).VAL))',ClassFileName,'file','y');
-PrintStringInfo('OUT(2).TP= ''d''',ClassFileName,'file','y');
-PrintStringInfo('OUT(2).SZ(1)= FA_SZ_2(FA_SZ_LQR(IN(1).VAL))',ClassFileName,'file','y');
-PrintStringInfo('OUT(2).SZ(2)= FA_SZ_1(FA_SZ_LQR(IN(1).VAL))',ClassFileName,'file','y');
-
-ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
-PrintStringInfo('ss2'+ArgSeparator+'d2d2',ClassFileName,'file','y');
-
-// --- Annotation Function And Function List Function. ---
-FunctionName = 'lqr';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
//------------------------------------
-<<<<<<< HEAD
//---- Class HEX2DEC --------------------
//------------------------------------
ClassName = 'HEX2DEC';
-=======
-//---- Class lqe ---------------------
-//------------------------------------
-ClassName = 'LQE';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD
//Arguements specified: initial value, start time, time vector, ode function
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
@@ -10406,44 +9131,20 @@ PrintStringInfo('g2'+ArgSeparator+'d0',ClassFileName,'file','y'); PrintStringInfo('d0'+ArgSeparator+'d0',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'hex2dec';
-=======
-PrintStringInfo('NIN= 1',ClassFileName,'file','y');
-PrintStringInfo('NOUT= 2',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).TP= ''d''',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(1)= FA_SZ_1(FA_SZ_LQE(IN(1).VAL,IN(1).SZ(1)))',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(2)= FA_SZ_1(FA_SZ_LQE(IN(1).VAL,IN(1).SZ(1)))',ClassFileName,'file','y');
-PrintStringInfo('OUT(2).TP= ''d''',ClassFileName,'file','y');
-PrintStringInfo('OUT(2).SZ(1)= FA_SZ_1(FA_SZ_LQE(IN(1).VAL,IN(1).SZ(1)))',ClassFileName,'file','y');
-PrintStringInfo('OUT(2).SZ(2)= FA_SZ_2(FA_SZ_LQE(IN(1).VAL,IN(1).SZ(1)))',ClassFileName,'file','y');
-
-ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
-PrintStringInfo('ss2'+ArgSeparator+'d2d2',ClassFileName,'file','y');
-
-// --- Annotation Function And Function List Function. ---
-FunctionName = 'lqe';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-<<<<<<< HEAD
//------------------------------------
//---- Class BASE2DEC --------------------
//------------------------------------
ClassName = 'BASE2DEC';
-=======
-//------------------------------------
-//---- Class obscont -----------------
-//------------------------------------
-ClassName = 'OBSCONT';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD
//Arguements specified: initial value, start time, time vector, ode function
PrintStringInfo('NIN= 2',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
@@ -10514,50 +9215,19 @@ PrintStringInfo('s0'+ArgSeparator+'s0',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'cotd';
-=======
-PrintStringInfo('NIN= 3',ClassFileName,'file','y');
-PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).TP= ''d''',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(1)= FA_SZ_1(FA_SZ_OBSCNT(IN(1).VAL,IN(1).SZ(1),IN(1).SZ(2),NOutArg))',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(2)= FA_SZ_2(FA_SZ_OBSCNT(IN(1).VAL,IN(1).SZ(1),IN(1).SZ(2),NOutArg))',ClassFileName,'file','y');
-
-PrintStringInfo('NIN= 3',ClassFileName,'file','y');
-PrintStringInfo('NOUT= 2',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).TP= ''d''',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(1)= FA_SZ_1(FA_SZ_OBSCNT(IN(1).VAL,IN(1).SZ(1),IN(1).SZ(2),NOutArg))',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(2)= FA_SZ_2(FA_SZ_OBSCNT(IN(1).VAL,IN(1).SZ(1),IN(1).SZ(2),NOutArg))',ClassFileName,'file','y');
-PrintStringInfo('OUT(2).TP= ''d''',ClassFileName,'file','y');
-PrintStringInfo('OUT(2).SZ(1)= ''1''',ClassFileName,'file','y');
-PrintStringInfo('OUT(2).SZ(2)= ''2''',ClassFileName,'file','y');
-
-ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
-PrintStringInfo('ss2d2d2'+ArgSeparator+'d2',ClassFileName,'file','y');
-PrintStringInfo('ss2d2d2'+ArgSeparator+'d2d2',ClassFileName,'file','y');
-
-// --- Annotation Function And Function List Function. ---
-FunctionName = 'obscont';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-<<<<<<< HEAD
// ------------------
// --- Class Coth. ---
// ------------------
ClassName = 'Coth';
-=======
-//------------------------------------
-//---- Class balanc ------------------
-//------------------------------------
-ClassName = 'BALANC';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1 ',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
@@ -10643,61 +9313,20 @@ PrintStringInfo('c0'+ArgSeparator+'c0',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'cscd';
-=======
-
-PrintStringInfo('NIN= 1',ClassFileName,'file','y');
-PrintStringInfo('NOUT= 2',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
-PrintStringInfo('OUT(2).TP= IN(1).TP',ClassFileName,'file','y');
-PrintStringInfo('OUT(2).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
-PrintStringInfo('OUT(2).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
-
-PrintStringInfo('NIN= 2',ClassFileName,'file','y');
-PrintStringInfo('NOUT= 4',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
-PrintStringInfo('OUT(2).TP= IN(1).TP',ClassFileName,'file','y');
-PrintStringInfo('OUT(2).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
-PrintStringInfo('OUT(2).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
-PrintStringInfo('OUT(3).TP= IN(1).TP',ClassFileName,'file','y');
-PrintStringInfo('OUT(3).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
-PrintStringInfo('OUT(3).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
-PrintStringInfo('OUT(4).TP= IN(1).TP',ClassFileName,'file','y');
-PrintStringInfo('OUT(4).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
-PrintStringInfo('OUT(4).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
-
-ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
-PrintStringInfo('d2'+ArgSeparator+'d2d2',ClassFileName,'file','y');
-PrintStringInfo('d2d2'+ArgSeparator+'d2d2d2d2',ClassFileName,'file','y');
-
-// --- Annotation Function And Function List Function. ---
-FunctionName = 'balanc';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-<<<<<<< HEAD
// ------------------
// --- Class Csch. ---
// ------------------
ClassName = 'Csch';
-=======
-//------------------------------------
-//---- Class RCOND -------------------
-//------------------------------------
-ClassName = 'RCOND';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1 ',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
@@ -10718,53 +9347,24 @@ PrintStringInfo('c0'+ArgSeparator+'c0',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'csch';
-=======
-
-PrintStringInfo('NIN= 1',ClassFileName,'file','y');
-PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).TP= ''d''',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
-
-ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
-PrintStringInfo('d2'+ArgSeparator+'d0',ClassFileName,'file','y');
-
-// --- Annotation Function And Function List Function. ---
-FunctionName = 'rcond';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-<<<<<<< HEAD
// --- Class Sec. ---
// ------------------
ClassName = 'Sec';
-=======
-//------------------------------------
-//---- Class CONVSTR --------------------
-//------------------------------------
-ClassName = 'CONVSTR';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1 ',ClassFileName,'file','y');
-=======
-
-//Arguements specified: initial value, start time, time vector, ode function
-PrintStringInfo('NIN= 2',ClassFileName,'file','y');
-PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
-<<<<<<< HEAD
// --- Function List Class. ---
ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
PrintStringInfo('d0'+ArgSeparator+'d0',ClassFileName,'file','y');
@@ -10779,55 +9379,25 @@ PrintStringInfo('c0'+ArgSeparator+'c0',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'sec';
-=======
-//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)= IN(1).SZ(1)',ClassFileName,'file','y');
-//PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(1)',ClassFileName,'file','y');
-
-
-ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
-//PrintStringInfo('g2'+ArgSeparator+'g2',ClassFileName,'file','y');
-PrintStringInfo('g2g2'+ArgSeparator+'g2',ClassFileName,'file','y');
-
-// --- Annotation Function And Function List Function. ---
-FunctionName = 'convstr';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-<<<<<<< HEAD
// ------------------
// --- Class Secd. ---
// ------------------
ClassName = 'Secd';
-=======
-//------------------------------------
-//---- Class STRSUBST --------------------
-//------------------------------------
-ClassName = 'STRSUBST';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1 ',ClassFileName,'file','y');
-=======
-
-//Arguements specified: initial value, start time, time vector, ode function
-PrintStringInfo('NIN= 3',ClassFileName,'file','y');
-PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
-<<<<<<< HEAD
// --- Function List Class. ---
ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
PrintStringInfo('d2'+ArgSeparator+'d2',ClassFileName,'file','y');
@@ -10837,55 +9407,25 @@ PrintStringInfo('s0'+ArgSeparator+'s0',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'secd';
-=======
-PrintStringInfo('NIN= 4',ClassFileName,'file','y');
-PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
-
-
-ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
-PrintStringInfo('g2g2g2'+ArgSeparator+'g2',ClassFileName,'file','y');
-PrintStringInfo('g2g2g2g2'+ArgSeparator+'g2',ClassFileName,'file','y');
-
-// --- Annotation Function And Function List Function. ---
-FunctionName = 'strsubst';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-<<<<<<< HEAD
// --- Class Sech. ---
// ------------------
ClassName = 'Sech';
-=======
-//------------------------------------
-//---- Class STRCMP --------------------
-//------------------------------------
-ClassName = 'STRCMP';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1 ',ClassFileName,'file','y');
-=======
-
-//Arguements specified: initial value, start time, time vector, ode function
-PrintStringInfo('NIN= 2',ClassFileName,'file','y');
-PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
-<<<<<<< HEAD
// --- Function List Class. ---
ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
PrintStringInfo('d0'+ArgSeparator+'d0',ClassFileName,'file','y');
@@ -10900,22 +9440,6 @@ PrintStringInfo('c0'+ArgSeparator+'c0',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'sech';
-=======
-PrintStringInfo('NIN= 3',ClassFileName,'file','y');
-PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(1)',ClassFileName,'file','y');
-
-
-ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
-//PrintStringInfo('g2'+ArgSeparator+'d2',ClassFileName,'file','y');
-PrintStringInfo('g2g2'+ArgSeparator+'d0',ClassFileName,'file','y');
-PrintStringInfo('g2g2g2'+ArgSeparator+'d0',ClassFileName,'file','y');
-
-// --- Annotation Function And Function List Function. ---
-FunctionName = 'strcmp';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
@@ -10923,15 +9447,9 @@ INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,Ex //------------------------------------
-<<<<<<< HEAD
//---- Class FACTORIAL --------------------
//------------------------------------
ClassName = 'FACTORIAL';
-=======
-//---- Class STRREV --------------------
-//------------------------------------
-ClassName = 'STRREV';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
@@ -10944,7 +9462,6 @@ PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y'); PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
-<<<<<<< HEAD
ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
PrintStringInfo('d0'+ArgSeparator+'d0',ClassFileName,'file','y');
PrintStringInfo('s0'+ArgSeparator+'s0',ClassFileName,'file','y');
@@ -10955,36 +9472,17 @@ PrintStringInfo('s2'+ArgSeparator+'s2',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'factorial';
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
-=======
-
-ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
-PrintStringInfo('g2'+ArgSeparator+'g2',ClassFileName,'file','y');
-
-// --- Annotation Function And Function List Function. ---
-FunctionName = 'strrev';
-PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
-
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-<<<<<<< HEAD
// --- Class Interp1. ---
// ------------------
ClassName = 'Interp1';
-=======
-
-//------------------------------------
-//---- Class STRRCHR --------------------
-//------------------------------------
-ClassName = 'STRRCHR';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD
PrintStringInfo('NIN= 4',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1 ',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= ''d''',ClassFileName,'file','y');
@@ -11007,43 +9505,17 @@ PrintStringInfo('d2d2d0g2'+ArgSeparator+'d0',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'interp1';
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
-=======
-
-//Arguements specified: initial value, start time, time vector, ode function
-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)= IN(1).SZ(1)',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
-
-ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
-PrintStringInfo('g2g2'+ArgSeparator+'g2',ClassFileName,'file','y');
-
-// --- Annotation Function And Function List Function. ---
-FunctionName = 'strrchr';
-PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
-
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-<<<<<<< HEAD
// --- Class Modk. ---
// ------------------
ClassName = 'Modk';
-=======
-
-//------------------------------------
-//---- Class DEC2BIN --------------------
-//------------------------------------
-ClassName = 'DEC2BIN';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1 ',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= ''d''',ClassFileName,'file','y');
@@ -11063,73 +9535,20 @@ PrintStringInfo('d2'+ArgSeparator+'d2',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'modk';
-=======
-
-//Arguements specified: initial value, start time, time vector, ode function
-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)= IN(1).SZ(1)',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(2)= FA_MUL(FA_SZ_DEC2BIN(IN(1).VAL),IN(1).SZ(2))',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)= IN(1).SZ(1)',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(2)= FA_MUL(IN(2).VAL,IN(1).SZ(2))',ClassFileName,'file','y');
-
-
-ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
-PrintStringInfo('d0'+ArgSeparator+'d2',ClassFileName,'file','y');
-PrintStringInfo('i80'+ArgSeparator+'i82',ClassFileName,'file','y');
-PrintStringInfo('i160'+ArgSeparator+'i162',ClassFileName,'file','y');
-PrintStringInfo('u80'+ArgSeparator+'u82',ClassFileName,'file','y');
-PrintStringInfo('u160'+ArgSeparator+'u162',ClassFileName,'file','y');
-
-PrintStringInfo('d0d0'+ArgSeparator+'d2',ClassFileName,'file','y');
-PrintStringInfo('i80d0'+ArgSeparator+'i82',ClassFileName,'file','y');
-PrintStringInfo('i160d0'+ArgSeparator+'i162',ClassFileName,'file','y');
-PrintStringInfo('u80d0'+ArgSeparator+'u82',ClassFileName,'file','y');
-PrintStringInfo('u160d0'+ArgSeparator+'u162',ClassFileName,'file','y');
-
-PrintStringInfo('d2'+ArgSeparator+'d2',ClassFileName,'file','y');
-PrintStringInfo('i82'+ArgSeparator+'i82',ClassFileName,'file','y');
-PrintStringInfo('i162'+ArgSeparator+'i162',ClassFileName,'file','y');
-PrintStringInfo('u82'+ArgSeparator+'u82',ClassFileName,'file','y');
-PrintStringInfo('u162'+ArgSeparator+'u162',ClassFileName,'file','y');
-
-PrintStringInfo('d2d0'+ArgSeparator+'d2',ClassFileName,'file','y');
-PrintStringInfo('i82d0'+ArgSeparator+'i82',ClassFileName,'file','y');
-PrintStringInfo('i162d0'+ArgSeparator+'i162',ClassFileName,'file','y');
-PrintStringInfo('u82d0'+ArgSeparator+'u82',ClassFileName,'file','y');
-PrintStringInfo('u162d0'+ArgSeparator+'u162',ClassFileName,'file','y');
-
-// --- Annotation Function And Function List Function. ---
-FunctionName = 'dec2bin';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-<<<<<<< HEAD
//------------------------------------
//---- Class PRIMES --------------------
//------------------------------------
ClassName = 'PRIMES';
-=======
-
-//------------------------------------
-//---- Class DEC2BASE --------------------
-//------------------------------------
-ClassName = 'DEC2BASE';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD
//Arguements specified: initial value, start time, time vector, ode function
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
@@ -11144,51 +9563,15 @@ PrintStringInfo('s0'+ArgSeparator+'s2',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'primes';
-=======
-//Arguements specified: initial value, start time, time vector, ode function
-PrintStringInfo('NIN= 2',ClassFileName,'file','y');
-PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).TP= ''g''',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(2)= FA_MUL(FA_SZ_DEC2BASE(IN(1).VAL,IN(2).VAL),IN(1).SZ(2))',ClassFileName,'file','y');
-
-PrintStringInfo('NIN= 3',ClassFileName,'file','y');
-PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).TP= ''g''',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(2)= FA_MUL(IN(2).VAL,IN(1).SZ(2))',ClassFileName,'file','y');
-
-
-ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
-PrintStringInfo('d0d0'+ArgSeparator+'g2',ClassFileName,'file','y');
-PrintStringInfo('d2d0'+ArgSeparator+'g2',ClassFileName,'file','y');
-PrintStringInfo('s0d0'+ArgSeparator+'g2',ClassFileName,'file','y');
-PrintStringInfo('s2d0'+ArgSeparator+'g2',ClassFileName,'file','y');
-
-PrintStringInfo('d0d0d0'+ArgSeparator+'g2',ClassFileName,'file','y');
-PrintStringInfo('d2d0d0'+ArgSeparator+'g2',ClassFileName,'file','y');
-PrintStringInfo('s0d0d0'+ArgSeparator+'g2',ClassFileName,'file','y');
-PrintStringInfo('s2d0d0'+ArgSeparator+'g2',ClassFileName,'file','y');
-
-// --- Annotation Function And Function List Function. ---
-FunctionName = 'dec2base';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-<<<<<<< HEAD
//------------------------------------
//---- Class GCD --------------------
//------------------------------------
ClassName = 'GCD';
-=======
-//------------------------------------
-//---- Class DEC2OCT --------------------
-//------------------------------------
-ClassName = 'DEC2OCT';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
@@ -11198,7 +9581,6 @@ 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');
-<<<<<<< HEAD
PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
@@ -11208,27 +9590,6 @@ PrintStringInfo('u82'+ArgSeparator+'u80',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'gcd';
-=======
-PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(2)= FA_MUL(FA_SZ_DEC2OCT(IN(1).VAL),IN(1).SZ(1))',ClassFileName,'file','y');
-
-
-ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
-PrintStringInfo('d0'+ArgSeparator+'d2',ClassFileName,'file','y');
-PrintStringInfo('i80'+ArgSeparator+'i82',ClassFileName,'file','y');
-PrintStringInfo('i160'+ArgSeparator+'i162',ClassFileName,'file','y');
-PrintStringInfo('u80'+ArgSeparator+'u82',ClassFileName,'file','y');
-PrintStringInfo('u160'+ArgSeparator+'u162',ClassFileName,'file','y');
-
-PrintStringInfo('d2'+ArgSeparator+'d2',ClassFileName,'file','y');
-PrintStringInfo('i82'+ArgSeparator+'i82',ClassFileName,'file','y');
-PrintStringInfo('i162'+ArgSeparator+'i162',ClassFileName,'file','y');
-PrintStringInfo('u82'+ArgSeparator+'u82',ClassFileName,'file','y');
-PrintStringInfo('u162'+ArgSeparator+'u162',ClassFileName,'file','y');
-
-// --- Annotation Function And Function List Function. ---
-FunctionName = 'dec2oct';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
@@ -11236,15 +9597,9 @@ INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,Ex //------------------------------------
-<<<<<<< HEAD
//---- Class LCM --------------------
//------------------------------------
ClassName = 'LCM';
-=======
-//---- Class DEC2HEX --------------------
-//------------------------------------
-ClassName = 'DEC2HEX';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
@@ -11253,7 +9608,6 @@ ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls); //Arguements specified: initial value, start time, time vector, ode function
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
-<<<<<<< HEAD
PrintStringInfo('OUT(1).TP= ''u8''',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
@@ -11264,34 +9618,11 @@ PrintStringInfo('u82'+ArgSeparator+'u80',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'lcm';
-=======
-PrintStringInfo('OUT(1).TP= ''g''',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(2)= FA_MUL(FA_SZ_DEC2HEX(IN(1).VAL),IN(1).SZ(1))',ClassFileName,'file','y');
-
-ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
-PrintStringInfo('d0'+ArgSeparator+'g2',ClassFileName,'file','y');
-PrintStringInfo('i80'+ArgSeparator+'g2',ClassFileName,'file','y');
-PrintStringInfo('i160'+ArgSeparator+'g2',ClassFileName,'file','y');
-PrintStringInfo('u80'+ArgSeparator+'g2',ClassFileName,'file','y');
-PrintStringInfo('u160'+ArgSeparator+'g2',ClassFileName,'file','y');
-
-PrintStringInfo('d2'+ArgSeparator+'g2',ClassFileName,'file','y');
-PrintStringInfo('i82'+ArgSeparator+'g2',ClassFileName,'file','y');
-PrintStringInfo('i162'+ArgSeparator+'g2',ClassFileName,'file','y');
-PrintStringInfo('u82'+ArgSeparator+'g2',ClassFileName,'file','y');
-PrintStringInfo('u162'+ArgSeparator+'g2',ClassFileName,'file','y');
-
-
-// --- Annotation Function And Function List Function. ---
-FunctionName = 'dec2hex';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-<<<<<<< HEAD
@@ -11301,12 +9632,6 @@ INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,Ex //---- Class FACTOR --------------------
//------------------------------------
ClassName = 'FACTOR';
-=======
-//------------------------------------
-//---- Class BIN2DEC --------------------
-//------------------------------------
-ClassName = 'BIN2DEC';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
@@ -11315,7 +9640,6 @@ ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls); //Arguements specified: initial value, start time, time vector, ode function
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
-<<<<<<< HEAD
PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(2)= FA_MUL(FA_SZ_FACTOR(IN(1).VAL),IN(1).SZ(1))',ClassFileName,'file','y');
@@ -11327,44 +9651,16 @@ PrintStringInfo('s0'+ArgSeparator+'s2',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'factor';
-=======
-PrintStringInfo('OUT(1).TP= ''d''',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
-
-ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
-PrintStringInfo('d0'+ArgSeparator+'d0',ClassFileName,'file','y');
-PrintStringInfo('i80'+ArgSeparator+'i80',ClassFileName,'file','y');
-PrintStringInfo('i160'+ArgSeparator+'i160',ClassFileName,'file','y');
-PrintStringInfo('u80'+ArgSeparator+'u80',ClassFileName,'file','y');
-PrintStringInfo('u160'+ArgSeparator+'u160',ClassFileName,'file','y');
-
-PrintStringInfo('d2'+ArgSeparator+'d2',ClassFileName,'file','y');
-PrintStringInfo('i82'+ArgSeparator+'i82',ClassFileName,'file','y');
-PrintStringInfo('i162'+ArgSeparator+'i162',ClassFileName,'file','y');
-PrintStringInfo('u82'+ArgSeparator+'u82',ClassFileName,'file','y');
-PrintStringInfo('u162'+ArgSeparator+'u162',ClassFileName,'file','y');
-
-// --- Annotation Function And Function List Function. ---
-FunctionName = 'bin2dec';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-<<<<<<< HEAD
//------------------------------------
//---- Class GCD --------------------
//------------------------------------
ClassName = 'GCD';
-=======
-//------------------------------------
-//---- Class OCT2DEC --------------------
-//------------------------------------
-ClassName = 'OCT2DEC';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
@@ -11373,7 +9669,6 @@ ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls); //Arguements specified: initial value, start time, time vector, ode function
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
-<<<<<<< HEAD
PrintStringInfo('OUT(1).TP= ''u8''',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
@@ -11384,50 +9679,21 @@ PrintStringInfo('u82'+ArgSeparator+'u80',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'gcd';
-=======
-PrintStringInfo('OUT(1).TP= ''d''',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
-
-ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
-PrintStringInfo('d0'+ArgSeparator+'d0',ClassFileName,'file','y');
-PrintStringInfo('i80'+ArgSeparator+'i80',ClassFileName,'file','y');
-PrintStringInfo('i160'+ArgSeparator+'i160',ClassFileName,'file','y');
-PrintStringInfo('u80'+ArgSeparator+'u80',ClassFileName,'file','y');
-PrintStringInfo('u160'+ArgSeparator+'u160',ClassFileName,'file','y');
-
-PrintStringInfo('d2'+ArgSeparator+'d2',ClassFileName,'file','y');
-PrintStringInfo('i82'+ArgSeparator+'i82',ClassFileName,'file','y');
-PrintStringInfo('i162'+ArgSeparator+'i162',ClassFileName,'file','y');
-PrintStringInfo('u82'+ArgSeparator+'u82',ClassFileName,'file','y');
-PrintStringInfo('u162'+ArgSeparator+'u162',ClassFileName,'file','y');
-
-// --- Annotation Function And Function List Function. ---
-FunctionName = 'oct2dec';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-<<<<<<< HEAD
//------------------------------------
//---- Class ZPBUTT --------------------
//------------------------------------
ClassName = 'ZPBUTT';
-=======
-//------------------------------------
-//---- Class HEX2DEC --------------------
-//------------------------------------
-ClassName = 'HEX2DEC';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD
PrintStringInfo('NIN= 2',ClassFileName,'file','y');
PrintStringInfo('NOUT= 2',ClassFileName,'file','y');
@@ -11445,42 +9711,20 @@ PrintStringInfo('d0d0'+ArgSeparator+'z2d0',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'zpbutt';
-=======
-//Arguements specified: initial value, start time, time vector, ode function
-PrintStringInfo('NIN= 1',ClassFileName,'file','y');
-PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).TP= ''d''',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
-
-
-ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
-PrintStringInfo('g2'+ArgSeparator+'d0',ClassFileName,'file','y');
-PrintStringInfo('d0'+ArgSeparator+'d0',ClassFileName,'file','y');
-// --- Annotation Function And Function List Function. ---
-FunctionName = 'hex2dec';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
//------------------------------------
-<<<<<<< HEAD
//---- Class ZPCH1 --------------------
//------------------------------------
ClassName = 'ZPCH1';
-=======
-//---- Class BASE2DEC --------------------
-//------------------------------------
-ClassName = 'BASE2DEC';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD
PrintStringInfo('NIN= 3',ClassFileName,'file','y');
PrintStringInfo('NOUT= 2',ClassFileName,'file','y');
@@ -11498,43 +9742,19 @@ PrintStringInfo('d0d0d0'+ArgSeparator+'z2d0',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'zpch1';
-=======
-//Arguements specified: initial value, start time, time vector, ode function
-PrintStringInfo('NIN= 2',ClassFileName,'file','y');
-PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).TP= ''d''',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
-
-
-ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
-PrintStringInfo('g2d0'+ArgSeparator+'d0',ClassFileName,'file','y');
-PrintStringInfo('d0d0'+ArgSeparator+'d0',ClassFileName,'file','y');
-//PrintStringInfo('g2'+ArgSeparator+'d2',ClassFileName,'file','y');
-// --- Annotation Function And Function List Function. ---
-FunctionName = 'base2dec';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-<<<<<<< HEAD
//------------------------------------
//---- Class ZPCH2 --------------------
//------------------------------------
ClassName = 'ZPCH2';
-=======
-// ------------------
-// --- Class Cosd. ---
-// ------------------
-ClassName = 'Cosd';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD
PrintStringInfo('NIN= 3',ClassFileName,'file','y');
@@ -11557,44 +9777,19 @@ PrintStringInfo('d0d0d0'+ArgSeparator+'z2z2d0',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'zpch2';
-=======
-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)= IN(1).SZ(1)',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
-
-// --- Function List Class. ---
-ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
-PrintStringInfo('d2'+ArgSeparator+'d2',ClassFileName,'file','y');
-PrintStringInfo('d0'+ArgSeparator+'d0',ClassFileName,'file','y');
-PrintStringInfo('s2'+ArgSeparator+'s2',ClassFileName,'file','y');
-PrintStringInfo('s0'+ArgSeparator+'s0',ClassFileName,'file','y');
-
-// --- Annotation Function And Function List Function. ---
-FunctionName = 'cosd';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-<<<<<<< HEAD
//------------------------------------
//---- Class BUTTMAG --------------------
//------------------------------------
ClassName = 'BUTTMAG';
-=======
-// ------------------
-// --- Class Cotd. ---
-// ------------------
-ClassName = 'Cotd';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD
PrintStringInfo('NIN= 3',ClassFileName,'file','y');
@@ -11613,44 +9808,19 @@ PrintStringInfo('u80u80d2'+ArgSeparator+'d2',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'buttmag';
-=======
-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)= IN(1).SZ(1)',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
-
-// --- Function List Class. ---
-ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
-PrintStringInfo('d2'+ArgSeparator+'d2',ClassFileName,'file','y');
-PrintStringInfo('d0'+ArgSeparator+'d0',ClassFileName,'file','y');
-PrintStringInfo('s2'+ArgSeparator+'s2',ClassFileName,'file','y');
-PrintStringInfo('s0'+ArgSeparator+'s0',ClassFileName,'file','y');
-
-// --- Annotation Function And Function List Function. ---
-FunctionName = 'cotd';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-<<<<<<< HEAD
//------------------------------------
//---- Class CHEB1MAG --------------------
//------------------------------------
ClassName = 'CHEB1MAG';
-=======
-// ------------------
-// --- Class Coth. ---
-// ------------------
-ClassName = 'Coth';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD
PrintStringInfo('NIN= 4',ClassFileName,'file','y');
@@ -11669,48 +9839,18 @@ PrintStringInfo('d0d0d0d2'+ArgSeparator+'d2',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'cheb1mag';
-=======
-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)= IN(1).SZ(1)',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
-
-// --- Function List Class. ---
-ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
-PrintStringInfo('d2'+ArgSeparator+'d2',ClassFileName,'file','y');
-PrintStringInfo('d0'+ArgSeparator+'d0',ClassFileName,'file','y');
-PrintStringInfo('s2'+ArgSeparator+'s2',ClassFileName,'file','y');
-PrintStringInfo('s0'+ArgSeparator+'s0',ClassFileName,'file','y');
-PrintStringInfo('z2'+ArgSeparator+'z2',ClassFileName,'file','y');
-PrintStringInfo('z0'+ArgSeparator+'z0',ClassFileName,'file','y');
-PrintStringInfo('c2'+ArgSeparator+'c2',ClassFileName,'file','y');
-PrintStringInfo('c0'+ArgSeparator+'c0',ClassFileName,'file','y');
-
-// --- Annotation Function And Function List Function. ---
-FunctionName = 'coth';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-<<<<<<< HEAD
//------------------------------------
//---- Class CHEB2MAG --------------------
//------------------------------------
ClassName = 'CHEB2MAG';
-=======
-
-// ------------------
-// --- Class Csc. ---
-// ------------------
-ClassName = 'Csc';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD
PrintStringInfo('NIN= 4',ClassFileName,'file','y');
@@ -11729,64 +9869,30 @@ PrintStringInfo('d0d0d0d2'+ArgSeparator+'d2',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'cheb2mag';
-=======
-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)= IN(1).SZ(1)',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
-
-// --- Function List Class. ---
-ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
-PrintStringInfo('d0'+ArgSeparator+'d0',ClassFileName,'file','y');
-PrintStringInfo('d2'+ArgSeparator+'d2',ClassFileName,'file','y');
-PrintStringInfo('s0'+ArgSeparator+'s0',ClassFileName,'file','y');
-PrintStringInfo('s2'+ArgSeparator+'s2',ClassFileName,'file','y');
-PrintStringInfo('z2'+ArgSeparator+'z2',ClassFileName,'file','y');
-PrintStringInfo('z0'+ArgSeparator+'z0',ClassFileName,'file','y');
-PrintStringInfo('c2'+ArgSeparator+'c2',ClassFileName,'file','y');
-PrintStringInfo('c0'+ArgSeparator+'c0',ClassFileName,'file','y');
-
-// --- Annotation Function And Function List Function. ---
-FunctionName = 'csc';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-<<<<<<< HEAD
//------------------------------------
//---- Class SINC --------------------
//------------------------------------
ClassName = 'SINC';
-=======
-// ------------------
-// --- Class Cscd. ---
-// ------------------
-ClassName = 'Cscd';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
-=======
-PrintStringInfo('NIN= 1',ClassFileName,'file','y');
-PrintStringInfo('NOUT= 1 ',ClassFileName,'file','y');
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
-<<<<<<< HEAD
@@ -11797,45 +9903,21 @@ PrintStringInfo('z2'+ArgSeparator+'z2',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'sinc';
-=======
-// --- Function List Class. ---
-ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
-PrintStringInfo('d2'+ArgSeparator+'d2',ClassFileName,'file','y');
-PrintStringInfo('d0'+ArgSeparator+'d0',ClassFileName,'file','y');
-PrintStringInfo('s2'+ArgSeparator+'s2',ClassFileName,'file','y');
-PrintStringInfo('s0'+ArgSeparator+'s0',ClassFileName,'file','y');
-
-PrintStringInfo('z2'+ArgSeparator+'z2',ClassFileName,'file','y');
-PrintStringInfo('z0'+ArgSeparator+'z0',ClassFileName,'file','y');
-PrintStringInfo('c2'+ArgSeparator+'c2',ClassFileName,'file','y');
-PrintStringInfo('c0'+ArgSeparator+'c0',ClassFileName,'file','y');
-
-// --- Annotation Function And Function List Function. ---
-FunctionName = 'cscd';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-<<<<<<< HEAD
//------------------------------------
//---- Class SINCD --------------------
//------------------------------------
ClassName = 'SINCD';
-=======
-// ------------------
-// --- Class Csch. ---
-// ------------------
-ClassName = 'Csch';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD
PrintStringInfo('NIN= 2',ClassFileName,'file','y');
@@ -11855,50 +9937,21 @@ PrintStringInfo('u80u80'+ArgSeparator+'d2',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'sincd';
-=======
-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)= IN(1).SZ(1)',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
-
-// --- Function List Class. ---
-ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
-PrintStringInfo('d0'+ArgSeparator+'d0',ClassFileName,'file','y');
-PrintStringInfo('d2'+ArgSeparator+'d2',ClassFileName,'file','y');
-PrintStringInfo('s0'+ArgSeparator+'s0',ClassFileName,'file','y');
-PrintStringInfo('s2'+ArgSeparator+'s2',ClassFileName,'file','y');
-
-PrintStringInfo('z2'+ArgSeparator+'z2',ClassFileName,'file','y');
-PrintStringInfo('z0'+ArgSeparator+'z0',ClassFileName,'file','y');
-PrintStringInfo('c2'+ArgSeparator+'c2',ClassFileName,'file','y');
-PrintStringInfo('c0'+ArgSeparator+'c0',ClassFileName,'file','y');
-
-// --- Annotation Function And Function List Function. ---
-FunctionName = 'csch';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-<<<<<<< HEAD
//------------------------------------
//---- Class FSFIRLIN --------------------
//------------------------------------
ClassName = 'FSFIRLIN';
-=======
-// --- Class Sec. ---
-// ------------------
-ClassName = 'Sec';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD
PrintStringInfo('NIN= 2',ClassFileName,'file','y');
@@ -11917,51 +9970,21 @@ PrintStringInfo('d2d0'+ArgSeparator+'d2',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'fsfirlin';
-=======
-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)= IN(1).SZ(1)',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
-
-// --- Function List Class. ---
-ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
-PrintStringInfo('d0'+ArgSeparator+'d0',ClassFileName,'file','y');
-PrintStringInfo('d2'+ArgSeparator+'d2',ClassFileName,'file','y');
-PrintStringInfo('s0'+ArgSeparator+'s0',ClassFileName,'file','y');
-PrintStringInfo('s2'+ArgSeparator+'s2',ClassFileName,'file','y');
-
-PrintStringInfo('z2'+ArgSeparator+'z2',ClassFileName,'file','y');
-PrintStringInfo('z0'+ArgSeparator+'z0',ClassFileName,'file','y');
-PrintStringInfo('c2'+ArgSeparator+'c2',ClassFileName,'file','y');
-PrintStringInfo('c0'+ArgSeparator+'c0',ClassFileName,'file','y');
-
-// --- Annotation Function And Function List Function. ---
-FunctionName = 'sec';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-<<<<<<< HEAD
//------------------------------------
//---- Class %K --------------------
//------------------------------------
ClassName = 'modk';
-=======
-// ------------------
-// --- Class Secd. ---
-// ------------------
-ClassName = 'Secd';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD
PrintStringInfo('NIN= 1',ClassFileName,'file','y');
@@ -11980,44 +10003,20 @@ PrintStringInfo('d2'+ArgSeparator+'d2',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'modk';
-=======
-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)= IN(1).SZ(1)',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
-
-// --- Function List Class. ---
-ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
-PrintStringInfo('d2'+ArgSeparator+'d2',ClassFileName,'file','y');
-PrintStringInfo('d0'+ArgSeparator+'d0',ClassFileName,'file','y');
-PrintStringInfo('s2'+ArgSeparator+'s2',ClassFileName,'file','y');
-PrintStringInfo('s0'+ArgSeparator+'s0',ClassFileName,'file','y');
-
-// --- Annotation Function And Function List Function. ---
-FunctionName = 'secd';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-<<<<<<< HEAD
//------------------------------------
//---- Class FILT_SINC --------------------
//------------------------------------
ClassName = 'FILT_SINC';
-=======
-// --- Class Sech. ---
-// ------------------
-ClassName = 'Sech';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD
PrintStringInfo('NIN= 2',ClassFileName,'file','y');
@@ -12036,28 +10035,6 @@ PrintStringInfo('d0d0'+ArgSeparator+'d2',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'filt_sinc';
-=======
-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)= IN(1).SZ(1)',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
-
-// --- Function List Class. ---
-ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
-PrintStringInfo('d0'+ArgSeparator+'d0',ClassFileName,'file','y');
-PrintStringInfo('d2'+ArgSeparator+'d2',ClassFileName,'file','y');
-PrintStringInfo('s0'+ArgSeparator+'s0',ClassFileName,'file','y');
-PrintStringInfo('s2'+ArgSeparator+'s2',ClassFileName,'file','y');
-
-PrintStringInfo('z2'+ArgSeparator+'z2',ClassFileName,'file','y');
-PrintStringInfo('z0'+ArgSeparator+'z0',ClassFileName,'file','y');
-PrintStringInfo('c2'+ArgSeparator+'c2',ClassFileName,'file','y');
-PrintStringInfo('c0'+ArgSeparator+'c0',ClassFileName,'file','y');
-
-// --- Annotation Function And Function List Function. ---
-FunctionName = 'sech';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
@@ -12065,21 +10042,14 @@ INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,Ex //------------------------------------
-<<<<<<< HEAD
//---- Class FFILT --------------------
//------------------------------------
ClassName = 'FFILT';
-=======
-//---- Class FACTORIAL --------------------
-//------------------------------------
-ClassName = 'FACTORIAL';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD
PrintStringInfo('NIN= 4',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
@@ -12097,45 +10067,20 @@ PrintStringInfo('g2d0d0d0'+ArgSeparator+'d2',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'ffilt';
-=======
-//Arguements specified: initial value, start time, time vector, ode function
-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)= IN(1).SZ(1)',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
-
-ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
-PrintStringInfo('d0'+ArgSeparator+'d0',ClassFileName,'file','y');
-PrintStringInfo('s0'+ArgSeparator+'s0',ClassFileName,'file','y');
-
-PrintStringInfo('d2'+ArgSeparator+'d2',ClassFileName,'file','y');
-PrintStringInfo('s2'+ArgSeparator+'s2',ClassFileName,'file','y');
-
-// --- Annotation Function And Function List Function. ---
-FunctionName = 'factorial';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-<<<<<<< HEAD
//------------------------------------
//---- Class %SN --------------------
//------------------------------------
ClassName = 'modsn';
-=======
-// --- Class Interp1. ---
-// ------------------
-ClassName = 'Interp1';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD
//PrintStringInfo('NIN= 2',ClassFileName,'file','y');
@@ -12170,52 +10115,22 @@ PrintStringInfo('z2d0'+ArgSeparator+'z2',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'modsn';
-=======
-PrintStringInfo('NIN= 4',ClassFileName,'file','y');
-PrintStringInfo('NOUT= 1 ',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).TP= ''d''',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(1)',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
-
-// --- Function List Class. ---
-ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
-PrintStringInfo('d2d2d0g2'+ArgSeparator+'d0',ClassFileName,'file','y');
-//PrintStringInfo('d2'+ArgSeparator+'d2',ClassFileName,'file','y');
-//PrintStringInfo('s0'+ArgSeparator+'s0',ClassFileName,'file','y');
-//PrintStringInfo('s2'+ArgSeparator+'s2',ClassFileName,'file','y');
-
-//PrintStringInfo('z2'+ArgSeparator+'z2',ClassFileName,'file','y');
-//PrintStringInfo('z0'+ArgSeparator+'z0',ClassFileName,'file','y');
-//PrintStringInfo('c2'+ArgSeparator+'c2',ClassFileName,'file','y');
-//PrintStringInfo('c0'+ArgSeparator+'c0',ClassFileName,'file','y');
-
-// --- Annotation Function And Function List Function. ---
-FunctionName = 'interp1';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-<<<<<<< HEAD
//------------------------------------
//---- Class ELL1MAG --------------------
//------------------------------------
ClassName = 'ell1mag';
-=======
-//------------------------------------
-//---- Class PRIMES --------------------
-//------------------------------------
-ClassName = 'PRIMES';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD
PrintStringInfo('NIN= 3',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= ''d''',ClassFileName,'file','y');
@@ -12228,43 +10143,20 @@ PrintStringInfo('d0d0d2'+ArgSeparator+'d2',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'ell1mag';
-=======
-//Arguements specified: initial value, start time, time vector, ode function
-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)= IN(1).SZ(1)',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(2)= FA_SZ_PRIMES(IN(1).VAL)',ClassFileName,'file','y');
-
-ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
-PrintStringInfo('d0'+ArgSeparator+'d2',ClassFileName,'file','y');
-PrintStringInfo('s0'+ArgSeparator+'s2',ClassFileName,'file','y');
-
-
-// --- Annotation Function And Function List Function. ---
-FunctionName = 'primes';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
//------------------------------------
-<<<<<<< HEAD
//---- Class AMELL --------------------
//------------------------------------
ClassName = 'amell';
-=======
-//---- Class FACTOR --------------------
-//------------------------------------
-ClassName = 'FACTOR';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// --- Class Annotation. ---
PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
-<<<<<<< HEAD
PrintStringInfo('NIN= 2',ClassFileName,'file','y');
PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
@@ -12277,34 +10169,15 @@ PrintStringInfo('d2d0'+ArgSeparator+'d2',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. ---
FunctionName = 'amell';
-=======
-//Arguements specified: initial value, start time, time vector, ode function
-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)= IN(1).SZ(1)',ClassFileName,'file','y');
-PrintStringInfo('OUT(1).SZ(2)= FA_MUL(FA_SZ_FACTOR(IN(1).VAL),IN(1).SZ(1))',ClassFileName,'file','y');
-
-ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
-PrintStringInfo('d0'+ArgSeparator+'d2',ClassFileName,'file','y');
-PrintStringInfo('s0'+ArgSeparator+'s2',ClassFileName,'file','y');
-
-
-// --- Annotation Function And Function List Function. ---
-FunctionName = 'factor';
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
-<<<<<<< HEAD
-=======
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0
// ////////////////////////////////////////////
// /////PARTE INTRODOTTA DA ALBERTO MOREA
// /////////////////////////////////////////////
diff --git a/2.3-1/macros/ToolInitialization/ManageNextConversion.sci b/2.3-1/macros/ToolInitialization/ManageNextConversion.sci index 2073ed3e..b0d4337b 100644 --- a/2.3-1/macros/ToolInitialization/ManageNextConversion.sci +++ b/2.3-1/macros/ToolInitialization/ManageNextConversion.sci @@ -44,11 +44,8 @@ FlagContinueTranslation = 0; // --- Finalize the current C code. ---
// ------------------------------------
C_FinalizeCode(FileInfo,SharedInfo);
-<<<<<<< HEAD //PrintStringInfo(' hello',ReportFileName,'file','y');
-======= ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // ------------------------------------------------
// --- Identify the next function to translate. ---
diff --git a/2.3-1/macros/buildmacros.sce b/2.3-1/macros/buildmacros.sce index 3e65f919..e78b15bb 100644 --- a/2.3-1/macros/buildmacros.sce +++ b/2.3-1/macros/buildmacros.sce @@ -9,15 +9,9 @@ Directories = [ "ASTManagement", ... "GeneralFunctions", ... "SymbolTable", ... "ToolInitialization", ... -<<<<<<< HEAD "Hardware/AVR", ... "Hardware/RasberryPi", ... "ImageProcessing", ... -======= - "Hardware/AVR", ... - "Hardware/RasberryPi", ... - "ImageProcessing", ... ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 "Scilab-Arduino"]; diff --git a/2.3-1/macros/cb_sci2c_gui.sci b/2.3-1/macros/cb_sci2c_gui.sci index 90dad3ba..bf77c25f 100644 --- a/2.3-1/macros/cb_sci2c_gui.sci +++ b/2.3-1/macros/cb_sci2c_gui.sci @@ -103,11 +103,7 @@ elseif get(gcbo, "tag")=="cancelbtn" | get(gcbo, "tag")=="close_menu" then elseif get(gcbo, "tag")=="convertbtn" then UserScilabMainFile = get(findobj("tag", "fileedit"), "string"); -<<<<<<< HEAD UserSciFilesPaths = get(findobj("tag", "subfunsedit"), "string"); -======= - UserSciFilesPaths = get(findobj("tag", "subfunsedit"), "string"); ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // Sci2CLibMainHeaderFName = get(findobj("tag", "headeredit"), "string"); @@ -203,12 +199,18 @@ 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 --- diff --git a/2.3-1/macros/findDeps/Scilab2CDeps.sci b/2.3-1/macros/findDeps/Scilab2CDeps.sci index cb278b46..8044e276 100644 --- a/2.3-1/macros/findDeps/Scilab2CDeps.sci +++ b/2.3-1/macros/findDeps/Scilab2CDeps.sci @@ -7,25 +7,16 @@ // you should have received as part of this distribution. The terms // are also available at // http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt -<<<<<<< HEAD function scilab2ccode = initDependecies() -======= -// Edited by: Yash Pratap Singh Tomar - -function scilab2ccode = Scilab2CDeps() ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 ///////////////////////////////// ////// AUXILIARY FUNCTIONS ////// ///////////////////////////////// -<<<<<<< HEAD -======= ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 //abs scilab2ccode.deps.cabss=["ssqrts","sabss","creals","cimags"] scilab2ccode.deps.cabsa=["cabss"] @@ -35,19 +26,8 @@ scilab2ccode.deps.sabss=[] scilab2ccode.deps.sabsa=["sabss"] scilab2ccode.deps.zabss=["dsqrts","dabss","zreals","zimags"] scilab2ccode.deps.zabsa=["zabss"] -<<<<<<< HEAD - - -======= -scilab2ccode.deps.u8absa=["u8abss"] -scilab2ccode.deps.u8abss=[] -scilab2ccode.deps.i8absa=["i8abss"] -scilab2ccode.deps.i8abss=[] -scilab2ccode.deps.u16absa=["u16abss"] -scilab2ccode.deps.u16abss=[] -scilab2ccode.deps.i16absa=["i16abss"] -scilab2ccode.deps.i16abss=[] ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 + + //conj scilab2ccode.deps.cconjs=["FloatComplex","creals","cimags"] scilab2ccode.deps.cconja=["cconjs"] @@ -59,28 +39,7 @@ scilab2ccode.deps.cfinda=["creals","cimags"] scilab2ccode.deps.dfinda=[] scilab2ccode.deps.sfinda=[] scilab2ccode.deps.zfinda=["zreals","zimags"] -<<<<<<< HEAD - -======= -scilab2ccode.deps.i8finda=[] -scilab2ccode.deps.i16finda=[] -scilab2ccode.deps.u8finda=[] -scilab2ccode.deps.u16finda=[] - -//float -scilab2ccode.deps.dfloats=[] -scilab2ccode.deps.dfloata=[] -scilab2ccode.deps.i8floats=[] -scilab2ccode.deps.i8floata=[] -scilab2ccode.deps.i16floats=[] -scilab2ccode.deps.i16floata=[] -scilab2ccode.deps.sfloats=[] -scilab2ccode.deps.sfloata=[] -scilab2ccode.deps.u8floats=[] -scilab2ccode.deps.u8floata=[] -scilab2ccode.deps.u16floats=[] -scilab2ccode.deps.u16floata=[] ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 + //find2d scilab2ccode.deps.cfind2da=["creals","cimags"] @@ -119,31 +78,9 @@ scilab2ccode.deps.zisnana=["zisnans"] scilab2ccode.deps.cpythags=["csqrts","cadds","cmuls"] scilab2ccode.deps.dpythags=["dsqrts"] scilab2ccode.deps.spythags=["ssqrts"] -<<<<<<< HEAD scilab2ccode.deps.cpythags=["zsqrts","zadds","zmuls"] //rand -======= -scilab2ccode.deps.zpythags=["zsqrts","zadds","zmuls"] - -//rand -scilab2ccode.deps.cranda=["crands"] -scilab2ccode.deps.crands=["FloatComplex"] -scilab2ccode.deps.dranda=["drands"] -scilab2ccode.deps.drands=[] -scilab2ccode.deps.i8randa=["i8rands"] -scilab2ccode.deps.i8rands=[] -scilab2ccode.deps.i16randa=["i16rands"] -scilab2ccode.deps.i16rands=[] -scilab2ccode.deps.sranda=["srands"] -scilab2ccode.deps.srands=[] -scilab2ccode.deps.u8randa=["u8rands"] -scilab2ccode.deps.u8rands=[] -scilab2ccode.deps.u16randa=["u16rands"] -scilab2ccode.deps.u16rands=[] -scilab2ccode.deps.zranda=["drands","DoubleComplex","zreals",] -scilab2ccode.deps.zrands=["drands","DoubleComplex"] ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 //sign scilab2ccode.deps.csigns=["FloatComplex","cabss","creals","cimags"] @@ -154,62 +91,11 @@ scilab2ccode.deps.dsigns=[] scilab2ccode.deps.dsigna=["ssigns"] scilab2ccode.deps.zsigns=["DoubleComplex","zabss","zreals","zimags"] scilab2ccode.deps.zsigna=["zsigns"] -<<<<<<< HEAD //size //type -======= -scilab2ccode.deps.i8signa=["i8signs"] -scilab2ccode.deps.i8signs=[] -scilab2ccode.deps.i16signa=["i16signs"] -scilab2ccode.deps.i16signs=[] -scilab2ccode.deps.u8signa=["u8signs"] -scilab2ccode.deps.u8signs=[] -scilab2ccode.deps.u16signa=["u16signs"] -scilab2ccode.deps.u16signs=[] - -//size -scilab2ccode.deps.dallsizea=[] - -//type - -///////////////////////////////// -///// CACSD ///////////// -//////////////////////////////// - -//lqe -scilab2ccode.deps.dlqea=["dtransposea","dlqra"] - -//lqr -scilab2ccode.deps.dlqra=["dtransposea","dmulma","dinverma","ddiffa","dschura","drdivma","dadda","deyea","dgschura"] - -//obscont -scilab2ccode.deps.dobsconta=["dmulma","dadda"] - -//syslin -scilab2ccode.deps.dsyslina=[] - -///////////////////////////////// -///////DIFFERENTIAL CALCULUS///// -///////////////////////////////// - -//diff -scilab2ccode.deps.ddiffca=[] -scilab2ccode.deps.i8diffca=[] -scilab2ccode.deps.i16diffca=[] -scilab2ccode.deps.sdiffca=[] -scilab2ccode.deps.u8diffca=[] -scilab2ccode.deps.u16diffca=[] - -//ode -scilab2ccode.deps.dodea=[] -scilab2ccode.deps.dodes=[] - - - ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 ////////////////////////////////// ////// ELEMENTARY FUNCTIONS ////// @@ -225,14 +111,6 @@ scilab2ccode.deps.sacosa=["sacoss"] scilab2ccode.deps.zacoss=["DoubleComplex","dsqrts","dabss","dacoss","datans","dlogs","dlog1ps","zreals","zimags"] scilab2ccode.deps.zacosa=["zacoss"] -<<<<<<< HEAD -======= -//acosd -scilab2ccode.deps.dacosda=["dacosds"] -scilab2ccode.deps.dacosds=[] -scilab2ccode.deps.sacosda=["sacosds"] -scilab2ccode.deps.sacosds=[] ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 //acosh scilab2ccode.deps.cacoshs=["FloatComplex","cacoss","creals","cimags"] @@ -244,79 +122,6 @@ scilab2ccode.deps.sacosha=["sacoshs"] scilab2ccode.deps.zacoshs=["DoubleComplex","zacoss","zreals","zimags"] scilab2ccode.deps.zacosha=["zacoshs"] -<<<<<<< HEAD -======= -//acot -scilab2ccode.deps.cacota=["cacots"] -scilab2ccode.deps.cacots=["FloatComplex","crdivs","catans"] -scilab2ccode.deps.dacota=["dacots"] -scilab2ccode.deps.dacots=[] -scilab2ccode.deps.sacota=["sacots"] -scilab2ccode.deps.sacots=[] -scilab2ccode.deps.zacota=["zacots"] -scilab2ccode.deps.zacots=["DoubleComplex","zrdivs","zatans"] - -//acotd -scilab2ccode.deps.dacotda=["dacotds"] -scilab2ccode.deps.dacotds=[] -scilab2ccode.deps.sacotda=["sacotds"] -scilab2ccode.deps.sacotds=[] - -//acoth -scilab2ccode.deps.cacotha=["cacoths"] -scilab2ccode.deps.cacoths=["FloatComplex","crdivs","catanhs"] -scilab2ccode.deps.dacotha=["dacoths"] -scilab2ccode.deps.dacoths=[] -scilab2ccode.deps.sacotha=["sacoths"] -scilab2ccode.deps.sacoths=[] -scilab2ccode.deps.zacotha=["zacoths"] -scilab2ccode.deps.zacoths=["DoubleComplex","zrdivs","zatanhs"] - -//acsc -scilab2ccode.deps.cacsca=["cacscs"] -scilab2ccode.deps.cacscs=["FloatComplex","crdivs","casins"] -scilab2ccode.deps.dacsca=["dacscs"] -scilab2ccode.deps.dacscs=[] -scilab2ccode.deps.sacsca=["sacscs"] -scilab2ccode.deps.sacscs=[] -scilab2ccode.deps.zacsca=["zacscs"] -scilab2ccode.deps.zacscs=["DoubleComplex","zrdivs","zasins"] - -//acscd -scilab2ccode.deps.dacscda=["dacscds"] -scilab2ccode.deps.dacscds=[] -scilab2ccode.deps.sacscda=["sacscds"] -scilab2ccode.deps.sacscds=[] - -//acsch -scilab2ccode.deps.cacsca=["cacscs"] -scilab2ccode.deps.cacscs=["FloatComplex","crdivs","cmuls"] -scilab2ccode.deps.dacscha=["dacschs"] -scilab2ccode.deps.dacschs=[] -scilab2ccode.deps.sacscha=["sacschs"] -scilab2ccode.deps.sacschs=[] -scilab2ccode.deps.zacsca=["zacscs"] -scilab2ccode.deps.zacscs=["zrdivs","DoubleComplex","zasins"] - -//asec -scilab2ccode.deps.daseca=["dasecs"] -scilab2ccode.deps.dasecs=[] -scilab2ccode.deps.saseca=["sasecs"] -scilab2ccode.deps.sasecs=[] - -//asecd -scilab2ccode.deps.dasecda=["dasecds"] -scilab2ccode.deps.dasecds=[] -scilab2ccode.deps.sasecda=["sasecds"] -scilab2ccode.deps.sasecds=[] - -//asech -scilab2ccode.deps.dasecha=["dasechs"] -scilab2ccode.deps.dasechs=[] -scilab2ccode.deps.sasecha=["sasechs"] -scilab2ccode.deps.sasechs=[] - ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 //asin scilab2ccode.deps.casins=["FloatComplex","ssqrts","sabss","sasins","satans","slogs","slog1ps","dabss","creals","cimags"] scilab2ccode.deps.casina=["casins"] @@ -327,16 +132,6 @@ scilab2ccode.deps.sasina=["sasins"] scilab2ccode.deps.zasins=["DoubleComplex","dsqrts","dabss","dasins","datans","dlog1ps","dlogs","zreals","zimags"] scilab2ccode.deps.zasina=["zasins"] -<<<<<<< HEAD -======= -//asind -scilab2ccode.deps.dasinda=["dasinds"] -scilab2ccode.deps.dasinds=[] -scilab2ccode.deps.sasinda=["sasinds"] -scilab2ccode.deps.sasinds=[] - - ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 //asinh scilab2ccode.deps.casinhs=["FloatComplex","casins","creals","cimags"] scilab2ccode.deps.casinha=["casinhs"] @@ -365,14 +160,6 @@ scilab2ccode.deps.datan2a=["datan2s"] scilab2ccode.deps.satan2s=[] scilab2ccode.deps.satan2a=["satan2s"] -<<<<<<< HEAD -======= -//atand -scilab2ccode.deps.datanda=["datands"] -scilab2ccode.deps.datands=[] -scilab2ccode.deps.satanda=["satands"] -scilab2ccode.deps.satands=[] ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 //atanh scilab2ccode.deps.catanhs=["FloatComplex","creals","cimags","catans"] @@ -384,58 +171,6 @@ scilab2ccode.deps.satanha=["satanhs"] scilab2ccode.deps.zatanhs=["DoubleComplex","zreals","zimags","zatans"] scilab2ccode.deps.zatanha=["zatanhs"] -<<<<<<< HEAD -======= -//bitand -scilab2ccode.deps.u8bitanda=["u8bitands"] -scilab2ccode.deps.u8bitands=[] -scilab2ccode.deps.u16bitanda=["u16bitands"] -scilab2ccode.deps.u16bitands=[] - -//bitcmp -scilab2ccode.deps.u8bitcmps=["u8bitcmps"] -scilab2ccode.deps.u8bitcmps=[] -scilab2ccode.deps.u16bitcmpa=["u16bitcmps"] -scilab2ccode.deps.u16bitcmps=[] - -//bitget -scilab2ccode.deps.u8bitgets=[] -scilab2ccode.deps.u16bitgets=[] - -//bitor -scilab2ccode.deps.u8bitora=["u8bitors"] -scilab2ccode.deps.u8bitors=[] -scilab2ccode.deps.u16bitora=["u16bitors"] -scilab2ccode.deps.u16bitors=[] - -//bitset -scilab2ccode.deps.u8bitsets=[] -scilab2ccode.deps.u16bitsets=[] - -//bitxor -scilab2ccode.deps.u8bitxora=["u8bitxors"] -scilab2ccode.deps.u8bitxors=[] -scilab2ccode.deps.u16bitxora=["u16bitxors"] -scilab2ccode.deps.u16bitxors=[] - -//ceil -scilab2ccode.deps.cceila=["cceils"] -scilab2ccode.deps.cceils=["creals","cimags","FloatComplex"] -scilab2ccode.deps.dceila=["dceils"] -scilab2ccode.deps.dceils=[] -scilab2ccode.deps.i8ceila=["i8ceils"] -scilab2ccode.deps.i8ceils=[] -scilab2ccode.deps.i16ceila=["i16ceils"] -scilab2ccode.deps.i16ceils=[] -scilab2ccode.deps.sceila=["sceils"] -scilab2ccode.deps.sceils=[] -scilab2ccode.deps.u8ceila=["u8ceils"] -scilab2ccode.deps.u8ceils=[] -scilab2ccode.deps.u16ceila=["u16ceils"] -scilab2ccode.deps.u16ceils=[] -scilab2ccode.deps.zceila=["zceils"] -scilab2ccode.deps.zceils=["zreals","zimags","DoubleComplex"] ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 //cos scilab2ccode.deps.ccoss=["creals","cimags","FloatComplex","scoss","scoshs","ssins","ssinhs"] @@ -446,18 +181,7 @@ scilab2ccode.deps.scoss=[] scilab2ccode.deps.scosa=["scoss"] scilab2ccode.deps.zcoss=["zreals","zimags","DoubleComplex","dcoss","dcoshs","dsins","dsinhs"] scilab2ccode.deps.zcosa=["zcoss"] -<<<<<<< HEAD - -======= -scilab2ccode.deps.i8cosa=["i8coss"] -scilab2ccode.deps.i8coss=[] -scilab2ccode.deps.i16cosa=["i16coss"] -scilab2ccode.deps.i16coss=[] -scilab2ccode.deps.u8cosa=["u8coss"] -scilab2ccode.deps.u8coss=[] -scilab2ccode.deps.u16cosa=["u16coss"] -scilab2ccode.deps.u16coss=[] ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 + //cosh scilab2ccode.deps.ccoshs=["ccoss","FloatComplex","creals","cimags"] @@ -468,17 +192,6 @@ scilab2ccode.deps.scoshs=["sexps","sabss"] scilab2ccode.deps.scosha=["scoshs"] scilab2ccode.deps.zcoshs=["zcoss","DoubleComplex","zreals","zimags"] scilab2ccode.deps.zcosha=["zcoshs"] -<<<<<<< HEAD -======= -scilab2ccode.deps.i8cosha=["i8coshs"] -scilab2ccode.deps.i8coshs=["i8abss","i8exps"] -scilab2ccode.deps.i16cosha=["i16coshs"] -scilab2ccode.deps.i16coshs=["i16abss","i16exps"] -scilab2ccode.deps.u8cosha=["u8coshs"] -scilab2ccode.deps.u8coshs=["u8abss","u8exps"] -scilab2ccode.deps.u16cosha=["u16coshs"] -scilab2ccode.deps.u16coshs=["u16abss","u16exps"] ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 //exp @@ -490,18 +203,7 @@ scilab2ccode.deps.sexps=[] scilab2ccode.deps.sexpa=["sexps"] scilab2ccode.deps.zexps=["zreals","zimags","DoubleComplex","dexps","dcoss","dsins"] scilab2ccode.deps.zexpa=["zexps"] -<<<<<<< HEAD - -======= -scilab2ccode.deps.i8expa=["i8exps"] -scilab2ccode.deps.i8exps=[] -scilab2ccode.deps.i16expa=["i16exps"] -scilab2ccode.deps.i16exps=[] -scilab2ccode.deps.u8expa=["u8exps"] -scilab2ccode.deps.u8exps=[] -scilab2ccode.deps.u16expa=["u16exps"] -scilab2ccode.deps.u16exps=[] ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 + //exp10 scilab2ccode.deps.cexp10s=["cpows","FloatComplex"] @@ -513,83 +215,6 @@ scilab2ccode.deps.sexp10a=["sexp10s"] scilab2ccode.deps.zexp10s=["zpows","DoubleComplex"] scilab2ccode.deps.zexp10a=["zexp10s"] -<<<<<<< HEAD -======= -//fix -scilab2ccode.deps.cfixa=["cfixs"] -scilab2ccode.deps.cfixs=["creals","cimags","FloatComplex"] -scilab2ccode.deps.dfixa=["dfixs"] -scilab2ccode.deps.dfixs=[] -scilab2ccode.deps.i8fixa=["i8fixs"] -scilab2ccode.deps.i8fixs=["i8floors","i8ceils"] -scilab2ccode.deps.i16fixa=["i16fixs"] -scilab2ccode.deps.i16fixs=["i16floors","i16ceils"] -scilab2ccode.deps.sfixa=["sfixs"] -scilab2ccode.deps.sfixs=[] -scilab2ccode.deps.u8fixa=["u8fixs"] -scilab2ccode.deps.u8fixs=["u8floors","u8ceils"] -scilab2ccode.deps.u16fixa=["u16fixs"] -scilab2ccode.deps.u16fixs=["u16floors","u16ceils"] -scilab2ccode.deps.zfixa=["zfixs"] -scilab2ccode.deps.zfixs=["zreals","zimags","DoubleComplex"] - -//floor -scilab2ccode.deps.cfloora=["cfloors"] -scilab2ccode.deps.cfloors=["creals","cimags","FloatComplex"] -scilab2ccode.deps.dfloora=["dfloors"] -scilab2ccode.deps.dfloors=[] -scilab2ccode.deps.i8floora=["i8floors"] -scilab2ccode.deps.i8floors=[] -scilab2ccode.deps.i16floora=["i16floors"] -scilab2ccode.deps.i16floors=[] -scilab2ccode.deps.sfloora=["sfloors"] -scilab2ccode.deps.sfloors=[] -scilab2ccode.deps.u8floora=["u8floors"] -scilab2ccode.deps.u8floors=[] -scilab2ccode.deps.u16floora=["u16floors"] -scilab2ccode.deps.u16floors=[] -scilab2ccode.deps.zfloors=["zfloors"] -scilab2ccode.deps.zfloors=["zreals","zimags","DoubleComplex"] - -//int -scilab2ccode.deps.cinta=["cfixa"] -scilab2ccode.deps.cints=["cfixs"] -scilab2ccode.deps.dinta=["dfixa"] -scilab2ccode.deps.dints=["dfixs"] -scilab2ccode.deps.sinta=["sfixa"] -scilab2ccode.deps.sints=["sfixs"] -scilab2ccode.deps.zinta=["zfixa"] -scilab2ccode.deps.zints=["zfixs"] - -//int8 -scilab2ccode.deps.dint8a=["dint8s"] -scilab2ccode.deps.dint8s=[] -scilab2ccode.deps.i16int8a=["i16int8s"] -scilab2ccode.deps.i16int8s=[] -scilab2ccode.deps.sint8a=["sint8s"] -scilab2ccode.deps.sint8s=[] -scilab2ccode.deps.u8int8a=["u8int8s"] -scilab2ccode.deps.u8int8s=[] -scilab2ccode.deps.u16int8a=["u16int8s"] -scilab2ccode.deps.u16int8s=[] - -//int16 -scilab2ccode.deps.dint16a=["dint16s"] -scilab2ccode.deps.dint16s=[] -scilab2ccode.deps.i8int16a=["i8int16s"] -scilab2ccode.deps.i8int16s=[] -scilab2ccode.deps.sint16a=["sint16s"] -scilab2ccode.deps.sint16s=[] -scilab2ccode.deps.u8int16a=["u8int16s"] -scilab2ccode.deps.u8int16s=[] -scilab2ccode.deps.u16int16a=["u16int16s"] -scilab2ccode.deps.u16int16s=[] - -//linspace -scilab2ccode.deps.dlinspacea=[] -scilab2ccode.deps.dlinspaces=[] - ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 //lnp1m1 scilab2ccode.deps.dlnp1m1s=["dabss"] @@ -628,12 +253,6 @@ scilab2ccode.deps.slog10a=["slog10s"] scilab2ccode.deps.zlog10s=["zlogs","DoubleComplex","zreals","zimags","dlogs"] scilab2ccode.deps.zlog10a=["zlog10s"] -<<<<<<< HEAD -======= -//logspace -scilab2ccode.deps.dlogspacea=[] -scilab2ccode.deps.dlogspaces=[] ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 //pow scilab2ccode.deps.cpows=["cexps","cmuls","clogs"] @@ -644,36 +263,7 @@ scilab2ccode.deps.spows=[] scilab2ccode.deps.spowa=["spows"] scilab2ccode.deps.zpows=["zexps","zmuls","zlogs"] scilab2ccode.deps.zpowa=["zpows"] -<<<<<<< HEAD - -======= -scilab2ccode.deps.i8powa=["i8pows"] -scilab2ccode.deps.i8pows=[] -scilab2ccode.deps.i16powa=["i16pows"] -scilab2ccode.deps.i16pows=[] -scilab2ccode.deps.u8powa=["u8pows"] -scilab2ccode.deps.u8pows=[] -scilab2ccode.deps.u16powa=["u16pows"] -scilab2ccode.deps.u16pows=[] - -//round -scilab2ccode.deps.crounda=["crounds"] -scilab2ccode.deps.crounds=["creals","cimags","FloatComplex"] -scilab2ccode.deps.drounda=["drounds"] -scilab2ccode.deps.drounds=[] -scilab2ccode.deps.i8rounda=["i8rounds"] -scilab2ccode.deps.i8rounds=[] -scilab2ccode.deps.i16rounda=["i16rounds"] -scilab2ccode.deps.i16rounds=[] -scilab2ccode.deps.srounda=["srounds"] -scilab2ccode.deps.srounds=[] -scilab2ccode.deps.u8rounda=["u8rounds"] -scilab2ccode.deps.u8rounds=[] -scilab2ccode.deps.u16rounda=["u16rounds"] -scilab2ccode.deps.u16rounds=[] -scilab2ccode.deps.zrounda=["zrounds"] -scilab2ccode.deps.zrounds=["zreals","zimags","DoubleComplex"] ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 + //sin scilab2ccode.deps.csins=["creals","cimags","FloatComplex","ssins","scoshs","scoss","ssinhs"] @@ -684,17 +274,6 @@ scilab2ccode.deps.ssins=[] scilab2ccode.deps.ssina=["ssins"] scilab2ccode.deps.zsins=["zreals","zimags","DoubleComplex","dsins","dcoshs","dcoss","dsinhs"] scilab2ccode.deps.zsina=["zsins"] -<<<<<<< HEAD -======= -scilab2ccode.deps.i8sina=["i8sins"] -scilab2ccode.deps.i8sins=[] -scilab2ccode.deps.i16sina=["i16sins"] -scilab2ccode.deps.i16sins=[] -scilab2ccode.deps.u8sina=["u8sins"] -scilab2ccode.deps.u8sins=[] -scilab2ccode.deps.u16sina=["u16sins"] -scilab2ccode.deps.u16sins=[] ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 //sinh @@ -706,17 +285,6 @@ scilab2ccode.deps.ssinhs=[] scilab2ccode.deps.ssinha=["ssinhs"] scilab2ccode.deps.zsinhs=["zreals","zimags","zsins","DoubleComplex"] scilab2ccode.deps.zsinha=["zsinhs"] -<<<<<<< HEAD -======= -scilab2ccode.deps.i8sinha=["i8sinhs"] -scilab2ccode.deps.i8sinhs=[] -scilab2ccode.deps.i16sinha=["i16sinhs"] -scilab2ccode.deps.i16sinhs=[] -scilab2ccode.deps.u8sinha=["u8sinhs"] -scilab2ccode.deps.u8sinhs=[] -scilab2ccode.deps.u16sinha=["u16sinhs"] -scilab2ccode.deps.u16sinhs=[] ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 //sqrt @@ -739,17 +307,6 @@ scilab2ccode.deps.stans=[] scilab2ccode.deps.stana=["stans"] scilab2ccode.deps.ztans=["dlogs","dsqrts","zreals","zimags","dcoss","dsinhs","dsins","dabss","DoubleComplex"] scilab2ccode.deps.ztana=["ztans"] -<<<<<<< HEAD -======= -scilab2ccode.deps.i8tana=["i8tans"] -scilab2ccode.deps.i8tans=[] -scilab2ccode.deps.i16tana=["i16tans"] -scilab2ccode.deps.i16tans=[] -scilab2ccode.deps.u8tana=["u8tans"] -scilab2ccode.deps.u8tans=[] -scilab2ccode.deps.u16tana=["u16tans"] -scilab2ccode.deps.u16tans=[] ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 //tanh @@ -761,294 +318,13 @@ scilab2ccode.deps.stanhs=[] scilab2ccode.deps.stanha=["stanhs"] scilab2ccode.deps.ztanhs=["zreals","zimags","ztans","DoubleComplex"] scilab2ccode.deps.ztanha=["ztanhs"] -<<<<<<< HEAD -======= -scilab2ccode.deps.i8tanha=["i8tanhs"] -scilab2ccode.deps.i8tanhs=[] -scilab2ccode.deps.i16tanha=["i16tanhs"] -scilab2ccode.deps.i16tanhs=[] -scilab2ccode.deps.u8tanha=["u8tanhs"] -scilab2ccode.deps.u8tanhs=[] -scilab2ccode.deps.u16tanha=["u16tanhs"] -scilab2ccode.deps.u16tanhs=[] - -//uint8 -scilab2ccode.deps.duint8a=["duint8s"] -scilab2ccode.deps.duint8s=[] -scilab2ccode.deps.i8uint8a=["i8uint8s"] -scilab2ccode.deps.i8uint8s=[] -scilab2ccode.deps.i16uint8a=["i16uint8s"] -scilab2ccode.deps.i16uint8s=[] -scilab2ccode.deps.suint8a=["suint8s"] -scilab2ccode.deps.suint8s=[] -scilab2ccode.deps.u16uint8a=["u16uint8s"] -scilab2ccode.deps.u16uint8s=[] - -//uint16 -scilab2ccode.deps.duint16a=["duint16s"] -scilab2ccode.deps.duint16s=[] -scilab2ccode.deps.i8uint16a=["i8uint16s"] -scilab2ccode.deps.i8uint16s=[] -scilab2ccode.deps.i16uint16a=["i16uint16s"] -scilab2ccode.deps.i16uint16s=[] -scilab2ccode.deps.suint16a=["suint16s"] -scilab2ccode.deps.suint16s=[] -scilab2ccode.deps.u8uint16a=["u8uint16s"] -scilab2ccode.deps.u8uint16s=[] - -//////DISCRETE_MATHEMATICS///////// - -//factor -scilab2ccode.deps.dfactors=[] -scilab2ccode.deps.sfactors=[] - -//factorial -scilab2ccode.deps.dfactoriala=["dfactorials"] -scilab2ccode.deps.dfactorials=[] -scilab2ccode.deps.sfactoriala=["dfactorials"] -scilab2ccode.deps.sfactorials=[] - -//primes -scilab2ccode.deps.dprimess=[] -scilab2ccode.deps.sprimess=[] - - -////////RADIX_CONVERSION//////// - -//base2dec -scilab2ccode.deps.dbase2decs=[] -scilab2ccode.deps.gbase2decs=[] - -//bin2dec -scilab2ccode.deps.dbin2deca=["dbin2decs"] -scilab2ccode.deps.dbin2decs=[] -scilab2ccode.deps.i8bin2deca=["i8bin2decs"] -scilab2ccode.deps.i8bin2decs=[] -scilab2ccode.deps.i16bin2deca=["i16bin2decs"] -scilab2ccode.deps.i16bin2decs=[] -scilab2ccode.deps.u8bin2deca=["u8bin2decs"] -scilab2ccode.deps.u8bin2decs=[] -scilab2ccode.deps.u16bin2deca=["u16bin2decs"] -scilab2ccode.deps.u16bin2decs=[] - -//dec2base -scilab2ccode.deps.ddec2basea=["ddec2bases"] -scilab2ccode.deps.ddec2bases=[] -scilab2ccode.deps.sdec2basea=["sdec2bases"] -scilab2ccode.deps.sdec2bases=[] - -//dec2bin -scilab2ccode.deps.ddec2bina=["ddec2bins"] -scilab2ccode.deps.ddec2bins=[] -scilab2ccode.deps.i8dec2bina=["i8dec2bins"] -scilab2ccode.deps.i8dec2bins=[] -scilab2ccode.deps.i16dec2bina=["i16dec2bins"] -scilab2ccode.deps.i16dec2bins=[] -scilab2ccode.deps.u8dec2bina=["u8dec2bins"] -scilab2ccode.deps.u8dec2bins=[] -scilab2ccode.deps.u16dec2bina=["u16dec2bins"] -scilab2ccode.deps.u16dec2bins=[] - -//dec2hex -scilab2ccode.deps.ddec2hexa=["ddec2hexs"] -scilab2ccode.deps.ddec2hexs=[] -scilab2ccode.deps.i8dec2hexa=["i8dec2hexs"] -scilab2ccode.deps.i8dec2hexs=[] -scilab2ccode.deps.i16dec2hexa=["i16dec2hexs"] -scilab2ccode.deps.i16dec2hexs=[] -scilab2ccode.deps.u8dec2hexa=["u8dec2hexs"] -scilab2ccode.deps.u8dec2hexs=[] -scilab2ccode.deps.u16dec2hexa=["u16dec2hexs"] -scilab2ccode.deps.u16dec2hexs=[] - -//dec2oct -scilab2ccode.deps.ddec2octa=["ddec2octs"] -scilab2ccode.deps.ddec2octs=[] -scilab2ccode.deps.i8dec2octa=["i8dec2octs"] -scilab2ccode.deps.i8dec2octs=[] -scilab2ccode.deps.i16dec2octa=["i16dec2octs"] -scilab2ccode.deps.i16dec2octs=[] -scilab2ccode.deps.u8dec2octa=["u8dec2octs"] -scilab2ccode.deps.u8dec2octs=[] -scilab2ccode.deps.u16dec2octs=["u16dec2octs"] -scilab2ccode.deps.u16dec2octs=[] - -//hex2dec -scilab2ccode.deps.dhex2decs=[] -scilab2ccode.deps.ghex2decs=[] - -//oct2dec -scilab2ccode.deps.doct2deca=["doct2decs"] -scilab2ccode.deps.doct2decs=[] -scilab2ccode.deps.i8oct2deca=["i8oct2decs"] -scilab2ccode.deps.i8oct2decs=[] -scilab2ccode.deps.i16oct2deca=["i16oct2decs"] -scilab2ccode.deps.i16oct2decs=[] -scilab2ccode.deps.u8oct2deca=["u8oct2decs"] -scilab2ccode.deps.u8oct2decs=[] -scilab2ccode.deps.u16oct2deca=["u16oct2decs"] -scilab2ccode.deps.u16oct2decs=[] - -//////////Trigonometry///////// - -//cosd -scilab2ccode.deps.dcosda=["dcosds"] -scilab2ccode.deps.dcosds=[] -scilab2ccode.deps.scosda=["scosds"] -scilab2ccode.deps.scosds=[] - -//cotd -scilab2ccode.deps.dcotda=["dcotds"] -scilab2ccode.deps.dcotds=[] -scilab2ccode.deps.scotda=["scotds"] -scilab2ccode.deps.scotds=[] - -//coth -scilab2ccode.deps.ccotha=["ccoths"] -scilab2ccode.deps.ccoths=["ctanhs","FloatComplex","crdivs"] -scilab2ccode.deps.dcotha=[] -scilab2ccode.deps.dcoths=[] -scilab2ccode.deps.scotha=[] -scilab2ccode.deps.scoths=[] -scilab2ccode.deps.zcotha=["zcoths"] -scilab2ccode.deps.zcoths=["zrdivs","DoubleComplex","ztanhs"] - -//csc -scilab2ccode.deps.ccsca=["ccscs"] -scilab2ccode.deps.ccscs=["csins","FloatComplex","crdivs"] -scilab2ccode.deps.dcsca=["dcscs"] -scilab2ccode.deps.dcscs=[] -scilab2ccode.deps.scsca=["scscs"] -scilab2ccode.deps.scscs=[] -scilab2ccode.deps.zcsca=["zcscs"] -scilab2ccode.deps.zcscs=["DoubleComplex","zrdivs","dsins","dcoshs","dcoss","dsinhs","zreals","zimags"] - -//cscd -scilab2ccode.deps.ccscda=["ccscds"] -scilab2ccode.deps.ccscds=["csins","FloatComplex","crdivs"] -scilab2ccode.deps.dcscda=["dcscds"] -scilab2ccode.deps.dcscds=[] -scilab2ccode.deps.scscda=["scscds"] -scilab2ccode.deps.scscds=[] -scilab2ccode.deps.zcscda=["zcscds"] -scilab2ccode.deps.zcscds=["zrdivs","DoubleComplex","zsins"] - -//csch -scilab2ccode.deps.ccscha=["ccschs"] -scilab2ccode.deps.ccschs=["csinhs","FloatComplex","crdivs"] -scilab2ccode.deps.dcscha=["dcschs"] -scilab2ccode.deps.dcschs=[] -scilab2ccode.deps.scscha=["scschs"] -scilab2ccode.deps.scschs=[] -scilab2ccode.deps.zcscha=["zcschs"] -scilab2ccode.deps.zcschs=["zrdivs","DoubleComplex","zsinhs"] - -//sec -scilab2ccode.deps.cseca=["csecs"] -scilab2ccode.deps.csecs=["ccoss","FloatComplex","crdivs"] -scilab2ccode.deps.dseca=[] -scilab2ccode.deps.dsecs=[] -scilab2ccode.deps.sseca=["ssecs"] -scilab2ccode.deps.ssecs=[] -scilab2ccode.deps.zseca=["zsecs"] -scilab2ccode.deps.zsecs=["zrdivs","DoubleComplex","zcoss"] - -//secd -scilab2ccode.deps.dsecda=["dsecds"] -scilab2ccode.deps.dsecds=[] -scilab2ccode.deps.ssecda=["ssecds"] -scilab2ccode.deps.ssecds=[] - -//sech -scilab2ccode.deps.csecha=["csechs"] -scilab2ccode.deps.ccoths=["ccoshs","FloatComplex","crdivs"] -scilab2ccode.deps.dsecha=["dsechs"] -scilab2ccode.deps.dsechs=[] -scilab2ccode.deps.ssecha=["ssechs"] -scilab2ccode.deps.ssechs=[] -scilab2ccode.deps.zsecha=["zsechs"] -scilab2ccode.deps.zsechs=["zrdivs","DoubleComplex","zcoshs"] - -/////////////////////////////// -////// FILES ////// -/////////////////////////////// - - -//mclose -scilab2ccode.deps.mclose=[] -//mopen -scilab2ccode.deps.mopen=[] - - -//mput -scilab2ccode.deps.dmputa=[] -scilab2ccode.deps.dmputs=[] -scilab2ccode.deps.i8mputa=[] -scilab2ccode.deps.i8mputs=[] -scilab2ccode.deps.i16mputa=[] -scilab2ccode.deps.i16mputs=[] -scilab2ccode.deps.smputa=[] -scilab2ccode.deps.smputs=[] -scilab2ccode.deps.u8mputa=[] -scilab2ccode.deps.u8mputs=[] -scilab2ccode.deps.u16mputa=[] -scilab2ccode.deps.u16mputs=[] ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 - - - -/////////////////////////////// -<<<<<<< HEAD -////// MATRIX OPERATIONS ////// -/////////////////////////////// - -======= -////// IMPLICITLIST ////// -/////////////////////////////// - -scilab2ccode.deps.cimplicitLists=["simplicitLists"] -scilab2ccode.deps.dimplicitLists=[] -scilab2ccode.deps.simplicitLists=[] -scilab2ccode.deps.zimplicitLists=["dimplicitLists"] - -/////////////////////////////// -/////// LINEARALGEBRA /////// -/////////////////////////////// - -//balanc -scilab2ccode.deps.dbalanca=["deyea"] - -//rcond -scilab2ccode.deps.drconda=[] - -//schur -scilab2ccode.deps.dgschura=[] -scilab2ccode.deps.dschura=[] /////////////////////////////// ////// MATRIX OPERATIONS ////// /////////////////////////////// -//cat -scilab2ccode.deps.ccata=[] -scilab2ccode.deps.ccats=[] -scilab2ccode.deps.dcata=[] -scilab2ccode.deps.dcatS=[] -scilab2ccode.deps.scata=[] -scilab2ccode.deps.scats=[] -scilab2ccode.deps.zcata=[] -scilab2ccode.deps.zcats=[] -scilab2ccode.deps.i8cata=[] -scilab2ccode.deps.i8cats=[] -scilab2ccode.deps.i16cata=[] -scilab2ccode.deps.i16catS=[] -scilab2ccode.deps.u8cata=[] -scilab2ccode.deps.u8cats=[] -scilab2ccode.deps.u16cata=[] -scilab2ccode.deps.u16cats=[] ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 //OpRc scilab2ccode.deps.crowcats=[] @@ -1079,95 +355,14 @@ scilab2ccode.deps.dchola=[] scilab2ccode.deps.schols=["ssqrts"] scilab2ccode.deps.schola=["ssqrts"] scilab2ccode.deps.zchola=["DoubleComplex","zreals","zimags","zdiffs","zmuls","zrdivs","zsqrts"] -<<<<<<< HEAD - -======= -//cumprod -scilab2ccode.deps.dcolumncumproda=[] -scilab2ccode.deps.dcumproda=[] -scilab2ccode.deps.drowcumproda=[] -scilab2ccode.deps.i8columncumproda=[] -scilab2ccode.deps.i8cumproda=[] -scilab2ccode.deps.i8rowcumproda=[] -scilab2ccode.deps.i16columncumproda=[] -scilab2ccode.deps.i16cumproda=[] -scilab2ccode.deps.i16rowcumproda=[] -scilab2ccode.deps.scolumncumproda=[] -scilab2ccode.deps.scumproda=[] -scilab2ccode.deps.srowcumproda=[] -scilab2ccode.deps.u8columncumproda=[] -scilab2ccode.deps.u8cumproda=[] -scilab2ccode.deps.u8rowcumproda=[] -scilab2ccode.deps.u16columncumproda=[] -scilab2ccode.deps.u16cumproda=[] -scilab2ccode.deps.u16rowcumproda=[] - -//cumcum -scilab2ccode.deps.dcolumncumsuma=[] -scilab2ccode.deps.dcumsuma=[] -scilab2ccode.deps.drowcumsuma=[] -scilab2ccode.deps.i8columncumsuma=[] -scilab2ccode.deps.i8cumsuma=[] -scilab2ccode.deps.i8rowcumsuma=[] -scilab2ccode.deps.i16columncumsuma=[] -scilab2ccode.deps.i16cumsuma=[] -scilab2ccode.deps.i16rowcumsuma=[] -scilab2ccode.deps.scolumncumsuma=[] -scilab2ccode.deps.scumsuma=[] -scilab2ccode.deps.srowcumsuma=[] -scilab2ccode.deps.u8columncumsuma=[] -scilab2ccode.deps.u8cumsuma=[] -scilab2ccode.deps.u8rowcumsuma=[] -scilab2ccode.deps.u16columncumsuma=[] -scilab2ccode.deps.u16cumsuma=[] -scilab2ccode.deps.u16rowcumsuma=[] ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 + //determ scilab2ccode.deps.cdeterma=["cdiffs","FloatComplex","cmuls","cadds","DoubleComplex","creals","cimags","zreals","zimags","zmuls","crdivs"] scilab2ccode.deps.ddeterma=[] scilab2ccode.deps.sdeterma=[] scilab2ccode.deps.zdeterma=["zdiffs","zmuls","DoubleComplex","zadds","zreals","zimags","zrdivs"] -<<<<<<< HEAD - -======= -scilab2ccode.deps.i8determa=[] -scilab2ccode.deps.i16determa=[] -scilab2ccode.deps.u8determa=[] -scilab2ccode.deps.u16determa=[] - -//diag -scilab2ccode.deps.ddiaga=[] -scilab2ccode.deps.ddiagexa=[] -scilab2ccode.deps.ddiagexs=[] -scilab2ccode.deps.ddiagina=[] -scilab2ccode.deps.ddiagins=[] -scilab2ccode.deps.ddiags=[] -scilab2ccode.deps.i8diags=[] -scilab2ccode.deps.i8diagexa=[] -scilab2ccode.deps.i8diagexs=[] -scilab2ccode.deps.i8diagina=[] -scilab2ccode.deps.i8diagins=[] -scilab2ccode.deps.i8diags=[] -scilab2ccode.deps.i16diaga=[] -scilab2ccode.deps.i16diags=[] -scilab2ccode.deps.i16diagexa=[] -scilab2ccode.deps.i16diagexs=[] -scilab2ccode.deps.i16diagina=[] -scilab2ccode.deps.i16diagins=[] -scilab2ccode.deps.u8diaga=[] -scilab2ccode.deps.u8diags=[] -scilab2ccode.deps.u8diagexa=[] -scilab2ccode.deps.u8diagexs=[] -scilab2ccode.deps.u8diagina=[] -scilab2ccode.deps.u8diagins=[] -scilab2ccode.deps.u16diaga=[] -scilab2ccode.deps.u16diags=[] -scilab2ccode.deps.u16diagexa=[] -scilab2ccode.deps.u16diagexs=[] -scilab2ccode.deps.u16diagina=[] -scilab2ccode.deps.u16diagins=[] ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 + //dist scilab2ccode.deps.cdists=["spows","creals","cimags","ssqrts"] @@ -1179,31 +374,6 @@ scilab2ccode.deps.sdista=["spows","ssqrts"] scilab2ccode.deps.zdists=["dpows","zreals","zimags","dsqrts"] scilab2ccode.deps.zdista=["dpows","zreals","zimags","dsqrts"] -<<<<<<< HEAD -======= -//division -scilab2ccode.deps.crdivcsv=["crdivv"] -scilab2ccode.deps.crdivscv=["crdivv"] -scilab2ccode.deps.crdivv=["crdivma","FloatComplex"] -scilab2ccode.deps.drdivv=["drdivma"] -scilab2ccode.deps.i8rdivma=["dtransposea"] -scilab2ccode.deps.i8ldivma=[] -scilab2ccode.deps.i8rdivv=["i8rdivma"] -scilab2ccode.deps.i16ldivma=[] -scilab2ccode.deps.i16rdivma=["dtransposea"] -scilab2ccode.deps.i16rdivv=["i16rdivma"] -scilab2ccode.deps.srdivv=["srdivma"] -scilab2ccode.deps.u8rdivma=["dtransposea"] -scilab2ccode.deps.u8ldivma=[] -scilab2ccode.deps.u8rdivv=["u8rdivma"] -scilab2ccode.deps.u16ldivma=[] -scilab2ccode.deps.u16rdivma=["dtransposea"] -scilab2ccode.deps.u16rdivv=["u16rdivma"] -scilab2ccode.deps.zrdivdzv=["dzerosa","zrdivv"] -scilab2ccode.deps.zrdivv=["zrdivma","DoubleComplex"] -scilab2ccode.deps.zrdivzdv=["dzerosa","zrdivv"] - ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 //OpSlash scilab2ccode.deps.crdivma=["DoubleComplex","creals","cimags","zrdivma","FloatComplex","zreals","zimags"] @@ -1231,14 +401,7 @@ scilab2ccode.deps.ceyea= ["FloatComplex"] scilab2ccode.deps.deyea= [] scilab2ccode.deps.seyea= [] scilab2ccode.deps.zeyea= ["DoubleComplex"] -<<<<<<< HEAD -======= -scilab2ccode.deps.i8eyea= [] -scilab2ccode.deps.i16eyea= [] -scilab2ccode.deps.u8eyea= [] -scilab2ccode.deps.u16eyea= [] ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 //fill scilab2ccode.deps.cfilla=["conesa","cmuls"] @@ -1246,25 +409,10 @@ scilab2ccode.deps.dfilla=["donesa"] scilab2ccode.deps.sfilla=["sonesa"] scilab2ccode.deps.zfilla=["zonesa","zmuls"] -<<<<<<< HEAD //hilbert scilab2ccode.deps.dhilberta=[] scilab2ccode.deps.shilberta=[] -======= -//flipdim -scilab2ccode.deps.dflipdima=[] -scilab2ccode.deps.i8flipdima=[] -scilab2ccode.deps.i16flipdima=[] -scilab2ccode.deps.sflipdima=[] -scilab2ccode.deps.u8flipdima=[] -scilab2ccode.deps.u16flipdima=[] - -//hilb -scilab2ccode.deps.dhilba=[] -scilab2ccode.deps.shilba=[] - ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 //infinite norm scilab2ccode.deps.cinfnorma=["spythags","creals","cimags"] @@ -1278,26 +426,10 @@ scilab2ccode.deps.cinverma=["DoubleComplex","creals","cimags","zinverma","FloatC scilab2ccode.deps.dinverma=[] scilab2ccode.deps.sinverma=["dinverma"] scilab2ccode.deps.zinverma=[] -<<<<<<< HEAD //jmat -======= -scilab2ccode.deps.i8inverma=[] -scilab2ccode.deps.i16inverma=[] -scilab2ccode.deps.u8inverma=[] -scilab2ccode.deps.u16inverma=[] - - -//jmat -scilab2ccode.deps.djmata=[] -scilab2ccode.deps.sjmata=[] - -//kron -scilab2ccode.deps.dkrona=[] -scilab2ccode.deps.skrona=[] ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 //logm scilab2ccode.deps.clogma=["DoubleComplex","creals","cimags","zlogma","FloatComplex","zreals","zimags"] @@ -1315,70 +447,21 @@ scilab2ccode.deps.smagns=[] scilab2ccode.deps.smagna=["smagns"] scilab2ccode.deps.zmagns=["zreals","zimags","dsqrts"] scilab2ccode.deps.zmagna=["zmagns"] -<<<<<<< HEAD - -======= -scilab2ccode.deps.i8magna=[] -scilab2ccode.deps.i8magns=["i8abss"] -scilab2ccode.deps.i16magna=["dmagns"] -scilab2ccode.deps.i16magns=["i16abss"] -scilab2ccode.deps.u8magna=["dmagns"] -scilab2ccode.deps.u8magns=["u8abss"] -scilab2ccode.deps.u16magna=["dmagns"] -scilab2ccode.deps.u16magns=["u16abss"] ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 + //OpStar scilab2ccode.deps.cmulma=["FloatComplex","cadds","cmuls"] scilab2ccode.deps.dmulma=[] scilab2ccode.deps.smulma=[] scilab2ccode.deps.zmulma=["zreala","zimaga","DoubleComplex","zadds","zmuls"] -<<<<<<< HEAD -======= -scilab2ccode.deps.i8mulma=[] -scilab2ccode.deps.i16mulma=[] -scilab2ccode.deps.u8mulma=[] -scilab2ccode.deps.u16mulma=[] - -//norm -scilab2ccode.deps.dnorma=[] -scilab2ccode.deps.dnormv=[] -scilab2ccode.deps.snorma=[] -scilab2ccode.deps.snormv=[] ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 //ones scilab2ccode.deps.conesa=["FloatComplex"] scilab2ccode.deps.donesa=[] scilab2ccode.deps.sonesa=[] scilab2ccode.deps.zonesa=["DoubleComplex"] -<<<<<<< HEAD - -======= -scilab2ccode.deps.i8onesa=[] -scilab2ccode.deps.i16onesa=[] -scilab2ccode.deps.u8onesa=[] -scilab2ccode.deps.u16onesa=[] - -//powm -scilab2ccode.deps.cpowma=["creals","cimags","cspec2a","cpows","cmulma","ctransposea","cconja","cinverma"] -scilab2ccode.deps.dpowma=["dzerosa","zspec2a","zpows","zmulma","ztransposea","zconja","zinverma","zreals","DoubleComplex"] -scilab2ccode.deps.spowma=["szerosa","cspec2a","cpows","FloatComplex","cmulma","ctransposea","cconja","cinverma","creals"] -scilab2ccode.deps.zpowma=["zreals","zimags","zspec2a","zpows","zmulma","ztransposea","zconja","zinverma"] - -//spec -scilab2ccode.deps.cspeca=["DoubleComplex","creals","cimags","zspeca","FloatComplex","zreals","zimags"] -scilab2ccode.deps.dspeca=[] -scilab2ccode.deps.sspeca=["dspeca"] -scilab2ccode.deps.zspeca=["DoubleComplex","zreals","zimags","zconjs","dzerosa"] - -//spec2 -scilab2ccode.deps.cspec2a=["DoubleComplex","creals","cimags","zspec2a","FloatComplex","zreals","zimags"] -scilab2ccode.deps.dspec2a=["dzerosa"] -scilab2ccode.deps.sspec2a=["dspec2a"] -scilab2ccode.deps.zspec2a=["DoubleComplex","zreals","zimags","dzerosa"] ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 + //Squared Magnitude scilab2ccode.deps.csquMagns=["creals","cimags"] @@ -1396,13 +479,6 @@ scilab2ccode.deps.ctracea=["creals","cimags","FloatComplex"] scilab2ccode.deps.dtracea=[] scilab2ccode.deps.stracea=[] scilab2ccode.deps.ztracea=["zreals","zimags","DoubleComplex"] -<<<<<<< HEAD -======= -scilab2ccode.deps.i8tracea=[] -scilab2ccode.deps.i16tracea=[] -scilab2ccode.deps.u8tracea=[] -scilab2ccode.deps.u16tracea=[] ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 //transpose @@ -1410,54 +486,16 @@ scilab2ccode.deps.ctransposea=["creals","cimags","FloatComplex"] scilab2ccode.deps.dtransposea=[] scilab2ccode.deps.stransposea=[] scilab2ccode.deps.ztransposea=["zreals","zimags","DoubleComplex"] -<<<<<<< HEAD - - - -======= -scilab2ccode.deps.i8transposea=[] -scilab2ccode.deps.i16transposea=[] -scilab2ccode.deps.u8transposea=[] -scilab2ccode.deps.u16transposea=[] - -//tril -scilab2ccode.deps.dtrila=[] -scilab2ccode.deps.i8trila=[] -scilab2ccode.deps.i16trila=[] -scilab2ccode.deps.strila=[] -scilab2ccode.deps.u8trila=[] -scilab2ccode.deps.u16trila=[] - -//triu -scilab2ccode.deps.dtriua=[] -scilab2ccode.deps.i8triua=[] -scilab2ccode.deps.i16triua=[] -scilab2ccode.deps.striua=[] -scilab2ccode.deps.u8triua=[] -scilab2ccode.deps.u16triua=[] - -//zeros -scilab2ccode.deps.czerosa=["FloatComplex"] -scilab2ccode.deps.dzerosa=[] -scilab2ccode.deps.dzerosh=[] -scilab2ccode.deps.i8zerosa=[] -scilab2ccode.deps.i16zerosa=[] -scilab2ccode.deps.szerosa=[] -scilab2ccode.deps.u8zerosa=[] -scilab2ccode.deps.u16zerosa=[] -scilab2ccode.deps.zzerosa=["DoubleComplex"] ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 + + + //////////////////////// ////// OPERATIONS ////// //////////////////////// -<<<<<<< HEAD //OpPlus -======= -//addition ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 scilab2ccode.deps.cadds=["creals","cimags","FloatComplex"] scilab2ccode.deps.cadda=["cadds"] scilab2ccode.deps.dadds=[] @@ -1466,23 +504,9 @@ scilab2ccode.deps.sadds=[] scilab2ccode.deps.sadda=["sadds"] scilab2ccode.deps.zadds=["zreals","zimags","DoubleComplex"] scilab2ccode.deps.zadda=["zadds"] -<<<<<<< HEAD //OpDotSlash/OpSlash -======= -scilab2ccode.deps.i8adda=["i8adds"] -scilab2ccode.deps.i8adds=[] -scilab2ccode.deps.i16adda=["i16adds"] -scilab2ccode.deps.i16adds=[] -scilab2ccode.deps.u8adda=["u8adds"] -scilab2ccode.deps.u8adds=[] -scilab2ccode.deps.u16adda=["u16adds"] -scilab2ccode.deps.u16adds=[] - - -//division ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 scilab2ccode.deps.crdivs=["FloatComplex"] scilab2ccode.deps.crdiva=["crdivs"] scilab2ccode.deps.drdivs=[] @@ -1491,12 +515,9 @@ scilab2ccode.deps.srdivs=[] scilab2ccode.deps.srdiva=["srdivs"] scilab2ccode.deps.zrdivs=["DoubleComplex"] scilab2ccode.deps.zrdiva=["zrdivs"] -<<<<<<< HEAD //OpBackSlash -======= ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 scilab2ccode.deps.cldivs=["cmuls","cconjs","creals","cimags","FloatComplex","crdivs"] scilab2ccode.deps.cldiva=["cldivs"] scilab2ccode.deps.dldivs=[] @@ -1505,30 +526,9 @@ scilab2ccode.deps.sldivs=[] scilab2ccode.deps.sldiva=["scldivs"] scilab2ccode.deps.zldivs=["zmuls","zconjs","zreals","zimags","DoubleComplex","zrdivs"] scilab2ccode.deps.zldiva=["zldivs"] -<<<<<<< HEAD //OpStar/OpDotStar -======= -scilab2ccode.deps.i8ldiva=["i8ldivs"] -scilab2ccode.deps.i8ldivs=[] -scilab2ccode.deps.i8rdiva=["i8rdivs"] -scilab2ccode.deps.i8rdivs=[] -scilab2ccode.deps.i16ldiva=["i16ldivs"] -scilab2ccode.deps.i16ldivs=[] -scilab2ccode.deps.i16rdiva=["i16rdivs"] -scilab2ccode.deps.i16rdivs=[] -scilab2ccode.deps.u8ldiva=["u8ldivs"] -scilab2ccode.deps.u8ldivs=[] -scilab2ccode.deps.u8rdiva=["u8rdivs"] -scilab2ccode.deps.u8rdivs=[] -scilab2ccode.deps.u16ldiva=["u16ldivs"] -scilab2ccode.deps.u16ldivs=[] -scilab2ccode.deps.u16rdiva=["u16rdivs"] -scilab2ccode.deps.u16rdivs=[] - -//multiplication ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 scilab2ccode.deps.cmuls=["FloatComplex"] scilab2ccode.deps.cmula=["cmuls"] scilab2ccode.deps.dmuls=[] @@ -1537,34 +537,9 @@ scilab2ccode.deps.smuls=[] scilab2ccode.deps.smula=["smuls"] scilab2ccode.deps.zmuls=["DoubleComplex"] scilab2ccode.deps.zmula=["zmuls"] -<<<<<<< HEAD //OpMinus -======= -scilab2ccode.deps.cmulcsv=["cmulv"] -scilab2ccode.deps.cmulscv=["cmulv"] -scilab2ccode.deps.cmulv=["cadds"] -scilab2ccode.deps.dmulv=["dmuls"] -scilab2ccode.deps.i8muls=[] -scilab2ccode.deps.i8mula=["i8muls"] -scilab2ccode.deps.i8mulv=["i8muls"] -scilab2ccode.deps.i16muls=[] -scilab2ccode.deps.i16mula=["i16muls"] -scilab2ccode.deps.i16mulv=["i16muls"] -scilab2ccode.deps.smulv=["smuls"] -scilab2ccode.deps.u8muls=[] -scilab2ccode.deps.u8mula=["u8muls"] -scilab2ccode.deps.u8mulv=["u8muls"] -scilab2ccode.deps.u16muls=[] -scilab2ccode.deps.u16mula=["u16muls"] -scilab2ccode.deps.u16mulv=["u16muls"] -scilab2ccode.deps.zmuldzv=["dzerosa","zmulv"] -scilab2ccode.deps.zmulzdv=["dzerosa","zmulv"] -scilab2ccode.deps.zmulv=["zadds"] - -//subtraction ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 scilab2ccode.deps.cdiffs=["creals","cimags","FloatComplex"] scilab2ccode.deps.cdiffa=["cdiffs"] scilab2ccode.deps.ddiffs=[] @@ -1573,17 +548,6 @@ scilab2ccode.deps.sdiffs=[] scilab2ccode.deps.sdiffa=["sdiffs"] scilab2ccode.deps.zdiffs=["zreals","zimags","DoubleComplex"] scilab2ccode.deps.zdiffa=["zdiffs"] -<<<<<<< HEAD -======= -scilab2ccode.deps.i8diffs=[] -scilab2ccode.deps.i8diffa=["i8diffs"] -scilab2ccode.deps.i16diffa=["i16diffs"] -scilab2ccode.deps.i16diffs=[] -scilab2ccode.deps.u8diffa=["u8diffs"] -scilab2ccode.deps.u8diffs=[] -scilab2ccode.deps.u16diffa=["u16diffs"] -scilab2ccode.deps.u16diffs=[] ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 /////////////////////////////// @@ -1617,20 +581,12 @@ scilab2ccode.deps.cfftma=["DoubleComplex","creals","cimags","zfftma","FloatCompl scilab2ccode.deps.dfft2=["dfftbi"] scilab2ccode.deps.dfftbi=["dfftmx"] scilab2ccode.deps.dfftmx=[] -<<<<<<< HEAD -======= -scilab2ccode.deps.dfftma=["dzerosa","zfftma","zreala"] ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 scilab2ccode.deps.fft842=["r2tx","r4tx","r8tx","DoubleComplex","zreals","zimags"] scilab2ccode.deps.r2tx=["zadds","zdiffs","DoubleComplex","zreals","zimags"] scilab2ccode.deps.r4tx=["zadds","zdiffs","DoubleComplex","zreals","zimags"] scilab2ccode.deps.r8tx=["zadds","zdiffs","DoubleComplex","zreals","zimags"] scilab2ccode.deps.zfftma=["zreala","zimaga","fft842","dfft2","DoubleComplexMatrix"] -<<<<<<< HEAD -======= -scilab2ccode.deps.sfftma=["szerosa","cfftma","creala"] ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 //hilbert scilab2ccode.deps.dhilberts=[] @@ -1638,23 +594,6 @@ scilab2ccode.deps.dhilberta=["DoubleComplex","zfftma","zmuls","zifftma"] scilab2ccode.deps.shilberts=[] scilab2ccode.deps.shilberta=["FloatComplex","cfftma","cmuls","cifftma"] -<<<<<<< HEAD -======= -//fftshift -scilab2ccode.deps.ccolumnfftshifta=[] -scilab2ccode.deps.cfftshifta=["crowfftshifta","ccolumnfftshifta"] -scilab2ccode.deps.crowfftshifta=[] -scilab2ccode.deps.dcolumnfftshifta=[] -scilab2ccode.deps.dfftshifta=["drowfftshifta","dcolumnfftshifta"] -scilab2ccode.deps.drowfftshifta=[] -scilab2ccode.deps.scolumnfftshifta=[] -scilab2ccode.deps.sfftshifta=["srowfftshifta","scolumnfftshifta"] -scilab2ccode.deps.srowfftshifta=[] -scilab2ccode.deps.zcolumnfftshifta=[] -scilab2ccode.deps.zfftshifta=["zrowfftshifta","zcolumnfftshifta"] -scilab2ccode.deps.zrowfftshifta=[] - ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 //ifft scilab2ccode.deps.cifftma=["DoubleComplex","creals","cimags","zifftma","FloatComplex","zreals","zimags"] @@ -1666,22 +605,6 @@ scilab2ccode.deps.ir2tx=["zadds","zdiffs","DoubleComplex","zreals","zimags"] scilab2ccode.deps.ir4tx=["zadds","zdiffs","DoubleComplex","zreals","zimags"] scilab2ccode.deps.ir8tx=["zadds","zdiffs","DoubleComplex","zreals","zimags"] scilab2ccode.deps.zifftma=["zreala","zimaga","ifft842","difft2","DoubleComplexMatrix"] -<<<<<<< HEAD -======= -scilab2ccode.deps.diffbi_lavraie=[] -scilab2ccode.deps.difftma=["dzerosa","zifftma","zreala"] -scilab2ccode.deps.sifftma=["szerosa","cifftma","creala"] - -//lev -scilab2ccode.deps.cleva=["crdivs","FloatComplex","creals","cimags","cmuls","cconjs","cdiffs","cadds"] -scilab2ccode.deps.cleva2=["crdivs","FloatComplex","creals","cimags","cmuls","cconjs","cdiffs","cadds"] -scilab2ccode.deps.dleva=[] -scilab2ccode.deps.dleva2=[] -scilab2ccode.deps.sleva=[] -scilab2ccode.deps.sleva2=[] -scilab2ccode.deps.zleva=["zrdivs","DoubleComplex","zreals","zimags","zmuls","zdiffs","zconjs","zadds"] -scilab2ccode.deps.zleva2=["zrdivs","DoubleComplex","zreals","zimags","zmuls","zdiffs","zconjs","zadds"] ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 //levin @@ -1707,11 +630,7 @@ scilab2ccode.deps.slevinmul2=[] scilab2ccode.deps.sdecalage=[] scilab2ccode.deps.slevinsub=[] scilab2ccode.deps.slevinsig=[] -<<<<<<< HEAD -======= -scilab2ccode.deps.levinUtils=[] ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 //lpc2cep scilab2ccode.deps.clpc2cepa=["cfftma","clogma","cifftma"] @@ -1724,28 +643,6 @@ scilab2ccode.deps.zlpc2cepa=["zfftma","zlogma","zifftma"] ////// STATISTIC FUNCTIONS ////// ///////////////////////////////// -<<<<<<< HEAD -======= -//max -scilab2ccode.deps.dcolumnmaxa=[] -scilab2ccode.deps.dmaxa=[] -scilab2ccode.deps.drowmaxa=[] -scilab2ccode.deps.i8columnmaxa=[] -scilab2ccode.deps.i8maxa=[] -scilab2ccode.deps.i8rowmaxa=[] -scilab2ccode.deps.i16columnmaxa=[] -scilab2ccode.deps.i16maxa=[] -scilab2ccode.deps.i16rowmaxa=[] -scilab2ccode.deps.scolumnmaxa=[] -scilab2ccode.deps.smaxa=[] -scilab2ccode.deps.srowmaxa=[] -scilab2ccode.deps.u8columnmaxa=[] -scilab2ccode.deps.u8maxa=[] -scilab2ccode.deps.u8rowmaxa=[] -scilab2ccode.deps.u16columnmaxa=[] -scilab2ccode.deps.u16maxa=[] -scilab2ccode.deps.u16rowmaxa=[] ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 //mean scilab2ccode.deps.cmeana=["FloatComplex","cadds","creals","cimags"] @@ -1761,47 +658,7 @@ scilab2ccode.deps.drowmeana=["drowsuma"] scilab2ccode.deps.srowmeana=["srowsuma"] scilab2ccode.deps.zrowmeana=["zrowsuma","zrdivs","DoubleComplex"] -<<<<<<< HEAD - -======= -//meanf -scilab2ccode.deps.cmeanfa=["FloatComplex","cadds","crdivs"] -scilab2ccode.deps.dmeanfa=[] -scilab2ccode.deps.smeanfa=[] -scilab2ccode.deps.zmeanfa=["DoubleComplex","zadds","zmuls","zrdivs"] -scilab2ccode.deps.ccolumnmeanfa=["cadds","cmuls","FloatComplex","crdivs"] -scilab2ccode.deps.dcolumnmeanfa=[] -scilab2ccode.deps.scolumnmeanfa=[] -scilab2ccode.deps.zcolumnmeanfa=["zmuls","zrdivs","DoubleComplex","zadds"] -scilab2ccode.deps.crowmeanfa=["cmuls","crdivs","FloatComplex","cadds"] -scilab2ccode.deps.drowmeanfa=["drowsuma"] -scilab2ccode.deps.srowmeanfa=[] -scilab2ccode.deps.zrowmeanfa=["zmuls","zrdivs","DoubleComplex","zadds"] -scilab2ccode.deps.cmeanfcs=["szerosa","cmeanfa"] -scilab2ccode.deps.cmeanfsc=["szerosa","cmeanfa"] -scilab2ccode.deps.zmeanfdz=["dzerosa","zmeanfa"] -scilab2ccode.deps.zmeanfzd=["dzerosa","zmeanfa"] - -//min -scilab2ccode.deps.dcolumnmina=[] -scilab2ccode.deps.dmina=[] -scilab2ccode.deps.drowmina=[] -scilab2ccode.deps.i8columnmina=[] -scilab2ccode.deps.i8mina=[] -scilab2ccode.deps.i8rowmina=[] -scilab2ccode.deps.i16columnmina=[] -scilab2ccode.deps.i16mina=[] -scilab2ccode.deps.i16rowmina=[] -scilab2ccode.deps.scolumnmina=[] -scilab2ccode.deps.smina=[] -scilab2ccode.deps.srowmina=[] -scilab2ccode.deps.u8columnmina=[] -scilab2ccode.deps.u8mina=[] -scilab2ccode.deps.u8rowmina=[] -scilab2ccode.deps.u16columnmina=[] -scilab2ccode.deps.u16mina=[] -scilab2ccode.deps.u16rowmina=[] ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 + //prod scilab2ccode.deps.cproda=["cmuls"] scilab2ccode.deps.dproda=[] @@ -1816,33 +673,6 @@ scilab2ccode.deps.drowproda=[] scilab2ccode.deps.srowproda=[] scilab2ccode.deps.zrowproda=["zmuls"] -<<<<<<< HEAD -======= -//stdevf -scilab2ccode.deps.ccolumnstdevfa=["FloatComplex","cpows","cdiffs","cmuls","cadds","sabss","creals","cimags","crdivs","csqrts"] -scilab2ccode.deps.cstdevfa=["FloatComplex","cmeanfa","cpows","cmuls","cadds","crdivs","csqrts","cdiffs"] -scilab2ccode.deps.crowstdevfa=["FloatComplex","crowmeanfa","cpows","cdiffs","cmuls","cadds""sabss","creals","cimags","crdivs","csqrts"] -scilab2ccode.deps.cstdevfcs=["FloatComplex","cmeanfcs","cpows","cdiffs","cmuls","cadds","creals","cimags","csqrts"] -scilab2ccode.deps.cstdevfsc=["szerosa","cstdevfa"] -scilab2ccode.deps.dcolumnstdevfa=["dcolumnmeanfa","dpows","dsqrts"] -scilab2ccode.deps.dstdevfa=[] -scilab2ccode.deps.drowstdevfa=[] -scilab2ccode.deps.i8columnmina=[] -scilab2ccode.deps.i8mina=[] -scilab2ccode.deps.i8rowmina=[] -scilab2ccode.deps.i16columnmina=[] -scilab2ccode.deps.i16mina=[] -scilab2ccode.deps.i16rowmina=[] -scilab2ccode.deps.scolumnmina=[] -scilab2ccode.deps.smina=[] -scilab2ccode.deps.srowmina=[] -scilab2ccode.deps.u8columnmina=[] -scilab2ccode.deps.u8mina=[] -scilab2ccode.deps.u8rowmina=[] -scilab2ccode.deps.u16columnmina=[] -scilab2ccode.deps.u16mina=[] -scilab2ccode.deps.u16rowmina=[] ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 //sum scilab2ccode.deps.csuma=["cadds"] @@ -1857,22 +687,7 @@ scilab2ccode.deps.crowsuma=["cadds"] scilab2ccode.deps.drowsuma=[] scilab2ccode.deps.srowsuma=[] scilab2ccode.deps.zrowsuma=["zadds"] -<<<<<<< HEAD - -======= -scilab2ccode.deps.i8suma=["i8adds"] -scilab2ccode.deps.i8columnsuma=["i8adds"] -scilab2ccode.deps.i8rowsuma=["i8adds"] -scilab2ccode.deps.i16suma=["i16adds"] -scilab2ccode.deps.i16columnsuma=["i16adds"] -scilab2ccode.deps.i16rowsuma=["i16adds"] -scilab2ccode.deps.u8suma=["u8adds"] -scilab2ccode.deps.U8columnsuma=["u8adds"] -scilab2ccode.deps.u8rowsuma=["u8adds"] -scilab2ccode.deps.u16suma=["u16adds"] -scilab2ccode.deps.u16columnsuma=["u16adds"] -scilab2ccode.deps.u16rowsuma=["u16adds"] ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 + //variance scilab2ccode.deps.cvariancea=["FloatComplex","cmeana","cdiffs","cadds","cpows","creals","cimags","crdivs"] @@ -1888,33 +703,11 @@ scilab2ccode.deps.drowvariancea=["dtransposea","dvariancea"] scilab2ccode.deps.srowvariancea=["stransposea","svariancea"] scilab2ccode.deps.zrowvariancea=["ztransposea","DoubleComplex","zreals","zimags","zvariancea"] -<<<<<<< HEAD -======= -//variancef -scilab2ccode.deps.cvariancefa=["FloatComplex","cmeanfa","cdiffs","cadds","cpows","cmuls","crdivs"] -scilab2ccode.deps.dvariancefa=["dmeanfa","dpows"] -scilab2ccode.deps.svariancefa=["smeanfa","spows"] -scilab2ccode.deps.zvariancefa=["DoubleComplex","zmeanfa","zdiffs","zadds","zpows","zrdivs"] -scilab2ccode.deps.ccolumnvariancefa=["cvariancefa","ctransposea"] -scilab2ccode.deps.dcolumnvariancefa=["dvariancefa","dtransposea"] -scilab2ccode.deps.scolumnvariancefa=["scolumnmeanfa","spows"] -scilab2ccode.deps.zcolumnvariancefa=["zvariancefa","ztransposea"] -scilab2ccode.deps.crowvariancefa=["cvariancefa"] -scilab2ccode.deps.drowvariancefa=["dvariancefa"] -scilab2ccode.deps.srowvariancefa=["svariancefa"] -scilab2ccode.deps.zrowvariancefa=["zvariancefa"] - ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 //////////////////// ////// STRING ////// //////////////////// -<<<<<<< HEAD -======= -//convstr -scilab2ccode.deps.gconvstrs=[] ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 //disp scilab2ccode.deps.cdisps=["creals","cimags"] @@ -1925,56 +718,12 @@ scilab2ccode.deps.sdisps=[] scilab2ccode.deps.sdispa=[] scilab2ccode.deps.zdisps=["zreals","zimags"] scilab2ccode.deps.zdispa=["zreals","zimags"] -<<<<<<< HEAD - -======= -scilab2ccode.deps.ddisph=[] -scilab2ccode.deps.i8disps=[] -scilab2ccode.deps.i8dispa=[] -scilab2ccode.deps.i16disps=[] -scilab2ccode.deps.i16dispa=[] -scilab2ccode.deps.u8disps=[] -scilab2ccode.deps.u8dispa=[] -scilab2ccode.deps.u16disps=[] -scilab2ccode.deps.u16dispa=[] - -//string -scilab2ccode.deps.cstringa=["cstrings"] -scilab2ccode.deps.cstrings=["creals","cimags"] -scilab2ccode.deps.dstringa=["dstrings"] -scilab2ccode.deps.dstrings=[] -scilab2ccode.deps.i8stringa=["i8strings"] -scilab2ccode.deps.i8strings=[] -scilab2ccode.deps.i16stringa=["i16strings"] -scilab2ccode.deps.i16strings=[] -scilab2ccode.deps.sstringa=["sstrings"] -scilab2ccode.deps.sstrings=[] -scilab2ccode.deps.u8stringa=["u8strings"] -scilab2ccode.deps.u8strings=[] -scilab2ccode.deps.u16stringa=["u16strings"] -scilab2ccode.deps.u16strings=[] -scilab2ccode.deps.zstringa=["zstrings"] -scilab2ccode.deps.zstrings=[] - -//strrchr -scilab2ccode.deps.gstrrchra=[] - -//strrev -scilab2ccode.deps.gstrreva=[] - -//strsubst -scilab2ccode.deps.gstrsubsta=[] ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 + /////////////////// ////// TYPES ////// /////////////////// -<<<<<<< HEAD -======= -scilab2ccode.deps.floatComplex=["creals","cimags","FloatComplex","cisreals","cisimags"] -scilab2ccode.deps.doubleComplex=["zreals","zimags","DoubleComplex","zisreals","zisimags"] ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 //floatComplex scilab2ccode.deps.creals=[] @@ -1997,27 +746,4 @@ scilab2ccode.deps.DoubleComplexMatrix=["DoubleComplex"] scilab2ccode.deps.zisreals=["zimags"] scilab2ccode.deps.zisimags=["zreals"] -<<<<<<< HEAD -======= -//Arduino Functions -scilab2ccode.deps.u8cmd_analog_ins=["duint16a","duint16s","i8uint16a","i8uint16s","i16uint16a","i16uint16s","suint16a","suint16s","u8uint16a","u8uint16s"] -scilab2ccode.deps.u8cmd_analog_in_volts=["dfloats","dfloata","i8floats","i8floata","i16floats","i16floata","sfloats","sfloata","u8floats","u8floata","u16floats","u16floata"] -scilab2ccode.deps.u8cmd_analog_outs=[] -scilab2ccode.deps.u8cmd_analog_out_volts=[] -scilab2ccode.deps.u8cmd_dcmotor_releases=[] -scilab2ccode.deps.u8cmd_dcmotor_runs=[] -scilab2ccode.deps.u8cmd_dcmotor_setups=[] -scilab2ccode.deps.u8cmd_digital_ins=["duint8a","duint8s","i8uint8a","i8uint8s","i16uint8a","i16uint8s","suint8a","suint8s","u16uint8a","u16uint8s"] -scilab2ccode.deps.u8cmd_digital_outs=[] -scilab2ccode.deps.u8cmd_i2c_devs=["duint8a","duint8s","i8uint8a","i8uint8s","i16uint8a","i16uint8s","suint8a","suint8s","u16uint8a","u16uint8s"] -scilab2ccode.deps.u8cmd_i2c_reads=[] -scilab2ccode.deps.u8cmd_i2c_read_registers=[] -scilab2ccode.deps.u8cmd_i2c_writes=[] -scilab2ccode.deps.u8cmd_i2c_write_registers=[] -scilab2ccode.deps.u8cmd_servo_attach=[] -scilab2ccode.deps.u8cmd_servo_move=[] -scilab2ccode.deps.u8cmd_servo_detach=[] -scilab2ccode.deps.u16sleeps=[] - ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 endfunction diff --git a/2.3-1/macros/findDeps/getAllHeaders.sci b/2.3-1/macros/findDeps/getAllHeaders.sci index 8e33e486..9eb019aa 100644 --- a/2.3-1/macros/findDeps/getAllHeaders.sci +++ b/2.3-1/macros/findDeps/getAllHeaders.sci @@ -60,10 +60,6 @@ function allHeaders = getAllHeaders(SharedInfo) "src/c/matrixOperations/includes/logm.h" "src/c/matrixOperations/includes/ones.h" "src/c/matrixOperations/includes/matrixSquaredMagnitude.h" - "src/c/linearAlgebra/includes/spec.h" - - "src/c/matrixOperations/includes/spec.h" - "src/c/matrixOperations/includes/matrixTranspose.h" "src/c/matrixOperations/includes/determ.h" "src/c/matrixOperations/includes/matrixMultiplication.h" diff --git a/2.3-1/macros/findDeps/getAllLibraries.sci b/2.3-1/macros/findDeps/getAllLibraries.sci index fe894ee8..9d74bbf7 100644 --- a/2.3-1/macros/findDeps/getAllLibraries.sci +++ b/2.3-1/macros/findDeps/getAllLibraries.sci @@ -24,13 +24,9 @@ function allLibraries = getAllLibraries(SharedInfo) Target = SharedInfo.Target; //Library files required for "RasberryPi" target RPi_libs = [ -<<<<<<< HEAD "thirdparty/lib/raspberrypi/libRPIwfi.a" "thirdparty/lib/raspberrypi/libwiringPi.a" "thirdparty/lib/raspberrypi/libwiringPiDev.a" -======= - "thirdparty/lib/raspberrypi/libwiringPi.so" ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 "thirdparty/lib/raspberrypi/libcblas.a" "thirdparty/lib/raspberrypi/librefblas.a" "thirdparty/lib/raspberrypi/liblapack.a" diff --git a/2.3-1/macros/findDeps/getAllSources.sci b/2.3-1/macros/findDeps/getAllSources.sci index f0f4e741..209cec08 100644 --- a/2.3-1/macros/findDeps/getAllSources.sci +++ b/2.3-1/macros/findDeps/getAllSources.sci @@ -1448,24 +1448,10 @@ function allSources = getAllSources(SharedInfo) "src/c/imageProcessing/cvimgproc/imcvCanny.cpp" "src/c/imageProcessing/cvimgproc/imcvCornerHarris.cpp"]; - if Target == "StandAlone" allSources = Standalone_files; elseif Target == "Arduino" allSources = cat(1,Standalone_files, Arduino_files); - - if Target == "Arduino" & BuildTool == "nmake" - Required_addrs = get_rquird_fnctns(Standalone_files,Arduino_files,SharedInfo); - end - - if Target == "StandAlone" - allSources = Standalone_files; - elseif Target == "Arduino" - if BuildTool == "nmake" - allSources = Required_addrs; - else - allSources = cat(1,Standalone_files, Arduino_files); - end elseif Target == "AVR" allSources = cat(1,Standalone_files, AVR_files); elseif Target == "RPi" diff --git a/2.3-1/macros/findDeps/get_rquird_fnctns.sci b/2.3-1/macros/findDeps/get_rquird_fnctns.sci deleted file mode 100644 index 28837952..00000000 --- a/2.3-1/macros/findDeps/get_rquird_fnctns.sci +++ /dev/null @@ -1,140 +0,0 @@ -// Copyright (C) 2017 - IIT Bombay - FOSSEE - -// This file must be used under the terms of the CeCILL. -// This source file is licensed as described in the file COPYING, which -// you should have received as part of this distribution. The terms -// are also available at -// http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt -// Author: Yash Pratap Singh Tomar -// Organization: FOSSEE, IIT Bombay -// Email: toolbox@scilab.in - -//This function creates and compares the list of functions used in scilab code to existing function list from getallSources -function Required_addrs = get_rquird_fnctns(Standalone_files,Arduino_files,SharedInfo) - Required_stdalon_indx = 1; - Required_ardno_indx = 1; - x = 1; - y = 1; - -//Creating lists for stanalone C file and function -//Some C files don't have their function name directory. So their address is being shifted to last of the list - Standalone_files_1 = Standalone_files; - Standalone_files_extras(1) = Standalone_files_1(76); - Standalone_files_extras(2) = Standalone_files_1(77); - Standalone_files_extras(3) = Standalone_files_1(1009); - Standalone_files_extras(4) = Standalone_files_1(1010); - Standalone_files_extras(5) = Standalone_files_1(1011); - Standalone_files_extras(6) = Standalone_files_1(1012); - Standalone_files_1(1012) = []; - Standalone_files_1(1011) = []; - Standalone_files_1(1010) = []; - Standalone_files_1(1009) = []; - Standalone_files_1(77) = []; - Standalone_files_1(76) = []; - -//calculating the total no. of standalone files - No_of_stdalon_files = size(Standalone_files_1); - No_of_stdalon_files = No_of_stdalon_files(1); - -//This for loop is to extract function name list from address list - for index=1:No_of_stdalon_files - K = strsplit(Standalone_files_1(index),"/"); - Standalone_files_folders(index) = K(4); - Standalone_C_files(index) = K(5); - Standalone_C_files(index) = strtok(Standalone_C_files(index),"."); - end - -//Here, it adds the functions to the list which were earlier removed to shift to the end - for index=1:6 - K = strsplit(Standalone_files_extras(index),"/"); - Standalone_files_folders(No_of_stdalon_files+index) = K(3); - Standalone_C_files(No_of_stdalon_files+index) = K(4); - Standalone_files_1(No_of_stdalon_files+index)= Standalone_files_extras(index); - Standalone_C_files(No_of_stdalon_files+index) = strtok(Standalone_C_files(No_of_stdalon_files+index),"."); - end - -//Following similar procedure for Arduino - Arduino_files_1 = Arduino_files; - No_of_ardno_files = size(Arduino_files_1); - No_of_ardno_files = No_of_ardno_files(1); - for index=1:No_of_ardno_files - K = strsplit(Arduino_files_1(index),"/"); - Arduino_files_folders(index) = K(4); - Arduino_C_files(index) = K(5); - Arduino_C_files(index) = strtok(Arduino_C_files(index),"."); - end - -//comparing -//this compares the list of functions used in scilab file to the created standalone C files and function list - for index = 1:SharedInfo.Function_list_index - for k = 1:No_of_stdalon_files - if SharedInfo.Function_list(index) == Standalone_files_folders(k) - Required_fnctn_stdalon(Required_stdalon_indx) = k; - Required_fnctn_stdlon_f(x) = Standalone_C_files(k); - x = x+1; - Required_stdalon_indx = Required_stdalon_indx + 1; - end - end - end - if x == 1 - Required_fnctn_stdlon_f = []; - end -//this compares the list of functions used in scilab file to the created Arduino files and function list -Required_stdalon_indx = Required_stdalon_indx - 1; - - for index = 1:SharedInfo.Function_list_index - for k = 1:No_of_ardno_files - if SharedInfo.Function_list(index) == Arduino_files_folders(k); - Required_fnctn_ardno(Required_ardno_indx) = k; - Required_fnctn_ardno_f(y) = Arduino_C_files(k); - y = y+1; - Required_ardno_indx = Required_ardno_indx + 1; - end - end - end - - Required_ardno_indx = Required_ardno_indx - 1; -//Calling Scilab2CDeps structure - scilab2ccode = Scilab2CDeps(); - -//Looking for the depencies of the C files used on other files - for index = 1:Required_stdalon_indx - call = "scilab2ccode.deps." + Standalone_C_files(Required_fnctn_stdalon(index)); - call_val = eval(call); - Required_fnctn_stdlon_f = cat(1,Required_fnctn_stdlon_f,(call_val)'); - end - - Required_fnctn_stdlon_f = unique(Required_fnctn_stdlon_f); - -//Looking for the depencies of the Arduino files used on other C or Arduino files - for index = 1:Required_ardno_indx - call = "scilab2ccode.deps." + Arduino_C_files(Required_fnctn_ardno(index)); - call_val = eval(call); - Required_fnctn_ardno_f = cat(1,Required_fnctn_ardno_f,(call_val)'); - end - Required_fnctn_ardno_f = unique(Required_fnctn_ardno_f); - -//Adding Standalone and Arudino files lists - all_files_addrs = cat(1,Standalone_files_1,Arduino_files_1); - -//Adding Requied Standalone and Arudino files lists which are to be copied - required_files = cat(1,Required_fnctn_stdlon_f,Required_fnctn_ardno_f); - required_files = unique(required_files); - no_of_required_files = size(required_files); - no_of_required_files = no_of_required_files(1); - no_of_all_files = size(all_files_addrs); - no_of_all_files = no_of_all_files(1); - - all_files = cat(1,Standalone_C_files,Arduino_C_files); - index = 1; -//Creating final list which has address of files to be copied - for i=1:no_of_required_files - for k=1:no_of_all_files - if required_files(i) == all_files(k) - Required_addrs(index) = all_files_addrs(k); - index = index + 1; - end - end - end - -endfunction diff --git a/2.3-1/macros/findDeps/names b/2.3-1/macros/findDeps/names index 7b471e9e..2b8c551b 100644 --- a/2.3-1/macros/findDeps/names +++ b/2.3-1/macros/findDeps/names @@ -5,7 +5,3 @@ getAllInterfaces getAllLibraries getAllSources getArduinoFiles -<<<<<<< HEAD -======= -get_rquird_fnctns ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 diff --git a/2.3-1/macros/runsci2c.sci b/2.3-1/macros/runsci2c.sci index f7ef59ed..2fc66be8 100644 --- a/2.3-1/macros/runsci2c.sci +++ b/2.3-1/macros/runsci2c.sci @@ -53,17 +53,10 @@ disp(RunSci2CMainDir); [FileInfoDatFile,SharedInfoDatFile] = INIT_SCI2C(UserScilabMainFile, ...
UserSciFilesPaths, SCI2COutputPath, RunMode, Target,Board_name);
-<<<<<<< HEAD // -- Load FileInfo and SharedInfo
load(SharedInfoDatFile,'SharedInfo');
load(FileInfoDatFile,'FileInfo');
-======= -// -- Load FileInfo and SharedInfo
-load(SharedInfoDatFile,'SharedInfo');
-load(FileInfoDatFile,'FileInfo');
-
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 RunMode = SharedInfo.RunMode;
// --- Generation of the library structure. ---
@@ -98,11 +91,7 @@ load(SharedInfoDatFile,'SharedInfo'); // ---------------------------
global SCI2CHOME
-<<<<<<< HEAD allSources = SCI2CHOME + "/" + getAllSources(SharedInfo);
-======= -allSources = SCI2CHOME + "/" + getAllSources(SharedInfo, BuildTool);
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 allHeaders = SCI2CHOME + "/" +getAllHeaders(SharedInfo);
allInterfaces = SCI2CHOME + "/" + getAllInterfaces(SharedInfo);
if(~isempty(getAllLibraries(SharedInfo)))
@@ -111,14 +100,7 @@ else allLibraries = ''
end
//allLibraries = SCI2CHOME + "/" + getAllLibraries(Target);
-<<<<<<< HEAD -======= -if (Target == 'Arduino')
- mkdir(SCI2COutputPath+"/arduino/");
- mkdir(SCI2COutputPath+"/arduino/sci2c_arduino");
-end
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 mkdir(SCI2COutputPath+"/src/");
mkdir(SCI2COutputPath+"/src/c/");
mkdir(SCI2COutputPath+"/includes/");
@@ -135,27 +117,11 @@ for i = 1:size(allSources, "*") if(~isempty(strstr(allSources(i),'dode')))
if(size(SharedInfo.Includelist) <> 0)
if((mtlb_strcmp(part(SharedInfo.Includelist(1),1:5),'odefn') == %T))
-<<<<<<< HEAD copyfile(allSources(i), SCI2COutputPath+"/src/c/");
end
end
else
copyfile(allSources(i), SCI2COutputPath+"/src/c/");
-======= - if BuildTool == "nmake"
- copyfile(allSources(i), SCI2COutputPath+"/arduino/sci2c_arduino/");
- else
- copyfile(allSources(i), SCI2COutputPath+"/src/c/");
- end
- end
- end
- else
- if BuildTool == "nmake"
- copyfile(allSources(i), SCI2COutputPath+"/arduino/sci2c_arduino/");
- else
- copyfile(allSources(i), SCI2COutputPath+"/src/c/");
- end
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 end
end
@@ -164,15 +130,7 @@ PrintStepInfo('Copying headers', FileInfo.GeneralReport,'both'); for i = 1:size(allHeaders, "*")
// DEBUG only
//disp("Copying "+allHeaders(i)+" in "+SCI2COutputPath+"/includes/");
-<<<<<<< HEAD copyfile(allHeaders(i), SCI2COutputPath+"/includes/");
-======= - if BuildTool == "nmake"
- copyfile(allHeaders(i), SCI2COutputPath+"/arduino/sci2c_arduino/");
- else
- copyfile(allHeaders(i), SCI2COutputPath+"/includes/");
- end
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 end
// -- Interfaces
@@ -180,15 +138,7 @@ PrintStepInfo('Copying interfaces', FileInfo.GeneralReport,'both'); for i = 1:size(allInterfaces, "*")
// DEBUG only
//disp("Copying "+allInterfaces(i)+" in "+SCI2COutputPath+"/interfaces/");
-<<<<<<< HEAD copyfile(allInterfaces(i), SCI2COutputPath+"/interfaces/");
-======= - if BuildTool == "nmake"
- copyfile(allInterfaces(i), SCI2COutputPath+"/arduino/sci2c_arduino/");
- else
- copyfile(allInterfaces(i), SCI2COutputPath+"/interfaces/");
- end
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 end
// -- Libraries
@@ -215,11 +165,8 @@ end if (Target == 'Arduino')
GenerateSetupFunction(FileInfo);
-<<<<<<< HEAD mkdir(SCI2COutputPath+"/arduino/");
mkdir(SCI2COutputPath+"/arduino/sci2c_arduino");
-======= ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 //Copy arduino makefile
arduinoFiles = SCI2CHOME + "/" + getArduinoFiles();
PrintStepInfo('Copying arduino files', FileInfo.GeneralReport,'both');
@@ -245,15 +192,6 @@ else C_GenerateMakefile_msvc(FileInfo,SharedInfo);
end
end
-<<<<<<< HEAD -======= -if BuildTool == "nmake" & Target == 'Arduino'
- movefile(SCI2COutputPath +"/setup_arduino.h", SCI2COutputPath+"/arduino/sci2c_arduino/");
- movefile(SCI2COutputPath +"/setup_arduino.cpp", SCI2COutputPath+"/arduino/sci2c_arduino/");
- movefile(SCI2COutputPath +"/loop_arduino.cpp", SCI2COutputPath+"/arduino/sci2c_arduino/");
- movefile(SCI2COutputPath +"/loop_arduino.h", SCI2COutputPath+"/arduino/sci2c_arduino/");
-end
->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 diff --git a/2.3-1/macros/scilab2c.sci b/2.3-1/macros/scilab2c.sci index aff3df69..70290d09 100644 --- a/2.3-1/macros/scilab2c.sci +++ b/2.3-1/macros/scilab2c.sci @@ -12,10 +12,7 @@ function scilab2c(varargin) [lhs, rhs] = argn(); -<<<<<<< HEAD -======= ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 select rhs // // scilab2c() @@ -201,10 +198,7 @@ error(msprintf(gettext("%s: Wrong number of input argument(s): %d expected.\n"), userchoice = 1; end if (userchoice == 1) -<<<<<<< HEAD -======= ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 // --- LAUNCH SCI2C --- runsci2c(UserScilabMainFile, UserSciFilesPaths, CCodeOutputDir, RunMode, BuildTool,Target,Board_name); end diff --git a/2.3-1/src/c/CACSD/includes/lqr.h b/2.3-1/src/c/CACSD/includes/lqr.h index aab06d33..5b20ee83 100644 --- a/2.3-1/src/c/CACSD/includes/lqr.h +++ b/2.3-1/src/c/CACSD/includes/lqr.h @@ -17,11 +17,7 @@ extern "C" { #endif -<<<<<<< HEAD void dlqra(double* sys, int sys_rows, int sys_cols, double* Q, double* R, double* S, double* X, double* K); -======= -void dlqra(double* sys, int sys_rows, int sys_cols, double* X, double* K); ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 #ifdef __cplusplus } /* extern "C" */ diff --git a/2.3-1/src/c/CACSD/interfaces/int_lqr.h b/2.3-1/src/c/CACSD/interfaces/int_lqr.h index c292f8c1..8deba90b 100644 --- a/2.3-1/src/c/CACSD/interfaces/int_lqr.h +++ b/2.3-1/src/c/CACSD/interfaces/int_lqr.h @@ -16,7 +16,6 @@ extern "C" { #endif -<<<<<<< HEAD #define ss2lqrd2d2(in1,size1,out1,out2) dlqra(in1,size1[0],size1[1],NULL,\ NULL,NULL,out1,out2); @@ -25,9 +24,6 @@ extern "C" { #define ss2d2d2d2lqrd2d2(in1,size1,in2,size2,in3,size3,in4,size4,out1,out2) \ dlqra(in1,size1[0],size1[1],in2,in3,in4,out1,out2); -======= -#define ss2lqrd2d2(in1,size1,out1,out2) dlqra(in1,size1[0],size1[1],out1,out2); ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 #ifdef __cplusplus } /* extern "C" */ diff --git a/2.3-1/src/c/CACSD/lqe/dlqea.c b/2.3-1/src/c/CACSD/lqe/dlqea.c index 06c1c6e0..e0be5b34 100644 --- a/2.3-1/src/c/CACSD/lqe/dlqea.c +++ b/2.3-1/src/c/CACSD/lqe/dlqea.c @@ -54,11 +54,7 @@ void dlqea(double* sys, int sys_rows, int sys_cols, double* X, double* K) /*Calculate LQR gain*/ K_lqr = (double*) malloc(no_of_ip*no_of_st*sizeof(double)); -<<<<<<< HEAD dlqra(sys_lqr,sys_lqr_rows,sys_lqr_cols,NULL,NULL,NULL,X,K_lqr); -======= - dlqra(sys_lqr,sys_lqr_rows,sys_lqr_cols,X,K_lqr); ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 dtransposea(K_lqr,sys_rows - no_of_st,no_of_st,K); }
\ No newline at end of file diff --git a/2.3-1/src/c/CACSD/lqr/dlqra.c b/2.3-1/src/c/CACSD/lqr/dlqra.c index 15120f7d..1440c3a8 100644 --- a/2.3-1/src/c/CACSD/lqr/dlqra.c +++ b/2.3-1/src/c/CACSD/lqr/dlqra.c @@ -22,12 +22,8 @@ #include "schur.h" #include "matrixDivision.h" -<<<<<<< HEAD void dlqra(double* sys, int sys_rows, int sys_cols, double* Q, double* R, \ double* S, double* K, double* X) -======= -void dlqra(double* sys, int sys_rows, int sys_cols, double* X, double* K) ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 { int no_of_states, no_of_inputs, no_of_outputs, dom = 1; int row,col; @@ -37,11 +33,7 @@ void dlqra(double* sys, int sys_rows, int sys_cols, double* X, double* K) double *A, *B, *C, *D; double *B_t, *C_t, *D_t; -<<<<<<< HEAD //double *Q, *R, *S; -======= - double *Q, *R, *S; ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 double *Ri, *LA, *LE; double *BRi, *StRi, *S_t; double *buf1, *buf2, *buf3, *buf4, *buf5, *buf6; @@ -99,18 +91,10 @@ void dlqra(double* sys, int sys_rows, int sys_cols, double* X, double* K) dom = (int)sys[(sys_rows*(sys_cols-2)) + no_of_states]; -<<<<<<< HEAD -======= - Q = (double*) malloc (no_of_states*no_of_states*sizeof(double)); - R = (double*) malloc (no_of_inputs*no_of_inputs*sizeof(double)); - S = (double*) malloc (no_of_inputs*no_of_states*sizeof(double)); - ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 dtransposea(B,no_of_states,no_of_inputs,B_t); dtransposea(C,no_of_outputs,no_of_states,C_t); dtransposea(D,no_of_outputs,no_of_inputs,D_t); -<<<<<<< HEAD if(Q == NULL) {/*If Q is not provided*/ Q = (double*) malloc (no_of_states*no_of_states*sizeof(double)); @@ -130,14 +114,6 @@ void dlqra(double* sys, int sys_rows, int sys_cols, double* X, double* K) } /*Free up unwanted variables*/ -======= - dmulma(C_t,no_of_states,no_of_outputs,C,no_of_outputs,no_of_states,Q); - dmulma(D_t,no_of_inputs,no_of_outputs,D,no_of_outputs,no_of_inputs,R); - dmulma(D_t,no_of_inputs,no_of_outputs,C,no_of_outputs,no_of_states,S); - - /*Free up unwanted variables*/ - ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 free(C); free(C_t); free(D); @@ -211,13 +187,8 @@ void dlqra(double* sys, int sys_rows, int sys_cols, double* X, double* K) /*Freeup umwanted variables*/ free(A); -<<<<<<< HEAD //free(Q); //free(R); -======= - free(Q); - free(R); ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 free(BRi); free(S_t); free(StRi); @@ -317,11 +288,7 @@ void dlqra(double* sys, int sys_rows, int sys_cols, double* X, double* K) } -<<<<<<< HEAD //free(Q); -======= - free(Q); ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 free(BRi); free(S_t); free(StRi); @@ -359,11 +326,7 @@ void dlqra(double* sys, int sys_rows, int sys_cols, double* X, double* K) /*inv(B'XB+R)*/ dmulma(B_t,no_of_inputs,no_of_states,X,no_of_states,no_of_states,buf3); -<<<<<<< HEAD dmulma(buf3,no_of_inputs,no_of_states,B,no_of_states,no_of_inputs,buf6); -======= - dmulma(buf3,no_of_inputs,no_of_states,B_t,no_of_states,no_of_inputs,buf6); ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 dadda(buf6,no_of_inputs*no_of_inputs,R,no_of_inputs*no_of_inputs,buf5); dinverma(buf5,buf6,no_of_inputs); /*B'XA+S*/ @@ -380,22 +343,14 @@ void dlqra(double* sys, int sys_rows, int sys_cols, double* X, double* K) free(A); free(B); -<<<<<<< HEAD //free(R); -======= - free(R); ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 free(buf5); free(buf6); } free(B_t); -<<<<<<< HEAD //free(S); -======= - free(S); ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 free(wsmall); free(X12); free(phi12); diff --git a/2.3-1/src/c/elementaryFunctions/includes/linspace.h b/2.3-1/src/c/elementaryFunctions/includes/linspace.h index 00b1471a..62d45015 100644 --- a/2.3-1/src/c/elementaryFunctions/includes/linspace.h +++ b/2.3-1/src/c/elementaryFunctions/includes/linspace.h @@ -21,16 +21,11 @@ extern "C" { EXTERN_ELEMFUNCT void dlinspaces(double low_limit,double up_limit,double range_num, double* out); -<<<<<<< HEAD EXTERN_ELEMFUNCT void slinspaces(float low_limit,float up_limit,float range_num, float* out); EXTERN_ELEMFUNCT void dlinspacea(double *low_limit,int row,double *up_limit,double range_num, double* out); EXTERN_ELEMFUNCT void slinspacea(float *low_limit,int row,float *up_limit,float range_num, float* out); -======= -EXTERN_ELEMFUNCT void dlinspacea(double *low_limit,int row,double *up_limit,double range_num, double* out); - ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 diff --git a/2.3-1/src/c/elementaryFunctions/interfaces/int_linspace.h b/2.3-1/src/c/elementaryFunctions/interfaces/int_linspace.h index febe516e..15ea2696 100644 --- a/2.3-1/src/c/elementaryFunctions/interfaces/int_linspace.h +++ b/2.3-1/src/c/elementaryFunctions/interfaces/int_linspace.h @@ -15,15 +15,10 @@ #define d0d0d0linspaced2(in1,in2,in3,out) dlinspaces(in1,in2,in3,out) -<<<<<<< HEAD #define s0s0s0linspaces2(in1,in2,in3,out) slinspaces(in1,in2,in3,out) #define d2d2d0linspaced2(in1,size1,in2,size2,in3,out) dlinspacea(in1,size1[0],in2,in3,out) #define s2s2s0linspaces2(in1,size1,in2,size2,in3,out) slinspacea(in1,size1[0],in2,in3,out) -======= -#define d2d2d0linspaced2(in1,size1,in2,size2,in3,out) dlinspacea(in1,size1[0],in2,in3,out) - ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 #endif diff --git a/2.3-1/src/c/hardware/rasberrypi/ISR/i16RPIPinISRs.c b/2.3-1/src/c/hardware/rasberrypi/ISR/i16RPIPinISRs.c deleted file mode 100644 index 6e398a17..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/ISR/i16RPIPinISRs.c +++ /dev/null @@ -1,25 +0,0 @@ -/* Copyright (C) 2016 - IIT Bombay - FOSSEE - - This file must be used under the terms of the CeCILL. - This source file is licensed as described in the file COPYING, which - you should have received as part of this distribution. The terms - are also available at - http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt - Author: Siddhesh Wani - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -/* Function to declare interrupt on pins and corresponding ISRs */ - -#include "types.h" -#include "RPIPeripheralPinISR.h" -#include "RPIPeripheralDigital.h" - -int16 i16RPIPinISRs(uint8 pin, uint8 edgetype, void (*ISRFunction)(void)) -{ - int status; - status = wiringPiISR((int)phy_pin[pin-1], (int) edgetype, ISRFunction); - return status; -} - diff --git a/2.3-1/src/c/hardware/rasberrypi/gpio/u8RPIDigitalIns.c b/2.3-1/src/c/hardware/rasberrypi/gpio/u8RPIDigitalIns.c deleted file mode 100644 index 7b84350f..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/gpio/u8RPIDigitalIns.c +++ /dev/null @@ -1,24 +0,0 @@ -/* Copyright (C) 2016 - IIT Bombay - FOSSEE - - This file must be used under the terms of the CeCILL. - This source file is licensed as described in the file COPYING, which - you should have received as part of this distribution. The terms - are also available at - http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt - Author: Siddhesh Wani - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -/* Function to read the state of the gpio pin */ - -#include "types.h" -#include "RPIPeripheralDigital.h" - -/*pin is reduced by one as array index starts from 0 and pin no starts from 1*/ -uint8 u8RPIDigitalIns(uint8 pin) -{ - uint8 state = 0; - state = digitalRead(phy_pin[pin-1]); - return (state); -} diff --git a/2.3-1/src/c/hardware/rasberrypi/gpio/u8RPIDigitalOuts.c b/2.3-1/src/c/hardware/rasberrypi/gpio/u8RPIDigitalOuts.c deleted file mode 100644 index f828f77e..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/gpio/u8RPIDigitalOuts.c +++ /dev/null @@ -1,26 +0,0 @@ -/* Copyright (C) 2016 - IIT Bombay - FOSSEE - - This file must be used under the terms of the CeCILL. - This source file is licensed as described in the file COPYING, which - you should have received as part of this distribution. The terms - are also available at - http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt - Author: Siddhesh Wani - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -/* Function to change the output state of the gpio pin */ - - -#include "types.h" -#include "RPIPeripheralDigital.h" - -/*pin is reduced by one as array index starts from 0 and pin no starts from 1*/ -void u8RPIDigitalOuts(uint8 pin, uint8 state) -{ - if (state == 0) /*low output*/ - digitalWrite(phy_pin[pin-1], LOW); - if (state == 1) /*high output*/ - digitalWrite(phy_pin[pin-1], HIGH); -} diff --git a/2.3-1/src/c/hardware/rasberrypi/gpio/u8RPIDigitalSetups.c b/2.3-1/src/c/hardware/rasberrypi/gpio/u8RPIDigitalSetups.c deleted file mode 100644 index f5fefe08..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/gpio/u8RPIDigitalSetups.c +++ /dev/null @@ -1,39 +0,0 @@ -/* Copyright (C) 2016 - IIT Bombay - FOSSEE - - This file must be used under the terms of the CeCILL. - This source file is licensed as described in the file COPYING, which - you should have received as part of this distribution. The terms - are also available at - http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt - Author: Siddhesh Wani - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -/* Function to setup digital pins - direction = 1 -> output - direction = 0 -> input -*/ - -#include "types.h" -#include "RPIPeripheralDigital.h" - - -/*This array maps pin numbers on RPi board, with pin numbers corrsponding -to WiringPi library*/ -int phy_pin[] = {17, 17, 8, 17, 9, 17, 7, 15, 17, 16, /*Pin 1 to 10*/ - 0, 1, 2, 17, 3, 4, 17, 5, 12, 17, /*Pin 11 to 20*/ - 13, 6, 14, 10, 17, 11, 30, 31, 21, 17, /*Pin 21 to 30*/ - 22, 26, 23, 17, 24, 27, 25, 28, 17, 29 }; /*Pin 31 to 40*/ - -/*pin is reduced by one as arrayiindex starts from 0 and pin no starts from 1*/ -void u8RPIDigitalSetups(uint8 pin, uint8 direction) -{ - if(direction == 1) /*Pin to be used as output*/ - pinMode(phy_pin[pin-1], OUTPUT); - else if(direction == 2) - pinMode(phy_pin[pin-1], PWM_OUTPUT); - else - pinMode(phy_pin[pin-1], INPUT); - -} diff --git a/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralDigital.h b/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralDigital.h index b9b88e79..22d470a2 100644 --- a/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralDigital.h +++ b/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralDigital.h @@ -1,8 +1,4 @@ -<<<<<<< HEAD /* Copyright (C) 2017 - IIT Bombay - FOSSEE -======= -/* Copyright (C) 2016 - IIT Bombay - FOSSEE ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 This file must be used under the terms of the CeCILL. This source file is licensed as described in the file COPYING, which @@ -23,24 +19,12 @@ extern "C" { #endif -<<<<<<< HEAD #include "types.h" uint8 u8RPI_digitalReads(uint8 pin); uint8 RPI_digitalReadByte(); void u8RPI_digitalWrites(uint8 pin, uint8 state); void u8RPI_digitalWriteBytes(uint8 value); -======= - -#include "types.h" -#include "wiringPi.h" - -extern int phy_pin[]; - -void u8RPIDigitalSetups(uint8 pin, uint8 direction); -void u8RPIDigitalOuts(uint8 pin, uint8 state); -uint8 u8RPIDigitalIns(uint8 pin); ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 #ifdef __cplusplus } /* extern "C" */ diff --git a/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralPWM.h b/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralPWM.h index 9c523f93..f1d3024e 100644 --- a/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralPWM.h +++ b/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralPWM.h @@ -5,28 +5,17 @@ you should have received as part of this distribution. The terms are also available at http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt -<<<<<<< HEAD Author: Siddhesh Wani, Jorawar Singh -======= - Author: Siddhesh Wani ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 Organization: FOSSEE, IIT Bombay Email: toolbox@scilab.in */ #ifndef __RPIPERIPHERALPWM_H__ #define __RPIPERIPHERALPWM_H__ -<<<<<<< HEAD -======= -#include "types.h" -#include "wiringPi.h" - ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 #ifdef __cplusplus extern "C" { #endif -<<<<<<< HEAD #include "types.h" void u8RPI_pwmWrites(uint8 pin,uint16 value); @@ -34,12 +23,6 @@ void u32RPI_pwmRanges(uint32 value); void gRPI_pwmModea(char* mode,int size); void u16RPI_pwmClocks(uint16 divisor); void u8RPI_pwmToneWrites(uint8 pin,uint16 value); -======= -void u8RPIHardPWMWrites(uint8 pin, uint16 value); -void u8RPIHardPWMSetRanges(uint16 value); -void u8RPIHardPWMSetModes(uint8 mode); -void u8RPIHardPWMSetClocks(uint16 clk_divisor); ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 #ifdef __cplusplus } /* extern "C" */ diff --git a/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralPinISR.h b/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralPinISR.h deleted file mode 100644 index fc5a8d04..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralPinISR.h +++ /dev/null @@ -1,26 +0,0 @@ - /* Copyright (C) 2016 - IIT Bombay - FOSSEE - - This file must be used under the terms of the CeCILL. - This source file is licensed as described in the file COPYING, which - you should have received as part of this distribution. The terms - are also available at - http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt - Author: Siddhesh Wani - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in - */ -#ifndef __RPIPERIPHERALPINISR_H__ -#define __RPIPERIPHERALPINISR_H__ - - -#ifdef __cplusplus -extern "C" { -#endif - -int16 i16RPIPinISRs(uint8 pin, uint8 edgetype, void (*ISRFunction)(void)); - -#ifdef __cplusplus -} /* extern "C" */ -#endif - -#endif /*__RPIPERIPHERALPINISR_H__*/ diff --git a/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralSerial.h b/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralSerial.h index 19ddcb21..67284bd0 100644 --- a/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralSerial.h +++ b/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralSerial.h @@ -5,28 +5,17 @@ you should have received as part of this distribution. The terms are also available at http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt -<<<<<<< HEAD Author: Siddhesh Wani, Jorawar Singh -======= - Author: Siddhesh Wani ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 Organization: FOSSEE, IIT Bombay Email: toolbox@scilab.in */ #ifndef __RPIPERIPHERALSERIAL_H__ #define __RPIPERIPHERALSERIAL_H__ -<<<<<<< HEAD -======= -#include "types.h" -#include "wiringSerial.h" - ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 #ifdef __cplusplus extern "C" { #endif -<<<<<<< HEAD #include "types.h" #include "wiringSerial.h" @@ -38,30 +27,6 @@ void u8RPI_serialGetchars(uint8 fd,char* out); void u8RPI_serialPrintfs(uint8 fd,char* msg,int size); void u8RPI_serialPutchars(uint8 fd,uint8 character); void u8RPI_serialPutss(uint8 fd,char* character,int size); -======= -int u8RPISerialSetups(char* port, int baudrate); -void u8RPISerialCloses(int fd); - -void u8RPISerialSendChars(int fd, uint8 data); -void u8RPISerialSendDatas(int fd, uint8 data); -void i8RPISerialSendDatas(int fd, int8 data); -void u16RPISerialSendDatas(int fd, uint16 data); -void i16RPISerialSendDatas(int fd, int16 data); -void sRPISerialSendDatas(int fd, float data); -void dRPISerialSendDatas(int fd, double data); -void u8RPISerialSendDataa(int fd, uint8* data, int size); -void i8RPISerialSendDataa(int fd, int8* data, int size); -void u16RPISerialSendDataa(int fd, uint16* data, int size); -void i16RPISerialSendDataa(int fd, int16* data, int size); -void sRPISerialSendDataa(int fd, float* data, int size); -void dRPISerialSendDataa(int fd, double* data, int size); -void gRPISerialSendDatas(int fd, uint8* data, int size); - -int16 i16RPISerialDataAvails(int fd); -int16 i16RPISerialGetChars(int fd); - -void u8RPISerialFlushs(int fd); ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 #ifdef __cplusplus } /* extern "C" */ diff --git a/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralThreading.h b/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralThreading.h deleted file mode 100644 index a7b2adb4..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralThreading.h +++ /dev/null @@ -1,28 +0,0 @@ - /* Copyright (C) 2016 - IIT Bombay - FOSSEE - - This file must be used under the terms of the CeCILL. - This source file is licensed as described in the file COPYING, which - you should have received as part of this distribution. The terms - are also available at - http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt - Author: Siddhesh Wani - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in - */ -#ifndef __RPIPERIPHERALTHREADING_H__ -#define __RPIPERIPHERALTHREADING_H__ - -#include "types.h" -#include "wiringPi.h" - -#ifdef __cplusplus -extern "C" { -#endif - -uint16 RPIThreadCreate(void *(*threadFunction)(void*)); - -#ifdef __cplusplus -} /* extern "C" */ -#endif - -#endif /*__RPIPERIPHERALTHREADING_H__*/ diff --git a/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralTiming.h b/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralTiming.h index b9087d77..e75a5394 100644 --- a/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralTiming.h +++ b/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralTiming.h @@ -5,11 +5,7 @@ you should have received as part of this distribution. The terms are also available at http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt -<<<<<<< HEAD Author: Siddhesh Wani, Jorawar Singh -======= - Author: Siddhesh Wani ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 Organization: FOSSEE, IIT Bombay Email: toolbox@scilab.in */ @@ -26,17 +22,10 @@ extern "C" { #include "types.h" #include "wiringPi.h" -<<<<<<< HEAD void u32RPI_delays(uint32 time); void u32RPI_delayMicros(uint32 time); uint32 RPI_millis(); uint32 RPI_micros(); -======= -void u16RPIDelayMillis(uint16 time); -void u16RPIDelayMicros(uint16 time); -uint32 u32RPIGetMillis(); -uint32 u32RPIGetMicros(); ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 #ifdef __cplusplus } /* extern "C" */ diff --git a/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralPinISR.h b/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralPinISR.h deleted file mode 100644 index b2c1ed16..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralPinISR.h +++ /dev/null @@ -1,25 +0,0 @@ - /* Copyright (C) 2016 - IIT Bombay - FOSSEE - - This file must be used under the terms of the CeCILL. - This source file is licensed as described in the file COPYING, which - you should have received as part of this distribution. The terms - are also available at - http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt - Author: Siddhesh Wani - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in - */ -#ifndef __INT_RPIPERIPHERALPINISR_H__ -#define __INT_RPIPERIPHERALPINISR_H__ - -#ifdef __cplusplus -extern "C" { -#endif - -#define RPI_PinISR(pin,edge,funname) i16RPIPinISRs((uint8)pin,(uint8)edge,funname) - -#ifdef __cplusplus -} /* extern "C" */ -#endif - -#endif /*__INT_RPIPERIPHERALPINISR_H__*/ diff --git a/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralThreading.h b/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralThreading.h deleted file mode 100644 index 68ed6e0e..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralThreading.h +++ /dev/null @@ -1,25 +0,0 @@ - /* Copyright (C) 2016 - IIT Bombay - FOSSEE - - This file must be used under the terms of the CeCILL. - This source file is licensed as described in the file COPYING, which - you should have received as part of this distribution. The terms - are also available at - http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt - Author: Siddhesh Wani - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in - */ -#ifndef __INT_RPIPERIPHERALTHREADING_H__ -#define __INT_RPIPERIPHERALTHREADING_H__ - -#ifdef __cplusplus -extern "C" { -#endif - -#define RPI_ThreadCreate(fn) RPIThreadCreate(fn); - -#ifdef __cplusplus -} /* extern "C" */ -#endif - -#endif /*__INT_RPIPERIPHERALTHREADING_H__*/ diff --git a/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralTiming.h b/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralTiming.h index c91fdfb2..cbbb47ae 100644 --- a/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralTiming.h +++ b/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralTiming.h @@ -5,19 +5,11 @@ you should have received as part of this distribution. The terms are also available at http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt -<<<<<<< HEAD Author: Jorawar Singh, Siddhesh Wani -======= - Author: Siddhesh Wani ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 Organization: FOSSEE, IIT Bombay Email: toolbox@scilab.in */ -<<<<<<< HEAD -======= - ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 #ifndef __INT_RPIPERIPHERALTIMING_H__ #define __INT_RPIPERIPHERALTIMING_H__ @@ -28,7 +20,6 @@ extern "C" { #endif -<<<<<<< HEAD #define u320RPI_delay(time) u32RPI_delays(time); #define d0RPI_delay(time) u32RPI_delays(time); @@ -37,20 +28,9 @@ extern "C" { #define RPI_millisu320() RPI_millis(); #define RPI_microsu320() RPI_micros(); -======= -#define RPI_DelayMicro(in1) u16RPIDelayMicros((uint16) in1) -#define RPI_DelayMilli(in1) u16RPIDelayMillis((uint16) in1) -#define RPI_GetMicro() u32RPIGetMicros() -#define RPI_GetMillis() u32RPIGetMillis() - ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 #ifdef __cplusplus } /* extern "C" */ #endif -<<<<<<< HEAD #endif /* !__INT_RPIPERIPHERALTIMING_H__ */ -======= -#endif /* !__RPIPERIPHERALTIMING_H__ */ ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 diff --git a/2.3-1/src/c/hardware/rasberrypi/pwm/u8RPIHardPWMSetClocks.c b/2.3-1/src/c/hardware/rasberrypi/pwm/u8RPIHardPWMSetClocks.c deleted file mode 100644 index d06b135c..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/pwm/u8RPIHardPWMSetClocks.c +++ /dev/null @@ -1,27 +0,0 @@ -/* Copyright (C) 2016 - IIT Bombay - FOSSEE - - This file must be used under the terms of the CeCILL. - This source file is licensed as described in the file COPYING, which - you should have received as part of this distribution. The terms - are also available at - http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt - Author: Siddhesh Wani - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -/*Function to set clock for pwm channel. Default clock is 19.2 MHz. 'clk_divisor' - along with range decides frequency for PWM - PWM frequency = 19.2 MHz / clk_divisor/ range - Range for clk_divisor = 1-2048 - */ - -#include "types.h" -#include "RPIPeripheralPWM.h" - -void u8RPIHardPWMSetClocks(uint16 clk_divisor) -{ - pwmSetClock(clk_divisor); - - -} diff --git a/2.3-1/src/c/hardware/rasberrypi/pwm/u8RPIHardPWMSetModes.c b/2.3-1/src/c/hardware/rasberrypi/pwm/u8RPIHardPWMSetModes.c deleted file mode 100644 index 0cca7a70..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/pwm/u8RPIHardPWMSetModes.c +++ /dev/null @@ -1,28 +0,0 @@ -/* Copyright (C) 2016 - IIT Bombay - FOSSEE - - This file must be used under the terms of the CeCILL. - This source file is licensed as described in the file COPYING, which - you should have received as part of this distribution. The terms - are also available at - http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt - Author: Siddhesh Wani - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -/*Function to set mode for PWM channel. Two modes are available - 0 --> balanced mode - 1 --> mark/space mode - */ - -#include "types.h" -#include "RPIPeripheralPWM.h" - -void u8RPIHardPWMSetModes(uint8 mode) -{ - if (mode == 1) /*mark/space mode*/ - pwmSetMode(PWM_MODE_MS); - else - pwmSetMode(PWM_MODE_BAL); - -} diff --git a/2.3-1/src/c/hardware/rasberrypi/pwm/u8RPIHardPWMSetRanges.c b/2.3-1/src/c/hardware/rasberrypi/pwm/u8RPIHardPWMSetRanges.c deleted file mode 100644 index b2489f59..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/pwm/u8RPIHardPWMSetRanges.c +++ /dev/null @@ -1,25 +0,0 @@ -/* Copyright (C) 2016 - IIT Bombay - FOSSEE - - This file must be used under the terms of the CeCILL. - This source file is licensed as described in the file COPYING, which - you should have received as part of this distribution. The terms - are also available at - http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt - Author: Siddhesh Wani - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -/*Function to assigne pwm duty to specified pin. PWM duty is decided by 'value' - and 'range' specified using corresponding function. - PWM duty = value/range - */ - -#include "types.h" -#include "RPIPeripheralPWM.h" - -void u8RPIHardPWMSetRanges(uint16 value) -{ - pwmSetRange(value); - -} diff --git a/2.3-1/src/c/hardware/rasberrypi/pwm/u8RPIHardPWMWrites.c b/2.3-1/src/c/hardware/rasberrypi/pwm/u8RPIHardPWMWrites.c deleted file mode 100644 index ae02bf0d..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/pwm/u8RPIHardPWMWrites.c +++ /dev/null @@ -1,26 +0,0 @@ -/* Copyright (C) 2016 - IIT Bombay - FOSSEE - - This file must be used under the terms of the CeCILL. - This source file is licensed as described in the file COPYING, which - you should have received as part of this distribution. The terms - are also available at - http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt - Author: Siddhesh Wani - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -/*Function to set range for pwm channel. PWM duty is decided by 'range' - and 'value' specified using corresponding function. - PWM duty = value/range - */ - -#include "types.h" -#include "RPIPeripheralPWM.h" -#include "RPIPeripheralDigital.h" - -void u8RPIHardPWMWrites(uint8 pin, uint16 value) -{ - pwmWrite((int)phy_pin[pin-1], value); - -} diff --git a/2.3-1/src/c/hardware/rasberrypi/serial/dRPISerialSendDataa.c b/2.3-1/src/c/hardware/rasberrypi/serial/dRPISerialSendDataa.c deleted file mode 100644 index f9902550..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/serial/dRPISerialSendDataa.c +++ /dev/null @@ -1,27 +0,0 @@ -/* Copyright (C) 2016 - IIT Bombay - FOSSEE - - This file must be used under the terms of the CeCILL. - This source file is licensed as described in the file COPYING, which - you should have received as part of this distribution. The terms - are also available at - http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt - Author: Siddhesh Wani - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -/* Function to send double data array/matrix on specified serial port. */ - -#include "types.h" -#include "RPIPeripheralSerial.h" - -void dRPISerialSendDataa(int fd, double* data, int size) -{ - int count = 0; - - for (count = 0; count < size; count++) - { - dRPISerialSendDatas(fd, data[count]); - } - -} diff --git a/2.3-1/src/c/hardware/rasberrypi/serial/dRPISerialSendDatas.c b/2.3-1/src/c/hardware/rasberrypi/serial/dRPISerialSendDatas.c deleted file mode 100644 index 39112fc2..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/serial/dRPISerialSendDatas.c +++ /dev/null @@ -1,35 +0,0 @@ -/* Copyright (C) 2016 - IIT Bombay - FOSSEE - - This file must be used under the terms of the CeCILL. - This source file is licensed as described in the file COPYING, which - you should have received as part of this distribution. The terms - are also available at - http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt - Author: Siddhesh Wani - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -/* Function to send double data on specified serial port. */ - -#include "types.h" -#include "RPIPeripheralSerial.h" - -void dRPISerialSendDatas(int fd, double data) -{ - uint8 count; - - union double_bytes{ - double double_data; - unsigned char bytes[sizeof(double)]; - } in_data; - - in_data.double_data = data; - - for(count=0; count<sizeof(double); count++) - { - /*Send lsb first*/ - serialPutchar(fd, (uint8) in_data.bytes[count]); - } - -} diff --git a/2.3-1/src/c/hardware/rasberrypi/serial/gRPISerialSendDatas.c b/2.3-1/src/c/hardware/rasberrypi/serial/gRPISerialSendDatas.c deleted file mode 100644 index f4ec8a85..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/serial/gRPISerialSendDatas.c +++ /dev/null @@ -1,27 +0,0 @@ -/* Copyright (C) 2016 - IIT Bombay - FOSSEE - - This file must be used under the terms of the CeCILL. - This source file is licensed as described in the file COPYING, which - you should have received as part of this distribution. The terms - are also available at - http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt - Author: Siddhesh Wani - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -/* Function to send string on specified serial port. */ - -#include "types.h" -#include "RPIPeripheralSerial.h" - -void gRPISerialSendDatas(int fd, uint8* data, int size) -{ - int count = 0; - - while(data[count] != '\0') - { - serialPutchar(fd, data[count]); - } - -} diff --git a/2.3-1/src/c/hardware/rasberrypi/serial/i16RPISerialDataAvails.c b/2.3-1/src/c/hardware/rasberrypi/serial/i16RPISerialDataAvails.c deleted file mode 100644 index b56a8196..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/serial/i16RPISerialDataAvails.c +++ /dev/null @@ -1,25 +0,0 @@ -/* Copyright (C) 2016 - IIT Bombay - FOSSEE - - This file must be used under the terms of the CeCILL. - This source file is licensed as described in the file COPYING, which - you should have received as part of this distribution. The terms - are also available at - http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt - Author: Siddhesh Wani - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -/* Function to check for data availability at specified port. Returns no of - bytes to be read */ - -#include "types.h" -#include "RPIPeripheralSerial.h" - -int16 i16RPISerialDataAvails(int fd) -{ - int bytes = 0; - bytes = serialDataAvail(fd); - - return bytes; -} diff --git a/2.3-1/src/c/hardware/rasberrypi/serial/i16RPISerialGetChars.c b/2.3-1/src/c/hardware/rasberrypi/serial/i16RPISerialGetChars.c deleted file mode 100644 index 18ca2a7a..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/serial/i16RPISerialGetChars.c +++ /dev/null @@ -1,27 +0,0 @@ -/* Copyright (C) 2016 - IIT Bombay - FOSSEE - - This file must be used under the terms of the CeCILL. - This source file is licensed as described in the file COPYING, which - you should have received as part of this distribution. The terms - are also available at - http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt - Author: Siddhesh Wani - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -/* Function to read character from spcified serial port (file descriptor). - This function will block execution for 10 secs if no character is available, - and will return -1 in that case*/ - -#include "types.h" -#include "RPIPeripheralSerial.h" - -int16 i16RPISerialGetChars(int fd) -{ - int data = 0; - - data = serialGetchar(fd); - - return data; -} diff --git a/2.3-1/src/c/hardware/rasberrypi/serial/i16RPISerialSendDataa.c b/2.3-1/src/c/hardware/rasberrypi/serial/i16RPISerialSendDataa.c deleted file mode 100644 index 24180f41..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/serial/i16RPISerialSendDataa.c +++ /dev/null @@ -1,27 +0,0 @@ -/* Copyright (C) 2016 - IIT Bombay - FOSSEE - - This file must be used under the terms of the CeCILL. - This source file is licensed as described in the file COPYING, which - you should have received as part of this distribution. The terms - are also available at - http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt - Author: Siddhesh Wani - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -/* Function to send signed 16-bit data array/matrix on specified serial port. */ - -#include "types.h" -#include "RPIPeripheralSerial.h" - -void i16RPISerialSendDataa(int fd, int16* data, int size) -{ - int count = 0; - - for (count = 0; count < size; ++count) - { - i16RPISerialSendDatas(fd, data[count]); - } - -} diff --git a/2.3-1/src/c/hardware/rasberrypi/serial/i16RPISerialSendDatas.c b/2.3-1/src/c/hardware/rasberrypi/serial/i16RPISerialSendDatas.c deleted file mode 100644 index fe6fe6f4..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/serial/i16RPISerialSendDatas.c +++ /dev/null @@ -1,24 +0,0 @@ -/* Copyright (C) 2016 - IIT Bombay - FOSSEE - - This file must be used under the terms of the CeCILL. - This source file is licensed as described in the file COPYING, which - you should have received as part of this distribution. The terms - are also available at - http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt - Author: Siddhesh Wani - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -/* Function to send signed 16-bit byte on specified serial port. */ - -#include "types.h" -#include "RPIPeripheralSerial.h" - -void i16RPISerialSendDatas(int fd, int16 data) -{ - /*Send lsb first*/ - serialPutchar(fd, (uint8) data); - serialPutchar(fd, (uint8) (data>>8)); - -} diff --git a/2.3-1/src/c/hardware/rasberrypi/serial/i8RPISerialSendDataa.c b/2.3-1/src/c/hardware/rasberrypi/serial/i8RPISerialSendDataa.c deleted file mode 100644 index c4dd199c..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/serial/i8RPISerialSendDataa.c +++ /dev/null @@ -1,26 +0,0 @@ -/* Copyright (C) 2016 - IIT Bombay - FOSSEE - - This file must be used under the terms of the CeCILL. - This source file is licensed as described in the file COPYING, which - you should have received as part of this distribution. The terms - are also available at - http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt - Author: Siddhesh Wani - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -/* Function to send signed 8-bit byte array/matrix on specified serial port. */ - -#include "types.h" -#include "RPIPeripheralSerial.h" - -void i8RPISerialSendDataa(int fd, int8* data, int size) -{ - int count = 0; - - for (count = 0; count < size; ++count) - { - i8RPISerialSendDatas(fd, data[count]); - } -} diff --git a/2.3-1/src/c/hardware/rasberrypi/serial/i8RPISerialSendDatas.c b/2.3-1/src/c/hardware/rasberrypi/serial/i8RPISerialSendDatas.c deleted file mode 100644 index e637871f..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/serial/i8RPISerialSendDatas.c +++ /dev/null @@ -1,22 +0,0 @@ -/* Copyright (C) 2016 - IIT Bombay - FOSSEE - - This file must be used under the terms of the CeCILL. - This source file is licensed as described in the file COPYING, which - you should have received as part of this distribution. The terms - are also available at - http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt - Author: Siddhesh Wani - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -/* Function to send signed 8-bit byte on specified serial port. */ - -#include "types.h" -#include "RPIPeripheralSerial.h" - -void i8RPISerialSendDatas(int fd, int8 data) -{ - serialPutchar(fd, (uint8) data); - -} diff --git a/2.3-1/src/c/hardware/rasberrypi/serial/sRPISerialSendDataa.c b/2.3-1/src/c/hardware/rasberrypi/serial/sRPISerialSendDataa.c deleted file mode 100644 index 14c0bc70..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/serial/sRPISerialSendDataa.c +++ /dev/null @@ -1,27 +0,0 @@ -/* Copyright (C) 2016 - IIT Bombay - FOSSEE - - This file must be used under the terms of the CeCILL. - This source file is licensed as described in the file COPYING, which - you should have received as part of this distribution. The terms - are also available at - http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt - Author: Siddhesh Wani - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -/* Function to send float data array/matrix on specified serial port. */ - -#include "types.h" -#include "RPIPeripheralSerial.h" - -void sRPISerialSendDataa(int fd, float* data, int size) -{ - int count = 0; - - for (count = 0; count < size; ++count) - { - sRPISerialSendDatas(fd, data[count]); - } - -} diff --git a/2.3-1/src/c/hardware/rasberrypi/serial/sRPISerialSendDatas.c b/2.3-1/src/c/hardware/rasberrypi/serial/sRPISerialSendDatas.c deleted file mode 100644 index ff78dd1f..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/serial/sRPISerialSendDatas.c +++ /dev/null @@ -1,34 +0,0 @@ -/* Copyright (C) 2016 - IIT Bombay - FOSSEE - - This file must be used under the terms of the CeCILL. - This source file is licensed as described in the file COPYING, which - you should have received as part of this distribution. The terms - are also available at - http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt - Author: Siddhesh Wani - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -/* Function to send float data on specified serial port. */ - -#include "types.h" -#include "RPIPeripheralSerial.h" - -void sRPISerialSendDatas(int fd, float data) -{ - uint8 count; - - union float_bytes{ - float float_data; - unsigned char bytes[sizeof(float)]; - } in_data; - in_data.float_data = data; - - for(count=0; count<sizeof(float); count++) - { - /*Send lsb first*/ - serialPutchar(fd, (uint8) in_data.bytes[count]); - } - -} diff --git a/2.3-1/src/c/hardware/rasberrypi/serial/u16RPISerialSendDataa.c b/2.3-1/src/c/hardware/rasberrypi/serial/u16RPISerialSendDataa.c deleted file mode 100644 index b444047b..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/serial/u16RPISerialSendDataa.c +++ /dev/null @@ -1,28 +0,0 @@ -/* Copyright (C) 2016 - IIT Bombay - FOSSEE - - This file must be used under the terms of the CeCILL. - This source file is licensed as described in the file COPYING, which - you should have received as part of this distribution. The terms - are also available at - http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt - Author: Siddhesh Wani - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -/* Function to send unsigned 16-bit data array/matrix on specified serial port. */ - -#include "types.h" -#include "RPIPeripheralSerial.h" - -void u16RPISerialSendDataa(int fd, uint16* data, int size) -{ - int count = 0; - - for (count = 0; count < size; ++count) - { - u16RPISerialSendDatas(fd, data[count]); - } - - -} diff --git a/2.3-1/src/c/hardware/rasberrypi/serial/u16RPISerialSendDatas.c b/2.3-1/src/c/hardware/rasberrypi/serial/u16RPISerialSendDatas.c deleted file mode 100644 index b4a90c29..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/serial/u16RPISerialSendDatas.c +++ /dev/null @@ -1,23 +0,0 @@ -/* Copyright (C) 2016 - IIT Bombay - FOSSEE - - This file must be used under the terms of the CeCILL. - This source file is licensed as described in the file COPYING, which - you should have received as part of this distribution. The terms - are also available at - http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt - Author: Siddhesh Wani - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -/* Function to send unsigned 16-bit data on specified serial port. */ - -#include "types.h" -#include "RPIPeripheralSerial.h" - -void u16RPISerialSendDatas(int fd, uint16 data) -{ - /*Send lsb first*/ - serialPutchar(fd, (uint8) data); - serialPutchar(fd, (uint8) (data>>8)); -} diff --git a/2.3-1/src/c/hardware/rasberrypi/serial/u16RPISerialSetups.c b/2.3-1/src/c/hardware/rasberrypi/serial/u16RPISerialSetups.c deleted file mode 100644 index cde4cba2..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/serial/u16RPISerialSetups.c +++ /dev/null @@ -1,25 +0,0 @@ -/* Copyright (C) 2016 - IIT Bombay - FOSSEE - - This file must be used under the terms of the CeCILL. - This source file is licensed as described in the file COPYING, which - you should have received as part of this distribution. The terms - are also available at - http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt - Author: Siddhesh Wani - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -/* Function to setup port with desired baud rate. */ - -#include "types.h" -#include "RPIPeripheralSerial.h" - -int u16RPISerialSetups(char* port, int baudrate) -{ - int fd; - - fd = serialOpen (port, baudrate); - - return fd; -} diff --git a/2.3-1/src/c/hardware/rasberrypi/serial/u8RPISerialCloses.c b/2.3-1/src/c/hardware/rasberrypi/serial/u8RPISerialCloses.c deleted file mode 100644 index 5162d15e..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/serial/u8RPISerialCloses.c +++ /dev/null @@ -1,21 +0,0 @@ -/* Copyright (C) 2016 - IIT Bombay - FOSSEE - - This file must be used under the terms of the CeCILL. - This source file is licensed as described in the file COPYING, which - you should have received as part of this distribution. The terms - are also available at - http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt - Author: Siddhesh Wani - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -/* Function to close serial port opened. */ - -#include "types.h" -#include "RPIPeripheralSerial.h" - -void u8RPISerialCloses(int fd) -{ - serialClose (fd); -} diff --git a/2.3-1/src/c/hardware/rasberrypi/serial/u8RPISerialFlushs.c b/2.3-1/src/c/hardware/rasberrypi/serial/u8RPISerialFlushs.c deleted file mode 100644 index c80a92c5..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/serial/u8RPISerialFlushs.c +++ /dev/null @@ -1,21 +0,0 @@ -/* Copyright (C) 2016 - IIT Bombay - FOSSEE - - This file must be used under the terms of the CeCILL. - This source file is licensed as described in the file COPYING, which - you should have received as part of this distribution. The terms - are also available at - http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt - Author: Siddhesh Wani - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -/* Function to discards data serial buffer (received as well as waiting to be sent */ - -#include "types.h" -#include "RPIPeripheralSerial.h" - -void u8RPISerialFlushs(int fd) -{ - serialFlush(fd); -} diff --git a/2.3-1/src/c/hardware/rasberrypi/serial/u8RPISerialSendChars.c b/2.3-1/src/c/hardware/rasberrypi/serial/u8RPISerialSendChars.c deleted file mode 100644 index e3813514..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/serial/u8RPISerialSendChars.c +++ /dev/null @@ -1,21 +0,0 @@ -/* Copyright (C) 2016 - IIT Bombay - FOSSEE - - This file must be used under the terms of the CeCILL. - This source file is licensed as described in the file COPYING, which - you should have received as part of this distribution. The terms - are also available at - http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt - Author: Siddhesh Wani - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -/* Function to send 8-bit char on specified serial port. */ - -#include "types.h" -#include "RPIPeripheralSerial.h" - -void u8RPISerialSendChars(int fd, uint8 data) -{ - serialPutchar(fd, data); -} diff --git a/2.3-1/src/c/hardware/rasberrypi/serial/u8RPISerialSendDataa.c b/2.3-1/src/c/hardware/rasberrypi/serial/u8RPISerialSendDataa.c deleted file mode 100644 index 9d097141..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/serial/u8RPISerialSendDataa.c +++ /dev/null @@ -1,27 +0,0 @@ -/* Copyright (C) 2016 - IIT Bombay - FOSSEE - - This file must be used under the terms of the CeCILL. - This source file is licensed as described in the file COPYING, which - you should have received as part of this distribution. The terms - are also available at - http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt - Author: Siddhesh Wani - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -/* Function to send unsigned 8-bit byte array/matrix on specified serial port. */ - -#include "types.h" -#include "RPIPeripheralSerial.h" - -void u8RPISerialSendDataa(int fd, uint8* data, int size) -{ - int count = 0; - - for (count = 0; count < size; ++count) - { - u8RPISerialSendDatas(fd, data[count]); - } - -} diff --git a/2.3-1/src/c/hardware/rasberrypi/serial/u8RPISerialSendDatas.c b/2.3-1/src/c/hardware/rasberrypi/serial/u8RPISerialSendDatas.c deleted file mode 100644 index 9edb439f..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/serial/u8RPISerialSendDatas.c +++ /dev/null @@ -1,22 +0,0 @@ -/* Copyright (C) 2016 - IIT Bombay - FOSSEE - - This file must be used under the terms of the CeCILL. - This source file is licensed as described in the file COPYING, which - you should have received as part of this distribution. The terms - are also available at - http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt - Author: Siddhesh Wani - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -/* Function to send unsigned 8-bit byte on specified serial port. */ - -#include "types.h" -#include "RPIPeripheralSerial.h" - -void u8RPISerialSendDatas(int fd, uint8 data) -{ - serialPutchar(fd, data); - -} diff --git a/2.3-1/src/c/hardware/rasberrypi/threading/u16RPIThreadCreates.c b/2.3-1/src/c/hardware/rasberrypi/threading/u16RPIThreadCreates.c deleted file mode 100644 index c05c959c..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/threading/u16RPIThreadCreates.c +++ /dev/null @@ -1,24 +0,0 @@ -/* Copyright (C) 2016 - IIT Bombay - FOSSEE - - This file must be used under the terms of the CeCILL. - This source file is licensed as described in the file COPYING, which - you should have received as part of this distribution. The terms - are also available at - http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt - Author: Siddhesh Wani - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -/* Function to create thread for given function */ - -#include "types.h" -#include "RPIPeripheralThreading.h" - -uint16 RPIThreadCreate(void *(*threadFunction)(void*)) -{ - int status; - status = piThreadCreate (threadFunction); - return status; -} - diff --git a/2.3-1/src/c/hardware/rasberrypi/timing/u16RPIDelayMicros.c b/2.3-1/src/c/hardware/rasberrypi/timing/u16RPIDelayMicros.c deleted file mode 100644 index 9aeeab7d..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/timing/u16RPIDelayMicros.c +++ /dev/null @@ -1,22 +0,0 @@ -/* Copyright (C) 2016 - IIT Bombay - FOSSEE - - This file must be used under the terms of the CeCILL. - This source file is licensed as described in the file COPYING, which - you should have received as part of this distribution. The terms - are also available at - http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt - Author: Siddhesh Wani - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -/* Function to insert some delay in code execution. */ - -#include "types.h" -#include "RPIPeripheralTiming.h" - -void u16RPIDelayMicros(uint16 time) -{ - delayMicroseconds(time); -} - diff --git a/2.3-1/src/c/hardware/rasberrypi/timing/u16RPIDelayMillis.c b/2.3-1/src/c/hardware/rasberrypi/timing/u16RPIDelayMillis.c deleted file mode 100644 index 26790861..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/timing/u16RPIDelayMillis.c +++ /dev/null @@ -1,25 +0,0 @@ -/* Copyright (C) 2016 - IIT Bombay - FOSSEE - - This file must be used under the terms of the CeCILL. - This source file is licensed as described in the file COPYING, which - you should have received as part of this distribution. The terms - are also available at - http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt - Author: Siddhesh Wani - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -/* Function to insert some delay in code execution. */ - - - -#include "types.h" -#include "RPIPeripheralTiming.h" - -void u16RPIDelayMillis(uint16 time) -{ - delay(time); - -} - diff --git a/2.3-1/src/c/hardware/rasberrypi/timing/u32RPIGetMicros.c b/2.3-1/src/c/hardware/rasberrypi/timing/u32RPIGetMicros.c deleted file mode 100644 index eb086a9f..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/timing/u32RPIGetMicros.c +++ /dev/null @@ -1,21 +0,0 @@ -/* Copyright (C) 2016 - IIT Bombay - FOSSEE - - This file must be used under the terms of the CeCILL. - This source file is licensed as described in the file COPYING, which - you should have received as part of this distribution. The terms - are also available at - http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt - Author: Siddhesh Wani - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -/* Function to get time in microsecond since first setup function called */ - -#include "types.h" -#include "RPIPeripheralTiming.h" - -uint32 u32RPIGetMicros() -{ - return(micros()); -}
\ No newline at end of file diff --git a/2.3-1/src/c/hardware/rasberrypi/timing/u32RPIGetMillis.c b/2.3-1/src/c/hardware/rasberrypi/timing/u32RPIGetMillis.c deleted file mode 100644 index c1189753..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/timing/u32RPIGetMillis.c +++ /dev/null @@ -1,21 +0,0 @@ -/* Copyright (C) 2016 - IIT Bombay - FOSSEE - - This file must be used under the terms of the CeCILL. - This source file is licensed as described in the file COPYING, which - you should have received as part of this distribution. The terms - are also available at - http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt - Author: Siddhesh Wani - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -/* Function to get time in millisecond since first setup function called */ - -#include "types.h" -#include "RPIPeripheralTiming.h" - -uint32 u32RPIGetMillis() -{ - return(millis()); -}
\ No newline at end of file diff --git a/2.3-1/src/c/matrixOperations/cat/ccata.c b/2.3-1/src/c/matrixOperations/cat/ccata.c index 6a2a6d99..cd2b4c92 100644 --- a/2.3-1/src/c/matrixOperations/cat/ccata.c +++ b/2.3-1/src/c/matrixOperations/cat/ccata.c @@ -26,11 +26,7 @@ void crowcata(floatComplex *in1, int lines1, int columns1, floatComplex *in2, i { for (j = 0 ; j < lines1 ; ++j) { -<<<<<<< HEAD out[i*(lines1 + lines2) + j] = in1[i*lines1 + j]; -======= - /*out[i*(lines1 + lines2) + j] = in1[i*lines1 + j];*/ ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 } for (j = 0 ; j < lines2 ; ++j) { diff --git a/2.3-1/src/c/matrixOperations/cat/zcata.c b/2.3-1/src/c/matrixOperations/cat/zcata.c index 659f14c0..485553d7 100644 --- a/2.3-1/src/c/matrixOperations/cat/zcata.c +++ b/2.3-1/src/c/matrixOperations/cat/zcata.c @@ -26,11 +26,7 @@ void zrowcata(doubleComplex *in1, int lines1, int columns1, doubleComplex *in2, { for (j = 0 ; j < lines1 ; ++j) { -<<<<<<< HEAD out[i*(lines1 + lines2) + j] = in1[i*lines1 + j]; -======= - /*out[i*(lines1 + lines2) + j] = in1[i*lines1 + j];*/ ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 } for (j = 0 ; j < lines2 ; ++j) { diff --git a/2.3-1/src/c/scilab-arduino/cmd_analog_in_volt/u8cmd_analog_in_volts.c b/2.3-1/src/c/scilab-arduino/cmd_analog_in_volt/u8cmd_analog_in_volts.c index 27f63c75..7018df2c 100644 --- a/2.3-1/src/c/scilab-arduino/cmd_analog_in_volt/u8cmd_analog_in_volts.c +++ b/2.3-1/src/c/scilab-arduino/cmd_analog_in_volt/u8cmd_analog_in_volts.c @@ -15,13 +15,8 @@ float u8cmd_analog_in_volts(uint8 board_no, uint8 pin) { -<<<<<<< HEAD float a; a = ((5*(float)analogRead(pin))/1023); -======= - float a; //declaration of variable - a = ((5*(float)analogRead(pin))/1023); //recieved 10 bit input from analog pin is convert to voltage(0 - 50 ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 return(a); } diff --git a/2.3-1/src/c/scilab-arduino/cmd_analog_out_volt/u8cmd_analog_out_volts.c b/2.3-1/src/c/scilab-arduino/cmd_analog_out_volt/u8cmd_analog_out_volts.c index 19a73fcf..2dd82e41 100644 --- a/2.3-1/src/c/scilab-arduino/cmd_analog_out_volt/u8cmd_analog_out_volts.c +++ b/2.3-1/src/c/scilab-arduino/cmd_analog_out_volt/u8cmd_analog_out_volts.c @@ -15,14 +15,8 @@ void u8cmd_analog_out_volts(uint8 board_no, uint8 pin, float value) { -<<<<<<< HEAD int a; a = ((value*255)/5); analogWrite(pin,a); -======= - int a; //declaring variable - a = ((value*255)/5); //converting given voltage to duty cycle value (0 - 255) - analogWrite(pin,a); //passing pin no. and duty cycle value ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 } diff --git a/2.3-1/src/c/scilab-arduino/cmd_dcmotor_release/u8cmd_dcmotor_releases.c b/2.3-1/src/c/scilab-arduino/cmd_dcmotor_release/u8cmd_dcmotor_releases.c index a2283035..349bcb17 100644 --- a/2.3-1/src/c/scilab-arduino/cmd_dcmotor_release/u8cmd_dcmotor_releases.c +++ b/2.3-1/src/c/scilab-arduino/cmd_dcmotor_release/u8cmd_dcmotor_releases.c @@ -15,7 +15,6 @@ void u8cmd_dcmotor_releases(uint8 board_no, uint8 motor_no) { -<<<<<<< HEAD if (dcm_mode[motor_no] == 3) { analogWrite(dcm_pin_1[motor_no],0); @@ -26,17 +25,5 @@ void u8cmd_dcmotor_releases(uint8 board_no, uint8 motor_no) { digitalWrite(dcm_pin_1[motor_no],LOW); digitalWrite(dcm_pin_2[motor_no],LOW); -======= - if (dcm_mode[motor_no] == 3) //for IC accepting analog value - { - analogWrite(dcm_pin_1[motor_no],0); //passing LOW to IC pins to stop the motor - analogWrite(dcm_pin_2[motor_no],0); - } - - else //for IC accepting digital value - { - digitalWrite(dcm_pin_1[motor_no],LOW); - digitalWrite(dcm_pin_2[motor_no],LOW); //passing LOW to IC pins to stop the motor ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 } } diff --git a/2.3-1/src/c/scilab-arduino/cmd_i2c_dev/u8cmd_i2c_devs.cpp b/2.3-1/src/c/scilab-arduino/cmd_i2c_dev/u8cmd_i2c_devs.cpp index 2ba4d393..adc1a6e5 100644 --- a/2.3-1/src/c/scilab-arduino/cmd_i2c_dev/u8cmd_i2c_devs.cpp +++ b/2.3-1/src/c/scilab-arduino/cmd_i2c_dev/u8cmd_i2c_devs.cpp @@ -1,34 +1,10 @@ -<<<<<<< HEAD -======= -/* Copyright (C) 2017 - IIT Bombay - FOSSEE - - This file must be used under the terms of the CeCILL. - This source file is licensed as described in the file COPYING, which - you should have received as part of this distribution. The terms - are also available at - http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt - Author: Yash Pratap Singh Tomar - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -//This function establishes I2C communication between arduino and given device - ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 #include "cmd_i2c_dev.h" #include "Arduino.h" #include "Wire.h" -<<<<<<< HEAD uint8 u8cmd_i2c_devs(uint8 address) { Wire.begin(); return((uint8)address); -======= -uint8 u8cmd_i2c_devs(uint8 address) -{ - Wire.begin(); //To initiate connection - return((uint8)address); //Returns address to create a device object ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 } diff --git a/2.3-1/src/c/scilab-arduino/cmd_i2c_read/u8cmd_i2c_reads.cpp b/2.3-1/src/c/scilab-arduino/cmd_i2c_read/u8cmd_i2c_reads.cpp index 78ef0ce1..8f02a87e 100644 --- a/2.3-1/src/c/scilab-arduino/cmd_i2c_read/u8cmd_i2c_reads.cpp +++ b/2.3-1/src/c/scilab-arduino/cmd_i2c_read/u8cmd_i2c_reads.cpp @@ -1,20 +1,3 @@ -<<<<<<< HEAD -======= -/* Copyright (C) 2017 - IIT Bombay - FOSSEE - - This file must be used under the terms of the CeCILL. - This source file is licensed as described in the file COPYING, which - you should have received as part of this distribution. The terms - are also available at - http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt - Author: Yash Pratap Singh Tomar - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - - -//This function reads data from I2C bus. ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 #include "cmd_i2c_read.h" #include "Arduino.h" #include "Wire.h" diff --git a/2.3-1/src/c/scilab-arduino/cmd_i2c_read_register/u8cmd_i2c_read_registers.cpp b/2.3-1/src/c/scilab-arduino/cmd_i2c_read_register/u8cmd_i2c_read_registers.cpp index 6b54159c..0a2ec2ed 100644 --- a/2.3-1/src/c/scilab-arduino/cmd_i2c_read_register/u8cmd_i2c_read_registers.cpp +++ b/2.3-1/src/c/scilab-arduino/cmd_i2c_read_register/u8cmd_i2c_read_registers.cpp @@ -1,20 +1,3 @@ -<<<<<<< HEAD -======= -/* Copyright (C) 2017 - IIT Bombay - FOSSEE - - This file must be used under the terms of the CeCILL. - This source file is licensed as described in the file COPYING, which - you should have received as part of this distribution. The terms - are also available at - http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt - Author: Yash Pratap Singh Tomar - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - - -//this function reads data from the device register with given address ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 #include "cmd_i2c_read_register.h" #include "Arduino.h" #include "Wire.h" diff --git a/2.3-1/src/c/scilab-arduino/cmd_i2c_write/u8cmd_i2c_writes.cpp b/2.3-1/src/c/scilab-arduino/cmd_i2c_write/u8cmd_i2c_writes.cpp index 788fd088..0239097a 100644 --- a/2.3-1/src/c/scilab-arduino/cmd_i2c_write/u8cmd_i2c_writes.cpp +++ b/2.3-1/src/c/scilab-arduino/cmd_i2c_write/u8cmd_i2c_writes.cpp @@ -1,19 +1,3 @@ -<<<<<<< HEAD -======= -/* Copyright (C) 2017 - IIT Bombay - FOSSEE - - This file must be used under the terms of the CeCILL. - This source file is licensed as described in the file COPYING, which - you should have received as part of this distribution. The terms - are also available at - http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt - Author: Yash Pratap Singh Tomar - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -//This function writes data to the connected device ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 #include "cmd_i2c_write.h" #include "Arduino.h" #include "Wire.h" diff --git a/2.3-1/src/c/scilab-arduino/cmd_i2c_write_register/u8cmd_i2c_write_registers.cpp b/2.3-1/src/c/scilab-arduino/cmd_i2c_write_register/u8cmd_i2c_write_registers.cpp index f10dd979..63cc7c7a 100644 --- a/2.3-1/src/c/scilab-arduino/cmd_i2c_write_register/u8cmd_i2c_write_registers.cpp +++ b/2.3-1/src/c/scilab-arduino/cmd_i2c_write_register/u8cmd_i2c_write_registers.cpp @@ -1,20 +1,3 @@ -<<<<<<< HEAD -======= -/* Copyright (C) 2017 - IIT Bombay - FOSSEE - - This file must be used under the terms of the CeCILL. - This source file is licensed as described in the file COPYING, which - you should have received as part of this distribution. The terms - are also available at - http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt - Author: Yash Pratap Singh Tomar - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - - -//This function writes to the register of the device ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 #include "cmd_i2c_write_register.h" #include "Arduino.h" #include "Wire.h" diff --git a/2.3-1/src/c/scilab-arduino/default_files/sci2c_arduino.ino b/2.3-1/src/c/scilab-arduino/default_files/sci2c_arduino.ino index 5d5d101b..df28950c 100644 --- a/2.3-1/src/c/scilab-arduino/default_files/sci2c_arduino.ino +++ b/2.3-1/src/c/scilab-arduino/default_files/sci2c_arduino.ino @@ -11,13 +11,8 @@ */ #include "Arduino.h" -<<<<<<< HEAD #include <loop_arduino.h> #include <setup_arduino.h> -======= -#include "loop_arduino.h" -#include "setup_arduino.h" ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 void setup() { diff --git a/2.3-1/src/c/scilab-arduino/includes/cmd_i2c_dev.h b/2.3-1/src/c/scilab-arduino/includes/cmd_i2c_dev.h index 85d154a3..861a8e7b 100644 --- a/2.3-1/src/c/scilab-arduino/includes/cmd_i2c_dev.h +++ b/2.3-1/src/c/scilab-arduino/includes/cmd_i2c_dev.h @@ -1,18 +1,3 @@ -<<<<<<< HEAD -======= -/* Copyright (C) 2017 - IIT Bombay - FOSSEE - - This file must be used under the terms of the CeCILL. - This source file is licensed as described in the file COPYING, which - you should have received as part of this distribution. The terms - are also available at - http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt - Author: Yash Pratap Singh Tomar - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 #ifndef __CMD_I2C_DEV_H__ #define __CMD_I2C_DEV_H__ diff --git a/2.3-1/src/c/scilab-arduino/includes/cmd_i2c_read.h b/2.3-1/src/c/scilab-arduino/includes/cmd_i2c_read.h index e49abcd3..791bdd38 100644 --- a/2.3-1/src/c/scilab-arduino/includes/cmd_i2c_read.h +++ b/2.3-1/src/c/scilab-arduino/includes/cmd_i2c_read.h @@ -1,18 +1,3 @@ -<<<<<<< HEAD -======= -/* Copyright (C) 2017 - IIT Bombay - FOSSEE - - This file must be used under the terms of the CeCILL. - This source file is licensed as described in the file COPYING, which - you should have received as part of this distribution. The terms - are also available at - http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt - Author: Yash Pratap Singh Tomar - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 #ifndef __CMD_I2C_READ_H__ #define __CMD_I2C_READ_H__ diff --git a/2.3-1/src/c/scilab-arduino/includes/cmd_i2c_read_register.h b/2.3-1/src/c/scilab-arduino/includes/cmd_i2c_read_register.h index 1b3a3cf9..ea203adf 100644 --- a/2.3-1/src/c/scilab-arduino/includes/cmd_i2c_read_register.h +++ b/2.3-1/src/c/scilab-arduino/includes/cmd_i2c_read_register.h @@ -1,18 +1,3 @@ -<<<<<<< HEAD -======= -/* Copyright (C) 2017 - IIT Bombay - FOSSEE - - This file must be used under the terms of the CeCILL. - This source file is licensed as described in the file COPYING, which - you should have received as part of this distribution. The terms - are also available at - http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt - Author: Yash Pratap Singh Tomar - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 #ifndef __CMD_I2C_READ_REGISTER_H__ #define __CMD_I2C_READ_REGISTER_H__ diff --git a/2.3-1/src/c/scilab-arduino/includes/cmd_i2c_write.h b/2.3-1/src/c/scilab-arduino/includes/cmd_i2c_write.h index 58667c70..6a57222b 100644 --- a/2.3-1/src/c/scilab-arduino/includes/cmd_i2c_write.h +++ b/2.3-1/src/c/scilab-arduino/includes/cmd_i2c_write.h @@ -1,18 +1,3 @@ -<<<<<<< HEAD -======= -/* Copyright (C) 2017 - IIT Bombay - FOSSEE - - This file must be used under the terms of the CeCILL. - This source file is licensed as described in the file COPYING, which - you should have received as part of this distribution. The terms - are also available at - http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt - Author: Yash Pratap Singh Tomar - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 #ifndef __CMD_I2C_WRITE_H__ #define __CMD_I2C_WRITE_H__ diff --git a/2.3-1/src/c/scilab-arduino/includes/cmd_i2c_write_register.h b/2.3-1/src/c/scilab-arduino/includes/cmd_i2c_write_register.h index bf8e7886..ff1b9ec0 100644 --- a/2.3-1/src/c/scilab-arduino/includes/cmd_i2c_write_register.h +++ b/2.3-1/src/c/scilab-arduino/includes/cmd_i2c_write_register.h @@ -1,18 +1,3 @@ -<<<<<<< HEAD -======= -/* Copyright (C) 2017 - IIT Bombay - FOSSEE - - This file must be used under the terms of the CeCILL. - This source file is licensed as described in the file COPYING, which - you should have received as part of this distribution. The terms - are also available at - http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt - Author: Yash Pratap Singh Tomar - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 #ifndef __CMD_I2C_WRITE_REGISTER_H__ #define __CMD_I2C_WRITE_REGISTER_H__ diff --git a/2.3-1/src/c/scilab-arduino/interfaces/int_cmd_i2c_dev.h b/2.3-1/src/c/scilab-arduino/interfaces/int_cmd_i2c_dev.h index c1de1b7a..c4d93d74 100644 --- a/2.3-1/src/c/scilab-arduino/interfaces/int_cmd_i2c_dev.h +++ b/2.3-1/src/c/scilab-arduino/interfaces/int_cmd_i2c_dev.h @@ -1,18 +1,3 @@ -<<<<<<< HEAD -======= -/* Copyright (C) 2017 - IIT Bombay - FOSSEE - - This file must be used under the terms of the CeCILL. - This source file is licensed as described in the file COPYING, which - you should have received as part of this distribution. The terms - are also available at - http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt - Author: Yash Pratap Singh Tomar - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 #ifndef __INT_CMD_I2C_DEV_H__ #define __INT_CMD_I2C_DEV_H__ diff --git a/2.3-1/src/c/scilab-arduino/interfaces/int_cmd_i2c_read.h b/2.3-1/src/c/scilab-arduino/interfaces/int_cmd_i2c_read.h index ef114266..b0633a07 100644 --- a/2.3-1/src/c/scilab-arduino/interfaces/int_cmd_i2c_read.h +++ b/2.3-1/src/c/scilab-arduino/interfaces/int_cmd_i2c_read.h @@ -1,18 +1,3 @@ -<<<<<<< HEAD -======= -/* Copyright (C) 2017 - IIT Bombay - FOSSEE - - This file must be used under the terms of the CeCILL. - This source file is licensed as described in the file COPYING, which - you should have received as part of this distribution. The terms - are also available at - http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt - Author: Yash Pratap Singh Tomar - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 #ifndef __INT_CMD_I2C_READ_H__ #define __INT_CMD_I2C_READ_H__ diff --git a/2.3-1/src/c/scilab-arduino/interfaces/int_cmd_i2c_read_register.h b/2.3-1/src/c/scilab-arduino/interfaces/int_cmd_i2c_read_register.h index c2cdc65a..5f4c5298 100644 --- a/2.3-1/src/c/scilab-arduino/interfaces/int_cmd_i2c_read_register.h +++ b/2.3-1/src/c/scilab-arduino/interfaces/int_cmd_i2c_read_register.h @@ -1,18 +1,3 @@ -<<<<<<< HEAD -======= -/* Copyright (C) 2017 - IIT Bombay - FOSSEE - - This file must be used under the terms of the CeCILL. - This source file is licensed as described in the file COPYING, which - you should have received as part of this distribution. The terms - are also available at - http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt - Author: Yash Pratap Singh Tomar - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 #ifndef __INT_CMD_I2C_READ_REGISTER_H__ #define __INT_CMD_I2C_READ_REGISTER_H__ diff --git a/2.3-1/src/c/scilab-arduino/interfaces/int_cmd_i2c_write.h b/2.3-1/src/c/scilab-arduino/interfaces/int_cmd_i2c_write.h index 23474a74..a7705a89 100644 --- a/2.3-1/src/c/scilab-arduino/interfaces/int_cmd_i2c_write.h +++ b/2.3-1/src/c/scilab-arduino/interfaces/int_cmd_i2c_write.h @@ -1,18 +1,3 @@ -<<<<<<< HEAD -======= -/* Copyright (C) 2017 - IIT Bombay - FOSSEE - - This file must be used under the terms of the CeCILL. - This source file is licensed as described in the file COPYING, which - you should have received as part of this distribution. The terms - are also available at - http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt - Author: Yash Pratap Singh Tomar - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 #ifndef __INT_CMD_I2C_WRITE_H__ #define __INT_CMD_I2C_WRITE_H__ diff --git a/2.3-1/src/c/scilab-arduino/interfaces/int_cmd_i2c_write_register.h b/2.3-1/src/c/scilab-arduino/interfaces/int_cmd_i2c_write_register.h index e385b3f7..35c0527e 100644 --- a/2.3-1/src/c/scilab-arduino/interfaces/int_cmd_i2c_write_register.h +++ b/2.3-1/src/c/scilab-arduino/interfaces/int_cmd_i2c_write_register.h @@ -1,18 +1,3 @@ -<<<<<<< HEAD -======= -/* Copyright (C) 2017 - IIT Bombay - FOSSEE - - This file must be used under the terms of the CeCILL. - This source file is licensed as described in the file COPYING, which - you should have received as part of this distribution. The terms - are also available at - http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt - Author: Yash Pratap Singh Tomar - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 #ifndef __INT_CMD_I2C_WRITE_REGISTER_H__ #define __INT_CMD_I2C_WRITE_REGISTER_H__ diff --git a/2.3-1/src/c/string/disp/ddispa.c b/2.3-1/src/c/string/disp/ddispa.c index 3ae1d15a..29aaceeb 100644 --- a/2.3-1/src/c/string/disp/ddispa.c +++ b/2.3-1/src/c/string/disp/ddispa.c @@ -16,11 +16,7 @@ double ddispa (double* in, int rows, int columns){ int i = 0,j = 0; for (i = 0; i < rows; ++i) { -<<<<<<< HEAD for (j=0;j<columns;j++) printf (" %e ", in[i+j*rows]); -======= - for (j=0;j<columns;j++) printf (" %1.20f ", in[i+j*rows]); ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 printf("\n"); } return 0; diff --git a/2.3-1/src/c/type/doubleComplex.h b/2.3-1/src/c/type/doubleComplex.h index c2e2d2e9..4be0d7d3 100644 --- a/2.3-1/src/c/type/doubleComplex.h +++ b/2.3-1/src/c/type/doubleComplex.h @@ -45,24 +45,6 @@ typedef struct double_complex doubleComplex; /* ** } */ -<<<<<<< HEAD -======= -#elif defined(ARDUINO) -/* -** Hand made Double Complex definition -** { -*/ -struct double_complex -{ - double real; - double imag; -}; - -typedef struct double_complex doubleComplex; -/* -** } -*/ ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 #else /* ** Standard C99 Complex @@ -75,10 +57,7 @@ typedef double complex doubleComplex; ** } */ #endif -<<<<<<< HEAD -======= ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 #ifdef __cplusplus extern "C" { #endif diff --git a/2.3-1/src/c/type/floatComplex.h b/2.3-1/src/c/type/floatComplex.h index fb4039b6..fe35ca48 100644 --- a/2.3-1/src/c/type/floatComplex.h +++ b/2.3-1/src/c/type/floatComplex.h @@ -44,24 +44,6 @@ struct float_complex typedef struct float_complex floatComplex; /* ** } -<<<<<<< HEAD -======= -*/
-#elif defined(ARDUINO)
-/* -** Hand made Float Complex definition -** { -*/ -struct float_complex -{ - float real; - float imag; -}; - -typedef struct float_complex floatComplex; -/* -** } ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 */ #else /* diff --git a/2.3-1/src/c/type/types.h b/2.3-1/src/c/type/types.h index 8379003b..a76bf303 100644 --- a/2.3-1/src/c/type/types.h +++ b/2.3-1/src/c/type/types.h @@ -4,11 +4,7 @@ /*****************************************************************************/ /* TYPE DEFINITIONS */ /*****************************************************************************/ -<<<<<<< HEAD typedef unsigned char boolean; -======= -/*typedef unsigned char boolean;*/ ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 typedef unsigned char uint8; typedef unsigned short uint16; diff --git a/2.3-1/tests/unit_tests/testArduino/analog_check.sci b/2.3-1/tests/unit_tests/testArduino/analog_check.sci deleted file mode 100644 index 779f5b7f..00000000 --- a/2.3-1/tests/unit_tests/testArduino/analog_check.sci +++ /dev/null @@ -1,7 +0,0 @@ -function analog_check() - cmd_analog_out(1,3,50) - cmd_analog_out(1,5,100) - cmd_analog_out(1,6,175) - cmd_analog_out(1,9,255) - -endfunction diff --git a/2.3-1/tests/unit_tests/testArduino/analog_in_check_volt.sci b/2.3-1/tests/unit_tests/testArduino/analog_in_check_volt.sci deleted file mode 100644 index 16e79054..00000000 --- a/2.3-1/tests/unit_tests/testArduino/analog_in_check_volt.sci +++ /dev/null @@ -1,4 +0,0 @@ -function analog_in_check_volt() - val = cmd_analog_in_volt(1,0) - cmd_analog_out_volt(1,6,val) -endfunction diff --git a/2.3-1/tests/unit_tests/testArduino/blink_13.sci b/2.3-1/tests/unit_tests/testArduino/blink_13.sci deleted file mode 100644 index 37dc93fd..00000000 --- a/2.3-1/tests/unit_tests/testArduino/blink_13.sci +++ /dev/null @@ -1,6 +0,0 @@ -function blink_13() - cmd_digital_out(1,13,1) //--To turn on the LED on pin no. 13 - sleep(1000) //---delay of 1 second - cmd_digital_out(1,13,0) //--To turn on the LED off pin no. 13 - sleep(1000) //---delay of 1 second -endfunction diff --git a/2.3-1/tests/unit_tests/testArduino/board_test_release2.sci b/2.3-1/tests/unit_tests/testArduino/board_test_release2.sci deleted file mode 100644 index fd21cff7..00000000 --- a/2.3-1/tests/unit_tests/testArduino/board_test_release2.sci +++ /dev/null @@ -1,11 +0,0 @@ -function board_test_release2() - cmd_dcmotor_setup(1,3,1,9,10) - cmd_dcmotor_run(1,1,255) - sleep(3000) - cmd_dcmotor_release(1,1) - sleep(3000) - cmd_dcmotor_run(1,1,-255) - sleep(3000) - cmd_dcmotor_release(1,1) - sleep(3000) -endfunction diff --git a/2.3-1/tests/unit_tests/testArduino/digital_in_check.sci b/2.3-1/tests/unit_tests/testArduino/digital_in_check.sci deleted file mode 100644 index 4dfbeb6e..00000000 --- a/2.3-1/tests/unit_tests/testArduino/digital_in_check.sci +++ /dev/null @@ -1,10 +0,0 @@ -function digital_in_check() - a=cmd_digital_in(1,7) - if a==1 then - cmd_digital_out(1,13,1) - cmd_digital_out(1,9,0) - else - cmd_digital_out(1,9,1) - cmd_digital_out(1,13,0) - end -endfunction diff --git a/2.3-1/tests/unit_tests/testArduino/i2c_master.sci b/2.3-1/tests/unit_tests/testArduino/i2c_master.sci deleted file mode 100644 index 2636185a..00000000 --- a/2.3-1/tests/unit_tests/testArduino/i2c_master.sci +++ /dev/null @@ -1,9 +0,0 @@ -function i2c_master()
-
- dev1 = cmd_i2c_dev(1);
- cmd_i2c_write(dev1,10);
- sleep(1000);
- cmd_i2c_write(dev1,9);
- sleep(1000);
-
-endfunction
diff --git a/2.3-1/thirdparty/lib/raspberrypi/libwiringPi.so b/2.3-1/thirdparty/lib/raspberrypi/libwiringPi.so Binary files differdeleted file mode 100644 index da4a81e1..00000000 --- a/2.3-1/thirdparty/lib/raspberrypi/libwiringPi.so +++ /dev/null |