From 87e2de9869a72ab2058f4b3ca60d5a6e6d8d6035 Mon Sep 17 00:00:00 2001 From: siddhu8990 Date: Tue, 8 Dec 2015 11:43:14 +0530 Subject: Modified so that code for all three output formats can be generated --- 2.3-1/macros/ASTManagement/AST2Ccode.bin | Bin 31992 -> 31992 bytes .../ASTManagement/AST_CheckCommonInOutArgs.bin | Bin 16824 -> 16824 bytes 2.3-1/macros/ASTManagement/AST_CheckLastFunc.bin | Bin 9164 -> 9164 bytes .../ASTManagement/AST_CheckPrecSpecifier.bin | Bin 10864 -> 10864 bytes 2.3-1/macros/ASTManagement/AST_DisplayStack.bin | Bin 4704 -> 4704 bytes .../macros/ASTManagement/AST_GetPrecAndLhsArg.bin | Bin 12360 -> 12360 bytes 2.3-1/macros/ASTManagement/AST_HandleEOL.bin | Bin 11572 -> 11572 bytes .../macros/ASTManagement/AST_HandleEndProgram.bin | Bin 7968 -> 7968 bytes 2.3-1/macros/ASTManagement/AST_HandleHeader.bin | Bin 38100 -> 38100 bytes .../macros/ASTManagement/AST_HandleWhileStatem.bin | Bin 16524 -> 16524 bytes .../macros/ASTManagement/AST_ParseEqualStruct.bin | Bin 20312 -> 20312 bytes .../ASTManagement/AST_ParseFuncallStruct.bin | Bin 14808 -> 14808 bytes .../macros/ASTManagement/AST_ParseIfExprStruct.bin | Bin 12944 -> 12944 bytes 2.3-1/macros/ASTManagement/AST_ParseOperStruct.bin | Bin 15484 -> 15484 bytes 2.3-1/macros/ASTManagement/AST_PopASTStack.bin | Bin 3896 -> 3896 bytes 2.3-1/macros/ASTManagement/AST_PushASTStack.bin | Bin 3300 -> 3300 bytes 2.3-1/macros/ASTManagement/AST_ReadASTHeader.bin | Bin 11288 -> 11288 bytes .../macros/ASTManagement/AST_ReadEqualRhsNames.bin | Bin 6972 -> 6972 bytes 2.3-1/macros/ASTManagement/GenOutArgNames.bin | Bin 13348 -> 13348 bytes 2.3-1/macros/ASTManagement/SciFile2ASTFile.bin | Bin 4192 -> 4192 bytes 2.3-1/macros/ASTManagement/lib | Bin 1644 -> 1680 bytes 2.3-1/macros/ASTManagement/objectlist2string.bin | Bin 1384 -> 1384 bytes 2.3-1/macros/CCodeGeneration/C_FinalizeCode.bin | Bin 13696 -> 13584 bytes 2.3-1/macros/CCodeGeneration/C_ForExpression.bin | Bin 32208 -> 32208 bytes 2.3-1/macros/CCodeGeneration/C_Funcall.bin | Bin 62060 -> 62220 bytes 2.3-1/macros/CCodeGeneration/C_GenDeclarations.bin | Bin 21532 -> 21532 bytes .../macros/CCodeGeneration/C_GenerateMakefile.bin | Bin 17792 -> 23080 bytes 2.3-1/macros/CCodeGeneration/C_IfExpression.bin | Bin 10612 -> 10612 bytes 2.3-1/macros/CCodeGeneration/C_InitHeader.bin | Bin 13696 -> 14056 bytes 2.3-1/macros/CCodeGeneration/C_InitHeader.sci | 2 +- .../CCodeGeneration/C_MemAllocOutTempVars.bin | Bin 12996 -> 12996 bytes 2.3-1/macros/CCodeGeneration/C_Type.bin | Bin 9600 -> 4680 bytes 2.3-1/macros/CCodeGeneration/C_WhileExpression.bin | Bin 13196 -> 13196 bytes 2.3-1/macros/CCodeGeneration/GenCFunDatFiles.bin | Bin 9348 -> 9348 bytes 2.3-1/macros/CCodeGeneration/GetClsFileName.bin | Bin 13340 -> 13340 bytes .../macros/CCodeGeneration/GetSymbolDimension.bin | Bin 8944 -> 8944 bytes .../CCodeGeneration/GetWhileCondVariable.bin | Bin 10228 -> 10228 bytes .../macros/CCodeGeneration/JoinDeclarAndCcode.bin | Bin 21988 -> 21988 bytes .../macros/CCodeGeneration/Sci2AnnotationFile.bin | Bin 7400 -> 7400 bytes 2.3-1/macros/CCodeGeneration/lib | Bin 972 -> 1184 bytes 2.3-1/macros/CCodeGeneration/names | 34 +++++----- 2.3-1/macros/ErrorMessages/lib | Bin 484 -> 696 bytes 2.3-1/macros/ErrorMessages/names | 2 +- 2.3-1/macros/FunctionAnnotation/FA_GetFunAnn.bin | Bin 30676 -> 30676 bytes .../macros/FunctionAnnotation/FA_GetOutArgInfo.bin | Bin 16712 -> 16712 bytes .../FunctionAnnotation/FA_GetResizeApproach.bin | Bin 10484 -> 10484 bytes 2.3-1/macros/FunctionAnnotation/FA_MAX.bin | Bin 5320 -> 5320 bytes 2.3-1/macros/FunctionAnnotation/FA_MIN.bin | Bin 4524 -> 4524 bytes 2.3-1/macros/FunctionAnnotation/FA_SZ_OPPLUS.bin | Bin 14040 -> 14040 bytes 2.3-1/macros/FunctionAnnotation/FA_SZ_OPPLUS.sci | 73 +-------------------- 2.3-1/macros/FunctionAnnotation/FA_TP_INT16.bin | Bin 9600 -> 2888 bytes 2.3-1/macros/FunctionAnnotation/FA_TP_INT8.bin | Bin 9600 -> 2876 bytes 2.3-1/macros/FunctionAnnotation/FA_TP_MAX.bin | Bin 5028 -> 5028 bytes 2.3-1/macros/FunctionAnnotation/FA_TP_MIN_REAL.bin | Bin 3512 -> 3512 bytes 2.3-1/macros/FunctionAnnotation/FA_TP_REAL.bin | Bin 4036 -> 4036 bytes 2.3-1/macros/FunctionAnnotation/FA_TP_UINT16.bin | Bin 9600 -> 2896 bytes 2.3-1/macros/FunctionAnnotation/FA_TP_UINT8.bin | Bin 9600 -> 2884 bytes 2.3-1/macros/FunctionAnnotation/lib | Bin 1928 -> 1964 bytes 2.3-1/macros/FunctionList/FL_ExistCFunction.bin | Bin 12304 -> 12304 bytes 2.3-1/macros/FunctionList/FL_GetFunctionClass.bin | Bin 6832 -> 6832 bytes 2.3-1/macros/FunctionList/FL_UpdateConverted.bin | Bin 5572 -> 5572 bytes 2.3-1/macros/FunctionList/FL_UpdateToBeConv.bin | Bin 14628 -> 14628 bytes 2.3-1/macros/FunctionList/lib | Bin 552 -> 764 bytes 2.3-1/macros/FunctionList/names | 4 +- 2.3-1/macros/GeneralFunctions/File2StringArray.bin | Bin 5808 -> 5808 bytes .../GeneralFunctions/FunName2SciFileName.bin | Bin 6964 -> 6964 bytes 2.3-1/macros/GeneralFunctions/IsNanSize.bin | Bin 4344 -> 4344 bytes .../macros/GeneralFunctions/KeyStr2FileStrPos.bin | Bin 10872 -> 10872 bytes 2.3-1/macros/GeneralFunctions/PrintStepInfo.bin | Bin 7356 -> 7356 bytes 2.3-1/macros/GeneralFunctions/PrintStringInfo.bin | Bin 8556 -> 8556 bytes 2.3-1/macros/GeneralFunctions/ReadStringCard.bin | Bin 7752 -> 7752 bytes 2.3-1/macros/GeneralFunctions/SCI2CCreateDir.bin | Bin 3316 -> 3316 bytes 2.3-1/macros/GeneralFunctions/SCI2CFindFile.bin | Bin 4344 -> 4344 bytes 2.3-1/macros/GeneralFunctions/SCI2CNInArgCheck.bin | Bin 3144 -> 3144 bytes .../macros/GeneralFunctions/SCI2COpenFileRead.bin | Bin 3424 -> 3424 bytes .../macros/GeneralFunctions/SCI2COpenFileWrite.bin | Bin 3476 -> 3476 bytes 2.3-1/macros/GeneralFunctions/SCI2Ccopyfile.bin | Bin 5712 -> 5712 bytes 2.3-1/macros/GeneralFunctions/SCI2Cmdelete.bin | Bin 4132 -> 4132 bytes 2.3-1/macros/GeneralFunctions/filenamefprintf.bin | Bin 6576 -> 6576 bytes 2.3-1/macros/GeneralFunctions/lib | Bin 1096 -> 1308 bytes 2.3-1/macros/GeneralFunctions/names | 40 +++++------ 2.3-1/macros/Hardware/AVR/AVRADCSetup.bin | Bin 0 -> 4168 bytes 2.3-1/macros/Hardware/AVR/AVRDigitalIn.bin | Bin 0 -> 3688 bytes 2.3-1/macros/Hardware/AVR/AVRDigitalIn.sci | 32 +++++++++ 2.3-1/macros/Hardware/AVR/AVRReadADC.bin | Bin 0 -> 4048 bytes 2.3-1/macros/Hardware/AVR/lib | Bin 728 -> 836 bytes 2.3-1/macros/Hardware/AVR/names | 3 + 2.3-1/macros/SymbolTable/ST_AnalyzeScope.bin | Bin 16788 -> 16788 bytes 2.3-1/macros/SymbolTable/ST_Del.bin | Bin 4552 -> 4552 bytes 2.3-1/macros/SymbolTable/ST_FindPos.bin | Bin 5104 -> 5104 bytes 2.3-1/macros/SymbolTable/ST_Get.bin | Bin 8108 -> 8108 bytes 2.3-1/macros/SymbolTable/ST_GetInArgInfo.bin | Bin 28200 -> 28200 bytes 2.3-1/macros/SymbolTable/ST_GetSymbolInfo.bin | Bin 13320 -> 13320 bytes 2.3-1/macros/SymbolTable/ST_InsForCntVars.bin | Bin 25508 -> 25508 bytes 2.3-1/macros/SymbolTable/ST_InsOutArg.bin | Bin 32432 -> 32432 bytes 2.3-1/macros/SymbolTable/ST_Load.bin | Bin 4288 -> 4288 bytes 2.3-1/macros/SymbolTable/ST_MatchSymbol.bin | Bin 9116 -> 9116 bytes 2.3-1/macros/SymbolTable/ST_Save.bin | Bin 5440 -> 5440 bytes 2.3-1/macros/SymbolTable/ST_Set.bin | Bin 7048 -> 7048 bytes 2.3-1/macros/SymbolTable/lib | Bin 692 -> 904 bytes 2.3-1/macros/SymbolTable/names | 14 ++-- .../macros/ToolInitialization/INIT_CreateDirs.bin | Bin 9600 -> 8900 bytes .../ToolInitialization/INIT_FillSCI2LibCDirs.bin | Bin 895476 -> 929056 bytes .../ToolInitialization/INIT_FillSCI2LibCDirs.sci | 54 +++++++++++++-- .../ToolInitialization/INIT_GenAnnFLFunctions.bin | Bin 9600 -> 3460 bytes .../macros/ToolInitialization/INIT_GenFileInfo.bin | Bin 13696 -> 19356 bytes .../ToolInitialization/INIT_GenLibraries.bin | Bin 9600 -> 8556 bytes .../ToolInitialization/INIT_GenSharedInfo.bin | Bin 13696 -> 19080 bytes .../ToolInitialization/INIT_LoadLibraries.bin | Bin 9600 -> 8844 bytes .../macros/ToolInitialization/INIT_RemoveDirs.bin | Bin 13696 -> 11880 bytes 2.3-1/macros/ToolInitialization/INIT_SCI2C.bin | Bin 21248 -> 23840 bytes .../ToolInitialization/INIT_SharedInfoEqual.bin | Bin 9600 -> 6500 bytes .../ToolInitialization/ManageNextConversion.bin | Bin 13696 -> 11012 bytes .../macros/ToolInitialization/UpdateSCI2CInfo.bin | Bin 30256 -> 37748 bytes 2.3-1/macros/ToolInitialization/lib | Bin 944 -> 980 bytes 2.3-1/macros/cb_sci2c_gui.bin | Bin 17088 -> 17820 bytes 2.3-1/macros/cb_sci2c_gui.sci | 5 +- 2.3-1/macros/findDeps/findDeps.bin | Bin 5400 -> 5400 bytes 2.3-1/macros/findDeps/getAllHeaders.bin | Bin 21056 -> 24080 bytes 2.3-1/macros/findDeps/getAllInterfaces.bin | Bin 20960 -> 25384 bytes 2.3-1/macros/findDeps/getAllSources.bin | Bin 89504 -> 152368 bytes 2.3-1/macros/findDeps/getArduinoFiles.bin | Bin 9600 -> 544 bytes 2.3-1/macros/findDeps/lib | Bin 512 -> 748 bytes 2.3-1/macros/findDeps/names | 6 +- 2.3-1/macros/lib | Bin 676 -> 712 bytes 2.3-1/macros/runsci2c.bin | Bin 26052 -> 26048 bytes 2.3-1/macros/runsci2c.sci | 6 +- 2.3-1/macros/sci2c_gui.bin | Bin 55932 -> 57340 bytes 2.3-1/macros/sci2c_gui.sci | 14 ++++ 2.3-1/macros/scilab2c.bin | Bin 18696 -> 19368 bytes 2.3-1/macros/scilab2c.sci | 24 ++++--- 2.3-1/src/c/hardware/avr/includes/AVRUtil.h | 25 +++++++ .../hardware/avr/interfaces/int_AVRPeripheralADC.h | 4 +- .../avr/interfaces/int_AVRPeripheralGPIO.h | 2 +- 2.3-1/src/c/hardware/avr/interfaces/int_AVRUtil.h | 23 +++++++ 2.3-1/src/c/hardware/avr/util/U16AVRSleeps.c | 14 ++++ 136 files changed, 238 insertions(+), 143 deletions(-) create mode 100644 2.3-1/macros/Hardware/AVR/AVRADCSetup.bin create mode 100644 2.3-1/macros/Hardware/AVR/AVRDigitalIn.bin create mode 100644 2.3-1/macros/Hardware/AVR/AVRDigitalIn.sci create mode 100644 2.3-1/macros/Hardware/AVR/AVRReadADC.bin create mode 100644 2.3-1/src/c/hardware/avr/includes/AVRUtil.h create mode 100644 2.3-1/src/c/hardware/avr/interfaces/int_AVRUtil.h create mode 100644 2.3-1/src/c/hardware/avr/util/U16AVRSleeps.c diff --git a/2.3-1/macros/ASTManagement/AST2Ccode.bin b/2.3-1/macros/ASTManagement/AST2Ccode.bin index ba4249af..8a4fc960 100644 Binary files a/2.3-1/macros/ASTManagement/AST2Ccode.bin and b/2.3-1/macros/ASTManagement/AST2Ccode.bin differ diff --git a/2.3-1/macros/ASTManagement/AST_CheckCommonInOutArgs.bin b/2.3-1/macros/ASTManagement/AST_CheckCommonInOutArgs.bin index 1e0f6178..5c190ba3 100644 Binary files a/2.3-1/macros/ASTManagement/AST_CheckCommonInOutArgs.bin and b/2.3-1/macros/ASTManagement/AST_CheckCommonInOutArgs.bin differ diff --git a/2.3-1/macros/ASTManagement/AST_CheckLastFunc.bin b/2.3-1/macros/ASTManagement/AST_CheckLastFunc.bin index cbe83086..9cac2273 100644 Binary files a/2.3-1/macros/ASTManagement/AST_CheckLastFunc.bin and b/2.3-1/macros/ASTManagement/AST_CheckLastFunc.bin differ diff --git a/2.3-1/macros/ASTManagement/AST_CheckPrecSpecifier.bin b/2.3-1/macros/ASTManagement/AST_CheckPrecSpecifier.bin index 44ecf54d..8e50397f 100644 Binary files a/2.3-1/macros/ASTManagement/AST_CheckPrecSpecifier.bin and b/2.3-1/macros/ASTManagement/AST_CheckPrecSpecifier.bin differ diff --git a/2.3-1/macros/ASTManagement/AST_DisplayStack.bin b/2.3-1/macros/ASTManagement/AST_DisplayStack.bin index 5dabb755..90cbcc74 100644 Binary files a/2.3-1/macros/ASTManagement/AST_DisplayStack.bin and b/2.3-1/macros/ASTManagement/AST_DisplayStack.bin differ diff --git a/2.3-1/macros/ASTManagement/AST_GetPrecAndLhsArg.bin b/2.3-1/macros/ASTManagement/AST_GetPrecAndLhsArg.bin index ba065623..d35ce90a 100644 Binary files a/2.3-1/macros/ASTManagement/AST_GetPrecAndLhsArg.bin and b/2.3-1/macros/ASTManagement/AST_GetPrecAndLhsArg.bin differ diff --git a/2.3-1/macros/ASTManagement/AST_HandleEOL.bin b/2.3-1/macros/ASTManagement/AST_HandleEOL.bin index c6a5a453..6547b54d 100644 Binary files a/2.3-1/macros/ASTManagement/AST_HandleEOL.bin and b/2.3-1/macros/ASTManagement/AST_HandleEOL.bin differ diff --git a/2.3-1/macros/ASTManagement/AST_HandleEndProgram.bin b/2.3-1/macros/ASTManagement/AST_HandleEndProgram.bin index 1be4e8d2..5e02fdcd 100644 Binary files a/2.3-1/macros/ASTManagement/AST_HandleEndProgram.bin and b/2.3-1/macros/ASTManagement/AST_HandleEndProgram.bin differ diff --git a/2.3-1/macros/ASTManagement/AST_HandleHeader.bin b/2.3-1/macros/ASTManagement/AST_HandleHeader.bin index d5e7b6be..b2ef8575 100644 Binary files a/2.3-1/macros/ASTManagement/AST_HandleHeader.bin and b/2.3-1/macros/ASTManagement/AST_HandleHeader.bin differ diff --git a/2.3-1/macros/ASTManagement/AST_HandleWhileStatem.bin b/2.3-1/macros/ASTManagement/AST_HandleWhileStatem.bin index 441bafc1..3e9942c2 100644 Binary files a/2.3-1/macros/ASTManagement/AST_HandleWhileStatem.bin and b/2.3-1/macros/ASTManagement/AST_HandleWhileStatem.bin differ diff --git a/2.3-1/macros/ASTManagement/AST_ParseEqualStruct.bin b/2.3-1/macros/ASTManagement/AST_ParseEqualStruct.bin index 2000da83..459c62e8 100644 Binary files a/2.3-1/macros/ASTManagement/AST_ParseEqualStruct.bin and b/2.3-1/macros/ASTManagement/AST_ParseEqualStruct.bin differ diff --git a/2.3-1/macros/ASTManagement/AST_ParseFuncallStruct.bin b/2.3-1/macros/ASTManagement/AST_ParseFuncallStruct.bin index b0fb22ca..c9d996a0 100644 Binary files a/2.3-1/macros/ASTManagement/AST_ParseFuncallStruct.bin and b/2.3-1/macros/ASTManagement/AST_ParseFuncallStruct.bin differ diff --git a/2.3-1/macros/ASTManagement/AST_ParseIfExprStruct.bin b/2.3-1/macros/ASTManagement/AST_ParseIfExprStruct.bin index fa6b82d3..cbf63413 100644 Binary files a/2.3-1/macros/ASTManagement/AST_ParseIfExprStruct.bin and b/2.3-1/macros/ASTManagement/AST_ParseIfExprStruct.bin differ diff --git a/2.3-1/macros/ASTManagement/AST_ParseOperStruct.bin b/2.3-1/macros/ASTManagement/AST_ParseOperStruct.bin index d8d70dd8..eea4c288 100644 Binary files a/2.3-1/macros/ASTManagement/AST_ParseOperStruct.bin and b/2.3-1/macros/ASTManagement/AST_ParseOperStruct.bin differ diff --git a/2.3-1/macros/ASTManagement/AST_PopASTStack.bin b/2.3-1/macros/ASTManagement/AST_PopASTStack.bin index 245f470b..f9b85d34 100644 Binary files a/2.3-1/macros/ASTManagement/AST_PopASTStack.bin and b/2.3-1/macros/ASTManagement/AST_PopASTStack.bin differ diff --git a/2.3-1/macros/ASTManagement/AST_PushASTStack.bin b/2.3-1/macros/ASTManagement/AST_PushASTStack.bin index 98b5dc4b..8fcd563c 100644 Binary files a/2.3-1/macros/ASTManagement/AST_PushASTStack.bin and b/2.3-1/macros/ASTManagement/AST_PushASTStack.bin differ diff --git a/2.3-1/macros/ASTManagement/AST_ReadASTHeader.bin b/2.3-1/macros/ASTManagement/AST_ReadASTHeader.bin index e599aaf5..614231c4 100644 Binary files a/2.3-1/macros/ASTManagement/AST_ReadASTHeader.bin and b/2.3-1/macros/ASTManagement/AST_ReadASTHeader.bin differ diff --git a/2.3-1/macros/ASTManagement/AST_ReadEqualRhsNames.bin b/2.3-1/macros/ASTManagement/AST_ReadEqualRhsNames.bin index a7bbfa6e..a131c498 100644 Binary files a/2.3-1/macros/ASTManagement/AST_ReadEqualRhsNames.bin and b/2.3-1/macros/ASTManagement/AST_ReadEqualRhsNames.bin differ diff --git a/2.3-1/macros/ASTManagement/GenOutArgNames.bin b/2.3-1/macros/ASTManagement/GenOutArgNames.bin index e2ff5fff..c0d18341 100644 Binary files a/2.3-1/macros/ASTManagement/GenOutArgNames.bin and b/2.3-1/macros/ASTManagement/GenOutArgNames.bin differ diff --git a/2.3-1/macros/ASTManagement/SciFile2ASTFile.bin b/2.3-1/macros/ASTManagement/SciFile2ASTFile.bin index 186252c5..be8bc0d5 100644 Binary files a/2.3-1/macros/ASTManagement/SciFile2ASTFile.bin and b/2.3-1/macros/ASTManagement/SciFile2ASTFile.bin differ diff --git a/2.3-1/macros/ASTManagement/lib b/2.3-1/macros/ASTManagement/lib index 4cd697ce..36d91dec 100644 Binary files a/2.3-1/macros/ASTManagement/lib and b/2.3-1/macros/ASTManagement/lib differ diff --git a/2.3-1/macros/ASTManagement/objectlist2string.bin b/2.3-1/macros/ASTManagement/objectlist2string.bin index 508d98ff..96159f22 100644 Binary files a/2.3-1/macros/ASTManagement/objectlist2string.bin and b/2.3-1/macros/ASTManagement/objectlist2string.bin differ diff --git a/2.3-1/macros/CCodeGeneration/C_FinalizeCode.bin b/2.3-1/macros/CCodeGeneration/C_FinalizeCode.bin index f306cc14..5cc21487 100644 Binary files a/2.3-1/macros/CCodeGeneration/C_FinalizeCode.bin and b/2.3-1/macros/CCodeGeneration/C_FinalizeCode.bin differ diff --git a/2.3-1/macros/CCodeGeneration/C_ForExpression.bin b/2.3-1/macros/CCodeGeneration/C_ForExpression.bin index 8441f442..1c3f6747 100644 Binary files a/2.3-1/macros/CCodeGeneration/C_ForExpression.bin and b/2.3-1/macros/CCodeGeneration/C_ForExpression.bin differ diff --git a/2.3-1/macros/CCodeGeneration/C_Funcall.bin b/2.3-1/macros/CCodeGeneration/C_Funcall.bin index 64ff20d1..fec47128 100644 Binary files a/2.3-1/macros/CCodeGeneration/C_Funcall.bin and b/2.3-1/macros/CCodeGeneration/C_Funcall.bin differ diff --git a/2.3-1/macros/CCodeGeneration/C_GenDeclarations.bin b/2.3-1/macros/CCodeGeneration/C_GenDeclarations.bin index 8511639e..8bd7257e 100644 Binary files a/2.3-1/macros/CCodeGeneration/C_GenDeclarations.bin and b/2.3-1/macros/CCodeGeneration/C_GenDeclarations.bin differ diff --git a/2.3-1/macros/CCodeGeneration/C_GenerateMakefile.bin b/2.3-1/macros/CCodeGeneration/C_GenerateMakefile.bin index 57bbf43d..cf4ea0e4 100644 Binary files a/2.3-1/macros/CCodeGeneration/C_GenerateMakefile.bin and b/2.3-1/macros/CCodeGeneration/C_GenerateMakefile.bin differ diff --git a/2.3-1/macros/CCodeGeneration/C_IfExpression.bin b/2.3-1/macros/CCodeGeneration/C_IfExpression.bin index 46a0db79..c6cda7bd 100644 Binary files a/2.3-1/macros/CCodeGeneration/C_IfExpression.bin and b/2.3-1/macros/CCodeGeneration/C_IfExpression.bin differ diff --git a/2.3-1/macros/CCodeGeneration/C_InitHeader.bin b/2.3-1/macros/CCodeGeneration/C_InitHeader.bin index 1bc38769..4513310c 100644 Binary files a/2.3-1/macros/CCodeGeneration/C_InitHeader.bin and b/2.3-1/macros/CCodeGeneration/C_InitHeader.bin differ diff --git a/2.3-1/macros/CCodeGeneration/C_InitHeader.sci b/2.3-1/macros/CCodeGeneration/C_InitHeader.sci index 1c2efd6a..1d67b601 100644 --- a/2.3-1/macros/CCodeGeneration/C_InitHeader.sci +++ b/2.3-1/macros/CCodeGeneration/C_InitHeader.sci @@ -19,7 +19,7 @@ function C_InitHeader(C_Prototype,HeaderFileName,Sci2CLibMainHeaderFName,OutForm // ------------------------------ // --- Check input arguments. --- // ------------------------------ -SCI2CNInArgCheck(argn(2),3,3); +SCI2CNInArgCheck(argn(2),4,4); // ----------------------- // --- Initialization. --- diff --git a/2.3-1/macros/CCodeGeneration/C_MemAllocOutTempVars.bin b/2.3-1/macros/CCodeGeneration/C_MemAllocOutTempVars.bin index 0e9c6f70..443ad3c1 100644 Binary files a/2.3-1/macros/CCodeGeneration/C_MemAllocOutTempVars.bin and b/2.3-1/macros/CCodeGeneration/C_MemAllocOutTempVars.bin differ diff --git a/2.3-1/macros/CCodeGeneration/C_Type.bin b/2.3-1/macros/CCodeGeneration/C_Type.bin index 83996bb0..64037d45 100644 Binary files a/2.3-1/macros/CCodeGeneration/C_Type.bin and b/2.3-1/macros/CCodeGeneration/C_Type.bin differ diff --git a/2.3-1/macros/CCodeGeneration/C_WhileExpression.bin b/2.3-1/macros/CCodeGeneration/C_WhileExpression.bin index 736c9773..cff8f38d 100644 Binary files a/2.3-1/macros/CCodeGeneration/C_WhileExpression.bin and b/2.3-1/macros/CCodeGeneration/C_WhileExpression.bin differ diff --git a/2.3-1/macros/CCodeGeneration/GenCFunDatFiles.bin b/2.3-1/macros/CCodeGeneration/GenCFunDatFiles.bin index 0a4f77eb..6a374f5b 100644 Binary files a/2.3-1/macros/CCodeGeneration/GenCFunDatFiles.bin and b/2.3-1/macros/CCodeGeneration/GenCFunDatFiles.bin differ diff --git a/2.3-1/macros/CCodeGeneration/GetClsFileName.bin b/2.3-1/macros/CCodeGeneration/GetClsFileName.bin index c5462aa6..30b25713 100644 Binary files a/2.3-1/macros/CCodeGeneration/GetClsFileName.bin and b/2.3-1/macros/CCodeGeneration/GetClsFileName.bin differ diff --git a/2.3-1/macros/CCodeGeneration/GetSymbolDimension.bin b/2.3-1/macros/CCodeGeneration/GetSymbolDimension.bin index c8041cfe..5c73f435 100644 Binary files a/2.3-1/macros/CCodeGeneration/GetSymbolDimension.bin and b/2.3-1/macros/CCodeGeneration/GetSymbolDimension.bin differ diff --git a/2.3-1/macros/CCodeGeneration/GetWhileCondVariable.bin b/2.3-1/macros/CCodeGeneration/GetWhileCondVariable.bin index 011320bb..6815fb4b 100644 Binary files a/2.3-1/macros/CCodeGeneration/GetWhileCondVariable.bin and b/2.3-1/macros/CCodeGeneration/GetWhileCondVariable.bin differ diff --git a/2.3-1/macros/CCodeGeneration/JoinDeclarAndCcode.bin b/2.3-1/macros/CCodeGeneration/JoinDeclarAndCcode.bin index d8a8408b..66286eb7 100644 Binary files a/2.3-1/macros/CCodeGeneration/JoinDeclarAndCcode.bin and b/2.3-1/macros/CCodeGeneration/JoinDeclarAndCcode.bin differ diff --git a/2.3-1/macros/CCodeGeneration/Sci2AnnotationFile.bin b/2.3-1/macros/CCodeGeneration/Sci2AnnotationFile.bin index b447d0c8..95fe5611 100644 Binary files a/2.3-1/macros/CCodeGeneration/Sci2AnnotationFile.bin and b/2.3-1/macros/CCodeGeneration/Sci2AnnotationFile.bin differ diff --git a/2.3-1/macros/CCodeGeneration/lib b/2.3-1/macros/CCodeGeneration/lib index dda98e16..9007df7e 100644 Binary files a/2.3-1/macros/CCodeGeneration/lib and b/2.3-1/macros/CCodeGeneration/lib differ diff --git a/2.3-1/macros/CCodeGeneration/names b/2.3-1/macros/CCodeGeneration/names index e41125fa..efbb400a 100644 --- a/2.3-1/macros/CCodeGeneration/names +++ b/2.3-1/macros/CCodeGeneration/names @@ -1,23 +1,23 @@ -C_IfElseBlocks -Sci2AnnotationFile -C_GenerateSCI2CHeader -C_SCI2CHeader +C_FinalizeCode +C_ForExpression +C_Funcall C_GenDeclarations +C_GenerateFunName +C_GenerateLaunchScript +C_GenerateMakefile +C_GenerateMakefile_msvc +C_GenerateSCI2CHeader +C_IfElseBlocks +C_IfExpression +C_IndentBlanks +C_InitHeader C_MemAllocOutTempVars +C_SCI2CHeader +C_Type C_WhileExpression -C_InitHeader GenCFunDatFiles -C_IfExpression -C_Type +GetClsFileName GetSymbolDimension -C_Funcall -C_FinalizeCode -JoinDeclarAndCcode GetWhileCondVariable -C_GenerateMakefile_msvc -C_GenerateLaunchScript -C_ForExpression -C_GenerateFunName -C_GenerateMakefile -GetClsFileName -C_IndentBlanks +JoinDeclarAndCcode +Sci2AnnotationFile diff --git a/2.3-1/macros/ErrorMessages/lib b/2.3-1/macros/ErrorMessages/lib index e61aba59..2b3ee2f3 100644 Binary files a/2.3-1/macros/ErrorMessages/lib and b/2.3-1/macros/ErrorMessages/lib differ diff --git a/2.3-1/macros/ErrorMessages/names b/2.3-1/macros/ErrorMessages/names index b327192a..f55e8f8b 100644 --- a/2.3-1/macros/ErrorMessages/names +++ b/2.3-1/macros/ErrorMessages/names @@ -1,3 +1,3 @@ EM_NanSize -EM_ZeroSize EM_UnknownStep +EM_ZeroSize diff --git a/2.3-1/macros/FunctionAnnotation/FA_GetFunAnn.bin b/2.3-1/macros/FunctionAnnotation/FA_GetFunAnn.bin index 7bb2f2bd..d3ca8c04 100644 Binary files a/2.3-1/macros/FunctionAnnotation/FA_GetFunAnn.bin and b/2.3-1/macros/FunctionAnnotation/FA_GetFunAnn.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_GetOutArgInfo.bin b/2.3-1/macros/FunctionAnnotation/FA_GetOutArgInfo.bin index 177df55a..1deaff60 100644 Binary files a/2.3-1/macros/FunctionAnnotation/FA_GetOutArgInfo.bin and b/2.3-1/macros/FunctionAnnotation/FA_GetOutArgInfo.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_GetResizeApproach.bin b/2.3-1/macros/FunctionAnnotation/FA_GetResizeApproach.bin index 6ebef2c9..77397e01 100644 Binary files a/2.3-1/macros/FunctionAnnotation/FA_GetResizeApproach.bin and b/2.3-1/macros/FunctionAnnotation/FA_GetResizeApproach.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_MAX.bin b/2.3-1/macros/FunctionAnnotation/FA_MAX.bin index b69cd8fc..a9debbab 100644 Binary files a/2.3-1/macros/FunctionAnnotation/FA_MAX.bin and b/2.3-1/macros/FunctionAnnotation/FA_MAX.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_MIN.bin b/2.3-1/macros/FunctionAnnotation/FA_MIN.bin index 6010c4bf..cc9bd02e 100644 Binary files a/2.3-1/macros/FunctionAnnotation/FA_MIN.bin and b/2.3-1/macros/FunctionAnnotation/FA_MIN.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPPLUS.bin b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPPLUS.bin index a0fa5424..da84349d 100644 Binary files a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPPLUS.bin and b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPPLUS.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPPLUS.sci b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPPLUS.sci index 4ad282ff..f439e23e 100644 --- a/2.3-1/macros/FunctionAnnotation/FA_SZ_OPPLUS.sci +++ b/2.3-1/macros/FunctionAnnotation/FA_SZ_OPPLUS.sci @@ -53,110 +53,41 @@ SCI2CNInArgCheck(argn(2),4,4); // --- Generate Output. --- // ------------------------ // --- Get dimensions of input arguments. --- -disp(in1type,'in1type before casting : '); -disp(type(in1type),'in1type before casting using type function : '); -disp(in2type,'in2type before casting : '); -disp(type(in2type),'in2type is before casting using type function : '); -disp(in1size,'in1size before casting : '); -disp(size(in1size),'in1size before casting using size funcion : '); -disp(in2size,'in2size before casting : ') -disp(size(in2size),'in2size before casting using size function : '); in1size = string(in1size); in2size = string(in2size); in1type = string(in1type); in2type = string(in2type); -disp(in1type,'in1type After casting : '); -disp(type(in1type),'in1type After casting using type function : '); -disp(in2type,'in2type After casting : '); -disp(type(in2type),'in2type After casting using type function : '); -disp(in1size,'in1size After casting : '); -disp(size(in1size),'in1size After casting using size funcion : '); -disp(in2size,'in2size After casting : ') -disp(size(in2size),'in2size After casting using size function : '); in1dim = GetSymbolDimension(in1size); -in2dim = GetSymbolDimension(in2size); -disp(in1dim,'in1dimension is : '); -disp(in2dim,'in2dimension is : '); + if ((in1type ~= 'g') & (in2type ~= 'g')) - disp("Inside 1st if condition"); opoutsize = FA_SZ_OPPLUSA(in1size,in2size); - disp(opoutsize,'Opoutsize in 1st if condition is : '); -disp("Going to 1st elseif statement"); elseif ((in1type == 'g') & (in2type == 'g')) - disp("Inside to elseif statement"); opoutsize(1) = '1'; - disp(opoutsize(1),"oputsize(1) is : ") if (isnum(in1size(1)) & isnum(in2size(1))) - disp("Inside 2nd if condition"); in1num = eval(in1size(1)); - disp(in1num,"in1num is in 2nd if : "); in2num = eval(in2size(1)); - disp(in2num,"in2num is in 2nd if : "); - if (in1num > 1 & in2num > 1) - disp("Inside 3rd if condition"); + if (in1num > 1 | in2num > 1) error(9999, 'String catenation can be performed only on strings of 1 x N size not N x 1 size'); //NUT: mi pare che non possano proprio esistere stringe di dimensione Nx1 perche' in //NUT: scilab esiste il tipo string che e' di size 1x1 e sono io a trasformarlo in //NUT: 1xN per cui se uso sempre questa convenzione non sbaglio mai. //NUT: ho provato in scilab a fare la trasposta di una stringa e ottengo sempre 1x1. - disp("End of 3rd if condition"); end - disp("End of 2nd if condition"); end if (isnum(in1size(2)) & isnum(in2size(2))) - disp("Inside 4th if condition"); in1num = eval(in1size(2)); - disp(in1num,"in1num is in 4th if : "); in2num = eval(in2size(2)); - disp(in2num,"in2num is in 4th if : "); opoutsize(2) = string(in1num+in2num-1); - disp(opoutsize(2),"Final Oputsize(2) without casting to String : "); if isnan(opoutsize(2)) - disp("Inside 5th if condition"); opoutsize(2) = '__SCI2CNANSIZE'; - disp(opoutsize(2),"Opoutsize(2) is when it is not a Number : "); else opoutsize(2) = string(opoutsize(2)); - disp(opoutsize(2),"Opoutsize(2) is casting to String : "); end - disp("Outside of 5th if condition"); else opoutsize(2) = '('+string(in1size(2))+'+'+string(in2size(2))+'-1)'; - disp(opoutsize(2),"Final Opoutsize(2) casting to String : ") - end - disp("Outside 4th if condition"); -disp("Going to Inside 2nd elseif condition"); - -elseif (in2type == 'g') - disp("Inside 4th elseif condition"); - if (isnum(in2size(2))) - disp(in2size(2),"in2size(2) is inside 1st if of 4th elseif : "); - if(in2size(2) == 3) - in1num = eval(in1size(2)); - opoutsize(2) = string(in1num); - #opoutsize = string(in1num); - disp(opoutsize,"opoutsize inside 1st If condition of 4th elseif : "); - else - in2num = eval(in1size(1)); - opoutsize(1) = string(in2num); - #opoutsize = in2num; - disp(opoutsize,"opoutsize inside 1st Else condition of 4th elseif : "); - end - disp("OutSide of 1st if condition of 4th elseif"); - - else - disp("Inside else condition of 4th else") - if(in2size(2) == 3) - opoutsize(2) = '('+string(in1size(2))+')'; - disp(opoutsize(2),"Final Opoutsize(2) is not a number : ") - else - opoutsize(1) = '('+string(in1size(1))+')'; - disp(opoutsize(1),"Final Opoutsize(1) is not a number : ") - end end else error(9999, 'Unexpected type combination for ""+"" operator (type1,type2): ('+in1type+in2type+').'); end endfunction - diff --git a/2.3-1/macros/FunctionAnnotation/FA_TP_INT16.bin b/2.3-1/macros/FunctionAnnotation/FA_TP_INT16.bin index 2ffc10e5..2ebb7346 100644 Binary files a/2.3-1/macros/FunctionAnnotation/FA_TP_INT16.bin and b/2.3-1/macros/FunctionAnnotation/FA_TP_INT16.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_TP_INT8.bin b/2.3-1/macros/FunctionAnnotation/FA_TP_INT8.bin index 3455174f..3f5055fb 100644 Binary files a/2.3-1/macros/FunctionAnnotation/FA_TP_INT8.bin and b/2.3-1/macros/FunctionAnnotation/FA_TP_INT8.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_TP_MAX.bin b/2.3-1/macros/FunctionAnnotation/FA_TP_MAX.bin index fabb6d28..099ea1ba 100644 Binary files a/2.3-1/macros/FunctionAnnotation/FA_TP_MAX.bin and b/2.3-1/macros/FunctionAnnotation/FA_TP_MAX.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_TP_MIN_REAL.bin b/2.3-1/macros/FunctionAnnotation/FA_TP_MIN_REAL.bin index fa2d4c3d..60293a1d 100644 Binary files a/2.3-1/macros/FunctionAnnotation/FA_TP_MIN_REAL.bin and b/2.3-1/macros/FunctionAnnotation/FA_TP_MIN_REAL.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_TP_REAL.bin b/2.3-1/macros/FunctionAnnotation/FA_TP_REAL.bin index 14f31012..7e54122a 100644 Binary files a/2.3-1/macros/FunctionAnnotation/FA_TP_REAL.bin and b/2.3-1/macros/FunctionAnnotation/FA_TP_REAL.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_TP_UINT16.bin b/2.3-1/macros/FunctionAnnotation/FA_TP_UINT16.bin index 5c0ec30c..687024f6 100644 Binary files a/2.3-1/macros/FunctionAnnotation/FA_TP_UINT16.bin and b/2.3-1/macros/FunctionAnnotation/FA_TP_UINT16.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/FA_TP_UINT8.bin b/2.3-1/macros/FunctionAnnotation/FA_TP_UINT8.bin index 69661391..02e74047 100644 Binary files a/2.3-1/macros/FunctionAnnotation/FA_TP_UINT8.bin and b/2.3-1/macros/FunctionAnnotation/FA_TP_UINT8.bin differ diff --git a/2.3-1/macros/FunctionAnnotation/lib b/2.3-1/macros/FunctionAnnotation/lib index 50f6251b..c2025c87 100644 Binary files a/2.3-1/macros/FunctionAnnotation/lib and b/2.3-1/macros/FunctionAnnotation/lib differ diff --git a/2.3-1/macros/FunctionList/FL_ExistCFunction.bin b/2.3-1/macros/FunctionList/FL_ExistCFunction.bin index 1182a7f2..1c85aa21 100644 Binary files a/2.3-1/macros/FunctionList/FL_ExistCFunction.bin and b/2.3-1/macros/FunctionList/FL_ExistCFunction.bin differ diff --git a/2.3-1/macros/FunctionList/FL_GetFunctionClass.bin b/2.3-1/macros/FunctionList/FL_GetFunctionClass.bin index 5ad5b2f9..faa210e6 100644 Binary files a/2.3-1/macros/FunctionList/FL_GetFunctionClass.bin and b/2.3-1/macros/FunctionList/FL_GetFunctionClass.bin differ diff --git a/2.3-1/macros/FunctionList/FL_UpdateConverted.bin b/2.3-1/macros/FunctionList/FL_UpdateConverted.bin index 9bb513b2..73f2cf02 100644 Binary files a/2.3-1/macros/FunctionList/FL_UpdateConverted.bin and b/2.3-1/macros/FunctionList/FL_UpdateConverted.bin differ diff --git a/2.3-1/macros/FunctionList/FL_UpdateToBeConv.bin b/2.3-1/macros/FunctionList/FL_UpdateToBeConv.bin index 99a4a715..44b5803f 100644 Binary files a/2.3-1/macros/FunctionList/FL_UpdateToBeConv.bin and b/2.3-1/macros/FunctionList/FL_UpdateToBeConv.bin differ diff --git a/2.3-1/macros/FunctionList/lib b/2.3-1/macros/FunctionList/lib index 9e2efca5..32c92be8 100644 Binary files a/2.3-1/macros/FunctionList/lib and b/2.3-1/macros/FunctionList/lib differ diff --git a/2.3-1/macros/FunctionList/names b/2.3-1/macros/FunctionList/names index 60e9c04c..c40e30ca 100644 --- a/2.3-1/macros/FunctionList/names +++ b/2.3-1/macros/FunctionList/names @@ -1,6 +1,6 @@ FL_ExistCFunction -FL_UpdateConverted FL_ExtractFuncList -FL_InOutArgs2CFunNames FL_GetFunctionClass +FL_InOutArgs2CFunNames +FL_UpdateConverted FL_UpdateToBeConv diff --git a/2.3-1/macros/GeneralFunctions/File2StringArray.bin b/2.3-1/macros/GeneralFunctions/File2StringArray.bin index 861d3240..1b050f4e 100644 Binary files a/2.3-1/macros/GeneralFunctions/File2StringArray.bin and b/2.3-1/macros/GeneralFunctions/File2StringArray.bin differ diff --git a/2.3-1/macros/GeneralFunctions/FunName2SciFileName.bin b/2.3-1/macros/GeneralFunctions/FunName2SciFileName.bin index 9e4a57c4..c3cb5387 100644 Binary files a/2.3-1/macros/GeneralFunctions/FunName2SciFileName.bin and b/2.3-1/macros/GeneralFunctions/FunName2SciFileName.bin differ diff --git a/2.3-1/macros/GeneralFunctions/IsNanSize.bin b/2.3-1/macros/GeneralFunctions/IsNanSize.bin index 1f8a65e9..71735125 100644 Binary files a/2.3-1/macros/GeneralFunctions/IsNanSize.bin and b/2.3-1/macros/GeneralFunctions/IsNanSize.bin differ diff --git a/2.3-1/macros/GeneralFunctions/KeyStr2FileStrPos.bin b/2.3-1/macros/GeneralFunctions/KeyStr2FileStrPos.bin index c5f54565..5c6cfaff 100644 Binary files a/2.3-1/macros/GeneralFunctions/KeyStr2FileStrPos.bin and b/2.3-1/macros/GeneralFunctions/KeyStr2FileStrPos.bin differ diff --git a/2.3-1/macros/GeneralFunctions/PrintStepInfo.bin b/2.3-1/macros/GeneralFunctions/PrintStepInfo.bin index 23879188..98208f8f 100644 Binary files a/2.3-1/macros/GeneralFunctions/PrintStepInfo.bin and b/2.3-1/macros/GeneralFunctions/PrintStepInfo.bin differ diff --git a/2.3-1/macros/GeneralFunctions/PrintStringInfo.bin b/2.3-1/macros/GeneralFunctions/PrintStringInfo.bin index 0e301c4f..c936b207 100644 Binary files a/2.3-1/macros/GeneralFunctions/PrintStringInfo.bin and b/2.3-1/macros/GeneralFunctions/PrintStringInfo.bin differ diff --git a/2.3-1/macros/GeneralFunctions/ReadStringCard.bin b/2.3-1/macros/GeneralFunctions/ReadStringCard.bin index b53000a2..f9b28283 100644 Binary files a/2.3-1/macros/GeneralFunctions/ReadStringCard.bin and b/2.3-1/macros/GeneralFunctions/ReadStringCard.bin differ diff --git a/2.3-1/macros/GeneralFunctions/SCI2CCreateDir.bin b/2.3-1/macros/GeneralFunctions/SCI2CCreateDir.bin index 881cd549..007b6fb8 100644 Binary files a/2.3-1/macros/GeneralFunctions/SCI2CCreateDir.bin and b/2.3-1/macros/GeneralFunctions/SCI2CCreateDir.bin differ diff --git a/2.3-1/macros/GeneralFunctions/SCI2CFindFile.bin b/2.3-1/macros/GeneralFunctions/SCI2CFindFile.bin index 86048da6..fe8e783d 100644 Binary files a/2.3-1/macros/GeneralFunctions/SCI2CFindFile.bin and b/2.3-1/macros/GeneralFunctions/SCI2CFindFile.bin differ diff --git a/2.3-1/macros/GeneralFunctions/SCI2CNInArgCheck.bin b/2.3-1/macros/GeneralFunctions/SCI2CNInArgCheck.bin index 1a868415..8d96b6e9 100644 Binary files a/2.3-1/macros/GeneralFunctions/SCI2CNInArgCheck.bin and b/2.3-1/macros/GeneralFunctions/SCI2CNInArgCheck.bin differ diff --git a/2.3-1/macros/GeneralFunctions/SCI2COpenFileRead.bin b/2.3-1/macros/GeneralFunctions/SCI2COpenFileRead.bin index c4cefcc1..7d5f101b 100644 Binary files a/2.3-1/macros/GeneralFunctions/SCI2COpenFileRead.bin and b/2.3-1/macros/GeneralFunctions/SCI2COpenFileRead.bin differ diff --git a/2.3-1/macros/GeneralFunctions/SCI2COpenFileWrite.bin b/2.3-1/macros/GeneralFunctions/SCI2COpenFileWrite.bin index 01744935..0287b3aa 100644 Binary files a/2.3-1/macros/GeneralFunctions/SCI2COpenFileWrite.bin and b/2.3-1/macros/GeneralFunctions/SCI2COpenFileWrite.bin differ diff --git a/2.3-1/macros/GeneralFunctions/SCI2Ccopyfile.bin b/2.3-1/macros/GeneralFunctions/SCI2Ccopyfile.bin index 2252cf58..e6d0a866 100644 Binary files a/2.3-1/macros/GeneralFunctions/SCI2Ccopyfile.bin and b/2.3-1/macros/GeneralFunctions/SCI2Ccopyfile.bin differ diff --git a/2.3-1/macros/GeneralFunctions/SCI2Cmdelete.bin b/2.3-1/macros/GeneralFunctions/SCI2Cmdelete.bin index e226bafb..67694b7f 100644 Binary files a/2.3-1/macros/GeneralFunctions/SCI2Cmdelete.bin and b/2.3-1/macros/GeneralFunctions/SCI2Cmdelete.bin differ diff --git a/2.3-1/macros/GeneralFunctions/filenamefprintf.bin b/2.3-1/macros/GeneralFunctions/filenamefprintf.bin index 253ea283..864a494d 100644 Binary files a/2.3-1/macros/GeneralFunctions/filenamefprintf.bin and b/2.3-1/macros/GeneralFunctions/filenamefprintf.bin differ diff --git a/2.3-1/macros/GeneralFunctions/lib b/2.3-1/macros/GeneralFunctions/lib index fe5c5d2f..a3af87e6 100644 Binary files a/2.3-1/macros/GeneralFunctions/lib and b/2.3-1/macros/GeneralFunctions/lib differ diff --git a/2.3-1/macros/GeneralFunctions/names b/2.3-1/macros/GeneralFunctions/names index 3f5c6265..eb8300a1 100644 --- a/2.3-1/macros/GeneralFunctions/names +++ b/2.3-1/macros/GeneralFunctions/names @@ -1,28 +1,28 @@ -SCI2Cstrncmp +Array2String ConvertPathMat2C -dispina -SCI2Cresize +File2StringArray +FunName2SciFileName +IsNanSize KeyStr2FileStrPos -SCI2COpenFileWrite -SCI2COpenFileRead -SCI2Cflipud -Array2String -SCI2Ccopyfile -SCI2Cstrncmps1size -SCI2Cfileexist PrintStepInfo +PrintStringInfo +ReadStringCard SCI2CCreateDir -SCI2CTemplate -squeezestrings -File2StringArray +SCI2CFindFile SCI2CNInArgCheck +SCI2COpenFileRead +SCI2COpenFileWrite +SCI2CTemplate +SCI2Ccopyfile +SCI2Cfileexist +SCI2Cflipud +SCI2Cmdelete +SCI2Cresize SCI2Cstring +SCI2Cstrncmp +SCI2Cstrncmps1size SizeInByte -IsNanSize -FunName2SciFileName -SCI2Cmdelete -float -ReadStringCard -PrintStringInfo +dispina filenamefprintf -SCI2CFindFile +float +squeezestrings diff --git a/2.3-1/macros/Hardware/AVR/AVRADCSetup.bin b/2.3-1/macros/Hardware/AVR/AVRADCSetup.bin new file mode 100644 index 00000000..6cf45dc9 Binary files /dev/null and b/2.3-1/macros/Hardware/AVR/AVRADCSetup.bin differ diff --git a/2.3-1/macros/Hardware/AVR/AVRDigitalIn.bin b/2.3-1/macros/Hardware/AVR/AVRDigitalIn.bin new file mode 100644 index 00000000..7ff2c98d Binary files /dev/null and b/2.3-1/macros/Hardware/AVR/AVRDigitalIn.bin differ diff --git a/2.3-1/macros/Hardware/AVR/AVRDigitalIn.sci b/2.3-1/macros/Hardware/AVR/AVRDigitalIn.sci new file mode 100644 index 00000000..ef57564c --- /dev/null +++ b/2.3-1/macros/Hardware/AVR/AVRDigitalIn.sci @@ -0,0 +1,32 @@ +function state = AVRDigitalIn(port,pin) +// Function to get state (high\low) of a digital input pin on AVR +// +// Calling Sequence +// state=AVRDigitalIn(port,pin) +// +// Parameters +// port : port of microcontroller to be used +// pin : pin of port (mentioned above) to be used +// Returns +// state : state of an input pin (HIGH\LOW) +// +// Description +// Each AVR microcontroller has pins which can be configured as digital +// inputs. These are normally divided among some 'ports' (group of pins). +// User has to select one of these port and which pin of that port as +// digital input. +// +// Examples +// pinA0 = AVRDigitalIn(1,0) //To read state on pin 0 of port A +// +// See also +// AVRDigitalOut AVRDigitalSetup +// +// +// Authors +// Siddhesh Wani +// + +// This is curretly dummy function. It provides no functionality but is required +// for providing support for generating C code for AVR. +endfunction diff --git a/2.3-1/macros/Hardware/AVR/AVRReadADC.bin b/2.3-1/macros/Hardware/AVR/AVRReadADC.bin new file mode 100644 index 00000000..c1067084 Binary files /dev/null and b/2.3-1/macros/Hardware/AVR/AVRReadADC.bin differ diff --git a/2.3-1/macros/Hardware/AVR/lib b/2.3-1/macros/Hardware/AVR/lib index 097a89f0..d08afbd3 100644 Binary files a/2.3-1/macros/Hardware/AVR/lib and b/2.3-1/macros/Hardware/AVR/lib differ diff --git a/2.3-1/macros/Hardware/AVR/names b/2.3-1/macros/Hardware/AVR/names index 4b941e9b..6e5b61bd 100644 --- a/2.3-1/macros/Hardware/AVR/names +++ b/2.3-1/macros/Hardware/AVR/names @@ -1,5 +1,8 @@ +AVRADCSetup +AVRDigitalIn AVRDigitalOut AVRDigitalSetup +AVRReadADC GetAVRSupportFunctions GetPeripheral InsertPeripheralInList diff --git a/2.3-1/macros/SymbolTable/ST_AnalyzeScope.bin b/2.3-1/macros/SymbolTable/ST_AnalyzeScope.bin index db6f03fd..950f704a 100644 Binary files a/2.3-1/macros/SymbolTable/ST_AnalyzeScope.bin and b/2.3-1/macros/SymbolTable/ST_AnalyzeScope.bin differ diff --git a/2.3-1/macros/SymbolTable/ST_Del.bin b/2.3-1/macros/SymbolTable/ST_Del.bin index 97af45ee..c26e2e58 100644 Binary files a/2.3-1/macros/SymbolTable/ST_Del.bin and b/2.3-1/macros/SymbolTable/ST_Del.bin differ diff --git a/2.3-1/macros/SymbolTable/ST_FindPos.bin b/2.3-1/macros/SymbolTable/ST_FindPos.bin index bdfd1b2d..c7003f30 100644 Binary files a/2.3-1/macros/SymbolTable/ST_FindPos.bin and b/2.3-1/macros/SymbolTable/ST_FindPos.bin differ diff --git a/2.3-1/macros/SymbolTable/ST_Get.bin b/2.3-1/macros/SymbolTable/ST_Get.bin index b746dbf5..512e72b7 100644 Binary files a/2.3-1/macros/SymbolTable/ST_Get.bin and b/2.3-1/macros/SymbolTable/ST_Get.bin differ diff --git a/2.3-1/macros/SymbolTable/ST_GetInArgInfo.bin b/2.3-1/macros/SymbolTable/ST_GetInArgInfo.bin index 725a7882..46c21548 100644 Binary files a/2.3-1/macros/SymbolTable/ST_GetInArgInfo.bin and b/2.3-1/macros/SymbolTable/ST_GetInArgInfo.bin differ diff --git a/2.3-1/macros/SymbolTable/ST_GetSymbolInfo.bin b/2.3-1/macros/SymbolTable/ST_GetSymbolInfo.bin index 66cf57ae..b8a7cf74 100644 Binary files a/2.3-1/macros/SymbolTable/ST_GetSymbolInfo.bin and b/2.3-1/macros/SymbolTable/ST_GetSymbolInfo.bin differ diff --git a/2.3-1/macros/SymbolTable/ST_InsForCntVars.bin b/2.3-1/macros/SymbolTable/ST_InsForCntVars.bin index 0404b5a8..12882fc7 100644 Binary files a/2.3-1/macros/SymbolTable/ST_InsForCntVars.bin and b/2.3-1/macros/SymbolTable/ST_InsForCntVars.bin differ diff --git a/2.3-1/macros/SymbolTable/ST_InsOutArg.bin b/2.3-1/macros/SymbolTable/ST_InsOutArg.bin index a4c9be95..94bcd3af 100644 Binary files a/2.3-1/macros/SymbolTable/ST_InsOutArg.bin and b/2.3-1/macros/SymbolTable/ST_InsOutArg.bin differ diff --git a/2.3-1/macros/SymbolTable/ST_Load.bin b/2.3-1/macros/SymbolTable/ST_Load.bin index 4d9be560..f158c2b6 100644 Binary files a/2.3-1/macros/SymbolTable/ST_Load.bin and b/2.3-1/macros/SymbolTable/ST_Load.bin differ diff --git a/2.3-1/macros/SymbolTable/ST_MatchSymbol.bin b/2.3-1/macros/SymbolTable/ST_MatchSymbol.bin index 08d65715..bf3fb985 100644 Binary files a/2.3-1/macros/SymbolTable/ST_MatchSymbol.bin and b/2.3-1/macros/SymbolTable/ST_MatchSymbol.bin differ diff --git a/2.3-1/macros/SymbolTable/ST_Save.bin b/2.3-1/macros/SymbolTable/ST_Save.bin index a0e1b0c4..4aa50a20 100644 Binary files a/2.3-1/macros/SymbolTable/ST_Save.bin and b/2.3-1/macros/SymbolTable/ST_Save.bin differ diff --git a/2.3-1/macros/SymbolTable/ST_Set.bin b/2.3-1/macros/SymbolTable/ST_Set.bin index 3efdc244..cbd26274 100644 Binary files a/2.3-1/macros/SymbolTable/ST_Set.bin and b/2.3-1/macros/SymbolTable/ST_Set.bin differ diff --git a/2.3-1/macros/SymbolTable/lib b/2.3-1/macros/SymbolTable/lib index 3b181b83..7ff755ef 100644 Binary files a/2.3-1/macros/SymbolTable/lib and b/2.3-1/macros/SymbolTable/lib differ diff --git a/2.3-1/macros/SymbolTable/names b/2.3-1/macros/SymbolTable/names index 0fdad1c3..b5a7d65f 100644 --- a/2.3-1/macros/SymbolTable/names +++ b/2.3-1/macros/SymbolTable/names @@ -1,12 +1,12 @@ -ST_FindPos ST_AnalyzeScope -ST_GetInArgInfo ST_Del -ST_GetSymbolInfo -ST_MatchSymbol +ST_FindPos ST_Get -ST_Load -ST_InsOutArg -ST_Set +ST_GetInArgInfo +ST_GetSymbolInfo ST_InsForCntVars +ST_InsOutArg +ST_Load +ST_MatchSymbol ST_Save +ST_Set diff --git a/2.3-1/macros/ToolInitialization/INIT_CreateDirs.bin b/2.3-1/macros/ToolInitialization/INIT_CreateDirs.bin index 2d6fb62f..16ebab82 100644 Binary files a/2.3-1/macros/ToolInitialization/INIT_CreateDirs.bin and b/2.3-1/macros/ToolInitialization/INIT_CreateDirs.bin differ diff --git a/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.bin b/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.bin index a85721c0..b2642d44 100644 Binary files a/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.bin and b/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.bin differ diff --git a/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci b/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci index 067a332c..6d829ceb 100644 --- a/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci +++ b/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci @@ -993,13 +993,9 @@ PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y'); PrintStringInfo('NIN= 2',ClassFileName,'file','y'); PrintStringInfo('NOUT= 1 ',ClassFileName,'file','y'); -disp("Going to FA_TP_MAX"); PrintStringInfo('OUT(1).TP= FA_TP_MAX(IN(1).TP,IN(2).TP)',ClassFileName,'file','y'); -disp("Going to FA_SZ_1"); PrintStringInfo('OUT(1).SZ(1)= FA_SZ_1(FA_SZ_OPPLUS(IN(1).SZ,IN(2).SZ,IN(1).TP,IN(2).TP))',ClassFileName,'file','y'); -disp("Going to FA_SZ_2"); PrintStringInfo('OUT(1).SZ(2)= FA_SZ_2(FA_SZ_OPPLUS(IN(1).SZ,IN(2).SZ,IN(1).TP,IN(2).TP))',ClassFileName,'file','y'); -disp("Outside of FA_SZ_2"); //PrintStringInfo('NIN= 2',ClassFileName,'file','y'); @@ -4036,6 +4032,56 @@ PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file', INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun); +//------------------------------------ +//---- Class AVRADCSetup ----------- +//------------------------------------ +ClassName = 'AVRADCSetup'; + +// --- 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= ''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+'u80',ClassFileName,'file','y'); + + +// --- Annotation Function And Function List Function. --- +FunctionName = 'AVRADCSetup'; +PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y'); +INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun); +INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun); + +//------------------------------------ +//---- Class AVRReadADC ----------- +//------------------------------------ +ClassName = 'AVRReadADC'; + +// --- 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= ''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('d0'+ArgSeparator+'u160',ClassFileName,'file','y'); + + +// --- Annotation Function And Function List Function. --- +FunctionName = 'AVRReadADC'; +PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y'); +INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun); +INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun); + // //////////////////////////////////////////// // /////PARTE INTRODOTTA DA ALBERTO MOREA diff --git a/2.3-1/macros/ToolInitialization/INIT_GenAnnFLFunctions.bin b/2.3-1/macros/ToolInitialization/INIT_GenAnnFLFunctions.bin index 62ea01a9..f7d2aa59 100644 Binary files a/2.3-1/macros/ToolInitialization/INIT_GenAnnFLFunctions.bin and b/2.3-1/macros/ToolInitialization/INIT_GenAnnFLFunctions.bin differ diff --git a/2.3-1/macros/ToolInitialization/INIT_GenFileInfo.bin b/2.3-1/macros/ToolInitialization/INIT_GenFileInfo.bin index ab778fa3..8f114a72 100644 Binary files a/2.3-1/macros/ToolInitialization/INIT_GenFileInfo.bin and b/2.3-1/macros/ToolInitialization/INIT_GenFileInfo.bin differ diff --git a/2.3-1/macros/ToolInitialization/INIT_GenLibraries.bin b/2.3-1/macros/ToolInitialization/INIT_GenLibraries.bin index 5752c049..bc3bc873 100644 Binary files a/2.3-1/macros/ToolInitialization/INIT_GenLibraries.bin and b/2.3-1/macros/ToolInitialization/INIT_GenLibraries.bin differ diff --git a/2.3-1/macros/ToolInitialization/INIT_GenSharedInfo.bin b/2.3-1/macros/ToolInitialization/INIT_GenSharedInfo.bin index 577d0d6e..4a82f12a 100644 Binary files a/2.3-1/macros/ToolInitialization/INIT_GenSharedInfo.bin and b/2.3-1/macros/ToolInitialization/INIT_GenSharedInfo.bin differ diff --git a/2.3-1/macros/ToolInitialization/INIT_LoadLibraries.bin b/2.3-1/macros/ToolInitialization/INIT_LoadLibraries.bin index 3e87dfb4..4cf02836 100644 Binary files a/2.3-1/macros/ToolInitialization/INIT_LoadLibraries.bin and b/2.3-1/macros/ToolInitialization/INIT_LoadLibraries.bin differ diff --git a/2.3-1/macros/ToolInitialization/INIT_RemoveDirs.bin b/2.3-1/macros/ToolInitialization/INIT_RemoveDirs.bin index 84268c31..5b11b8dd 100644 Binary files a/2.3-1/macros/ToolInitialization/INIT_RemoveDirs.bin and b/2.3-1/macros/ToolInitialization/INIT_RemoveDirs.bin differ diff --git a/2.3-1/macros/ToolInitialization/INIT_SCI2C.bin b/2.3-1/macros/ToolInitialization/INIT_SCI2C.bin index 615ca83f..72623b28 100644 Binary files a/2.3-1/macros/ToolInitialization/INIT_SCI2C.bin and b/2.3-1/macros/ToolInitialization/INIT_SCI2C.bin differ diff --git a/2.3-1/macros/ToolInitialization/INIT_SharedInfoEqual.bin b/2.3-1/macros/ToolInitialization/INIT_SharedInfoEqual.bin index 37ed1ac1..31238a31 100644 Binary files a/2.3-1/macros/ToolInitialization/INIT_SharedInfoEqual.bin and b/2.3-1/macros/ToolInitialization/INIT_SharedInfoEqual.bin differ diff --git a/2.3-1/macros/ToolInitialization/ManageNextConversion.bin b/2.3-1/macros/ToolInitialization/ManageNextConversion.bin index 2bddc808..a34ee4f6 100644 Binary files a/2.3-1/macros/ToolInitialization/ManageNextConversion.bin and b/2.3-1/macros/ToolInitialization/ManageNextConversion.bin differ diff --git a/2.3-1/macros/ToolInitialization/UpdateSCI2CInfo.bin b/2.3-1/macros/ToolInitialization/UpdateSCI2CInfo.bin index 8abfbaf8..16e99c9a 100644 Binary files a/2.3-1/macros/ToolInitialization/UpdateSCI2CInfo.bin and b/2.3-1/macros/ToolInitialization/UpdateSCI2CInfo.bin differ diff --git a/2.3-1/macros/ToolInitialization/lib b/2.3-1/macros/ToolInitialization/lib index 6d909b02..6240d3dd 100644 Binary files a/2.3-1/macros/ToolInitialization/lib and b/2.3-1/macros/ToolInitialization/lib differ diff --git a/2.3-1/macros/cb_sci2c_gui.bin b/2.3-1/macros/cb_sci2c_gui.bin index 00bf3684..3c70ac39 100644 Binary files a/2.3-1/macros/cb_sci2c_gui.bin and b/2.3-1/macros/cb_sci2c_gui.bin differ diff --git a/2.3-1/macros/cb_sci2c_gui.sci b/2.3-1/macros/cb_sci2c_gui.sci index 9d1770fb..b6fbd1ac 100644 --- a/2.3-1/macros/cb_sci2c_gui.sci +++ b/2.3-1/macros/cb_sci2c_gui.sci @@ -57,10 +57,11 @@ elseif or(get(gcbo, "tag")==["runradioall","runradiotranslate","runradiogenlib"] // --- Output format option --- -elseif or(get(gcbo, "tag")==["outformatradiostalone","outformatradioarduino"]) then +elseif or(get(gcbo, "tag")==["outformatradiostalone","outformatradioarduino","outformatradioavr"]) then set(findobj("tag", "outformatradiostalone"), "value", 0); set(findobj("tag", "outformatradioarduino"), "value", 0); + set(findobj("tag", "outformatradioavr"), "value", 0); set(gcbo, "value", 1); @@ -115,6 +116,8 @@ elseif get(gcbo, "tag")=="convertbtn" then OutFormat = "StandAlone"; elseif get(findobj("tag", "outformatradioarduino"), "value") == 1 then OutFormat = "Arduino"; + elseif get(findobj("tag", "outformatradioavr"), "value") == 1 then + OutFormat = "AVR"; end CopySciCodeIntoCCode = get(findobj("tag", "sciintocradioyes"), "value") == 1; diff --git a/2.3-1/macros/findDeps/findDeps.bin b/2.3-1/macros/findDeps/findDeps.bin index 92fb7556..fb11e006 100644 Binary files a/2.3-1/macros/findDeps/findDeps.bin and b/2.3-1/macros/findDeps/findDeps.bin differ diff --git a/2.3-1/macros/findDeps/getAllHeaders.bin b/2.3-1/macros/findDeps/getAllHeaders.bin index 9bedf9f5..4314c53a 100644 Binary files a/2.3-1/macros/findDeps/getAllHeaders.bin and b/2.3-1/macros/findDeps/getAllHeaders.bin differ diff --git a/2.3-1/macros/findDeps/getAllInterfaces.bin b/2.3-1/macros/findDeps/getAllInterfaces.bin index 3bde73d5..b49fdbf0 100644 Binary files a/2.3-1/macros/findDeps/getAllInterfaces.bin and b/2.3-1/macros/findDeps/getAllInterfaces.bin differ diff --git a/2.3-1/macros/findDeps/getAllSources.bin b/2.3-1/macros/findDeps/getAllSources.bin index 9cfa087d..49439778 100644 Binary files a/2.3-1/macros/findDeps/getAllSources.bin and b/2.3-1/macros/findDeps/getAllSources.bin differ diff --git a/2.3-1/macros/findDeps/getArduinoFiles.bin b/2.3-1/macros/findDeps/getArduinoFiles.bin index 7c698ba1..f8937bfe 100644 Binary files a/2.3-1/macros/findDeps/getArduinoFiles.bin and b/2.3-1/macros/findDeps/getArduinoFiles.bin differ diff --git a/2.3-1/macros/findDeps/lib b/2.3-1/macros/findDeps/lib index 7c151b2b..8d3728f0 100644 Binary files a/2.3-1/macros/findDeps/lib and b/2.3-1/macros/findDeps/lib differ diff --git a/2.3-1/macros/findDeps/names b/2.3-1/macros/findDeps/names index 88d610bf..dc32fef6 100644 --- a/2.3-1/macros/findDeps/names +++ b/2.3-1/macros/findDeps/names @@ -1,6 +1,6 @@ -getAllSources -getAllHeaders -getAllInterfaces Scilab2CDeps findDeps +getAllHeaders +getAllInterfaces +getAllSources getArduinoFiles diff --git a/2.3-1/macros/lib b/2.3-1/macros/lib index 8fbf4888..1b718c75 100644 Binary files a/2.3-1/macros/lib and b/2.3-1/macros/lib differ diff --git a/2.3-1/macros/runsci2c.bin b/2.3-1/macros/runsci2c.bin index 053c3311..afe6e7d6 100644 Binary files a/2.3-1/macros/runsci2c.bin and b/2.3-1/macros/runsci2c.bin differ diff --git a/2.3-1/macros/runsci2c.sci b/2.3-1/macros/runsci2c.sci index ac826a3a..91587031 100644 --- a/2.3-1/macros/runsci2c.sci +++ b/2.3-1/macros/runsci2c.sci @@ -105,7 +105,7 @@ mkdir(SCI2COutputPath+"/interfaces/"); PrintStepInfo('Copying sources', FileInfo.GeneralReport,'both'); for i = 1:size(allSources, "*") // DEBUG only - disp("Copying "+allSources(i)+" in "+SCI2COutputPath+"/src/c/"); + //disp("Copying "+allSources(i)+" in "+SCI2COutputPath+"/src/c/"); copyfile(allSources(i), SCI2COutputPath+"/src/c/"); end @@ -113,7 +113,7 @@ end PrintStepInfo('Copying headers', FileInfo.GeneralReport,'both'); for i = 1:size(allHeaders, "*") // DEBUG only - disp("Copying "+allHeaders(i)+" in "+SCI2COutputPath+"/includes/"); + //disp("Copying "+allHeaders(i)+" in "+SCI2COutputPath+"/includes/"); copyfile(allHeaders(i), SCI2COutputPath+"/includes/"); end @@ -121,7 +121,7 @@ end PrintStepInfo('Copying interfaces', FileInfo.GeneralReport,'both'); for i = 1:size(allInterfaces, "*") // DEBUG only - disp("Copying "+allInterfaces(i)+" in "+SCI2COutputPath+"/interfaces/"); + //disp("Copying "+allInterfaces(i)+" in "+SCI2COutputPath+"/interfaces/"); copyfile(allInterfaces(i), SCI2COutputPath+"/interfaces/"); end diff --git a/2.3-1/macros/sci2c_gui.bin b/2.3-1/macros/sci2c_gui.bin index 9bdf607c..2e72ec49 100644 Binary files a/2.3-1/macros/sci2c_gui.bin and b/2.3-1/macros/sci2c_gui.bin differ diff --git a/2.3-1/macros/sci2c_gui.sci b/2.3-1/macros/sci2c_gui.sci index 3abe497c..cb75b158 100644 --- a/2.3-1/macros/sci2c_gui.sci +++ b/2.3-1/macros/sci2c_gui.sci @@ -214,6 +214,20 @@ outformatradioarduino = uicontrol("parent", sci2cfig,... "callback", "cb_sci2c_gui",... "tag", "outformatradioarduino"); +outformatradioavr = uicontrol("parent", sci2cfig,... + "style", "radiobutton",... + "string", gettext("AVR"),... + "position",[2*margin+widgetLabelWidth+3*radiow outformaty radiow widgeth],... + "horizontalalignment", "left",... + "fontname", defaultfont,... + "fontunits", "points",... + "fontsize", 12,... + "min", 0, ... + "max", 1, ... + "value", 0,... + "callback", "cb_sci2c_gui",... + "tag", "outformatradioavr"); + // --- Run mode option --- runy = outformaty + margin + widgeth; runlabel = uicontrol("parent", sci2cfig,... diff --git a/2.3-1/macros/scilab2c.bin b/2.3-1/macros/scilab2c.bin index e9fb5faa..6defd940 100644 Binary files a/2.3-1/macros/scilab2c.bin and b/2.3-1/macros/scilab2c.bin differ diff --git a/2.3-1/macros/scilab2c.sci b/2.3-1/macros/scilab2c.sci index 64d5753f..3eab16ee 100644 --- a/2.3-1/macros/scilab2c.sci +++ b/2.3-1/macros/scilab2c.sci @@ -120,8 +120,8 @@ function scilab2c(varargin) error(msprintf(gettext("%s: argument #%d must be: ""make"" or ""nmake"".\n"),"scilab2c",5)); return end - if varargin(6) <> "StandAlone" & varargin(6) <> "Arduino" - error(msprintf(gettext("%s: argument #%d must be: ""StandAlone"" or ""Arduino"".\n"),"scilab2c",5)); + if varargin(6) <> "StandAlone" & varargin(6) <> "Arduino" & varargin(6) <> "AVR" + error(msprintf(gettext("%s: argument #%d must be: ""StandAlone"" or ""Arduino"" or ""AVR"".\n"),"scilab2c",5)); return end UserScilabMainFile = varargin(1); @@ -143,20 +143,24 @@ error(msprintf(gettext("%s: Wrong number of input argument(s): %d expected.\n"), // --- LAUNCH USER SCI CODE TO TEST IT BEFORE TRANSLATING IT!!! --- -// if OutFormat == "StandAlone" -// runscicode(UserScilabMainFile, UserSciFilesPaths); -// end -// --- ASK USER FOR CONTINUATION. --- +// If OutFormat choosen is 'Standalone' then only execute the code, otherwise directly start conversion. + if OutFormat == "StandAlone" + runscicode(UserScilabMainFile, UserSciFilesPaths); + + // --- ASK USER FOR CONTINUATION. --- // Do not open confirmation box if we are not in STD mode. - if(getscilabmode() == "STD") - userchoice = messagebox("Exection Succesfull. Start translation ?", "modal", "info", ["Yes" "No"]) + if(getscilabmode() == "STD") + userchoice = messagebox("Exection Succesfull. Start translation ?", "modal", "info", ["Yes" "No"]) + else + userchoice = 1 + end else - userchoice = 1 + userchoice = 1; end if (userchoice == 1) // --- LAUNCH SCI2C --- - runsci2c(UserScilabMainFile, UserSciFilesPaths, CCodeOutputDir, RunMode, BuildTool,'AVR'); + runsci2c(UserScilabMainFile, UserSciFilesPaths, CCodeOutputDir, RunMode, BuildTool,OutFormat); end endfunction diff --git a/2.3-1/src/c/hardware/avr/includes/AVRUtil.h b/2.3-1/src/c/hardware/avr/includes/AVRUtil.h new file mode 100644 index 00000000..2e6d9ae4 --- /dev/null +++ b/2.3-1/src/c/hardware/avr/includes/AVRUtil.h @@ -0,0 +1,25 @@ +//This file defines functions corresponding to delay functions +// +// Authors +// Siddhesh Wani +// +#ifndef __AVRUTIL_H__ +#define __AVRUTIL_H__ + +#include + + +#ifdef __cplusplus +extern "C" { +#endif + +#include "Types.h" +#include "avr/util.h" + +uint8 U16AVRSleeps (uint16 delay); + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#endif /* !__AVRUTIL_H__ */ diff --git a/2.3-1/src/c/hardware/avr/interfaces/int_AVRPeripheralADC.h b/2.3-1/src/c/hardware/avr/interfaces/int_AVRPeripheralADC.h index 073f8a0c..0aafb8c0 100644 --- a/2.3-1/src/c/hardware/avr/interfaces/int_AVRPeripheralADC.h +++ b/2.3-1/src/c/hardware/avr/interfaces/int_AVRPeripheralADC.h @@ -14,10 +14,10 @@ extern "C" { #endif -#define d0d0AVRDigitalSetupu80(in1,in2) u8AVRADCSetups((uint8) in1,\ +#define d0d0AVRADCSetupu80(in1,in2) u8AVRADCSetups((uint8) in1,\ (uint8) in2); -#define d0AVRDigitalOutu160(in1) u8AVRReadADC((uint8) in1); +#define d0AVRReadADCu160(in1) u8AVRReadADCs((uint8) in1); #ifdef __cplusplus } /* extern "C" */ diff --git a/2.3-1/src/c/hardware/avr/interfaces/int_AVRPeripheralGPIO.h b/2.3-1/src/c/hardware/avr/interfaces/int_AVRPeripheralGPIO.h index 88e4c635..a4f9b91d 100644 --- a/2.3-1/src/c/hardware/avr/interfaces/int_AVRPeripheralGPIO.h +++ b/2.3-1/src/c/hardware/avr/interfaces/int_AVRPeripheralGPIO.h @@ -17,7 +17,7 @@ extern "C" { #define d0d0d0AVRDigitalSetupu80(in1,in2,in3) u8AVRDigitalSetups((uint8) in1,\ (uint8) in2, (uint8) in3); -#define d0d0AVRDigitalOutu80(in1,in2) u8AVRDigitalIns((uint8) in1,\ +#define d0d0AVRDigitalInu80(in1,in2) u8AVRDigitalIns((uint8) in1,\ (uint8) in2); #define d0d0d0AVRDigitalOutu80(in1,in2,in3) u8AVRDigitalOuts((uint8) in1,\ diff --git a/2.3-1/src/c/hardware/avr/interfaces/int_AVRUtil.h b/2.3-1/src/c/hardware/avr/interfaces/int_AVRUtil.h new file mode 100644 index 00000000..ce96951b --- /dev/null +++ b/2.3-1/src/c/hardware/avr/interfaces/int_AVRUtil.h @@ -0,0 +1,23 @@ +//This file defines interfaces corresponding to uitl function. +// +// Authors +// Siddhesh Wani +// + +#ifndef __INT_AVRUTIL_H__ +#define __INT_AVRUTIL_H__ + +#include +#include "AVRUtil.h" + +#ifdef __cplusplus +extern "C" { +#endif + +#define d0sleepu80(in1) U16AVRSleeps ((uint16) in1); + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#endif /* !__AVRPERIPHERALGPIO_H__ */ diff --git a/2.3-1/src/c/hardware/avr/util/U16AVRSleeps.c b/2.3-1/src/c/hardware/avr/util/U16AVRSleeps.c new file mode 100644 index 00000000..f2144717 --- /dev/null +++ b/2.3-1/src/c/hardware/avr/util/U16AVRSleeps.c @@ -0,0 +1,14 @@ +//Function to introduce specific delay in milliseconds +// +//Authors +// Siddhesh Wani +// + +#include "AVRUtil.h" + +uint8 U16AVRSleeps (uint16 delay) +{ + _delay_ms(delay); + + retrun 0; +} -- cgit