diff options
Diffstat (limited to '2.3-1/macros')
340 files changed, 474 insertions, 27 deletions
diff --git a/2.3-1/macros/ASTManagement/%comment_string.bin b/2.3-1/macros/ASTManagement/%comment_string.bin Binary files differdeleted file mode 100644 index fb894945..00000000 --- a/2.3-1/macros/ASTManagement/%comment_string.bin +++ /dev/null diff --git a/2.3-1/macros/ASTManagement/%cste_string.bin b/2.3-1/macros/ASTManagement/%cste_string.bin Binary files differdeleted file mode 100644 index ba643c47..00000000 --- a/2.3-1/macros/ASTManagement/%cste_string.bin +++ /dev/null diff --git a/2.3-1/macros/ASTManagement/%equal_string.bin b/2.3-1/macros/ASTManagement/%equal_string.bin Binary files differdeleted file mode 100644 index 7f88fee6..00000000 --- a/2.3-1/macros/ASTManagement/%equal_string.bin +++ /dev/null diff --git a/2.3-1/macros/ASTManagement/%for_string.bin b/2.3-1/macros/ASTManagement/%for_string.bin Binary files differdeleted file mode 100644 index c3fda16b..00000000 --- a/2.3-1/macros/ASTManagement/%for_string.bin +++ /dev/null diff --git a/2.3-1/macros/ASTManagement/%funcall_string.bin b/2.3-1/macros/ASTManagement/%funcall_string.bin Binary files differdeleted file mode 100644 index 8354586d..00000000 --- a/2.3-1/macros/ASTManagement/%funcall_string.bin +++ /dev/null diff --git a/2.3-1/macros/ASTManagement/%ifthenel_string.bin b/2.3-1/macros/ASTManagement/%ifthenel_string.bin Binary files differdeleted file mode 100644 index 1c6fa73d..00000000 --- a/2.3-1/macros/ASTManagement/%ifthenel_string.bin +++ /dev/null diff --git a/2.3-1/macros/ASTManagement/%ifthenelse_string.bin b/2.3-1/macros/ASTManagement/%ifthenelse_string.bin Binary files differdeleted file mode 100644 index 456ffadc..00000000 --- a/2.3-1/macros/ASTManagement/%ifthenelse_string.bin +++ /dev/null diff --git a/2.3-1/macros/ASTManagement/%operatio_string.bin b/2.3-1/macros/ASTManagement/%operatio_string.bin Binary files differdeleted file mode 100644 index 40abf6b2..00000000 --- a/2.3-1/macros/ASTManagement/%operatio_string.bin +++ /dev/null diff --git a/2.3-1/macros/ASTManagement/%operation_string.bin b/2.3-1/macros/ASTManagement/%operation_string.bin Binary files differdeleted file mode 100644 index dfbeec96..00000000 --- a/2.3-1/macros/ASTManagement/%operation_string.bin +++ /dev/null diff --git a/2.3-1/macros/ASTManagement/%program_p.bin b/2.3-1/macros/ASTManagement/%program_p.bin Binary files differdeleted file mode 100644 index 216a38b2..00000000 --- a/2.3-1/macros/ASTManagement/%program_p.bin +++ /dev/null diff --git a/2.3-1/macros/ASTManagement/%program_string.bin b/2.3-1/macros/ASTManagement/%program_string.bin Binary files differdeleted file mode 100644 index 3a8fc95b..00000000 --- a/2.3-1/macros/ASTManagement/%program_string.bin +++ /dev/null diff --git a/2.3-1/macros/ASTManagement/%variable_string.bin b/2.3-1/macros/ASTManagement/%variable_string.bin Binary files differdeleted file mode 100644 index f81fd6e0..00000000 --- a/2.3-1/macros/ASTManagement/%variable_string.bin +++ /dev/null diff --git a/2.3-1/macros/ASTManagement/%while_string.bin b/2.3-1/macros/ASTManagement/%while_string.bin Binary files differdeleted file mode 100644 index 142189c6..00000000 --- a/2.3-1/macros/ASTManagement/%while_string.bin +++ /dev/null diff --git a/2.3-1/macros/ASTManagement/AST2Ccode.bin b/2.3-1/macros/ASTManagement/AST2Ccode.bin Binary files differdeleted file mode 100644 index e5e07800..00000000 --- a/2.3-1/macros/ASTManagement/AST2Ccode.bin +++ /dev/null diff --git a/2.3-1/macros/ASTManagement/AST_CheckCommonInOutArgs.bin b/2.3-1/macros/ASTManagement/AST_CheckCommonInOutArgs.bin Binary files differdeleted file mode 100644 index 5c190ba3..00000000 --- a/2.3-1/macros/ASTManagement/AST_CheckCommonInOutArgs.bin +++ /dev/null diff --git a/2.3-1/macros/ASTManagement/AST_CheckLastFunc.bin b/2.3-1/macros/ASTManagement/AST_CheckLastFunc.bin Binary files differdeleted file mode 100644 index 9cac2273..00000000 --- a/2.3-1/macros/ASTManagement/AST_CheckLastFunc.bin +++ /dev/null diff --git a/2.3-1/macros/ASTManagement/AST_CheckLineLength.bin b/2.3-1/macros/ASTManagement/AST_CheckLineLength.bin Binary files differdeleted file mode 100644 index db486797..00000000 --- a/2.3-1/macros/ASTManagement/AST_CheckLineLength.bin +++ /dev/null diff --git a/2.3-1/macros/ASTManagement/AST_CheckPrecSpecifier.bin b/2.3-1/macros/ASTManagement/AST_CheckPrecSpecifier.bin Binary files differdeleted file mode 100644 index 8e50397f..00000000 --- a/2.3-1/macros/ASTManagement/AST_CheckPrecSpecifier.bin +++ /dev/null diff --git a/2.3-1/macros/ASTManagement/AST_DisplayStack.bin b/2.3-1/macros/ASTManagement/AST_DisplayStack.bin Binary files differdeleted file mode 100644 index 90cbcc74..00000000 --- a/2.3-1/macros/ASTManagement/AST_DisplayStack.bin +++ /dev/null diff --git a/2.3-1/macros/ASTManagement/AST_ExtractNameAndScope.bin b/2.3-1/macros/ASTManagement/AST_ExtractNameAndScope.bin Binary files differdeleted file mode 100644 index 1944d88b..00000000 --- a/2.3-1/macros/ASTManagement/AST_ExtractNameAndScope.bin +++ /dev/null diff --git a/2.3-1/macros/ASTManagement/AST_GetASTFile.bin b/2.3-1/macros/ASTManagement/AST_GetASTFile.bin Binary files differdeleted file mode 100644 index 261430e5..00000000 --- a/2.3-1/macros/ASTManagement/AST_GetASTFile.bin +++ /dev/null diff --git a/2.3-1/macros/ASTManagement/AST_GetFuncallPrm.bin b/2.3-1/macros/ASTManagement/AST_GetFuncallPrm.bin Binary files differdeleted file mode 100644 index 37dbe771..00000000 --- a/2.3-1/macros/ASTManagement/AST_GetFuncallPrm.bin +++ /dev/null diff --git a/2.3-1/macros/ASTManagement/AST_GetPrecAndLhsArg.bin b/2.3-1/macros/ASTManagement/AST_GetPrecAndLhsArg.bin Binary files differdeleted file mode 100644 index 71e44cb1..00000000 --- a/2.3-1/macros/ASTManagement/AST_GetPrecAndLhsArg.bin +++ /dev/null diff --git a/2.3-1/macros/ASTManagement/AST_HandleEOL.bin b/2.3-1/macros/ASTManagement/AST_HandleEOL.bin Binary files differdeleted file mode 100644 index 3b6b3bd1..00000000 --- a/2.3-1/macros/ASTManagement/AST_HandleEOL.bin +++ /dev/null diff --git a/2.3-1/macros/ASTManagement/AST_HandleEndFor.bin b/2.3-1/macros/ASTManagement/AST_HandleEndFor.bin Binary files differdeleted file mode 100644 index a6031b43..00000000 --- a/2.3-1/macros/ASTManagement/AST_HandleEndFor.bin +++ /dev/null diff --git a/2.3-1/macros/ASTManagement/AST_HandleEndGenFun.bin b/2.3-1/macros/ASTManagement/AST_HandleEndGenFun.bin Binary files differdeleted file mode 100644 index 5c2833ea..00000000 --- a/2.3-1/macros/ASTManagement/AST_HandleEndGenFun.bin +++ /dev/null diff --git a/2.3-1/macros/ASTManagement/AST_HandleEndProgram.bin b/2.3-1/macros/ASTManagement/AST_HandleEndProgram.bin Binary files differdeleted file mode 100644 index 5e02fdcd..00000000 --- a/2.3-1/macros/ASTManagement/AST_HandleEndProgram.bin +++ /dev/null diff --git a/2.3-1/macros/ASTManagement/AST_HandleEndWhile.bin b/2.3-1/macros/ASTManagement/AST_HandleEndWhile.bin Binary files differdeleted file mode 100644 index bafccbc2..00000000 --- a/2.3-1/macros/ASTManagement/AST_HandleEndWhile.bin +++ /dev/null diff --git a/2.3-1/macros/ASTManagement/AST_HandleFor.bin b/2.3-1/macros/ASTManagement/AST_HandleFor.bin Binary files differdeleted file mode 100644 index 27d44a12..00000000 --- a/2.3-1/macros/ASTManagement/AST_HandleFor.bin +++ /dev/null diff --git a/2.3-1/macros/ASTManagement/AST_HandleForStatem.bin b/2.3-1/macros/ASTManagement/AST_HandleForStatem.bin Binary files differdeleted file mode 100644 index 4839b049..00000000 --- a/2.3-1/macros/ASTManagement/AST_HandleForStatem.bin +++ /dev/null diff --git a/2.3-1/macros/ASTManagement/AST_HandleHeader.bin b/2.3-1/macros/ASTManagement/AST_HandleHeader.bin Binary files differdeleted file mode 100644 index 87ef763a..00000000 --- a/2.3-1/macros/ASTManagement/AST_HandleHeader.bin +++ /dev/null diff --git a/2.3-1/macros/ASTManagement/AST_HandleIfElse.bin b/2.3-1/macros/ASTManagement/AST_HandleIfElse.bin Binary files differdeleted file mode 100644 index 343dd489..00000000 --- a/2.3-1/macros/ASTManagement/AST_HandleIfElse.bin +++ /dev/null diff --git a/2.3-1/macros/ASTManagement/AST_HandleWhileExpr.bin b/2.3-1/macros/ASTManagement/AST_HandleWhileExpr.bin Binary files differdeleted file mode 100644 index 5f3da2de..00000000 --- a/2.3-1/macros/ASTManagement/AST_HandleWhileExpr.bin +++ /dev/null diff --git a/2.3-1/macros/ASTManagement/AST_HandleWhileStatem.bin b/2.3-1/macros/ASTManagement/AST_HandleWhileStatem.bin Binary files differdeleted file mode 100644 index 3e9942c2..00000000 --- a/2.3-1/macros/ASTManagement/AST_HandleWhileStatem.bin +++ /dev/null diff --git a/2.3-1/macros/ASTManagement/AST_ParseEqualStruct.bin b/2.3-1/macros/ASTManagement/AST_ParseEqualStruct.bin Binary files differdeleted file mode 100644 index 459c62e8..00000000 --- a/2.3-1/macros/ASTManagement/AST_ParseEqualStruct.bin +++ /dev/null diff --git a/2.3-1/macros/ASTManagement/AST_ParseFuncallStruct.bin b/2.3-1/macros/ASTManagement/AST_ParseFuncallStruct.bin Binary files differdeleted file mode 100644 index c9d996a0..00000000 --- a/2.3-1/macros/ASTManagement/AST_ParseFuncallStruct.bin +++ /dev/null diff --git a/2.3-1/macros/ASTManagement/AST_ParseIfExprStruct.bin b/2.3-1/macros/ASTManagement/AST_ParseIfExprStruct.bin Binary files differdeleted file mode 100644 index cbf63413..00000000 --- a/2.3-1/macros/ASTManagement/AST_ParseIfExprStruct.bin +++ /dev/null diff --git a/2.3-1/macros/ASTManagement/AST_ParseOperStruct.bin b/2.3-1/macros/ASTManagement/AST_ParseOperStruct.bin Binary files differdeleted file mode 100644 index eea4c288..00000000 --- a/2.3-1/macros/ASTManagement/AST_ParseOperStruct.bin +++ /dev/null diff --git a/2.3-1/macros/ASTManagement/AST_PopASTStack.bin b/2.3-1/macros/ASTManagement/AST_PopASTStack.bin Binary files differdeleted file mode 100644 index f9b85d34..00000000 --- a/2.3-1/macros/ASTManagement/AST_PopASTStack.bin +++ /dev/null diff --git a/2.3-1/macros/ASTManagement/AST_PushASTStack.bin b/2.3-1/macros/ASTManagement/AST_PushASTStack.bin Binary files differdeleted file mode 100644 index 8fcd563c..00000000 --- a/2.3-1/macros/ASTManagement/AST_PushASTStack.bin +++ /dev/null diff --git a/2.3-1/macros/ASTManagement/AST_ReadASTHeader.bin b/2.3-1/macros/ASTManagement/AST_ReadASTHeader.bin Binary files differdeleted file mode 100644 index 614231c4..00000000 --- a/2.3-1/macros/ASTManagement/AST_ReadASTHeader.bin +++ /dev/null diff --git a/2.3-1/macros/ASTManagement/AST_ReadEqualRhsNames.bin b/2.3-1/macros/ASTManagement/AST_ReadEqualRhsNames.bin Binary files differdeleted file mode 100644 index a131c498..00000000 --- a/2.3-1/macros/ASTManagement/AST_ReadEqualRhsNames.bin +++ /dev/null diff --git a/2.3-1/macros/ASTManagement/GenOutArgNames.bin b/2.3-1/macros/ASTManagement/GenOutArgNames.bin Binary files differdeleted file mode 100644 index c0d18341..00000000 --- a/2.3-1/macros/ASTManagement/GenOutArgNames.bin +++ /dev/null diff --git a/2.3-1/macros/ASTManagement/Operator2FunName.bin b/2.3-1/macros/ASTManagement/Operator2FunName.bin Binary files differdeleted file mode 100644 index 884c99bc..00000000 --- a/2.3-1/macros/ASTManagement/Operator2FunName.bin +++ /dev/null diff --git a/2.3-1/macros/ASTManagement/SciFile2ASTFile.bin b/2.3-1/macros/ASTManagement/SciFile2ASTFile.bin Binary files differdeleted file mode 100644 index be8bc0d5..00000000 --- a/2.3-1/macros/ASTManagement/SciFile2ASTFile.bin +++ /dev/null diff --git a/2.3-1/macros/ASTManagement/_comment_string.bin b/2.3-1/macros/ASTManagement/_comment_string.bin Binary files differdeleted file mode 100644 index fb894945..00000000 --- a/2.3-1/macros/ASTManagement/_comment_string.bin +++ /dev/null diff --git a/2.3-1/macros/ASTManagement/_cste_string.bin b/2.3-1/macros/ASTManagement/_cste_string.bin Binary files differdeleted file mode 100644 index ba643c47..00000000 --- a/2.3-1/macros/ASTManagement/_cste_string.bin +++ /dev/null diff --git a/2.3-1/macros/ASTManagement/_equal_string.bin b/2.3-1/macros/ASTManagement/_equal_string.bin Binary files differdeleted file mode 100644 index 7f88fee6..00000000 --- a/2.3-1/macros/ASTManagement/_equal_string.bin +++ /dev/null diff --git a/2.3-1/macros/ASTManagement/_for_string.bin b/2.3-1/macros/ASTManagement/_for_string.bin Binary files differdeleted file mode 100644 index c3fda16b..00000000 --- a/2.3-1/macros/ASTManagement/_for_string.bin +++ /dev/null diff --git a/2.3-1/macros/ASTManagement/_funcall_string.bin b/2.3-1/macros/ASTManagement/_funcall_string.bin Binary files differdeleted file mode 100644 index 8354586d..00000000 --- a/2.3-1/macros/ASTManagement/_funcall_string.bin +++ /dev/null diff --git a/2.3-1/macros/ASTManagement/_ifthenel_string.bin b/2.3-1/macros/ASTManagement/_ifthenel_string.bin Binary files differdeleted file mode 100644 index 1c6fa73d..00000000 --- a/2.3-1/macros/ASTManagement/_ifthenel_string.bin +++ /dev/null diff --git a/2.3-1/macros/ASTManagement/_ifthenelse_string.bin b/2.3-1/macros/ASTManagement/_ifthenelse_string.bin Binary files differdeleted file mode 100644 index 456ffadc..00000000 --- a/2.3-1/macros/ASTManagement/_ifthenelse_string.bin +++ /dev/null diff --git a/2.3-1/macros/ASTManagement/_operatio_string.bin b/2.3-1/macros/ASTManagement/_operatio_string.bin Binary files differdeleted file mode 100644 index 40abf6b2..00000000 --- a/2.3-1/macros/ASTManagement/_operatio_string.bin +++ /dev/null diff --git a/2.3-1/macros/ASTManagement/_operation_string.bin b/2.3-1/macros/ASTManagement/_operation_string.bin Binary files differdeleted file mode 100644 index dfbeec96..00000000 --- a/2.3-1/macros/ASTManagement/_operation_string.bin +++ /dev/null diff --git a/2.3-1/macros/ASTManagement/_program_p.bin b/2.3-1/macros/ASTManagement/_program_p.bin Binary files differdeleted file mode 100644 index 216a38b2..00000000 --- a/2.3-1/macros/ASTManagement/_program_p.bin +++ /dev/null diff --git a/2.3-1/macros/ASTManagement/_program_string.bin b/2.3-1/macros/ASTManagement/_program_string.bin Binary files differdeleted file mode 100644 index 3a8fc95b..00000000 --- a/2.3-1/macros/ASTManagement/_program_string.bin +++ /dev/null diff --git a/2.3-1/macros/ASTManagement/_variable_string.bin b/2.3-1/macros/ASTManagement/_variable_string.bin Binary files differdeleted file mode 100644 index f81fd6e0..00000000 --- a/2.3-1/macros/ASTManagement/_variable_string.bin +++ /dev/null diff --git a/2.3-1/macros/ASTManagement/_while_string.bin b/2.3-1/macros/ASTManagement/_while_string.bin Binary files differdeleted file mode 100644 index 142189c6..00000000 --- a/2.3-1/macros/ASTManagement/_while_string.bin +++ /dev/null diff --git a/2.3-1/macros/ASTManagement/lib b/2.3-1/macros/ASTManagement/lib Binary files differindex 9c1210d2..7b6a162e 100644 --- a/2.3-1/macros/ASTManagement/lib +++ b/2.3-1/macros/ASTManagement/lib diff --git a/2.3-1/macros/ASTManagement/objectlist2string.bin b/2.3-1/macros/ASTManagement/objectlist2string.bin Binary files differdeleted file mode 100644 index 96159f22..00000000 --- a/2.3-1/macros/ASTManagement/objectlist2string.bin +++ /dev/null diff --git a/2.3-1/macros/CCodeGeneration/C_FinalizeCode.bin b/2.3-1/macros/CCodeGeneration/C_FinalizeCode.bin Binary files differdeleted file mode 100644 index b4005914..00000000 --- a/2.3-1/macros/CCodeGeneration/C_FinalizeCode.bin +++ /dev/null diff --git a/2.3-1/macros/CCodeGeneration/C_ForExpression.bin b/2.3-1/macros/CCodeGeneration/C_ForExpression.bin Binary files differdeleted file mode 100644 index 1c3f6747..00000000 --- a/2.3-1/macros/CCodeGeneration/C_ForExpression.bin +++ /dev/null diff --git a/2.3-1/macros/CCodeGeneration/C_Funcall.bin b/2.3-1/macros/CCodeGeneration/C_Funcall.bin Binary files differdeleted file mode 100644 index 80fda7c4..00000000 --- a/2.3-1/macros/CCodeGeneration/C_Funcall.bin +++ /dev/null diff --git a/2.3-1/macros/CCodeGeneration/C_GenDeclarations.bin b/2.3-1/macros/CCodeGeneration/C_GenDeclarations.bin Binary files differdeleted file mode 100644 index c3b36009..00000000 --- a/2.3-1/macros/CCodeGeneration/C_GenDeclarations.bin +++ /dev/null diff --git a/2.3-1/macros/CCodeGeneration/C_GenerateFunName.bin b/2.3-1/macros/CCodeGeneration/C_GenerateFunName.bin Binary files differdeleted file mode 100644 index 1b723f16..00000000 --- a/2.3-1/macros/CCodeGeneration/C_GenerateFunName.bin +++ /dev/null diff --git a/2.3-1/macros/CCodeGeneration/C_GenerateLaunchScript.bin b/2.3-1/macros/CCodeGeneration/C_GenerateLaunchScript.bin Binary files differdeleted file mode 100644 index 587c1547..00000000 --- a/2.3-1/macros/CCodeGeneration/C_GenerateLaunchScript.bin +++ /dev/null diff --git a/2.3-1/macros/CCodeGeneration/C_GenerateMakefile.bin b/2.3-1/macros/CCodeGeneration/C_GenerateMakefile.bin Binary files differdeleted file mode 100644 index cea86411..00000000 --- a/2.3-1/macros/CCodeGeneration/C_GenerateMakefile.bin +++ /dev/null diff --git a/2.3-1/macros/CCodeGeneration/C_GenerateMakefile.sci b/2.3-1/macros/CCodeGeneration/C_GenerateMakefile.sci index 7dfb4da4..893ec938 100644 --- a/2.3-1/macros/CCodeGeneration/C_GenerateMakefile.sci +++ b/2.3-1/macros/CCodeGeneration/C_GenerateMakefile.sci @@ -78,6 +78,25 @@ else PrintStringInfo('CXXFLAGS = -Wall -pedantic -g -I $(HSRCDIR) -I $(ISRCDIR) -L $(LIBDIR)',FileInfo.MakefileFilename,'file','y','y'); PrintStringInfo('LDFLAGS = -lblas -llapack -lm ',FileInfo.MakefileFilename,'file','y','y'); end + + //If ode function is used, add libgsl. + if(size(SharedInfo.Includelist) <> 0) + if((mtlb_strcmp(part(SharedInfo.Includelist(1),1:5),'odefn') == %T)) + if(target == 'RPi') + PrintStringInfo('LDFLAGS = -lgsl -lcblas',FileInfo.MakefileFilename,'file','y','y'); + else + PrintStringInfo('LDFLAGS = -lgsl',FileInfo.MakefileFilename,'file','y','y'); + end + + end + end + + if (target == 'RPi') + PrintStringInfo('LDFLAGS += -llapack -lrefblas -lgfortran -lwiringPi',FileInfo.MakefileFilename,'file','y','y'); + else + PrintStringInfo('LDFLAGS += -lblas -llapack -lm ',FileInfo.MakefileFilename,'file','y','y'); + end + if(SharedInfo.OpenCVUsed == %T) PrintStringInfo('LDFLAGS += -lopencv_calib3d -lopencv_contrib -lopencv_features2d -lopencv_flann -lopencv_gpu',FileInfo.MakefileFilename,'file','y','y'); PrintStringInfo('LDFLAGS += -lopencv_highgui -lopencv_imgproc -lopencv_legacy -lopencv_ml -lopencv_nonfree',FileInfo.MakefileFilename,'file','y','y'); diff --git a/2.3-1/macros/CCodeGeneration/C_GenerateMakefile_msvc.bin b/2.3-1/macros/CCodeGeneration/C_GenerateMakefile_msvc.bin Binary files differdeleted file mode 100644 index 838c674e..00000000 --- a/2.3-1/macros/CCodeGeneration/C_GenerateMakefile_msvc.bin +++ /dev/null diff --git a/2.3-1/macros/CCodeGeneration/C_GenerateMkfle_arduino.sci b/2.3-1/macros/CCodeGeneration/C_GenerateMkfle_arduino.sci new file mode 100644 index 00000000..b43eb442 --- /dev/null +++ b/2.3-1/macros/CCodeGeneration/C_GenerateMkfle_arduino.sci @@ -0,0 +1,12 @@ +function C_GenerateMkfle_arduino(FileInfo,SharedInfo) + + PrintStringInfo('ARDUINO_DIR = /usr/share/arduino',FileInfo.MakefileFilename,'file','y','y'); + PrintStringInfo('ARDMK_DIR = /usr/share/arduino',FileInfo.MakefileFilename,'file','y','y'); + PrintStringInfo('AVR_TOOLS_DIR = /usr',FileInfo.MakefileFilename,'file','y','y'); + PrintStringInfo('BOARD_TAG = ' + SharedInfo.Board_name ,FileInfo.MakefileFilename,'file','y','y'); + PrintStringInfo('USER_LIB_PATH = ../',FileInfo.MakefileFilename,'file','y','y'); + PrintStringInfo('ARDUINO_LIBS = ../src/c ../includes ../interfaces ../ Wire',FileInfo.MakefileFilename,'file','y','y'); + PrintStringInfo('ARDUINO_PORT = /dev/ttyACM0',FileInfo.MakefileFilename,'file','y','y'); + PrintStringInfo('include /usr/share/arduino/Arduino.mk',FileInfo.MakefileFilename,'file','y','y'); + +endfunction diff --git a/2.3-1/macros/CCodeGeneration/C_GenerateSCI2CHeader.bin b/2.3-1/macros/CCodeGeneration/C_GenerateSCI2CHeader.bin Binary files differdeleted file mode 100644 index 2e02cae4..00000000 --- a/2.3-1/macros/CCodeGeneration/C_GenerateSCI2CHeader.bin +++ /dev/null diff --git a/2.3-1/macros/CCodeGeneration/C_IfElseBlocks.bin b/2.3-1/macros/CCodeGeneration/C_IfElseBlocks.bin Binary files differdeleted file mode 100644 index 332e89bf..00000000 --- a/2.3-1/macros/CCodeGeneration/C_IfElseBlocks.bin +++ /dev/null diff --git a/2.3-1/macros/CCodeGeneration/C_IfExpression.bin b/2.3-1/macros/CCodeGeneration/C_IfExpression.bin Binary files differdeleted file mode 100644 index c6cda7bd..00000000 --- a/2.3-1/macros/CCodeGeneration/C_IfExpression.bin +++ /dev/null diff --git a/2.3-1/macros/CCodeGeneration/C_IndentBlanks.bin b/2.3-1/macros/CCodeGeneration/C_IndentBlanks.bin Binary files differdeleted file mode 100644 index 77bfaebc..00000000 --- a/2.3-1/macros/CCodeGeneration/C_IndentBlanks.bin +++ /dev/null diff --git a/2.3-1/macros/CCodeGeneration/C_InitHeader.bin b/2.3-1/macros/CCodeGeneration/C_InitHeader.bin Binary files differdeleted file mode 100644 index 567822c0..00000000 --- a/2.3-1/macros/CCodeGeneration/C_InitHeader.bin +++ /dev/null diff --git a/2.3-1/macros/CCodeGeneration/C_MemAllocOutTempVars.bin b/2.3-1/macros/CCodeGeneration/C_MemAllocOutTempVars.bin Binary files differdeleted file mode 100644 index 443ad3c1..00000000 --- a/2.3-1/macros/CCodeGeneration/C_MemAllocOutTempVars.bin +++ /dev/null diff --git a/2.3-1/macros/CCodeGeneration/C_SCI2CHeader.bin b/2.3-1/macros/CCodeGeneration/C_SCI2CHeader.bin Binary files differdeleted file mode 100644 index 1d3e6182..00000000 --- a/2.3-1/macros/CCodeGeneration/C_SCI2CHeader.bin +++ /dev/null diff --git a/2.3-1/macros/CCodeGeneration/C_Type.bin b/2.3-1/macros/CCodeGeneration/C_Type.bin Binary files differdeleted file mode 100644 index 7b5bf444..00000000 --- a/2.3-1/macros/CCodeGeneration/C_Type.bin +++ /dev/null diff --git a/2.3-1/macros/CCodeGeneration/C_WhileExpression.bin b/2.3-1/macros/CCodeGeneration/C_WhileExpression.bin Binary files differdeleted file mode 100644 index cff8f38d..00000000 --- a/2.3-1/macros/CCodeGeneration/C_WhileExpression.bin +++ /dev/null diff --git a/2.3-1/macros/CCodeGeneration/GenCFunDatFiles.bin b/2.3-1/macros/CCodeGeneration/GenCFunDatFiles.bin Binary files differdeleted file mode 100644 index 6a374f5b..00000000 --- a/2.3-1/macros/CCodeGeneration/GenCFunDatFiles.bin +++ /dev/null diff --git a/2.3-1/macros/CCodeGeneration/GetClsFileName.bin b/2.3-1/macros/CCodeGeneration/GetClsFileName.bin Binary files differdeleted file mode 100644 index 30b25713..00000000 --- a/2.3-1/macros/CCodeGeneration/GetClsFileName.bin +++ /dev/null diff --git a/2.3-1/macros/CCodeGeneration/GetSymbolDimension.bin b/2.3-1/macros/CCodeGeneration/GetSymbolDimension.bin Binary files differdeleted file mode 100644 index 5c73f435..00000000 --- a/2.3-1/macros/CCodeGeneration/GetSymbolDimension.bin +++ /dev/null diff --git a/2.3-1/macros/CCodeGeneration/GetWhileCondVariable.bin b/2.3-1/macros/CCodeGeneration/GetWhileCondVariable.bin Binary files differdeleted file mode 100644 index 6815fb4b..00000000 --- a/2.3-1/macros/CCodeGeneration/GetWhileCondVariable.bin +++ /dev/null diff --git a/2.3-1/macros/CCodeGeneration/JoinDeclarAndCcode.bin b/2.3-1/macros/CCodeGeneration/JoinDeclarAndCcode.bin Binary files differdeleted file mode 100644 index 084ab085..00000000 --- a/2.3-1/macros/CCodeGeneration/JoinDeclarAndCcode.bin +++ /dev/null diff --git a/2.3-1/macros/CCodeGeneration/Sci2AnnotationFile.bin b/2.3-1/macros/CCodeGeneration/Sci2AnnotationFile.bin Binary files differdeleted file mode 100644 index 95fe5611..00000000 --- a/2.3-1/macros/CCodeGeneration/Sci2AnnotationFile.bin +++ /dev/null diff --git a/2.3-1/macros/CCodeGeneration/lib b/2.3-1/macros/CCodeGeneration/lib Binary files differindex 9a1b93cc..2db4b8c8 100644 --- a/2.3-1/macros/CCodeGeneration/lib +++ b/2.3-1/macros/CCodeGeneration/lib diff --git a/2.3-1/macros/CCodeGeneration/names b/2.3-1/macros/CCodeGeneration/names index efbb400a..5311c7fd 100644 --- a/2.3-1/macros/CCodeGeneration/names +++ b/2.3-1/macros/CCodeGeneration/names @@ -6,6 +6,7 @@ C_GenerateFunName C_GenerateLaunchScript C_GenerateMakefile C_GenerateMakefile_msvc +C_GenerateMkfle_arduino C_GenerateSCI2CHeader C_IfElseBlocks C_IfExpression diff --git a/2.3-1/macros/ErrorMessages/EM_NanSize.bin b/2.3-1/macros/ErrorMessages/EM_NanSize.bin Binary files differdeleted file mode 100644 index d0ad584b..00000000 --- a/2.3-1/macros/ErrorMessages/EM_NanSize.bin +++ /dev/null diff --git a/2.3-1/macros/ErrorMessages/EM_UnknownStep.bin b/2.3-1/macros/ErrorMessages/EM_UnknownStep.bin Binary files differdeleted file mode 100644 index 57a2b4d7..00000000 --- a/2.3-1/macros/ErrorMessages/EM_UnknownStep.bin +++ /dev/null diff --git a/2.3-1/macros/ErrorMessages/EM_ZeroSize.bin b/2.3-1/macros/ErrorMessages/EM_ZeroSize.bin Binary files differdeleted file mode 100644 index f8d2830f..00000000 --- a/2.3-1/macros/ErrorMessages/EM_ZeroSize.bin +++ /dev/null diff --git a/2.3-1/macros/ErrorMessages/lib b/2.3-1/macros/ErrorMessages/lib Binary files differindex 4c570fd9..fe21443a 100644 --- a/2.3-1/macros/ErrorMessages/lib +++ b/2.3-1/macros/ErrorMessages/lib diff --git a/2.3-1/macros/FunctionAnnotation/FA_ADD.bin b/2.3-1/macros/FunctionAnnotation/FA_ADD.bin Binary files differdeleted file mode 100644 index 6c810828..00000000 --- a/2.3-1/macros/FunctionAnnotation/FA_ADD.bin +++ /dev/null diff --git a/2.3-1/macros/FunctionAnnotation/FA_DIV.bin b/2.3-1/macros/FunctionAnnotation/FA_DIV.bin Binary files differdeleted file mode 100644 index 6e6708fe..00000000 --- a/2.3-1/macros/FunctionAnnotation/FA_DIV.bin +++ /dev/null diff --git a/2.3-1/macros/FunctionAnnotation/FA_GetDefaultPrecision.bin b/2.3-1/macros/FunctionAnnotation/FA_GetDefaultPrecision.bin Binary files differdeleted file mode 100644 index fa48e833..00000000 --- a/2.3-1/macros/FunctionAnnotation/FA_GetDefaultPrecision.bin +++ /dev/null diff --git a/2.3-1/macros/FunctionAnnotation/FA_GetFunAnn.bin b/2.3-1/macros/FunctionAnnotation/FA_GetFunAnn.bin Binary files differdeleted file mode 100644 index b38770ee..00000000 --- a/2.3-1/macros/FunctionAnnotation/FA_GetFunAnn.bin +++ /dev/null diff --git a/2.3-1/macros/FunctionAnnotation/FA_GetOutArgInfo.bin b/2.3-1/macros/FunctionAnnotation/FA_GetOutArgInfo.bin Binary files differdeleted file mode 100644 index 89c0d1d3..00000000 --- a/2.3-1/macros/FunctionAnnotation/FA_GetOutArgInfo.bin +++ /dev/null diff --git a/2.3-1/macros/FunctionAnnotation/FA_GetResizeApproach.bin b/2.3-1/macros/FunctionAnnotation/FA_GetResizeApproach.bin Binary files differdeleted file mode 100644 index 77397e01..00000000 --- a/2.3-1/macros/FunctionAnnotation/FA_GetResizeApproach.bin +++ /dev/null diff --git a/2.3-1/macros/FunctionAnnotation/FA_INT.bin b/2.3-1/macros/FunctionAnnotation/FA_INT.bin Binary files differdeleted file mode 100644 index edf9bb84..00000000 --- a/2.3-1/macros/FunctionAnnotation/FA_INT.bin +++ /dev/null diff --git a/2.3-1/macros/FunctionAnnotation/FA_MAX.bin b/2.3-1/macros/FunctionAnnotation/FA_MAX.bin Binary files differdeleted file mode 100644 index a9debbab..00000000 --- a/2.3-1/macros/FunctionAnnotation/FA_MAX.bin +++ /dev/null diff --git a/2.3-1/macros/FunctionAnnotation/FA_MIN.bin b/2.3-1/macros/FunctionAnnotation/FA_MIN.bin Binary files differdeleted file mode 100644 index cc9bd02e..00000000 --- a/2.3-1/macros/FunctionAnnotation/FA_MIN.bin +++ /dev/null diff --git a/2.3-1/macros/FunctionAnnotation/FA_MUL.bin b/2.3-1/macros/FunctionAnnotation/FA_MUL.bin Binary files differdeleted file mode 100644 index 8b674c21..00000000 --- a/2.3-1/macros/FunctionAnnotation/FA_MUL.bin +++ /dev/null diff --git a/2.3-1/macros/FunctionAnnotation/FA_REAL.bin b/2.3-1/macros/FunctionAnnotation/FA_REAL.bin Binary files differdeleted file mode 100644 index ed68eb74..00000000 --- a/2.3-1/macros/FunctionAnnotation/FA_REAL.bin +++ /dev/null diff --git a/2.3-1/macros/FunctionAnnotation/FA_SCHUR_SZ.bin b/2.3-1/macros/FunctionAnnotation/FA_SCHUR_SZ.bin Binary files differdeleted file mode 100644 index 292a6193..00000000 --- a/2.3-1/macros/FunctionAnnotation/FA_SCHUR_SZ.bin +++ /dev/null diff --git a/2.3-1/macros/FunctionAnnotation/FA_SCHUR_TP.bin b/2.3-1/macros/FunctionAnnotation/FA_SCHUR_TP.bin Binary files differdeleted file mode 100644 index 4b0b438f..00000000 --- a/2.3-1/macros/FunctionAnnotation/FA_SCHUR_TP.bin +++ /dev/null diff --git a/2.3-1/macros/FunctionAnnotation/FA_SUB.bin b/2.3-1/macros/FunctionAnnotation/FA_SUB.bin Binary files differdeleted file mode 100644 index fdc52b4d..00000000 --- a/2.3-1/macros/FunctionAnnotation/FA_SUB.bin +++ /dev/null diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_1.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_1.bin Binary files differdeleted file mode 100644 index c01ff59d..00000000 --- a/2.3-1/macros/FunctionAnnotation/FA_SZ_1.bin +++ /dev/null diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_2.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_2.bin Binary files differdeleted file mode 100644 index 00834df4..00000000 --- a/2.3-1/macros/FunctionAnnotation/FA_SZ_2.bin +++ /dev/null diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_COLUMN_DIAG.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_COLUMN_DIAG.bin Binary files differdeleted file mode 100644 index a3b34afc..00000000 --- a/2.3-1/macros/FunctionAnnotation/FA_SZ_COLUMN_DIAG.bin +++ /dev/null diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_COL_DIAG_IN_EX.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_COL_DIAG_IN_EX.bin Binary files differdeleted file mode 100644 index 76748237..00000000 --- a/2.3-1/macros/FunctionAnnotation/FA_SZ_COL_DIAG_IN_EX.bin +++ /dev/null diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2BASE.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2BASE.bin Binary files differdeleted file mode 100644 index 879c5885..00000000 --- a/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2BASE.bin +++ /dev/null diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2BIN.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2BIN.bin Binary files differdeleted file mode 100644 index af9d1cb8..00000000 --- a/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2BIN.bin +++ /dev/null diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2HEX.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2HEX.bin Binary files differdeleted file mode 100644 index ddabb108..00000000 --- a/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2HEX.bin +++ /dev/null diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2OCT.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2OCT.bin Binary files differdeleted file mode 100644 index be386e03..00000000 --- a/2.3-1/macros/FunctionAnnotation/FA_SZ_DEC2OCT.bin +++ /dev/null diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_DIFF.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_DIFF.bin Binary files differdeleted file mode 100644 index 08d66c13..00000000 --- a/2.3-1/macros/FunctionAnnotation/FA_SZ_DIFF.bin +++ /dev/null diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_FACTOR.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_FACTOR.bin Binary files differdeleted file mode 100644 index ee8f8991..00000000 --- a/2.3-1/macros/FunctionAnnotation/FA_SZ_FACTOR.bin +++ /dev/null diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_FROM_VAL.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_FROM_VAL.bin Binary files differdeleted file mode 100644 index a06f3b16..00000000 --- a/2.3-1/macros/FunctionAnnotation/FA_SZ_FROM_VAL.bin +++ /dev/null diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_LINSPACE_ROW.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_LINSPACE_ROW.bin Binary files differdeleted file mode 100644 index 60cb9d4e..00000000 --- a/2.3-1/macros/FunctionAnnotation/FA_SZ_LINSPACE_ROW.bin +++ /dev/null diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_LQE.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_LQE.bin Binary files differdeleted file mode 100644 index 8abfa39b..00000000 --- a/2.3-1/macros/FunctionAnnotation/FA_SZ_LQE.bin +++ /dev/null diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_LQR.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_LQR.bin Binary files differdeleted file mode 100644 index 843fb2ce..00000000 --- a/2.3-1/macros/FunctionAnnotation/FA_SZ_LQR.bin +++ /dev/null diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OBSCNT.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_OBSCNT.bin Binary files differdeleted file mode 100644 index b936e29c..00000000 --- a/2.3-1/macros/FunctionAnnotation/FA_SZ_OBSCNT.bin +++ /dev/null diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPAPEX.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPAPEX.bin Binary files differdeleted file mode 100644 index 90e50348..00000000 --- a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPAPEX.bin +++ /dev/null diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPBACKSLASH.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPBACKSLASH.bin Binary files differdeleted file mode 100644 index be3e89ac..00000000 --- a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPBACKSLASH.bin +++ /dev/null diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPCC.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPCC.bin Binary files differdeleted file mode 100644 index 767385a3..00000000 --- a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPCC.bin +++ /dev/null diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPDOTAPEX.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPDOTAPEX.bin Binary files differdeleted file mode 100644 index 822cb5e8..00000000 --- a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPDOTAPEX.bin +++ /dev/null diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPDOTBACKSLASH.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPDOTBACKSLASH.bin Binary files differdeleted file mode 100644 index 2af7e390..00000000 --- a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPDOTBACKSLASH.bin +++ /dev/null diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPDOTHAT.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPDOTHAT.bin Binary files differdeleted file mode 100644 index 72d6e23d..00000000 --- a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPDOTHAT.bin +++ /dev/null diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPDOTSLASH.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPDOTSLASH.bin Binary files differdeleted file mode 100644 index f060e87e..00000000 --- a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPDOTSLASH.bin +++ /dev/null diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPDOTSTAR.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPDOTSTAR.bin Binary files differdeleted file mode 100644 index 6be9a457..00000000 --- a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPDOTSTAR.bin +++ /dev/null diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPHAT.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPHAT.bin Binary files differdeleted file mode 100644 index feb8122d..00000000 --- a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPHAT.bin +++ /dev/null diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGAND.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGAND.bin Binary files differdeleted file mode 100644 index e4419128..00000000 --- a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGAND.bin +++ /dev/null diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGEQ.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGEQ.bin Binary files differdeleted file mode 100644 index afe431b3..00000000 --- a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGEQ.bin +++ /dev/null diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGGE.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGGE.bin Binary files differdeleted file mode 100644 index 87d2d5bf..00000000 --- a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGGE.bin +++ /dev/null diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGGT.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGGT.bin Binary files differdeleted file mode 100644 index c3a1d88c..00000000 --- a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGGT.bin +++ /dev/null diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGLE.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGLE.bin Binary files differdeleted file mode 100644 index 80216050..00000000 --- a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGLE.bin +++ /dev/null diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGLT.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGLT.bin Binary files differdeleted file mode 100644 index 417fe265..00000000 --- a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGLT.bin +++ /dev/null diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGNE.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGNE.bin Binary files differdeleted file mode 100644 index 6c9f9bf0..00000000 --- a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGNE.bin +++ /dev/null diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGNOT.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGNOT.bin Binary files differdeleted file mode 100644 index 417a9195..00000000 --- a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGNOT.bin +++ /dev/null diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGOR.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGOR.bin Binary files differdeleted file mode 100644 index af6c2a8e..00000000 --- a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPLOGOR.bin +++ /dev/null diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPMINUS.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPMINUS.bin Binary files differdeleted file mode 100644 index deac97df..00000000 --- a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPMINUS.bin +++ /dev/null diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPPLUS.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPPLUS.bin Binary files differdeleted file mode 100644 index da84349d..00000000 --- a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPPLUS.bin +++ /dev/null diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPPLUSA.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPPLUSA.bin Binary files differdeleted file mode 100644 index b45ac592..00000000 --- a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPPLUSA.bin +++ /dev/null diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPRC.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPRC.bin Binary files differdeleted file mode 100644 index 6d55e274..00000000 --- a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPRC.bin +++ /dev/null diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPSLASH.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPSLASH.bin Binary files differdeleted file mode 100644 index 14bb17f9..00000000 --- a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPSLASH.bin +++ /dev/null diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPSTAR.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPSTAR.bin Binary files differdeleted file mode 100644 index 2f28cb62..00000000 --- a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPSTAR.bin +++ /dev/null diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_PRIMES.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_PRIMES.bin Binary files differdeleted file mode 100644 index 353edab7..00000000 --- a/2.3-1/macros/FunctionAnnotation/FA_SZ_PRIMES.bin +++ /dev/null diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_COLUMN_CAT.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_COLUMN_CAT.bin Binary files differdeleted file mode 100644 index 3b0c0b78..00000000 --- a/2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_COLUMN_CAT.bin +++ /dev/null diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_DIAG.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_DIAG.bin Binary files differdeleted file mode 100644 index f5f1a236..00000000 --- a/2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_DIAG.bin +++ /dev/null diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_DIAG_INS_EXT.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_DIAG_INS_EXT.bin Binary files differdeleted file mode 100644 index e5d8e650..00000000 --- a/2.3-1/macros/FunctionAnnotation/FA_SZ_ROW_DIAG_INS_EXT.bin +++ /dev/null diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_SEL1.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_SEL1.bin Binary files differdeleted file mode 100644 index 1d68a2e6..00000000 --- a/2.3-1/macros/FunctionAnnotation/FA_SZ_SEL1.bin +++ /dev/null diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_SEL2.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_SEL2.bin Binary files differdeleted file mode 100644 index d3897f7d..00000000 --- a/2.3-1/macros/FunctionAnnotation/FA_SZ_SEL2.bin +++ /dev/null diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_U_SVA.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_U_SVA.bin Binary files differdeleted file mode 100644 index 1bf8b165..00000000 --- a/2.3-1/macros/FunctionAnnotation/FA_SZ_U_SVA.bin +++ /dev/null diff --git a/2.3-1/macros/FunctionAnnotation/FA_TP_C.bin b/2.3-1/macros/FunctionAnnotation/FA_TP_C.bin Binary files differdeleted file mode 100644 index d13d92ca..00000000 --- a/2.3-1/macros/FunctionAnnotation/FA_TP_C.bin +++ /dev/null diff --git a/2.3-1/macros/FunctionAnnotation/FA_TP_COMPLEX.bin b/2.3-1/macros/FunctionAnnotation/FA_TP_COMPLEX.bin Binary files differdeleted file mode 100644 index 3400b2af..00000000 --- a/2.3-1/macros/FunctionAnnotation/FA_TP_COMPLEX.bin +++ /dev/null diff --git a/2.3-1/macros/FunctionAnnotation/FA_TP_CVIMAGE.bin b/2.3-1/macros/FunctionAnnotation/FA_TP_CVIMAGE.bin Binary files differdeleted file mode 100644 index a7327099..00000000 --- a/2.3-1/macros/FunctionAnnotation/FA_TP_CVIMAGE.bin +++ /dev/null diff --git a/2.3-1/macros/FunctionAnnotation/FA_TP_D.bin b/2.3-1/macros/FunctionAnnotation/FA_TP_D.bin Binary files differdeleted file mode 100644 index 12293dab..00000000 --- a/2.3-1/macros/FunctionAnnotation/FA_TP_D.bin +++ /dev/null diff --git a/2.3-1/macros/FunctionAnnotation/FA_TP_I.bin b/2.3-1/macros/FunctionAnnotation/FA_TP_I.bin Binary files differdeleted file mode 100644 index 503be40b..00000000 --- a/2.3-1/macros/FunctionAnnotation/FA_TP_I.bin +++ /dev/null diff --git a/2.3-1/macros/FunctionAnnotation/FA_TP_INT16.bin b/2.3-1/macros/FunctionAnnotation/FA_TP_INT16.bin Binary files differdeleted file mode 100644 index fba4305a..00000000 --- a/2.3-1/macros/FunctionAnnotation/FA_TP_INT16.bin +++ /dev/null diff --git a/2.3-1/macros/FunctionAnnotation/FA_TP_INT8.bin b/2.3-1/macros/FunctionAnnotation/FA_TP_INT8.bin Binary files differdeleted file mode 100644 index f67d7485..00000000 --- a/2.3-1/macros/FunctionAnnotation/FA_TP_INT8.bin +++ /dev/null diff --git a/2.3-1/macros/FunctionAnnotation/FA_TP_MAX.bin b/2.3-1/macros/FunctionAnnotation/FA_TP_MAX.bin Binary files differdeleted file mode 100644 index 099ea1ba..00000000 --- a/2.3-1/macros/FunctionAnnotation/FA_TP_MAX.bin +++ /dev/null diff --git a/2.3-1/macros/FunctionAnnotation/FA_TP_MIN_REAL.bin b/2.3-1/macros/FunctionAnnotation/FA_TP_MIN_REAL.bin Binary files differdeleted file mode 100644 index 60293a1d..00000000 --- a/2.3-1/macros/FunctionAnnotation/FA_TP_MIN_REAL.bin +++ /dev/null diff --git a/2.3-1/macros/FunctionAnnotation/FA_TP_REAL.bin b/2.3-1/macros/FunctionAnnotation/FA_TP_REAL.bin Binary files differdeleted file mode 100644 index 7e54122a..00000000 --- a/2.3-1/macros/FunctionAnnotation/FA_TP_REAL.bin +++ /dev/null diff --git a/2.3-1/macros/FunctionAnnotation/FA_TP_S.bin b/2.3-1/macros/FunctionAnnotation/FA_TP_S.bin Binary files differdeleted file mode 100644 index 1419e461..00000000 --- a/2.3-1/macros/FunctionAnnotation/FA_TP_S.bin +++ /dev/null diff --git a/2.3-1/macros/FunctionAnnotation/FA_TP_UINT16.bin b/2.3-1/macros/FunctionAnnotation/FA_TP_UINT16.bin Binary files differdeleted file mode 100644 index dc455ca6..00000000 --- a/2.3-1/macros/FunctionAnnotation/FA_TP_UINT16.bin +++ /dev/null diff --git a/2.3-1/macros/FunctionAnnotation/FA_TP_UINT8.bin b/2.3-1/macros/FunctionAnnotation/FA_TP_UINT8.bin Binary files differdeleted file mode 100644 index 508db417..00000000 --- a/2.3-1/macros/FunctionAnnotation/FA_TP_UINT8.bin +++ /dev/null diff --git a/2.3-1/macros/FunctionAnnotation/FA_TP_USER.bin b/2.3-1/macros/FunctionAnnotation/FA_TP_USER.bin Binary files differdeleted file mode 100644 index 87e18d54..00000000 --- a/2.3-1/macros/FunctionAnnotation/FA_TP_USER.bin +++ /dev/null diff --git a/2.3-1/macros/FunctionAnnotation/FA_TP_Z.bin b/2.3-1/macros/FunctionAnnotation/FA_TP_Z.bin Binary files differdeleted file mode 100644 index 6c371723..00000000 --- a/2.3-1/macros/FunctionAnnotation/FA_TP_Z.bin +++ /dev/null diff --git a/2.3-1/macros/FunctionAnnotation/lib b/2.3-1/macros/FunctionAnnotation/lib Binary files differindex 2615994f..db2c80b7 100644 --- a/2.3-1/macros/FunctionAnnotation/lib +++ b/2.3-1/macros/FunctionAnnotation/lib diff --git a/2.3-1/macros/FunctionList/FL_ExistCFunction.bin b/2.3-1/macros/FunctionList/FL_ExistCFunction.bin Binary files differdeleted file mode 100644 index 1c85aa21..00000000 --- a/2.3-1/macros/FunctionList/FL_ExistCFunction.bin +++ /dev/null diff --git a/2.3-1/macros/FunctionList/FL_ExtractFuncList.bin b/2.3-1/macros/FunctionList/FL_ExtractFuncList.bin Binary files differdeleted file mode 100644 index ec74708d..00000000 --- a/2.3-1/macros/FunctionList/FL_ExtractFuncList.bin +++ /dev/null diff --git a/2.3-1/macros/FunctionList/FL_GetFunctionClass.bin b/2.3-1/macros/FunctionList/FL_GetFunctionClass.bin Binary files differdeleted file mode 100644 index faa210e6..00000000 --- a/2.3-1/macros/FunctionList/FL_GetFunctionClass.bin +++ /dev/null diff --git a/2.3-1/macros/FunctionList/FL_InOutArgs2CFunNames.bin b/2.3-1/macros/FunctionList/FL_InOutArgs2CFunNames.bin Binary files differdeleted file mode 100644 index 09d5eb5e..00000000 --- a/2.3-1/macros/FunctionList/FL_InOutArgs2CFunNames.bin +++ /dev/null diff --git a/2.3-1/macros/FunctionList/FL_UpdateConverted.bin b/2.3-1/macros/FunctionList/FL_UpdateConverted.bin Binary files differdeleted file mode 100644 index 73f2cf02..00000000 --- a/2.3-1/macros/FunctionList/FL_UpdateConverted.bin +++ /dev/null diff --git a/2.3-1/macros/FunctionList/FL_UpdateToBeConv.bin b/2.3-1/macros/FunctionList/FL_UpdateToBeConv.bin Binary files differdeleted file mode 100644 index 44b5803f..00000000 --- a/2.3-1/macros/FunctionList/FL_UpdateToBeConv.bin +++ /dev/null diff --git a/2.3-1/macros/FunctionList/lib b/2.3-1/macros/FunctionList/lib Binary files differindex 9b8cfc81..41269eda 100644 --- a/2.3-1/macros/FunctionList/lib +++ b/2.3-1/macros/FunctionList/lib diff --git a/2.3-1/macros/GeneralFunctions/Array2String.bin b/2.3-1/macros/GeneralFunctions/Array2String.bin Binary files differdeleted file mode 100644 index c40274de..00000000 --- a/2.3-1/macros/GeneralFunctions/Array2String.bin +++ /dev/null diff --git a/2.3-1/macros/GeneralFunctions/ConvertPathMat2C.bin b/2.3-1/macros/GeneralFunctions/ConvertPathMat2C.bin Binary files differdeleted file mode 100644 index 7dd14227..00000000 --- a/2.3-1/macros/GeneralFunctions/ConvertPathMat2C.bin +++ /dev/null diff --git a/2.3-1/macros/GeneralFunctions/File2StringArray.bin b/2.3-1/macros/GeneralFunctions/File2StringArray.bin Binary files differdeleted file mode 100644 index 1b050f4e..00000000 --- a/2.3-1/macros/GeneralFunctions/File2StringArray.bin +++ /dev/null diff --git a/2.3-1/macros/GeneralFunctions/FunName2SciFileName.bin b/2.3-1/macros/GeneralFunctions/FunName2SciFileName.bin Binary files differdeleted file mode 100644 index c3cb5387..00000000 --- a/2.3-1/macros/GeneralFunctions/FunName2SciFileName.bin +++ /dev/null diff --git a/2.3-1/macros/GeneralFunctions/IsNanSize.bin b/2.3-1/macros/GeneralFunctions/IsNanSize.bin Binary files differdeleted file mode 100644 index 71735125..00000000 --- a/2.3-1/macros/GeneralFunctions/IsNanSize.bin +++ /dev/null diff --git a/2.3-1/macros/GeneralFunctions/KeyStr2FileStrPos.bin b/2.3-1/macros/GeneralFunctions/KeyStr2FileStrPos.bin Binary files differdeleted file mode 100644 index 5c6cfaff..00000000 --- a/2.3-1/macros/GeneralFunctions/KeyStr2FileStrPos.bin +++ /dev/null diff --git a/2.3-1/macros/GeneralFunctions/PrintStepInfo.bin b/2.3-1/macros/GeneralFunctions/PrintStepInfo.bin Binary files differdeleted file mode 100644 index 98208f8f..00000000 --- a/2.3-1/macros/GeneralFunctions/PrintStepInfo.bin +++ /dev/null diff --git a/2.3-1/macros/GeneralFunctions/PrintStringInfo.bin b/2.3-1/macros/GeneralFunctions/PrintStringInfo.bin Binary files differdeleted file mode 100644 index c936b207..00000000 --- a/2.3-1/macros/GeneralFunctions/PrintStringInfo.bin +++ /dev/null diff --git a/2.3-1/macros/GeneralFunctions/ReadStringCard.bin b/2.3-1/macros/GeneralFunctions/ReadStringCard.bin Binary files differdeleted file mode 100644 index f9b28283..00000000 --- a/2.3-1/macros/GeneralFunctions/ReadStringCard.bin +++ /dev/null diff --git a/2.3-1/macros/GeneralFunctions/SCI2CCreateDir.bin b/2.3-1/macros/GeneralFunctions/SCI2CCreateDir.bin Binary files differdeleted file mode 100644 index 007b6fb8..00000000 --- a/2.3-1/macros/GeneralFunctions/SCI2CCreateDir.bin +++ /dev/null diff --git a/2.3-1/macros/GeneralFunctions/SCI2CFindFile.bin b/2.3-1/macros/GeneralFunctions/SCI2CFindFile.bin Binary files differdeleted file mode 100644 index fe8e783d..00000000 --- a/2.3-1/macros/GeneralFunctions/SCI2CFindFile.bin +++ /dev/null diff --git a/2.3-1/macros/GeneralFunctions/SCI2CNInArgCheck.bin b/2.3-1/macros/GeneralFunctions/SCI2CNInArgCheck.bin Binary files differdeleted file mode 100644 index 8d96b6e9..00000000 --- a/2.3-1/macros/GeneralFunctions/SCI2CNInArgCheck.bin +++ /dev/null diff --git a/2.3-1/macros/GeneralFunctions/SCI2COpenFileRead.bin b/2.3-1/macros/GeneralFunctions/SCI2COpenFileRead.bin Binary files differdeleted file mode 100644 index f3f6a5e3..00000000 --- a/2.3-1/macros/GeneralFunctions/SCI2COpenFileRead.bin +++ /dev/null diff --git a/2.3-1/macros/GeneralFunctions/SCI2COpenFileWrite.bin b/2.3-1/macros/GeneralFunctions/SCI2COpenFileWrite.bin Binary files differdeleted file mode 100644 index 0287b3aa..00000000 --- a/2.3-1/macros/GeneralFunctions/SCI2COpenFileWrite.bin +++ /dev/null diff --git a/2.3-1/macros/GeneralFunctions/SCI2CTemplate.bin b/2.3-1/macros/GeneralFunctions/SCI2CTemplate.bin Binary files differdeleted file mode 100644 index c485b457..00000000 --- a/2.3-1/macros/GeneralFunctions/SCI2CTemplate.bin +++ /dev/null diff --git a/2.3-1/macros/GeneralFunctions/SCI2Ccopyfile.bin b/2.3-1/macros/GeneralFunctions/SCI2Ccopyfile.bin Binary files differdeleted file mode 100644 index e6d0a866..00000000 --- a/2.3-1/macros/GeneralFunctions/SCI2Ccopyfile.bin +++ /dev/null diff --git a/2.3-1/macros/GeneralFunctions/SCI2Cfileexist.bin b/2.3-1/macros/GeneralFunctions/SCI2Cfileexist.bin Binary files differdeleted file mode 100644 index 524c8c42..00000000 --- a/2.3-1/macros/GeneralFunctions/SCI2Cfileexist.bin +++ /dev/null diff --git a/2.3-1/macros/GeneralFunctions/SCI2Cflipud.bin b/2.3-1/macros/GeneralFunctions/SCI2Cflipud.bin Binary files differdeleted file mode 100644 index baf71bb9..00000000 --- a/2.3-1/macros/GeneralFunctions/SCI2Cflipud.bin +++ /dev/null diff --git a/2.3-1/macros/GeneralFunctions/SCI2Cmdelete.bin b/2.3-1/macros/GeneralFunctions/SCI2Cmdelete.bin Binary files differdeleted file mode 100644 index 67694b7f..00000000 --- a/2.3-1/macros/GeneralFunctions/SCI2Cmdelete.bin +++ /dev/null diff --git a/2.3-1/macros/GeneralFunctions/SCI2Cresize.bin b/2.3-1/macros/GeneralFunctions/SCI2Cresize.bin Binary files differdeleted file mode 100644 index a909d306..00000000 --- a/2.3-1/macros/GeneralFunctions/SCI2Cresize.bin +++ /dev/null diff --git a/2.3-1/macros/GeneralFunctions/SCI2Cstring.bin b/2.3-1/macros/GeneralFunctions/SCI2Cstring.bin Binary files differdeleted file mode 100644 index 887482bb..00000000 --- a/2.3-1/macros/GeneralFunctions/SCI2Cstring.bin +++ /dev/null diff --git a/2.3-1/macros/GeneralFunctions/SCI2Cstrncmp.bin b/2.3-1/macros/GeneralFunctions/SCI2Cstrncmp.bin Binary files differdeleted file mode 100644 index 78ce9a1a..00000000 --- a/2.3-1/macros/GeneralFunctions/SCI2Cstrncmp.bin +++ /dev/null diff --git a/2.3-1/macros/GeneralFunctions/SCI2Cstrncmps1size.bin b/2.3-1/macros/GeneralFunctions/SCI2Cstrncmps1size.bin Binary files differdeleted file mode 100644 index e9a45d96..00000000 --- a/2.3-1/macros/GeneralFunctions/SCI2Cstrncmps1size.bin +++ /dev/null diff --git a/2.3-1/macros/GeneralFunctions/SizeInByte.bin b/2.3-1/macros/GeneralFunctions/SizeInByte.bin Binary files differdeleted file mode 100644 index 04c7a752..00000000 --- a/2.3-1/macros/GeneralFunctions/SizeInByte.bin +++ /dev/null diff --git a/2.3-1/macros/GeneralFunctions/dispina.bin b/2.3-1/macros/GeneralFunctions/dispina.bin Binary files differdeleted file mode 100644 index 25d03faf..00000000 --- a/2.3-1/macros/GeneralFunctions/dispina.bin +++ /dev/null diff --git a/2.3-1/macros/GeneralFunctions/filenamefprintf.bin b/2.3-1/macros/GeneralFunctions/filenamefprintf.bin Binary files differdeleted file mode 100644 index 864a494d..00000000 --- a/2.3-1/macros/GeneralFunctions/filenamefprintf.bin +++ /dev/null diff --git a/2.3-1/macros/GeneralFunctions/float.bin b/2.3-1/macros/GeneralFunctions/float.bin Binary files differdeleted file mode 100644 index fd0c449e..00000000 --- a/2.3-1/macros/GeneralFunctions/float.bin +++ /dev/null diff --git a/2.3-1/macros/GeneralFunctions/lib b/2.3-1/macros/GeneralFunctions/lib Binary files differindex 54bea32b..3391b450 100644 --- a/2.3-1/macros/GeneralFunctions/lib +++ b/2.3-1/macros/GeneralFunctions/lib diff --git a/2.3-1/macros/GeneralFunctions/squeezestrings.bin b/2.3-1/macros/GeneralFunctions/squeezestrings.bin Binary files differdeleted file mode 100644 index 11b97ec9..00000000 --- a/2.3-1/macros/GeneralFunctions/squeezestrings.bin +++ /dev/null diff --git a/2.3-1/macros/Hardware/AVR/AVRADCSetup.bin b/2.3-1/macros/Hardware/AVR/AVRADCSetup.bin Binary files differdeleted file mode 100644 index a1cbcf3c..00000000 --- a/2.3-1/macros/Hardware/AVR/AVRADCSetup.bin +++ /dev/null diff --git a/2.3-1/macros/Hardware/AVR/AVRDigitalIn.bin b/2.3-1/macros/Hardware/AVR/AVRDigitalIn.bin Binary files differdeleted file mode 100644 index 0fdfab82..00000000 --- a/2.3-1/macros/Hardware/AVR/AVRDigitalIn.bin +++ /dev/null diff --git a/2.3-1/macros/Hardware/AVR/AVRDigitalOut.bin b/2.3-1/macros/Hardware/AVR/AVRDigitalOut.bin Binary files differdeleted file mode 100644 index 7e56e466..00000000 --- a/2.3-1/macros/Hardware/AVR/AVRDigitalOut.bin +++ /dev/null diff --git a/2.3-1/macros/Hardware/AVR/AVRDigitalPortSetup.bin b/2.3-1/macros/Hardware/AVR/AVRDigitalPortSetup.bin Binary files differdeleted file mode 100644 index cf96fbb1..00000000 --- a/2.3-1/macros/Hardware/AVR/AVRDigitalPortSetup.bin +++ /dev/null diff --git a/2.3-1/macros/Hardware/AVR/AVRDigitalSetup.bin b/2.3-1/macros/Hardware/AVR/AVRDigitalSetup.bin Binary files differdeleted file mode 100644 index dec6eb2a..00000000 --- a/2.3-1/macros/Hardware/AVR/AVRDigitalSetup.bin +++ /dev/null diff --git a/2.3-1/macros/Hardware/AVR/AVRGetTimerValue.bin b/2.3-1/macros/Hardware/AVR/AVRGetTimerValue.bin Binary files differdeleted file mode 100644 index 1b883131..00000000 --- a/2.3-1/macros/Hardware/AVR/AVRGetTimerValue.bin +++ /dev/null diff --git a/2.3-1/macros/Hardware/AVR/AVRPWM0SetDuty.bin b/2.3-1/macros/Hardware/AVR/AVRPWM0SetDuty.bin Binary files differdeleted file mode 100644 index 1518222d..00000000 --- a/2.3-1/macros/Hardware/AVR/AVRPWM0SetDuty.bin +++ /dev/null diff --git a/2.3-1/macros/Hardware/AVR/AVRPWM0Setup.bin b/2.3-1/macros/Hardware/AVR/AVRPWM0Setup.bin Binary files differdeleted file mode 100644 index 08867048..00000000 --- a/2.3-1/macros/Hardware/AVR/AVRPWM0Setup.bin +++ /dev/null diff --git a/2.3-1/macros/Hardware/AVR/AVRPWM1SetDuty.bin b/2.3-1/macros/Hardware/AVR/AVRPWM1SetDuty.bin Binary files differdeleted file mode 100644 index 79e4ab62..00000000 --- a/2.3-1/macros/Hardware/AVR/AVRPWM1SetDuty.bin +++ /dev/null diff --git a/2.3-1/macros/Hardware/AVR/AVRPWM1Setup.bin b/2.3-1/macros/Hardware/AVR/AVRPWM1Setup.bin Binary files differdeleted file mode 100644 index 235cdba2..00000000 --- a/2.3-1/macros/Hardware/AVR/AVRPWM1Setup.bin +++ /dev/null diff --git a/2.3-1/macros/Hardware/AVR/AVRPWM2SetDuty.bin b/2.3-1/macros/Hardware/AVR/AVRPWM2SetDuty.bin Binary files differdeleted file mode 100644 index a1c7f3b2..00000000 --- a/2.3-1/macros/Hardware/AVR/AVRPWM2SetDuty.bin +++ /dev/null diff --git a/2.3-1/macros/Hardware/AVR/AVRPWM2Setup.bin b/2.3-1/macros/Hardware/AVR/AVRPWM2Setup.bin Binary files differdeleted file mode 100644 index 66996c08..00000000 --- a/2.3-1/macros/Hardware/AVR/AVRPWM2Setup.bin +++ /dev/null diff --git a/2.3-1/macros/Hardware/AVR/AVRReadADC.bin b/2.3-1/macros/Hardware/AVR/AVRReadADC.bin Binary files differdeleted file mode 100644 index 25b45a83..00000000 --- a/2.3-1/macros/Hardware/AVR/AVRReadADC.bin +++ /dev/null diff --git a/2.3-1/macros/Hardware/AVR/AVRSleep.bin b/2.3-1/macros/Hardware/AVR/AVRSleep.bin Binary files differdeleted file mode 100644 index e4b10d83..00000000 --- a/2.3-1/macros/Hardware/AVR/AVRSleep.bin +++ /dev/null diff --git a/2.3-1/macros/Hardware/AVR/AVRTimerSetup.bin b/2.3-1/macros/Hardware/AVR/AVRTimerSetup.bin Binary files differdeleted file mode 100644 index 775d718a..00000000 --- a/2.3-1/macros/Hardware/AVR/AVRTimerSetup.bin +++ /dev/null diff --git a/2.3-1/macros/Hardware/AVR/AVRUARTReceive.bin b/2.3-1/macros/Hardware/AVR/AVRUARTReceive.bin Binary files differdeleted file mode 100644 index 013036e3..00000000 --- a/2.3-1/macros/Hardware/AVR/AVRUARTReceive.bin +++ /dev/null diff --git a/2.3-1/macros/Hardware/AVR/AVRUARTSetup.bin b/2.3-1/macros/Hardware/AVR/AVRUARTSetup.bin Binary files differdeleted file mode 100644 index 82ec2911..00000000 --- a/2.3-1/macros/Hardware/AVR/AVRUARTSetup.bin +++ /dev/null diff --git a/2.3-1/macros/Hardware/AVR/AVRUARTTransmit.bin b/2.3-1/macros/Hardware/AVR/AVRUARTTransmit.bin Binary files differdeleted file mode 100644 index 9e53d9a6..00000000 --- a/2.3-1/macros/Hardware/AVR/AVRUARTTransmit.bin +++ /dev/null diff --git a/2.3-1/macros/Hardware/AVR/GetAVRSupportFunctions.bin b/2.3-1/macros/Hardware/AVR/GetAVRSupportFunctions.bin Binary files differdeleted file mode 100644 index 48ab5cd8..00000000 --- a/2.3-1/macros/Hardware/AVR/GetAVRSupportFunctions.bin +++ /dev/null diff --git a/2.3-1/macros/Hardware/AVR/GetPeripheral.bin b/2.3-1/macros/Hardware/AVR/GetPeripheral.bin Binary files differdeleted file mode 100644 index b496bbb0..00000000 --- a/2.3-1/macros/Hardware/AVR/GetPeripheral.bin +++ /dev/null diff --git a/2.3-1/macros/Hardware/AVR/InsertPeripheralInList.bin b/2.3-1/macros/Hardware/AVR/InsertPeripheralInList.bin Binary files differdeleted file mode 100644 index c49f4e04..00000000 --- a/2.3-1/macros/Hardware/AVR/InsertPeripheralInList.bin +++ /dev/null diff --git a/2.3-1/macros/Hardware/AVR/IsAVRSupportFunction.bin b/2.3-1/macros/Hardware/AVR/IsAVRSupportFunction.bin Binary files differdeleted file mode 100644 index e2382308..00000000 --- a/2.3-1/macros/Hardware/AVR/IsAVRSupportFunction.bin +++ /dev/null diff --git a/2.3-1/macros/Hardware/AVR/lib b/2.3-1/macros/Hardware/AVR/lib Binary files differindex 5f9662bb..1bbb9cf1 100644 --- a/2.3-1/macros/Hardware/AVR/lib +++ b/2.3-1/macros/Hardware/AVR/lib diff --git a/2.3-1/macros/Hardware/RasberryPi/GetRPISupportFunctions.bin b/2.3-1/macros/Hardware/RasberryPi/GetRPISupportFunctions.bin Binary files differdeleted file mode 100644 index a70999c0..00000000 --- a/2.3-1/macros/Hardware/RasberryPi/GetRPISupportFunctions.bin +++ /dev/null diff --git a/2.3-1/macros/Hardware/RasberryPi/IsRPISupportFunction.bin b/2.3-1/macros/Hardware/RasberryPi/IsRPISupportFunction.bin Binary files differdeleted file mode 100644 index 11533d3e..00000000 --- a/2.3-1/macros/Hardware/RasberryPi/IsRPISupportFunction.bin +++ /dev/null diff --git a/2.3-1/macros/Hardware/RasberryPi/RPI_DelayMicro.bin b/2.3-1/macros/Hardware/RasberryPi/RPI_DelayMicro.bin Binary files differdeleted file mode 100644 index a4d32cb6..00000000 --- a/2.3-1/macros/Hardware/RasberryPi/RPI_DelayMicro.bin +++ /dev/null diff --git a/2.3-1/macros/Hardware/RasberryPi/RPI_DelayMilli.bin b/2.3-1/macros/Hardware/RasberryPi/RPI_DelayMilli.bin Binary files differdeleted file mode 100644 index b6eeb30b..00000000 --- a/2.3-1/macros/Hardware/RasberryPi/RPI_DelayMilli.bin +++ /dev/null diff --git a/2.3-1/macros/Hardware/RasberryPi/RPI_DigitalIn.bin b/2.3-1/macros/Hardware/RasberryPi/RPI_DigitalIn.bin Binary files differdeleted file mode 100644 index f4c16f39..00000000 --- a/2.3-1/macros/Hardware/RasberryPi/RPI_DigitalIn.bin +++ /dev/null diff --git a/2.3-1/macros/Hardware/RasberryPi/RPI_DigitalOut.bin b/2.3-1/macros/Hardware/RasberryPi/RPI_DigitalOut.bin Binary files differdeleted file mode 100644 index b7ad06e5..00000000 --- a/2.3-1/macros/Hardware/RasberryPi/RPI_DigitalOut.bin +++ /dev/null diff --git a/2.3-1/macros/Hardware/RasberryPi/RPI_DigitalSetup.bin b/2.3-1/macros/Hardware/RasberryPi/RPI_DigitalSetup.bin Binary files differdeleted file mode 100644 index 1ac5b582..00000000 --- a/2.3-1/macros/Hardware/RasberryPi/RPI_DigitalSetup.bin +++ /dev/null diff --git a/2.3-1/macros/Hardware/RasberryPi/RPI_GetMicros.bin b/2.3-1/macros/Hardware/RasberryPi/RPI_GetMicros.bin Binary files differdeleted file mode 100644 index 3e6c08fa..00000000 --- a/2.3-1/macros/Hardware/RasberryPi/RPI_GetMicros.bin +++ /dev/null diff --git a/2.3-1/macros/Hardware/RasberryPi/RPI_GetMillis.bin b/2.3-1/macros/Hardware/RasberryPi/RPI_GetMillis.bin Binary files differdeleted file mode 100644 index b9143650..00000000 --- a/2.3-1/macros/Hardware/RasberryPi/RPI_GetMillis.bin +++ /dev/null diff --git a/2.3-1/macros/Hardware/RasberryPi/RPI_HardPWMSetClock.bin b/2.3-1/macros/Hardware/RasberryPi/RPI_HardPWMSetClock.bin Binary files differdeleted file mode 100644 index 1efe0803..00000000 --- a/2.3-1/macros/Hardware/RasberryPi/RPI_HardPWMSetClock.bin +++ /dev/null diff --git a/2.3-1/macros/Hardware/RasberryPi/RPI_HardPWMSetMode.bin b/2.3-1/macros/Hardware/RasberryPi/RPI_HardPWMSetMode.bin Binary files differdeleted file mode 100644 index 075d6e60..00000000 --- a/2.3-1/macros/Hardware/RasberryPi/RPI_HardPWMSetMode.bin +++ /dev/null diff --git a/2.3-1/macros/Hardware/RasberryPi/RPI_HardPWMSetRange.bin b/2.3-1/macros/Hardware/RasberryPi/RPI_HardPWMSetRange.bin Binary files differdeleted file mode 100644 index 8ded2709..00000000 --- a/2.3-1/macros/Hardware/RasberryPi/RPI_HardPWMSetRange.bin +++ /dev/null diff --git a/2.3-1/macros/Hardware/RasberryPi/RPI_HardPWMWrite.bin b/2.3-1/macros/Hardware/RasberryPi/RPI_HardPWMWrite.bin Binary files differdeleted file mode 100644 index 9957f3a4..00000000 --- a/2.3-1/macros/Hardware/RasberryPi/RPI_HardPWMWrite.bin +++ /dev/null diff --git a/2.3-1/macros/Hardware/RasberryPi/RPI_PinISR.bin b/2.3-1/macros/Hardware/RasberryPi/RPI_PinISR.bin Binary files differdeleted file mode 100644 index ddeff684..00000000 --- a/2.3-1/macros/Hardware/RasberryPi/RPI_PinISR.bin +++ /dev/null diff --git a/2.3-1/macros/Hardware/RasberryPi/RPI_SerialClose.bin b/2.3-1/macros/Hardware/RasberryPi/RPI_SerialClose.bin Binary files differdeleted file mode 100644 index dce972dc..00000000 --- a/2.3-1/macros/Hardware/RasberryPi/RPI_SerialClose.bin +++ /dev/null diff --git a/2.3-1/macros/Hardware/RasberryPi/RPI_SerialFlush.bin b/2.3-1/macros/Hardware/RasberryPi/RPI_SerialFlush.bin Binary files differdeleted file mode 100644 index 2a3704d0..00000000 --- a/2.3-1/macros/Hardware/RasberryPi/RPI_SerialFlush.bin +++ /dev/null diff --git a/2.3-1/macros/Hardware/RasberryPi/RPI_SerialGetChar.bin b/2.3-1/macros/Hardware/RasberryPi/RPI_SerialGetChar.bin Binary files differdeleted file mode 100644 index 928f28a3..00000000 --- a/2.3-1/macros/Hardware/RasberryPi/RPI_SerialGetChar.bin +++ /dev/null diff --git a/2.3-1/macros/Hardware/RasberryPi/RPI_SerialSendChar.bin b/2.3-1/macros/Hardware/RasberryPi/RPI_SerialSendChar.bin Binary files differdeleted file mode 100644 index 7614ebcb..00000000 --- a/2.3-1/macros/Hardware/RasberryPi/RPI_SerialSendChar.bin +++ /dev/null diff --git a/2.3-1/macros/Hardware/RasberryPi/RPI_SerialSendData.bin b/2.3-1/macros/Hardware/RasberryPi/RPI_SerialSendData.bin Binary files differdeleted file mode 100644 index a3524a6c..00000000 --- a/2.3-1/macros/Hardware/RasberryPi/RPI_SerialSendData.bin +++ /dev/null diff --git a/2.3-1/macros/Hardware/RasberryPi/RPI_SerialSetup.bin b/2.3-1/macros/Hardware/RasberryPi/RPI_SerialSetup.bin Binary files differdeleted file mode 100644 index 0128c27b..00000000 --- a/2.3-1/macros/Hardware/RasberryPi/RPI_SerialSetup.bin +++ /dev/null diff --git a/2.3-1/macros/Hardware/RasberryPi/lib b/2.3-1/macros/Hardware/RasberryPi/lib Binary files differindex 370158ba..a20e2446 100644 --- a/2.3-1/macros/Hardware/RasberryPi/lib +++ b/2.3-1/macros/Hardware/RasberryPi/lib diff --git a/2.3-1/macros/Hardware/RasberryPi/u16RPISerialDataAvail.bin b/2.3-1/macros/Hardware/RasberryPi/u16RPISerialDataAvail.bin Binary files differdeleted file mode 100644 index 3789bd6c..00000000 --- a/2.3-1/macros/Hardware/RasberryPi/u16RPISerialDataAvail.bin +++ /dev/null diff --git a/2.3-1/macros/ImageProcessing/core/CV_CreateImage.bin b/2.3-1/macros/ImageProcessing/core/CV_CreateImage.bin Binary files differdeleted file mode 100644 index d5aa3080..00000000 --- a/2.3-1/macros/ImageProcessing/core/CV_CreateImage.bin +++ /dev/null diff --git a/2.3-1/macros/ImageProcessing/core/CV_GetImgSize.bin b/2.3-1/macros/ImageProcessing/core/CV_GetImgSize.bin Binary files differdeleted file mode 100644 index ede60e6f..00000000 --- a/2.3-1/macros/ImageProcessing/core/CV_GetImgSize.bin +++ /dev/null diff --git a/2.3-1/macros/ImageProcessing/core/lib b/2.3-1/macros/ImageProcessing/core/lib Binary files differindex 94cf463f..ddf7134c 100644 --- a/2.3-1/macros/ImageProcessing/core/lib +++ b/2.3-1/macros/ImageProcessing/core/lib diff --git a/2.3-1/macros/ImageProcessing/highgui/CV_LoadImage.bin b/2.3-1/macros/ImageProcessing/highgui/CV_LoadImage.bin Binary files differdeleted file mode 100644 index f8e13375..00000000 --- a/2.3-1/macros/ImageProcessing/highgui/CV_LoadImage.bin +++ /dev/null diff --git a/2.3-1/macros/ImageProcessing/highgui/CV_SaveImage.bin b/2.3-1/macros/ImageProcessing/highgui/CV_SaveImage.bin Binary files differdeleted file mode 100644 index 8d056bf1..00000000 --- a/2.3-1/macros/ImageProcessing/highgui/CV_SaveImage.bin +++ /dev/null diff --git a/2.3-1/macros/ImageProcessing/highgui/CV_ShowImage.bin b/2.3-1/macros/ImageProcessing/highgui/CV_ShowImage.bin Binary files differdeleted file mode 100644 index c4e00fc7..00000000 --- a/2.3-1/macros/ImageProcessing/highgui/CV_ShowImage.bin +++ /dev/null diff --git a/2.3-1/macros/ImageProcessing/highgui/CV_WaitKey.bin b/2.3-1/macros/ImageProcessing/highgui/CV_WaitKey.bin Binary files differdeleted file mode 100644 index 30a42f41..00000000 --- a/2.3-1/macros/ImageProcessing/highgui/CV_WaitKey.bin +++ /dev/null diff --git a/2.3-1/macros/ImageProcessing/highgui/lib b/2.3-1/macros/ImageProcessing/highgui/lib Binary files differindex 21e6ae81..312b608a 100644 --- a/2.3-1/macros/ImageProcessing/highgui/lib +++ b/2.3-1/macros/ImageProcessing/highgui/lib diff --git a/2.3-1/macros/ImageProcessing/imgproc/CV_AdaptiveThreshold.bin b/2.3-1/macros/ImageProcessing/imgproc/CV_AdaptiveThreshold.bin Binary files differdeleted file mode 100644 index 26a58c0c..00000000 --- a/2.3-1/macros/ImageProcessing/imgproc/CV_AdaptiveThreshold.bin +++ /dev/null diff --git a/2.3-1/macros/ImageProcessing/imgproc/CV_Blur.bin b/2.3-1/macros/ImageProcessing/imgproc/CV_Blur.bin Binary files differdeleted file mode 100644 index 9fc1af49..00000000 --- a/2.3-1/macros/ImageProcessing/imgproc/CV_Blur.bin +++ /dev/null diff --git a/2.3-1/macros/ImageProcessing/imgproc/CV_Canny.bin b/2.3-1/macros/ImageProcessing/imgproc/CV_Canny.bin Binary files differdeleted file mode 100644 index df824781..00000000 --- a/2.3-1/macros/ImageProcessing/imgproc/CV_Canny.bin +++ /dev/null diff --git a/2.3-1/macros/ImageProcessing/imgproc/CV_CornerHarris.bin b/2.3-1/macros/ImageProcessing/imgproc/CV_CornerHarris.bin Binary files differdeleted file mode 100644 index 291d3e4d..00000000 --- a/2.3-1/macros/ImageProcessing/imgproc/CV_CornerHarris.bin +++ /dev/null diff --git a/2.3-1/macros/ImageProcessing/imgproc/CV_CvtColor.bin b/2.3-1/macros/ImageProcessing/imgproc/CV_CvtColor.bin Binary files differdeleted file mode 100644 index eee1018f..00000000 --- a/2.3-1/macros/ImageProcessing/imgproc/CV_CvtColor.bin +++ /dev/null diff --git a/2.3-1/macros/ImageProcessing/imgproc/CV_Dilate.bin b/2.3-1/macros/ImageProcessing/imgproc/CV_Dilate.bin Binary files differdeleted file mode 100644 index 3f2d2d99..00000000 --- a/2.3-1/macros/ImageProcessing/imgproc/CV_Dilate.bin +++ /dev/null diff --git a/2.3-1/macros/ImageProcessing/imgproc/CV_DistanceTransform.bin b/2.3-1/macros/ImageProcessing/imgproc/CV_DistanceTransform.bin Binary files differdeleted file mode 100644 index 0955b5f0..00000000 --- a/2.3-1/macros/ImageProcessing/imgproc/CV_DistanceTransform.bin +++ /dev/null diff --git a/2.3-1/macros/ImageProcessing/imgproc/CV_Erode.bin b/2.3-1/macros/ImageProcessing/imgproc/CV_Erode.bin Binary files differdeleted file mode 100644 index 33d42312..00000000 --- a/2.3-1/macros/ImageProcessing/imgproc/CV_Erode.bin +++ /dev/null diff --git a/2.3-1/macros/ImageProcessing/imgproc/CV_GaussianBlur.bin b/2.3-1/macros/ImageProcessing/imgproc/CV_GaussianBlur.bin Binary files differdeleted file mode 100644 index b1766626..00000000 --- a/2.3-1/macros/ImageProcessing/imgproc/CV_GaussianBlur.bin +++ /dev/null diff --git a/2.3-1/macros/ImageProcessing/imgproc/CV_MedianBlur.bin b/2.3-1/macros/ImageProcessing/imgproc/CV_MedianBlur.bin Binary files differdeleted file mode 100644 index fdcd23ed..00000000 --- a/2.3-1/macros/ImageProcessing/imgproc/CV_MedianBlur.bin +++ /dev/null diff --git a/2.3-1/macros/ImageProcessing/imgproc/CV_Threshold.bin b/2.3-1/macros/ImageProcessing/imgproc/CV_Threshold.bin Binary files differdeleted file mode 100644 index c2ce1c60..00000000 --- a/2.3-1/macros/ImageProcessing/imgproc/CV_Threshold.bin +++ /dev/null diff --git a/2.3-1/macros/ImageProcessing/imgproc/lib b/2.3-1/macros/ImageProcessing/imgproc/lib Binary files differindex 35c8cc53..0e03e68f 100644 --- a/2.3-1/macros/ImageProcessing/imgproc/lib +++ b/2.3-1/macros/ImageProcessing/imgproc/lib diff --git a/2.3-1/macros/Scilab-Arduino/GenerateSetupFunction.bin b/2.3-1/macros/Scilab-Arduino/GenerateSetupFunction.bin Binary files differdeleted file mode 100644 index 0051630c..00000000 --- a/2.3-1/macros/Scilab-Arduino/GenerateSetupFunction.bin +++ /dev/null diff --git a/2.3-1/macros/Scilab-Arduino/GetArduinoFunctions.bin b/2.3-1/macros/Scilab-Arduino/GetArduinoFunctions.bin Binary files differdeleted file mode 100644 index fe9e2040..00000000 --- a/2.3-1/macros/Scilab-Arduino/GetArduinoFunctions.bin +++ /dev/null diff --git a/2.3-1/macros/Scilab-Arduino/GetArduinoFunctions.sci b/2.3-1/macros/Scilab-Arduino/GetArduinoFunctions.sci index a112fe6a..eff61fe6 100644 --- a/2.3-1/macros/Scilab-Arduino/GetArduinoFunctions.sci +++ b/2.3-1/macros/Scilab-Arduino/GetArduinoFunctions.sci @@ -30,6 +30,7 @@ ArduinoFunctions = [ "cmd_dcmotor_run" "cmd_servo_attach" "cmd_servo_detach" - "cmd_servo_move"]; + "cmd_servo_move" + "i2c_dev"]; endfunction diff --git a/2.3-1/macros/Scilab-Arduino/GetArduinoSetupFunctions.bin b/2.3-1/macros/Scilab-Arduino/GetArduinoSetupFunctions.bin Binary files differdeleted file mode 100644 index 67f9fada..00000000 --- a/2.3-1/macros/Scilab-Arduino/GetArduinoSetupFunctions.bin +++ /dev/null diff --git a/2.3-1/macros/Scilab-Arduino/GetArduinoSetupFunctions.sci b/2.3-1/macros/Scilab-Arduino/GetArduinoSetupFunctions.sci index d2cd0c74..d310648e 100644 --- a/2.3-1/macros/Scilab-Arduino/GetArduinoSetupFunctions.sci +++ b/2.3-1/macros/Scilab-Arduino/GetArduinoSetupFunctions.sci @@ -24,6 +24,8 @@ function ArduinoSetupFunctions = GetArduinoSetupFunctions() ArduinoSetupFunctions = [ "cmd_dcmotor_setup" "cmd_servo_attach" - "cmd_servo_detach"]; + "cmd_servo_detach" + "i2c_dev"]; + endfunction diff --git a/2.3-1/macros/Scilab-Arduino/InsertSetupInList.bin b/2.3-1/macros/Scilab-Arduino/InsertSetupInList.bin Binary files differdeleted file mode 100644 index 29e37315..00000000 --- a/2.3-1/macros/Scilab-Arduino/InsertSetupInList.bin +++ /dev/null diff --git a/2.3-1/macros/Scilab-Arduino/IsArduinoFunction.bin b/2.3-1/macros/Scilab-Arduino/IsArduinoFunction.bin Binary files differdeleted file mode 100644 index 5dbfacad..00000000 --- a/2.3-1/macros/Scilab-Arduino/IsArduinoFunction.bin +++ /dev/null diff --git a/2.3-1/macros/Scilab-Arduino/IsArduinoSetupFunction.bin b/2.3-1/macros/Scilab-Arduino/IsArduinoSetupFunction.bin Binary files differdeleted file mode 100644 index 8948d1a3..00000000 --- a/2.3-1/macros/Scilab-Arduino/IsArduinoSetupFunction.bin +++ /dev/null diff --git a/2.3-1/macros/Scilab-Arduino/IsArduinoSetupFunction.sci b/2.3-1/macros/Scilab-Arduino/IsArduinoSetupFunction.sci index 3e1c18fb..4afceca8 100644 --- a/2.3-1/macros/Scilab-Arduino/IsArduinoSetupFunction.sci +++ b/2.3-1/macros/Scilab-Arduino/IsArduinoSetupFunction.sci @@ -9,6 +9,7 @@ // Email: toolbox@scilab.in function Output = IsArduinoSetupFunction(FunName) +disp(FunName) // ----------------------------------------------------------------- // Check whether input function name is an Arduino setup function or not. // @@ -25,6 +26,7 @@ function Output = IsArduinoSetupFunction(FunName) //Get list of supported functions for Arduino ArduinoSetupFunctions = GetArduinoSetupFunctions(); + //Check whether input function is present in above list or not FunNameInArduinoSetup = members(FunName,ArduinoSetupFunctions); Output = bool2s(FunNameInArduinoSetup~=0); diff --git a/2.3-1/macros/Scilab-Arduino/i2c_dev.sci b/2.3-1/macros/Scilab-Arduino/i2c_dev.sci new file mode 100644 index 00000000..f86e588a --- /dev/null +++ b/2.3-1/macros/Scilab-Arduino/i2c_dev.sci @@ -0,0 +1,3 @@ +function z = i2c_dev(address) + z = 0 +endfunction diff --git a/2.3-1/macros/Scilab-Arduino/i2c_read.sci b/2.3-1/macros/Scilab-Arduino/i2c_read.sci new file mode 100644 index 00000000..6916b9c1 --- /dev/null +++ b/2.3-1/macros/Scilab-Arduino/i2c_read.sci @@ -0,0 +1,2 @@ +function y = i2c_read(address,bytes) +endfunction diff --git a/2.3-1/macros/Scilab-Arduino/i2c_read_register.sci b/2.3-1/macros/Scilab-Arduino/i2c_read_register.sci new file mode 100644 index 00000000..51a88eeb --- /dev/null +++ b/2.3-1/macros/Scilab-Arduino/i2c_read_register.sci @@ -0,0 +1,3 @@ +function x = i2c_read_register(address,reg_adrs) + x = 0; +endfunction diff --git a/2.3-1/macros/Scilab-Arduino/i2c_write.sci b/2.3-1/macros/Scilab-Arduino/i2c_write.sci new file mode 100644 index 00000000..8dfd070a --- /dev/null +++ b/2.3-1/macros/Scilab-Arduino/i2c_write.sci @@ -0,0 +1,2 @@ +function i2c_write(address,data) +endfunction diff --git a/2.3-1/macros/Scilab-Arduino/i2c_write_register.sci b/2.3-1/macros/Scilab-Arduino/i2c_write_register.sci new file mode 100644 index 00000000..a9b55530 --- /dev/null +++ b/2.3-1/macros/Scilab-Arduino/i2c_write_register.sci @@ -0,0 +1,2 @@ +function i2c_write_register(address, reg_adrs, data) +endfunction diff --git a/2.3-1/macros/Scilab-Arduino/lib b/2.3-1/macros/Scilab-Arduino/lib Binary files differindex cd911eef..a5bf12b2 100644 --- a/2.3-1/macros/Scilab-Arduino/lib +++ b/2.3-1/macros/Scilab-Arduino/lib diff --git a/2.3-1/macros/Scilab-Arduino/names b/2.3-1/macros/Scilab-Arduino/names index 55eb6fef..c1386c3b 100644 --- a/2.3-1/macros/Scilab-Arduino/names +++ b/2.3-1/macros/Scilab-Arduino/names @@ -4,3 +4,8 @@ GetArduinoSetupFunctions InsertSetupInList IsArduinoFunction IsArduinoSetupFunction +i2c_dev +i2c_read +i2c_read_register +i2c_write +i2c_write_register diff --git a/2.3-1/macros/SymbolTable/ST_AnalyzeScope.bin b/2.3-1/macros/SymbolTable/ST_AnalyzeScope.bin Binary files differdeleted file mode 100644 index 7e727a04..00000000 --- a/2.3-1/macros/SymbolTable/ST_AnalyzeScope.bin +++ /dev/null diff --git a/2.3-1/macros/SymbolTable/ST_Del.bin b/2.3-1/macros/SymbolTable/ST_Del.bin Binary files differdeleted file mode 100644 index c26e2e58..00000000 --- a/2.3-1/macros/SymbolTable/ST_Del.bin +++ /dev/null diff --git a/2.3-1/macros/SymbolTable/ST_FindPos.bin b/2.3-1/macros/SymbolTable/ST_FindPos.bin Binary files differdeleted file mode 100644 index c7003f30..00000000 --- a/2.3-1/macros/SymbolTable/ST_FindPos.bin +++ /dev/null diff --git a/2.3-1/macros/SymbolTable/ST_Get.bin b/2.3-1/macros/SymbolTable/ST_Get.bin Binary files differdeleted file mode 100644 index 512e72b7..00000000 --- a/2.3-1/macros/SymbolTable/ST_Get.bin +++ /dev/null diff --git a/2.3-1/macros/SymbolTable/ST_GetInArgInfo.bin b/2.3-1/macros/SymbolTable/ST_GetInArgInfo.bin Binary files differdeleted file mode 100644 index 6eb16e37..00000000 --- a/2.3-1/macros/SymbolTable/ST_GetInArgInfo.bin +++ /dev/null diff --git a/2.3-1/macros/SymbolTable/ST_GetInArgInfo.sci b/2.3-1/macros/SymbolTable/ST_GetInArgInfo.sci index 9f5cbd4e..4c85408c 100644 --- a/2.3-1/macros/SymbolTable/ST_GetInArgInfo.sci +++ b/2.3-1/macros/SymbolTable/ST_GetInArgInfo.sci @@ -49,13 +49,13 @@ for cntinarg = 1:NInArg tmpname = InArg(cntinarg).Name;
tmpscope = InArg(cntinarg).Scope;
lengthNumber = length('Number_');
- if (part(tmpscope,1:lengthNumber) == 'Number_')
+ if (part(tmpscope,1:lengthNumber) == 'Number_')
// #RNU_RES_B
PrintStringInfo('Input Argument '+string(cntinarg)+' is a number: '+tmpname+'.',FileInfo.Funct(nxtscifunnumber).ReportFileName,'file');
// #RNU_RES_E
UpdatedInArg(cntinarg).Type = part(tmpscope,lengthNumber+1:lengthNumber+1);
if (UpdatedInArg(cntinarg).Type == 'x')
- UpdatedInArg(cntinarg).Type = SharedInfo.DefaultPrecision; // It is the default.
+ UpdatedInArg(cntinarg).Type = SharedInfo.DefaultPrecision; // It is the default
elseif (UpdatedInArg(cntinarg).Type == 'X')
if (SharedInfo.DefaultPrecision == 's')
UpdatedInArg(cntinarg).Type = 'c'; // It is the default.
@@ -101,6 +101,17 @@ for cntinarg = 1:NInArg UpdatedInArg(cntinarg).FindLike = 0;
UpdatedInArg(cntinarg).Dimension = 0;
UpdatedInArg(cntinarg).Scope = 'Number';
+ if((ASTFunName == 'cmd_analog_in' | ASTFunName == 'cmd_analog_in_volt' ) & cntinarg == 2)
+ numvalue = eval(tmpname);
+ if (SharedInfo.Board_name == 'mega' | SharedInfo.Board_name == 'mega2560') then
+ tmpname = string(numvalue + 54)
+ UpdatedInArg(cntinarg).Value = 54 + numvalue;
+ else
+ tmpname = string(numvalue + 14)
+ UpdatedInArg(cntinarg).Value = 14 + numvalue;
+ end
+ UpdatedInArg(cntinarg).Name = tmpname; // Change the name.
+ end
elseif (tmpscope == 'String')
// #RNU_RES_B
diff --git a/2.3-1/macros/SymbolTable/ST_GetSymbolInfo.bin b/2.3-1/macros/SymbolTable/ST_GetSymbolInfo.bin Binary files differdeleted file mode 100644 index b8a7cf74..00000000 --- a/2.3-1/macros/SymbolTable/ST_GetSymbolInfo.bin +++ /dev/null diff --git a/2.3-1/macros/SymbolTable/ST_InsForCntVars.bin b/2.3-1/macros/SymbolTable/ST_InsForCntVars.bin Binary files differdeleted file mode 100644 index 12882fc7..00000000 --- a/2.3-1/macros/SymbolTable/ST_InsForCntVars.bin +++ /dev/null diff --git a/2.3-1/macros/SymbolTable/ST_InsOutArg.bin b/2.3-1/macros/SymbolTable/ST_InsOutArg.bin Binary files differdeleted file mode 100644 index ec9970cb..00000000 --- a/2.3-1/macros/SymbolTable/ST_InsOutArg.bin +++ /dev/null diff --git a/2.3-1/macros/SymbolTable/ST_InsOutArg.sci b/2.3-1/macros/SymbolTable/ST_InsOutArg.sci index f4958ff7..fd6b426c 100644 --- a/2.3-1/macros/SymbolTable/ST_InsOutArg.sci +++ b/2.3-1/macros/SymbolTable/ST_InsOutArg.sci @@ -47,8 +47,6 @@ PrintStringInfo('***Putting output arguments in the symbol table***',ReportFileN // ---------------------------
// --- End Initialization. ---
// ---------------------------
-
-
for counteroutput = 1:NOutArg
// #RNU_RES_B
PrintStringInfo(' Symbol ""'+OutArg(counteroutput).Name+'""',ReportFileName,'file','y','n');
diff --git a/2.3-1/macros/SymbolTable/ST_Load.bin b/2.3-1/macros/SymbolTable/ST_Load.bin Binary files differdeleted file mode 100644 index f158c2b6..00000000 --- a/2.3-1/macros/SymbolTable/ST_Load.bin +++ /dev/null diff --git a/2.3-1/macros/SymbolTable/ST_MatchSymbol.bin b/2.3-1/macros/SymbolTable/ST_MatchSymbol.bin Binary files differdeleted file mode 100644 index 278560d0..00000000 --- a/2.3-1/macros/SymbolTable/ST_MatchSymbol.bin +++ /dev/null diff --git a/2.3-1/macros/SymbolTable/ST_Save.bin b/2.3-1/macros/SymbolTable/ST_Save.bin Binary files differdeleted file mode 100644 index 4aa50a20..00000000 --- a/2.3-1/macros/SymbolTable/ST_Save.bin +++ /dev/null diff --git a/2.3-1/macros/SymbolTable/ST_Set.bin b/2.3-1/macros/SymbolTable/ST_Set.bin Binary files differdeleted file mode 100644 index cbd26274..00000000 --- a/2.3-1/macros/SymbolTable/ST_Set.bin +++ /dev/null diff --git a/2.3-1/macros/SymbolTable/lib b/2.3-1/macros/SymbolTable/lib Binary files differindex 102c8c96..ad10f776 100644 --- a/2.3-1/macros/SymbolTable/lib +++ b/2.3-1/macros/SymbolTable/lib diff --git a/2.3-1/macros/ToolInitialization/INIT_CreateDirs.bin b/2.3-1/macros/ToolInitialization/INIT_CreateDirs.bin Binary files differdeleted file mode 100644 index 16ebab82..00000000 --- a/2.3-1/macros/ToolInitialization/INIT_CreateDirs.bin +++ /dev/null diff --git a/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.bin b/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.bin Binary files differdeleted file mode 100644 index 1c1a52c5..00000000 --- a/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.bin +++ /dev/null diff --git a/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci b/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci index c44ef3b9..9a219c08 100644 --- a/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci +++ b/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci @@ -4685,6 +4685,165 @@ INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,Ex //------------------------------------
+//---- Class cmd_analog_in_volt -----------
+//------------------------------------
+ClassName = 'cmd_analog_in_volt';
+
+// --- Class Annotation. ---
+PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
+ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
+PrintStringInfo('NIN= 2',ClassFileName,'file','y');
+PrintStringInfo('NOUT= 1 ',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).TP= ''s''',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('d0d0'+ArgSeparator+'s0',ClassFileName,'file','y');
+
+// --- Annotation Function And Function List Function. ---
+FunctionName = 'cmd_analog_in_volt';
+PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
+
+
+//------------------------------------
+//---- Class cmd_i2c_dev -----------
+//------------------------------------
+ClassName = 'cmd_i2c_dev';
+
+// --- 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('d0'+ArgSeparator+'u80',ClassFileName,'file','y');
+
+// --- Annotation Function And Function List Function. ---
+FunctionName = 'cmd_i2c_dev';
+PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
+
+
+
+//------------------------------------
+//---- Class cmd_i2c_write -----------
+//------------------------------------
+ClassName = 'cmd_i2c_write';
+
+// --- Class Annotation. ---
+PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
+ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
+PrintStringInfo('NIN= 2',ClassFileName,'file','y');
+PrintStringInfo('NOUT= 0 ',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).TP= ''s''',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('d0d0'+ArgSeparator+'',ClassFileName,'file','y');
+PrintStringInfo('u80d0'+ArgSeparator+'',ClassFileName,'file','y');
+
+// --- Annotation Function And Function List Function. ---
+FunctionName = 'cmd_i2c_write';
+PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
+
+
+//------------------------------------
+//---- Class cmd_i2c_read -----------
+//------------------------------------
+ClassName = 'cmd_i2c_read';
+
+// --- Class Annotation. ---
+PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
+ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
+PrintStringInfo('NIN= 2',ClassFileName,'file','y');
+PrintStringInfo('NOUT= 1 ',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).TP= ''s''',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('d0d0'+ArgSeparator+'s0',ClassFileName,'file','y');
+PrintStringInfo('u80d0'+ArgSeparator+'s0',ClassFileName,'file','y');
+
+// --- Annotation Function And Function List Function. ---
+FunctionName = 'cmd_i2c_read';
+PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
+
+
+//------------------------------------
+//---- Class cmd_i2c_read_register -----------
+//------------------------------------
+ClassName = 'cmd_i2c_read_register';
+
+// --- Class Annotation. ---
+PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
+ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
+PrintStringInfo('NIN= 2',ClassFileName,'file','y');
+PrintStringInfo('NOUT= 1 ',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).TP= ''u16''',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('d0d0'+ArgSeparator+'u160',ClassFileName,'file','y');
+PrintStringInfo('u80d0'+ArgSeparator+'u160',ClassFileName,'file','y');
+
+// --- Annotation Function And Function List Function. ---
+FunctionName = 'cmd_i2c_read_register';
+PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
+
+
+
+
+//------------------------------------
+//---- Class cmd_i2c_write_register -----------
+//------------------------------------
+ClassName = 'cmd_i2c_write_register';
+
+// --- Class Annotation. ---
+PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
+ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
+PrintStringInfo('NIN= 3',ClassFileName,'file','y');
+PrintStringInfo('NOUT= 0 ',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).TP= ''s''',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('d0d0d0'+ArgSeparator+'',ClassFileName,'file','y');
+PrintStringInfo('u80d0d0'+ArgSeparator+'',ClassFileName,'file','y');
+
+// --- Annotation Function And Function List Function. ---
+FunctionName = 'cmd_i2c_write_register';
+PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
+
+
+
+
+//------------------------------------
//---- Class Sleep -------------------
//------------------------------------
@@ -4711,6 +4870,57 @@ INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,Ex //------------------------------------
+//---- Class cmd_analog_out_volt ----------
+//------------------------------------
+ClassName = 'cmd_analog_out_volt';
+
+// --- Class Annotation. ---
+PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
+ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
+PrintStringInfo('NIN= 3',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');
+
+// --- Function List Class. ---
+ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
+PrintStringInfo('d0d0d0'+ArgSeparator+'',ClassFileName,'file','y');
+PrintStringInfo('d0d0s0'+ArgSeparator+'',ClassFileName,'file','y');
+
+// --- Annotation Function And Function List Function. ---
+FunctionName = 'cmd_analog_out_volt';
+PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
+
+//------------------------------------
+//---- Class cmd_dcmotor_release -------
+//------------------------------------
+ClassName = 'cmd_dcmotor_release';
+
+// --- Class Annotation. ---
+PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
+ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
+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');
+
+// --- Function List Class. ---
+ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
+PrintStringInfo('d0d0'+ArgSeparator+'',ClassFileName,'file','y');
+
+// --- Annotation Function And Function List Function. ---
+FunctionName = 'cmd_dcmotor_release';
+PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
+
+
+
+//------------------------------------
//---Functions for AVR ---------------
//------------------------------------
@@ -6576,15 +6786,34 @@ ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls); 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(1)= FA_SZ_2(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_1(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');
+
+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_2(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_1(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');
+
+PrintStringInfo('NIN= 4',ClassFileName,'file','y');
+PrintStringInfo('NOUT= 2',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).TP= ''d''',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(1)= FA_SZ_2(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(1)= FA_SZ_1(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');
-
+PrintStringInfo('ss2d2d2'+ArgSeparator+'d2d2',ClassFileName,'file','y');
+PrintStringInfo('ss2d2d2d2'+ArgSeparator+'d2d2',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'lqr';
PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
diff --git a/2.3-1/macros/ToolInitialization/INIT_GenAnnFLFunctions.bin b/2.3-1/macros/ToolInitialization/INIT_GenAnnFLFunctions.bin Binary files differdeleted file mode 100644 index f7d2aa59..00000000 --- a/2.3-1/macros/ToolInitialization/INIT_GenAnnFLFunctions.bin +++ /dev/null diff --git a/2.3-1/macros/ToolInitialization/INIT_GenFileInfo.bin b/2.3-1/macros/ToolInitialization/INIT_GenFileInfo.bin Binary files differdeleted file mode 100644 index a8d47222..00000000 --- a/2.3-1/macros/ToolInitialization/INIT_GenFileInfo.bin +++ /dev/null diff --git a/2.3-1/macros/ToolInitialization/INIT_GenLibraries.bin b/2.3-1/macros/ToolInitialization/INIT_GenLibraries.bin Binary files differdeleted file mode 100644 index bc3bc873..00000000 --- a/2.3-1/macros/ToolInitialization/INIT_GenLibraries.bin +++ /dev/null diff --git a/2.3-1/macros/ToolInitialization/INIT_GenSharedInfo.bin b/2.3-1/macros/ToolInitialization/INIT_GenSharedInfo.bin Binary files differdeleted file mode 100644 index 7263830a..00000000 --- a/2.3-1/macros/ToolInitialization/INIT_GenSharedInfo.bin +++ /dev/null diff --git a/2.3-1/macros/ToolInitialization/INIT_GenSharedInfo.sci b/2.3-1/macros/ToolInitialization/INIT_GenSharedInfo.sci index abe813cc..3c682bf8 100644 --- a/2.3-1/macros/ToolInitialization/INIT_GenSharedInfo.sci +++ b/2.3-1/macros/ToolInitialization/INIT_GenSharedInfo.sci @@ -1,4 +1,4 @@ -function SharedInfo = INIT_GenSharedInfo(RunMode,UserScilabMainFile,TotTempScalarVars,EnableTempVarsReuse,Sci2CLibMainHeaderFName,CopySciCodeIntoCCode,Target)
+function SharedInfo = INIT_GenSharedInfo(RunMode,UserScilabMainFile,TotTempScalarVars,EnableTempVarsReuse,Sci2CLibMainHeaderFName,CopySciCodeIntoCCode,Target,Board_name)
// function SharedInfo = INIT_GenSharedInfo(WorkingDir,OutCCCodeDir,UserSciFilesPaths,...
// RunMode,UserScilabMainFile,TotTempScalarVars,EnableTempVarsReuse,Sci2CLibMainHeaderFName)
// -----------------------------------------------------------------
@@ -132,4 +132,6 @@ SharedInfo.Includelist = list(); //Maintains list of functions being used in cod // to add their header files to main function.
SharedInfo.OpenCVUsed = %F; // Specifies if opencv library is used or not
+SharedInfo.Board_name = Board_name; //Specifies Name of Arduino board
+
endfunction
diff --git a/2.3-1/macros/ToolInitialization/INIT_LoadLibraries.bin b/2.3-1/macros/ToolInitialization/INIT_LoadLibraries.bin Binary files differdeleted file mode 100644 index c85aac6e..00000000 --- a/2.3-1/macros/ToolInitialization/INIT_LoadLibraries.bin +++ /dev/null diff --git a/2.3-1/macros/ToolInitialization/INIT_RemoveDirs.bin b/2.3-1/macros/ToolInitialization/INIT_RemoveDirs.bin Binary files differdeleted file mode 100644 index c1ee9ec0..00000000 --- a/2.3-1/macros/ToolInitialization/INIT_RemoveDirs.bin +++ /dev/null diff --git a/2.3-1/macros/ToolInitialization/INIT_SCI2C.bin b/2.3-1/macros/ToolInitialization/INIT_SCI2C.bin Binary files differdeleted file mode 100644 index 19402302..00000000 --- a/2.3-1/macros/ToolInitialization/INIT_SCI2C.bin +++ /dev/null diff --git a/2.3-1/macros/ToolInitialization/INIT_SCI2C.sci b/2.3-1/macros/ToolInitialization/INIT_SCI2C.sci index 82533022..b6da9bd1 100644 --- a/2.3-1/macros/ToolInitialization/INIT_SCI2C.sci +++ b/2.3-1/macros/ToolInitialization/INIT_SCI2C.sci @@ -1,5 +1,5 @@ function [FileInfoDatFile,SharedInfoDatFile] = ...
- INIT_SCI2C(UserScilabMainFile, UserSciFilesPaths, SCI2COutputDir, RunMode,Target)
+ INIT_SCI2C(UserScilabMainFile, UserSciFilesPaths, SCI2COutputDir, RunMode,Target,Board_name)
// function [FileInfoDatFile,SharedInfoDatFile] = INIT_SCI2C(SCI2CInputPrmFile)
// -----------------------------------------------------------------
// #RNU_RES_B
@@ -68,7 +68,7 @@ OutCCCodeDir = SCI2CResultDir; //-- FIXME : MainLibHeader and Verbose mode are (?) configurable
SharedInfo = INIT_GenSharedInfo(RunMode,UserScilabMainFile, ...
- TotTempScalarVars,EnableTempVarsReuse,"sci2clib.h", %t,Target);
+ TotTempScalarVars,EnableTempVarsReuse,"sci2clib.h", %t,Target,Board_name);
// ----------------------------
// --- Initialize FileInfo. ---
diff --git a/2.3-1/macros/ToolInitialization/INIT_SharedInfoEqual.bin b/2.3-1/macros/ToolInitialization/INIT_SharedInfoEqual.bin Binary files differdeleted file mode 100644 index 31238a31..00000000 --- a/2.3-1/macros/ToolInitialization/INIT_SharedInfoEqual.bin +++ /dev/null diff --git a/2.3-1/macros/ToolInitialization/ManageNextConversion.bin b/2.3-1/macros/ToolInitialization/ManageNextConversion.bin Binary files differdeleted file mode 100644 index bf43562a..00000000 --- a/2.3-1/macros/ToolInitialization/ManageNextConversion.bin +++ /dev/null diff --git a/2.3-1/macros/ToolInitialization/UpdateSCI2CInfo.bin b/2.3-1/macros/ToolInitialization/UpdateSCI2CInfo.bin Binary files differdeleted file mode 100644 index c13904d2..00000000 --- a/2.3-1/macros/ToolInitialization/UpdateSCI2CInfo.bin +++ /dev/null diff --git a/2.3-1/macros/ToolInitialization/doublecomplex.bin b/2.3-1/macros/ToolInitialization/doublecomplex.bin Binary files differdeleted file mode 100644 index 5e616f7c..00000000 --- a/2.3-1/macros/ToolInitialization/doublecomplex.bin +++ /dev/null diff --git a/2.3-1/macros/ToolInitialization/floatcomplex.bin b/2.3-1/macros/ToolInitialization/floatcomplex.bin Binary files differdeleted file mode 100644 index bd77a45f..00000000 --- a/2.3-1/macros/ToolInitialization/floatcomplex.bin +++ /dev/null diff --git a/2.3-1/macros/ToolInitialization/lib b/2.3-1/macros/ToolInitialization/lib Binary files differindex 14cee0d5..4d03bdc5 100644 --- a/2.3-1/macros/ToolInitialization/lib +++ b/2.3-1/macros/ToolInitialization/lib diff --git a/2.3-1/macros/cb_sci2c_gui.bin b/2.3-1/macros/cb_sci2c_gui.bin Binary files differdeleted file mode 100644 index bc691e45..00000000 --- a/2.3-1/macros/cb_sci2c_gui.bin +++ /dev/null diff --git a/2.3-1/macros/cb_sci2c_gui.sci b/2.3-1/macros/cb_sci2c_gui.sci index 8f3f92ad..9dbe9742 100644 --- a/2.3-1/macros/cb_sci2c_gui.sci +++ b/2.3-1/macros/cb_sci2c_gui.sci @@ -64,8 +64,13 @@ elseif or(get(gcbo, "tag")==["outformatradiostalone","outformatradioarduino","ou set(findobj("tag", "outformatradioavr"), "value", 0); set(findobj("tag", "outformatradiorpi"), "value", 0); set(gcbo, "value", 1); - - + if get(findobj("tag", "outformatradioarduino"), "value") == 1 then + set(findobj("tag", "brdnmType"), "enable", "on"); + else + set(findobj("tag", "brdnmType"), "enable", "off"); + end + //disp("YES") + //disp(get(findobj("tag", "brdnmType"), "value")) // // --- Copy Scilab code into C option --- // @@ -121,6 +126,64 @@ elseif get(gcbo, "tag")=="convertbtn" then elseif get(findobj("tag", "outformatradiorpi"), "value") == 1 then Target = "RPi"; end + if get(findobj("tag", "brdnmType"), "value") == 2 then + Board_name = "uno" + elseif get(findobj("tag", "brdnmType"), "value") == 3 then + Board_name = "mega" + elseif get(findobj("tag", "brdnmType"), "value") == 4 then + Board_name = "mega2560" + elseif get(findobj("tag", "brdnmType"), "value") == 5 then + Board_name = "nano" + elseif get(findobj("tag", "brdnmType"), "value") == 6 then + Board_name = "nano328" + elseif get(findobj("tag", "brdnmType"), "value") == 7 then + Board_name = "micro" + elseif get(findobj("tag", "brdnmType"), "value") == 8 then + Board_name = "mini" + elseif get(findobj("tag", "brdnmType"), "value") == 9 then + Board_name = "mini328" + elseif get(findobj("tag", "brdnmType"), "value") == 10 then + Board_name = "pro328" + elseif get(findobj("tag", "brdnmType"), "value") == 11 then + Board_name = "pro" + elseif get(findobj("tag", "brdnmType"), "value") == 12 then + Board_name = "pro5v328" + elseif get(findobj("tag", "brdnmType"), "value") == 13 then + Board_name = "pro5v" + elseif get(findobj("tag", "brdnmType"), "value") == 14 then + Board_name = "atmega168" + elseif get(findobj("tag", "brdnmType"), "value") == 15 then + Board_name = "atmega8" + elseif get(findobj("tag", "brdnmType"), "value") == 16 then + Board_name = "atmega328" + elseif get(findobj("tag", "brdnmType"), "value") == 17 then + Board_name = "bt328" + elseif get(findobj("tag", "brdnmType"), "value") == 18 then + Board_name = "bt" + elseif get(findobj("tag", "brdnmType"), "value") == 19 then + Board_name = "diecimila" + elseif get(findobj("tag", "brdnmType"), "value") == 20 then + Board_name = "esplora" + elseif get(findobj("tag", "brdnmType"), "value") == 21 then + Board_name = "ethernet" + elseif get(findobj("tag", "brdnmType"), "value") == 22 then + Board_name = "fio" + elseif get(findobj("tag", "brdnmType"), "value") == 23 then + Board_name = "leonardo" + elseif get(findobj("tag", "brdnmType"), "value") == 24 then + Board_name = "robotControl" + elseif get(findobj("tag", "brdnmType"), "value") == 25 then + Board_name = "robotMotor" + elseif get(findobj("tag", "brdnmType"), "value") == 26 then + Board_name = "lilypad328" + elseif get(findobj("tag", "brdnmType"), "value") == 27 then + Board_name = "lilypad" + elseif get(findobj("tag", "brdnmType"), "value") == 28 then + Board_name = "lilyPadUSB" + + //elseif get(findobj("tag", "brdnmType"), "value") == [1 0 0 0 0 0] then + //Board_name = "none" + end CopySciCodeIntoCCode = get(findobj("tag", "sciintocradioyes"), "value") == 1; @@ -140,7 +203,7 @@ elseif get(gcbo, "tag")=="convertbtn" then // mprintf("RunMode = {%s}\n", RunMode); // mprintf("CopySciCodeIntoCCode = {%d}\n", bool2s(CopySciCodeIntoCCode)); // mprintf("NativeBuild = {%s}\n", NativeBuild); - scilab2c(UserScilabMainFile, UserSciCodeMainDir, UserSciFilesPaths, RunMode, NativeBuild,Target); + scilab2c(UserScilabMainFile, UserSciCodeMainDir, UserSciFilesPaths, RunMode, NativeBuild,Target,Board_name); // // --- sci2c help --- // diff --git a/2.3-1/macros/findDeps/Scilab2CDeps.bin b/2.3-1/macros/findDeps/Scilab2CDeps.bin Binary files differdeleted file mode 100644 index ae162ecb..00000000 --- a/2.3-1/macros/findDeps/Scilab2CDeps.bin +++ /dev/null diff --git a/2.3-1/macros/findDeps/findDeps.bin b/2.3-1/macros/findDeps/findDeps.bin Binary files differdeleted file mode 100644 index fb11e006..00000000 --- a/2.3-1/macros/findDeps/findDeps.bin +++ /dev/null diff --git a/2.3-1/macros/findDeps/getAllHeaders.bin b/2.3-1/macros/findDeps/getAllHeaders.bin Binary files differdeleted file mode 100644 index 6142deb2..00000000 --- a/2.3-1/macros/findDeps/getAllHeaders.bin +++ /dev/null diff --git a/2.3-1/macros/findDeps/getAllHeaders.sci b/2.3-1/macros/findDeps/getAllHeaders.sci index 01439b23..b76fe1c0 100644 --- a/2.3-1/macros/findDeps/getAllHeaders.sci +++ b/2.3-1/macros/findDeps/getAllHeaders.sci @@ -208,7 +208,15 @@ function allHeaders = getAllHeaders(SharedInfo) //"src/c/scilab-arduino/includes/cmd_servo_attach.h" //"src/c/scilab-arduino/includes/cmd_servo_detach.h" //"src/c/scilab-arduino/includes/cmd_servo_move.h" - "src/c/scilab-arduino/includes/sleep.h"]; + "src/c/scilab-arduino/includes/sleep.h" + "src/c/scilab-arduino/includes/cmd_analog_in_volt.h" + "src/c/scilab-arduino/includes/cmd_analog_out_volt.h" + "src/c/scilab-arduino/includes/cmd_dcmotor_release.h" + "src/c/scilab-arduino/includes/cmd_i2c_dev.h" + "src/c/scilab-arduino/includes/cmd_i2c_write.h" + "src/c/scilab-arduino/includes/cmd_i2c_read.h" + "src/c/scilab-arduino/includes/cmd_i2c_read_register.h" + "src/c/scilab-arduino/includes/cmd_i2c_write_register.h"]; AVR_headers = [ "src/c/hardware/avr/includes/AVRPeripheralGPIO.h" @@ -250,4 +258,8 @@ function allHeaders = getAllHeaders(SharedInfo) allHeaders = cat(1,allHeaders,OpenCV_headers); end + if((mtlb_strcmp(part(SharedInfo.Includelist(1),1:5),'odefn') == %T)) + allHeaders = cat(1,allHeaders,"thirdparty/includes/GSL"); + end + endfunction diff --git a/2.3-1/macros/findDeps/getAllInterfaces.bin b/2.3-1/macros/findDeps/getAllInterfaces.bin Binary files differdeleted file mode 100644 index 17139ce1..00000000 --- a/2.3-1/macros/findDeps/getAllInterfaces.bin +++ /dev/null diff --git a/2.3-1/macros/findDeps/getAllInterfaces.sci b/2.3-1/macros/findDeps/getAllInterfaces.sci index 08171a5b..db3caadf 100644 --- a/2.3-1/macros/findDeps/getAllInterfaces.sci +++ b/2.3-1/macros/findDeps/getAllInterfaces.sci @@ -200,7 +200,14 @@ function allInterfaces = getAllInterfaces(SharedInfo) "src/c/scilab-arduino/interfaces/int_cmd_analog_in.h" "src/c/scilab-arduino/interfaces/int_cmd_dcmotor.h" "src/c/scilab-arduino/interfaces/int_cmd_servo.h" - "src/c/scilab-arduino/interfaces/int_sleep.h"]; + "src/c/scilab-arduino/interfaces/int_sleep.h" + "src/c/scilab-arduino/interfaces/int_cmd_analog_in_volt.h" + "src/c/scilab-arduino/interfaces/int_cmd_analog_out_volt.h" + "src/c/scilab-arduino/interfaces/int_cmd_i2c_dev.h" + "src/c/scilab-arduino/interfaces/int_cmd_i2c_write.h" + "src/c/scilab-arduino/interfaces/int_cmd_i2c_read.h" + "src/c/scilab-arduino/interfaces/int_cmd_i2c_write_register.h" + "src/c/scilab-arduino/interfaces/int_cmd_i2c_read_register.h"]; //Interface files required for "AVR" output AVR_interfaces = [ diff --git a/2.3-1/macros/findDeps/getAllLibraries.bin b/2.3-1/macros/findDeps/getAllLibraries.bin Binary files differdeleted file mode 100644 index 098b51e6..00000000 --- a/2.3-1/macros/findDeps/getAllLibraries.bin +++ /dev/null diff --git a/2.3-1/macros/findDeps/getAllSources.bin b/2.3-1/macros/findDeps/getAllSources.bin Binary files differdeleted file mode 100644 index 7bc8fd0d..00000000 --- a/2.3-1/macros/findDeps/getAllSources.bin +++ /dev/null diff --git a/2.3-1/macros/findDeps/getAllSources.sci b/2.3-1/macros/findDeps/getAllSources.sci index f0f883be..ea7dd1fc 100644 --- a/2.3-1/macros/findDeps/getAllSources.sci +++ b/2.3-1/macros/findDeps/getAllSources.sci @@ -1207,7 +1207,15 @@ function allSources = getAllSources(SharedInfo) //"src/c/scilab-arduino/cmd_servo_attach/u8cmd_servo_attach.cpp" //"src/c/scilab-arduino/cmd_servo_detach/u8cmd_servo_detach.cpp" //"src/c/scilab-arduino/cmd_servo_move/u8cmd_servo_move.cpp" - "src/c/scilab-arduino/sleep/u16sleeps.c"]; + "src/c/scilab-arduino/sleep/u16sleeps.c" + "src/c/scilab-arduino/cmd_analog_in_volt/u8cmd_analog_in_volts.c" + "src/c/scilab-arduino/cmd_analog_out_volt/u8cmd_analog_out_volts.c" + "src/c/scilab-arduino/cmd_dcmotor_release/u8cmd_dcmotor_releases.c" + "src/c/scilab-arduino/cmd_i2c_dev/u8cmd_i2c_devs.cpp" + "src/c/scilab-arduino/cmd_i2c_write/u8cmd_i2c_writes.cpp" + "src/c/scilab-arduino/cmd_i2c_read/u8cmd_i2c_reads.cpp" + "src/c/scilab-arduino/cmd_i2c_write_register/u8cmd_i2c_write_registers.cpp" + "src/c/scilab-arduino/cmd_i2c_read_register/u8cmd_i2c_read_registers.cpp"]; //Files to be inserted only if output format selected is 'AVR'. AVR_files = [ diff --git a/2.3-1/macros/findDeps/getArduinoFiles.bin b/2.3-1/macros/findDeps/getArduinoFiles.bin Binary files differdeleted file mode 100644 index 411018b0..00000000 --- a/2.3-1/macros/findDeps/getArduinoFiles.bin +++ /dev/null diff --git a/2.3-1/macros/findDeps/getArduinoFiles.sci b/2.3-1/macros/findDeps/getArduinoFiles.sci index aae8e500..97264575 100644 --- a/2.3-1/macros/findDeps/getArduinoFiles.sci +++ b/2.3-1/macros/findDeps/getArduinoFiles.sci @@ -23,6 +23,5 @@ function arduinoFiles = getArduinoFiles() arduinoFiles = [ "src/c/scilab-arduino/default_files/setup_arduino.h" - "src/c/scilab-arduino/default_files/Makefile" "src/c/scilab-arduino/default_files/sci2c_arduino.ino"]; endfunction diff --git a/2.3-1/macros/findDeps/lib b/2.3-1/macros/findDeps/lib Binary files differindex 963ce40e..0c9a1117 100644 --- a/2.3-1/macros/findDeps/lib +++ b/2.3-1/macros/findDeps/lib diff --git a/2.3-1/macros/getScilab2cVersion.bin b/2.3-1/macros/getScilab2cVersion.bin Binary files differdeleted file mode 100644 index 9620859e..00000000 --- a/2.3-1/macros/getScilab2cVersion.bin +++ /dev/null diff --git a/2.3-1/macros/lib b/2.3-1/macros/lib Binary files differindex 54b35571..cc23f7db 100644 --- a/2.3-1/macros/lib +++ b/2.3-1/macros/lib diff --git a/2.3-1/macros/runsci2c.bin b/2.3-1/macros/runsci2c.bin Binary files differdeleted file mode 100644 index 24c1b902..00000000 --- a/2.3-1/macros/runsci2c.bin +++ /dev/null diff --git a/2.3-1/macros/runsci2c.sci b/2.3-1/macros/runsci2c.sci index eb32a4b5..f05cb83d 100644 --- a/2.3-1/macros/runsci2c.sci +++ b/2.3-1/macros/runsci2c.sci @@ -1,4 +1,4 @@ -function runsci2c(UserScilabMainFile, UserSciFilesPaths, SCI2COutputPath, Runmode, BuildTool,Target)
+function runsci2c(UserScilabMainFile, UserSciFilesPaths, SCI2COutputPath, Runmode, BuildTool,Target,Board_name)
// function runsci2c(SCI2CInputPrmFile)
// -----------------------------------------------------------------
// === hArtes/PoliBa/GAP SCI2C tool ===
@@ -51,7 +51,7 @@ disp(RunSci2CMainDir); // --- Initialize the SCI2C tool directories and files. ---
[FileInfoDatFile,SharedInfoDatFile] = INIT_SCI2C(UserScilabMainFile, ...
- UserSciFilesPaths, SCI2COutputPath, RunMode, Target);
+ UserSciFilesPaths, SCI2COutputPath, RunMode, Target,Board_name);
// -- Load FileInfo and SharedInfo
load(SharedInfoDatFile,'SharedInfo');
@@ -177,6 +177,8 @@ if (Target == 'Arduino') //disp("Copying "+arduinoFiles(i)+" in "+SCI2COutputPath+"/arduino/sci2carduino");
copyfile(arduinoFiles(i), SCI2COutputPath+"/arduino/sci2c_arduino/");
end
+ C_GenerateMkfle_arduino(FileInfo,SharedInfo);
+ movefile(FileInfo.MakefileFilename, SCI2COutputPath+"/arduino/sci2c_arduino/");
elseif (Target == 'AVR')
AVRFile = SCI2CHOME + "/" + "src/c/hardware/avr/default_files/Makefile";
copyfile(AVRFile, SCI2COutputPath);
diff --git a/2.3-1/macros/runscicode.bin b/2.3-1/macros/runscicode.bin Binary files differdeleted file mode 100644 index 46bda7cc..00000000 --- a/2.3-1/macros/runscicode.bin +++ /dev/null diff --git a/2.3-1/macros/sci2c_gui.bin b/2.3-1/macros/sci2c_gui.bin Binary files differdeleted file mode 100644 index 57a2f696..00000000 --- a/2.3-1/macros/sci2c_gui.bin +++ /dev/null diff --git a/2.3-1/macros/sci2c_gui.sci b/2.3-1/macros/sci2c_gui.sci index 6dbd4628..bee6fe43 100644 --- a/2.3-1/macros/sci2c_gui.sci +++ b/2.3-1/macros/sci2c_gui.sci @@ -38,7 +38,7 @@ uimenu("parent", h, "label", gettext("Sci2c help page"), "callback", "cb_sci2c_g uimenu("parent", h, "label", gettext("About SCI2C tools..."), "callback", "cb_sci2c_gui", "tag", "about_sci2c_menu"); figw = 800; -figh = 15*margin + btnh + 9*widgeth; +figh = 16*margin + btnh + 10*widgeth; sci2cfig.axes_size = [figw figh]; sci2cfig.auto_resize = "on"; //sci2cfig.visible = "off"; // to be sure that no plot can appear in the window @@ -79,7 +79,7 @@ optframe = uicontrol("parent", sci2cfig,... "relief", "groove",... "style", "frame",... "units", "pixels",... - "position", [margin 2*margin+btnh figw-2*margin 4*margin+6*widgeth],... + "position", [margin 2*margin+btnh figw-2*margin 7*margin+6*widgeth],... "fontname", defaultfont,... "fontunits", "points",... "fontsize", 12,... @@ -90,7 +90,7 @@ opttitle = uicontrol("parent", sci2cfig,... "style", "text",... "string", gettext("Options"),... "units", "pixels",... - "position", [2*margin 2*margin+btnh+4*margin+6*widgeth-8 50 18],... + "position", [2*margin 5*margin+btnh+4*margin+6*widgeth-8 50 18],... "fontname", defaultfont,... "fontunits", "points",... "fontsize", 11,... @@ -175,6 +175,33 @@ sciintocradiono = uicontrol("parent", sci2cfig,... "callback", "cb_sci2c_gui",... "tag", "sciintocradiono"); +// --- Board Name ---- +brdnmy = sciintocy + margin + btnh ; +brdnmlabel = uicontrol("parent", sci2cfig,... + "style", "text",... + "string", gettext("Board Name: "),... + "position",[2*margin brdnmy widgetLabelWidth widgeth],... + "horizontalalignment", "left",... + "fontname", defaultfont,... + "fontunits", "points",... + "fontsize", 12); + +brdnmType = uicontrol("parent", sci2cfig,... + "style", "popupmenu",... + "string", ["";"Uno";"Mega-ATmega1280";"Mega-2560 or Mega ADK";"Nano - ATmega168";"Nano - ATmega328";"Micro";"Mini - Atmega168";"Mini - Atmega328";"Pro Mini (3.3V, 8MHz) - ATmega328";"Pro Mini (3.3V, 8MHz) - ATmega168";"Pro Mini (5V, 16MHz) - ATmega328";"Pro Mini (5V, 16MHz) - ATmega168";"NG or older - ATmega168";"NG or older - ATmega8";"Duemilanove - ATmega328";"BT - ATmega328";"BT - ATmega 168";"Diecimila/Duemilanove - ATmega168";"Esplora";"Ethernet";"Fio";"Leonardo";"Robot Control";"Robot Motor";"LilyPad Arduino - ATmega328";"LilyPad Arduino - ATmega168";"LilyPad Arduino USB"],... + "position",[2*margin+widgetLabelWidth brdnmy 3*radiow widgeth],... + "horizontalalignment", "left",... + "fontname", defaultfont,... + "enable", "off",... + "fontunits", "points",... + "fontsize", 12,... + "min", 0, ... + "max", 1, ... + "value", [1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0],... + "callback", "cb_sci2c_gui",... + "tag", "brdnmType"); + +sciintocy = brdnmy // --- Output format: Standalone or Arduino outformaty = sciintocy + margin + btnh ; outformatlabel = uicontrol("parent", sci2cfig,... @@ -240,7 +267,8 @@ outformatradiorpi = uicontrol("parent", sci2cfig,... "max", 1, ... "value", 0,... "callback", "cb_sci2c_gui",... - "tag", "outformatradiorpi"); + "tag", "outformatradiorpi"); + // --- Run mode option --- runy = outformaty + margin + widgeth; @@ -296,7 +324,7 @@ runradiogenlib = uicontrol("parent", sci2cfig,... // --- Output directory --- // ------------------------ // Frame -optframemaxy = 2*margin+btnh + 4*margin+6*widgeth; +optframemaxy = 5*margin+btnh + 4*margin+6*widgeth; outframe = uicontrol("parent", sci2cfig,... "relief", "groove",... "style", "frame",... diff --git a/2.3-1/macros/scilab2c.bin b/2.3-1/macros/scilab2c.bin Binary files differdeleted file mode 100644 index 9fc934f8..00000000 --- a/2.3-1/macros/scilab2c.bin +++ /dev/null diff --git a/2.3-1/macros/scilab2c.sci b/2.3-1/macros/scilab2c.sci index 41494eac..69d95541 100644 --- a/2.3-1/macros/scilab2c.sci +++ b/2.3-1/macros/scilab2c.sci @@ -133,6 +133,40 @@ function scilab2c(varargin) RunMode = varargin(4); BuildTool = varargin(5); Target = varargin(6); + case 7 + for i = 1:4 + if typeof(varargin(i)) <> "string" + error(msprintf(gettext("%s: Wrong type for input argument #%d: String expected.\n"),"scilab2c",i)); + return + end + end + if varargin(4) <> "All" & varargin(4) <> "Translate" & varargin(4) <> "GenLibraryStructure" & varargin(4) <> "FunCall" + error(msprintf(gettext("%s: argument #%d must be: ""All"", ""Translate"" ,""GenLibraryStructure"" or ""FunCall"".\n"),"scilab2c",4)); + return + end + if varargin(5) <> "make" & varargin(5) <> "nmake" + error(msprintf(gettext("%s: argument #%d must be: ""make"" or ""nmake"".\n"),"scilab2c",5)); + return + end + if varargin(6) <> "StandAlone" & varargin(6) <> "Arduino" & varargin(6) <> "AVR" & varargin(6) <> "RPi" + error(msprintf(gettext("%s: argument #%d must be: ""StandAlone"" or ""Arduino"" or ""AVR"" or ""RPi"".\n"),"scilab2c",5)); + return + end + //if varargin(7) <> "uno" & varargin(7) <> "mega" & varargin(7) <> "mega2560" & varargin(7) <> "micro" & varargin(7) <> "nano" & varargin(7) <> "mini" + // error(msprintf(gettext("%s: argument #%d must be: ""uno"" or ""mega"" or ""micro"" or ""nano"" or ""mini"".\n"),"scilab2c",7)); + //return + //end + UserScilabMainFile = varargin(1); + CCodeOutputDir = varargin(2); + if varargin(3) == "" + UserSciFilesPaths = []; + else + UserSciFilesPaths = varargin(3); + end + RunMode = varargin(4); + BuildTool = varargin(5); + Target = varargin(6); + Board_name = varargin(7); else // // Calling scilab2c with more than understood values @@ -159,7 +193,7 @@ error(msprintf(gettext("%s: Wrong number of input argument(s): %d expected.\n"), end if (userchoice == 1) // --- LAUNCH SCI2C --- - runsci2c(UserScilabMainFile, UserSciFilesPaths, CCodeOutputDir, RunMode, BuildTool,Target); + runsci2c(UserScilabMainFile, UserSciFilesPaths, CCodeOutputDir, RunMode, BuildTool,Target,Board_name); end endfunction |