diff options
| author | siddhu8990 | 2015-12-08 11:43:14 +0530 |
|---|---|---|
| committer | siddhu8990 | 2015-12-08 11:43:14 +0530 |
| commit | 56d929da6683ca38ab07870173dba5aadb451403 (patch) | |
| tree | 481583d1acbde742f975ea7b140f005d4ac08216 /macros | |
| parent | 28917732a0c500c5db111ed49dbd7755758f5f72 (diff) | |
| download | Scilab2C_fossee_old-56d929da6683ca38ab07870173dba5aadb451403.tar.gz Scilab2C_fossee_old-56d929da6683ca38ab07870173dba5aadb451403.tar.bz2 Scilab2C_fossee_old-56d929da6683ca38ab07870173dba5aadb451403.zip | |
Modified so that code for all three output formats can be generated
Diffstat (limited to 'macros')
131 files changed, 173 insertions, 140 deletions
diff --git a/macros/ASTManagement/AST2Ccode.bin b/macros/ASTManagement/AST2Ccode.bin Binary files differindex ba4249a..8a4fc96 100644 --- a/macros/ASTManagement/AST2Ccode.bin +++ b/macros/ASTManagement/AST2Ccode.bin diff --git a/macros/ASTManagement/AST_CheckCommonInOutArgs.bin b/macros/ASTManagement/AST_CheckCommonInOutArgs.bin Binary files differindex 1e0f617..5c190ba 100644 --- a/macros/ASTManagement/AST_CheckCommonInOutArgs.bin +++ b/macros/ASTManagement/AST_CheckCommonInOutArgs.bin diff --git a/macros/ASTManagement/AST_CheckLastFunc.bin b/macros/ASTManagement/AST_CheckLastFunc.bin Binary files differindex cbe8308..9cac227 100644 --- a/macros/ASTManagement/AST_CheckLastFunc.bin +++ b/macros/ASTManagement/AST_CheckLastFunc.bin diff --git a/macros/ASTManagement/AST_CheckPrecSpecifier.bin b/macros/ASTManagement/AST_CheckPrecSpecifier.bin Binary files differindex 44ecf54..8e50397 100644 --- a/macros/ASTManagement/AST_CheckPrecSpecifier.bin +++ b/macros/ASTManagement/AST_CheckPrecSpecifier.bin diff --git a/macros/ASTManagement/AST_DisplayStack.bin b/macros/ASTManagement/AST_DisplayStack.bin Binary files differindex 5dabb75..90cbcc7 100644 --- a/macros/ASTManagement/AST_DisplayStack.bin +++ b/macros/ASTManagement/AST_DisplayStack.bin diff --git a/macros/ASTManagement/AST_GetPrecAndLhsArg.bin b/macros/ASTManagement/AST_GetPrecAndLhsArg.bin Binary files differindex ba06562..d35ce90 100644 --- a/macros/ASTManagement/AST_GetPrecAndLhsArg.bin +++ b/macros/ASTManagement/AST_GetPrecAndLhsArg.bin diff --git a/macros/ASTManagement/AST_HandleEOL.bin b/macros/ASTManagement/AST_HandleEOL.bin Binary files differindex c6a5a45..6547b54 100644 --- a/macros/ASTManagement/AST_HandleEOL.bin +++ b/macros/ASTManagement/AST_HandleEOL.bin diff --git a/macros/ASTManagement/AST_HandleEndProgram.bin b/macros/ASTManagement/AST_HandleEndProgram.bin Binary files differindex 1be4e8d..5e02fdc 100644 --- a/macros/ASTManagement/AST_HandleEndProgram.bin +++ b/macros/ASTManagement/AST_HandleEndProgram.bin diff --git a/macros/ASTManagement/AST_HandleHeader.bin b/macros/ASTManagement/AST_HandleHeader.bin Binary files differindex d5e7b6b..b2ef857 100644 --- a/macros/ASTManagement/AST_HandleHeader.bin +++ b/macros/ASTManagement/AST_HandleHeader.bin diff --git a/macros/ASTManagement/AST_HandleWhileStatem.bin b/macros/ASTManagement/AST_HandleWhileStatem.bin Binary files differindex 441bafc..3e9942c 100644 --- a/macros/ASTManagement/AST_HandleWhileStatem.bin +++ b/macros/ASTManagement/AST_HandleWhileStatem.bin diff --git a/macros/ASTManagement/AST_ParseEqualStruct.bin b/macros/ASTManagement/AST_ParseEqualStruct.bin Binary files differindex 2000da8..459c62e 100644 --- a/macros/ASTManagement/AST_ParseEqualStruct.bin +++ b/macros/ASTManagement/AST_ParseEqualStruct.bin diff --git a/macros/ASTManagement/AST_ParseFuncallStruct.bin b/macros/ASTManagement/AST_ParseFuncallStruct.bin Binary files differindex b0fb22c..c9d996a 100644 --- a/macros/ASTManagement/AST_ParseFuncallStruct.bin +++ b/macros/ASTManagement/AST_ParseFuncallStruct.bin diff --git a/macros/ASTManagement/AST_ParseIfExprStruct.bin b/macros/ASTManagement/AST_ParseIfExprStruct.bin Binary files differindex fa6b82d..cbf6341 100644 --- a/macros/ASTManagement/AST_ParseIfExprStruct.bin +++ b/macros/ASTManagement/AST_ParseIfExprStruct.bin diff --git a/macros/ASTManagement/AST_ParseOperStruct.bin b/macros/ASTManagement/AST_ParseOperStruct.bin Binary files differindex d8d70dd..eea4c28 100644 --- a/macros/ASTManagement/AST_ParseOperStruct.bin +++ b/macros/ASTManagement/AST_ParseOperStruct.bin diff --git a/macros/ASTManagement/AST_PopASTStack.bin b/macros/ASTManagement/AST_PopASTStack.bin Binary files differindex 245f470..f9b85d3 100644 --- a/macros/ASTManagement/AST_PopASTStack.bin +++ b/macros/ASTManagement/AST_PopASTStack.bin diff --git a/macros/ASTManagement/AST_PushASTStack.bin b/macros/ASTManagement/AST_PushASTStack.bin Binary files differindex 98b5dc4..8fcd563 100644 --- a/macros/ASTManagement/AST_PushASTStack.bin +++ b/macros/ASTManagement/AST_PushASTStack.bin diff --git a/macros/ASTManagement/AST_ReadASTHeader.bin b/macros/ASTManagement/AST_ReadASTHeader.bin Binary files differindex e599aaf..614231c 100644 --- a/macros/ASTManagement/AST_ReadASTHeader.bin +++ b/macros/ASTManagement/AST_ReadASTHeader.bin diff --git a/macros/ASTManagement/AST_ReadEqualRhsNames.bin b/macros/ASTManagement/AST_ReadEqualRhsNames.bin Binary files differindex a7bbfa6..a131c49 100644 --- a/macros/ASTManagement/AST_ReadEqualRhsNames.bin +++ b/macros/ASTManagement/AST_ReadEqualRhsNames.bin diff --git a/macros/ASTManagement/GenOutArgNames.bin b/macros/ASTManagement/GenOutArgNames.bin Binary files differindex e2ff5ff..c0d1834 100644 --- a/macros/ASTManagement/GenOutArgNames.bin +++ b/macros/ASTManagement/GenOutArgNames.bin diff --git a/macros/ASTManagement/SciFile2ASTFile.bin b/macros/ASTManagement/SciFile2ASTFile.bin Binary files differindex 186252c..be8bc0d 100644 --- a/macros/ASTManagement/SciFile2ASTFile.bin +++ b/macros/ASTManagement/SciFile2ASTFile.bin diff --git a/macros/ASTManagement/lib b/macros/ASTManagement/lib Binary files differindex 4cd697c..36d91de 100644 --- a/macros/ASTManagement/lib +++ b/macros/ASTManagement/lib diff --git a/macros/ASTManagement/objectlist2string.bin b/macros/ASTManagement/objectlist2string.bin Binary files differindex 508d98f..96159f2 100644 --- a/macros/ASTManagement/objectlist2string.bin +++ b/macros/ASTManagement/objectlist2string.bin diff --git a/macros/CCodeGeneration/C_FinalizeCode.bin b/macros/CCodeGeneration/C_FinalizeCode.bin Binary files differindex f306cc1..5cc2148 100644 --- a/macros/CCodeGeneration/C_FinalizeCode.bin +++ b/macros/CCodeGeneration/C_FinalizeCode.bin diff --git a/macros/CCodeGeneration/C_ForExpression.bin b/macros/CCodeGeneration/C_ForExpression.bin Binary files differindex 8441f44..1c3f674 100644 --- a/macros/CCodeGeneration/C_ForExpression.bin +++ b/macros/CCodeGeneration/C_ForExpression.bin diff --git a/macros/CCodeGeneration/C_Funcall.bin b/macros/CCodeGeneration/C_Funcall.bin Binary files differindex 64ff20d..fec4712 100644 --- a/macros/CCodeGeneration/C_Funcall.bin +++ b/macros/CCodeGeneration/C_Funcall.bin diff --git a/macros/CCodeGeneration/C_GenDeclarations.bin b/macros/CCodeGeneration/C_GenDeclarations.bin Binary files differindex 8511639..8bd7257 100644 --- a/macros/CCodeGeneration/C_GenDeclarations.bin +++ b/macros/CCodeGeneration/C_GenDeclarations.bin diff --git a/macros/CCodeGeneration/C_GenerateMakefile.bin b/macros/CCodeGeneration/C_GenerateMakefile.bin Binary files differindex 57bbf43..cf4ea0e 100644 --- a/macros/CCodeGeneration/C_GenerateMakefile.bin +++ b/macros/CCodeGeneration/C_GenerateMakefile.bin diff --git a/macros/CCodeGeneration/C_IfExpression.bin b/macros/CCodeGeneration/C_IfExpression.bin Binary files differindex 46a0db7..c6cda7b 100644 --- a/macros/CCodeGeneration/C_IfExpression.bin +++ b/macros/CCodeGeneration/C_IfExpression.bin diff --git a/macros/CCodeGeneration/C_InitHeader.bin b/macros/CCodeGeneration/C_InitHeader.bin Binary files differindex 1bc3876..4513310 100644 --- a/macros/CCodeGeneration/C_InitHeader.bin +++ b/macros/CCodeGeneration/C_InitHeader.bin diff --git a/macros/CCodeGeneration/C_InitHeader.sci b/macros/CCodeGeneration/C_InitHeader.sci index 1c2efd6..1d67b60 100644 --- a/macros/CCodeGeneration/C_InitHeader.sci +++ b/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/macros/CCodeGeneration/C_MemAllocOutTempVars.bin b/macros/CCodeGeneration/C_MemAllocOutTempVars.bin Binary files differindex 0e9c6f7..443ad3c 100644 --- a/macros/CCodeGeneration/C_MemAllocOutTempVars.bin +++ b/macros/CCodeGeneration/C_MemAllocOutTempVars.bin diff --git a/macros/CCodeGeneration/C_Type.bin b/macros/CCodeGeneration/C_Type.bin Binary files differindex 83996bb..64037d4 100644 --- a/macros/CCodeGeneration/C_Type.bin +++ b/macros/CCodeGeneration/C_Type.bin diff --git a/macros/CCodeGeneration/C_WhileExpression.bin b/macros/CCodeGeneration/C_WhileExpression.bin Binary files differindex 736c977..cff8f38 100644 --- a/macros/CCodeGeneration/C_WhileExpression.bin +++ b/macros/CCodeGeneration/C_WhileExpression.bin diff --git a/macros/CCodeGeneration/GenCFunDatFiles.bin b/macros/CCodeGeneration/GenCFunDatFiles.bin Binary files differindex 0a4f77e..6a374f5 100644 --- a/macros/CCodeGeneration/GenCFunDatFiles.bin +++ b/macros/CCodeGeneration/GenCFunDatFiles.bin diff --git a/macros/CCodeGeneration/GetClsFileName.bin b/macros/CCodeGeneration/GetClsFileName.bin Binary files differindex c5462aa..30b2571 100644 --- a/macros/CCodeGeneration/GetClsFileName.bin +++ b/macros/CCodeGeneration/GetClsFileName.bin diff --git a/macros/CCodeGeneration/GetSymbolDimension.bin b/macros/CCodeGeneration/GetSymbolDimension.bin Binary files differindex c8041cf..5c73f43 100644 --- a/macros/CCodeGeneration/GetSymbolDimension.bin +++ b/macros/CCodeGeneration/GetSymbolDimension.bin diff --git a/macros/CCodeGeneration/GetWhileCondVariable.bin b/macros/CCodeGeneration/GetWhileCondVariable.bin Binary files differindex 011320b..6815fb4 100644 --- a/macros/CCodeGeneration/GetWhileCondVariable.bin +++ b/macros/CCodeGeneration/GetWhileCondVariable.bin diff --git a/macros/CCodeGeneration/JoinDeclarAndCcode.bin b/macros/CCodeGeneration/JoinDeclarAndCcode.bin Binary files differindex d8a8408..66286eb 100644 --- a/macros/CCodeGeneration/JoinDeclarAndCcode.bin +++ b/macros/CCodeGeneration/JoinDeclarAndCcode.bin diff --git a/macros/CCodeGeneration/Sci2AnnotationFile.bin b/macros/CCodeGeneration/Sci2AnnotationFile.bin Binary files differindex b447d0c..95fe561 100644 --- a/macros/CCodeGeneration/Sci2AnnotationFile.bin +++ b/macros/CCodeGeneration/Sci2AnnotationFile.bin diff --git a/macros/CCodeGeneration/lib b/macros/CCodeGeneration/lib Binary files differindex dda98e1..9007df7 100644 --- a/macros/CCodeGeneration/lib +++ b/macros/CCodeGeneration/lib diff --git a/macros/CCodeGeneration/names b/macros/CCodeGeneration/names index e41125f..efbb400 100644 --- a/macros/CCodeGeneration/names +++ b/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/macros/ErrorMessages/lib b/macros/ErrorMessages/lib Binary files differindex e61aba5..2b3ee2f 100644 --- a/macros/ErrorMessages/lib +++ b/macros/ErrorMessages/lib diff --git a/macros/ErrorMessages/names b/macros/ErrorMessages/names index b327192..f55e8f8 100644 --- a/macros/ErrorMessages/names +++ b/macros/ErrorMessages/names @@ -1,3 +1,3 @@ EM_NanSize -EM_ZeroSize EM_UnknownStep +EM_ZeroSize diff --git a/macros/FunctionAnnotation/FA_GetFunAnn.bin b/macros/FunctionAnnotation/FA_GetFunAnn.bin Binary files differindex 7bb2f2b..d3ca8c0 100644 --- a/macros/FunctionAnnotation/FA_GetFunAnn.bin +++ b/macros/FunctionAnnotation/FA_GetFunAnn.bin diff --git a/macros/FunctionAnnotation/FA_GetOutArgInfo.bin b/macros/FunctionAnnotation/FA_GetOutArgInfo.bin Binary files differindex 177df55..1deaff6 100644 --- a/macros/FunctionAnnotation/FA_GetOutArgInfo.bin +++ b/macros/FunctionAnnotation/FA_GetOutArgInfo.bin diff --git a/macros/FunctionAnnotation/FA_GetResizeApproach.bin b/macros/FunctionAnnotation/FA_GetResizeApproach.bin Binary files differindex 6ebef2c..77397e0 100644 --- a/macros/FunctionAnnotation/FA_GetResizeApproach.bin +++ b/macros/FunctionAnnotation/FA_GetResizeApproach.bin diff --git a/macros/FunctionAnnotation/FA_MAX.bin b/macros/FunctionAnnotation/FA_MAX.bin Binary files differindex b69cd8f..a9debba 100644 --- a/macros/FunctionAnnotation/FA_MAX.bin +++ b/macros/FunctionAnnotation/FA_MAX.bin diff --git a/macros/FunctionAnnotation/FA_MIN.bin b/macros/FunctionAnnotation/FA_MIN.bin Binary files differindex 6010c4b..cc9bd02 100644 --- a/macros/FunctionAnnotation/FA_MIN.bin +++ b/macros/FunctionAnnotation/FA_MIN.bin diff --git a/macros/FunctionAnnotation/FA_SZ_OPPLUS.bin b/macros/FunctionAnnotation/FA_SZ_OPPLUS.bin Binary files differindex a0fa542..da84349 100644 --- a/macros/FunctionAnnotation/FA_SZ_OPPLUS.bin +++ b/macros/FunctionAnnotation/FA_SZ_OPPLUS.bin diff --git a/macros/FunctionAnnotation/FA_SZ_OPPLUS.sci b/macros/FunctionAnnotation/FA_SZ_OPPLUS.sci index 4ad282f..f439e23 100644 --- a/macros/FunctionAnnotation/FA_SZ_OPPLUS.sci +++ b/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/macros/FunctionAnnotation/FA_TP_INT16.bin b/macros/FunctionAnnotation/FA_TP_INT16.bin Binary files differindex 2ffc10e..2ebb734 100644 --- a/macros/FunctionAnnotation/FA_TP_INT16.bin +++ b/macros/FunctionAnnotation/FA_TP_INT16.bin diff --git a/macros/FunctionAnnotation/FA_TP_INT8.bin b/macros/FunctionAnnotation/FA_TP_INT8.bin Binary files differindex 3455174..3f5055f 100644 --- a/macros/FunctionAnnotation/FA_TP_INT8.bin +++ b/macros/FunctionAnnotation/FA_TP_INT8.bin diff --git a/macros/FunctionAnnotation/FA_TP_MAX.bin b/macros/FunctionAnnotation/FA_TP_MAX.bin Binary files differindex fabb6d2..099ea1b 100644 --- a/macros/FunctionAnnotation/FA_TP_MAX.bin +++ b/macros/FunctionAnnotation/FA_TP_MAX.bin diff --git a/macros/FunctionAnnotation/FA_TP_MIN_REAL.bin b/macros/FunctionAnnotation/FA_TP_MIN_REAL.bin Binary files differindex fa2d4c3..60293a1 100644 --- a/macros/FunctionAnnotation/FA_TP_MIN_REAL.bin +++ b/macros/FunctionAnnotation/FA_TP_MIN_REAL.bin diff --git a/macros/FunctionAnnotation/FA_TP_REAL.bin b/macros/FunctionAnnotation/FA_TP_REAL.bin Binary files differindex 14f3101..7e54122 100644 --- a/macros/FunctionAnnotation/FA_TP_REAL.bin +++ b/macros/FunctionAnnotation/FA_TP_REAL.bin diff --git a/macros/FunctionAnnotation/FA_TP_UINT16.bin b/macros/FunctionAnnotation/FA_TP_UINT16.bin Binary files differindex 5c0ec30..687024f 100644 --- a/macros/FunctionAnnotation/FA_TP_UINT16.bin +++ b/macros/FunctionAnnotation/FA_TP_UINT16.bin diff --git a/macros/FunctionAnnotation/FA_TP_UINT8.bin b/macros/FunctionAnnotation/FA_TP_UINT8.bin Binary files differindex 6966139..02e7404 100644 --- a/macros/FunctionAnnotation/FA_TP_UINT8.bin +++ b/macros/FunctionAnnotation/FA_TP_UINT8.bin diff --git a/macros/FunctionAnnotation/lib b/macros/FunctionAnnotation/lib Binary files differindex 50f6251..c2025c8 100644 --- a/macros/FunctionAnnotation/lib +++ b/macros/FunctionAnnotation/lib diff --git a/macros/FunctionList/FL_ExistCFunction.bin b/macros/FunctionList/FL_ExistCFunction.bin Binary files differindex 1182a7f..1c85aa2 100644 --- a/macros/FunctionList/FL_ExistCFunction.bin +++ b/macros/FunctionList/FL_ExistCFunction.bin diff --git a/macros/FunctionList/FL_GetFunctionClass.bin b/macros/FunctionList/FL_GetFunctionClass.bin Binary files differindex 5ad5b2f..faa210e 100644 --- a/macros/FunctionList/FL_GetFunctionClass.bin +++ b/macros/FunctionList/FL_GetFunctionClass.bin diff --git a/macros/FunctionList/FL_UpdateConverted.bin b/macros/FunctionList/FL_UpdateConverted.bin Binary files differindex 9bb513b..73f2cf0 100644 --- a/macros/FunctionList/FL_UpdateConverted.bin +++ b/macros/FunctionList/FL_UpdateConverted.bin diff --git a/macros/FunctionList/FL_UpdateToBeConv.bin b/macros/FunctionList/FL_UpdateToBeConv.bin Binary files differindex 99a4a71..44b5803 100644 --- a/macros/FunctionList/FL_UpdateToBeConv.bin +++ b/macros/FunctionList/FL_UpdateToBeConv.bin diff --git a/macros/FunctionList/lib b/macros/FunctionList/lib Binary files differindex 9e2efca..32c92be 100644 --- a/macros/FunctionList/lib +++ b/macros/FunctionList/lib diff --git a/macros/FunctionList/names b/macros/FunctionList/names index 60e9c04..c40e30c 100644 --- a/macros/FunctionList/names +++ b/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/macros/GeneralFunctions/File2StringArray.bin b/macros/GeneralFunctions/File2StringArray.bin Binary files differindex 861d324..1b050f4 100644 --- a/macros/GeneralFunctions/File2StringArray.bin +++ b/macros/GeneralFunctions/File2StringArray.bin diff --git a/macros/GeneralFunctions/FunName2SciFileName.bin b/macros/GeneralFunctions/FunName2SciFileName.bin Binary files differindex 9e4a57c..c3cb538 100644 --- a/macros/GeneralFunctions/FunName2SciFileName.bin +++ b/macros/GeneralFunctions/FunName2SciFileName.bin diff --git a/macros/GeneralFunctions/IsNanSize.bin b/macros/GeneralFunctions/IsNanSize.bin Binary files differindex 1f8a65e..7173512 100644 --- a/macros/GeneralFunctions/IsNanSize.bin +++ b/macros/GeneralFunctions/IsNanSize.bin diff --git a/macros/GeneralFunctions/KeyStr2FileStrPos.bin b/macros/GeneralFunctions/KeyStr2FileStrPos.bin Binary files differindex c5f5456..5c6cfaf 100644 --- a/macros/GeneralFunctions/KeyStr2FileStrPos.bin +++ b/macros/GeneralFunctions/KeyStr2FileStrPos.bin diff --git a/macros/GeneralFunctions/PrintStepInfo.bin b/macros/GeneralFunctions/PrintStepInfo.bin Binary files differindex 2387918..98208f8 100644 --- a/macros/GeneralFunctions/PrintStepInfo.bin +++ b/macros/GeneralFunctions/PrintStepInfo.bin diff --git a/macros/GeneralFunctions/PrintStringInfo.bin b/macros/GeneralFunctions/PrintStringInfo.bin Binary files differindex 0e301c4..c936b20 100644 --- a/macros/GeneralFunctions/PrintStringInfo.bin +++ b/macros/GeneralFunctions/PrintStringInfo.bin diff --git a/macros/GeneralFunctions/ReadStringCard.bin b/macros/GeneralFunctions/ReadStringCard.bin Binary files differindex b53000a..f9b2828 100644 --- a/macros/GeneralFunctions/ReadStringCard.bin +++ b/macros/GeneralFunctions/ReadStringCard.bin diff --git a/macros/GeneralFunctions/SCI2CCreateDir.bin b/macros/GeneralFunctions/SCI2CCreateDir.bin Binary files differindex 881cd54..007b6fb 100644 --- a/macros/GeneralFunctions/SCI2CCreateDir.bin +++ b/macros/GeneralFunctions/SCI2CCreateDir.bin diff --git a/macros/GeneralFunctions/SCI2CFindFile.bin b/macros/GeneralFunctions/SCI2CFindFile.bin Binary files differindex 86048da..fe8e783 100644 --- a/macros/GeneralFunctions/SCI2CFindFile.bin +++ b/macros/GeneralFunctions/SCI2CFindFile.bin diff --git a/macros/GeneralFunctions/SCI2CNInArgCheck.bin b/macros/GeneralFunctions/SCI2CNInArgCheck.bin Binary files differindex 1a86841..8d96b6e 100644 --- a/macros/GeneralFunctions/SCI2CNInArgCheck.bin +++ b/macros/GeneralFunctions/SCI2CNInArgCheck.bin diff --git a/macros/GeneralFunctions/SCI2COpenFileRead.bin b/macros/GeneralFunctions/SCI2COpenFileRead.bin Binary files differindex c4cefcc..7d5f101 100644 --- a/macros/GeneralFunctions/SCI2COpenFileRead.bin +++ b/macros/GeneralFunctions/SCI2COpenFileRead.bin diff --git a/macros/GeneralFunctions/SCI2COpenFileWrite.bin b/macros/GeneralFunctions/SCI2COpenFileWrite.bin Binary files differindex 0174493..0287b3a 100644 --- a/macros/GeneralFunctions/SCI2COpenFileWrite.bin +++ b/macros/GeneralFunctions/SCI2COpenFileWrite.bin diff --git a/macros/GeneralFunctions/SCI2Ccopyfile.bin b/macros/GeneralFunctions/SCI2Ccopyfile.bin Binary files differindex 2252cf5..e6d0a86 100644 --- a/macros/GeneralFunctions/SCI2Ccopyfile.bin +++ b/macros/GeneralFunctions/SCI2Ccopyfile.bin diff --git a/macros/GeneralFunctions/SCI2Cmdelete.bin b/macros/GeneralFunctions/SCI2Cmdelete.bin Binary files differindex e226baf..67694b7 100644 --- a/macros/GeneralFunctions/SCI2Cmdelete.bin +++ b/macros/GeneralFunctions/SCI2Cmdelete.bin diff --git a/macros/GeneralFunctions/filenamefprintf.bin b/macros/GeneralFunctions/filenamefprintf.bin Binary files differindex 253ea28..864a494 100644 --- a/macros/GeneralFunctions/filenamefprintf.bin +++ b/macros/GeneralFunctions/filenamefprintf.bin diff --git a/macros/GeneralFunctions/lib b/macros/GeneralFunctions/lib Binary files differindex fe5c5d2..a3af87e 100644 --- a/macros/GeneralFunctions/lib +++ b/macros/GeneralFunctions/lib diff --git a/macros/GeneralFunctions/names b/macros/GeneralFunctions/names index 3f5c626..eb8300a 100644 --- a/macros/GeneralFunctions/names +++ b/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/macros/Hardware/AVR/AVRADCSetup.bin b/macros/Hardware/AVR/AVRADCSetup.bin Binary files differnew file mode 100644 index 0000000..6cf45dc --- /dev/null +++ b/macros/Hardware/AVR/AVRADCSetup.bin diff --git a/macros/Hardware/AVR/AVRDigitalIn.bin b/macros/Hardware/AVR/AVRDigitalIn.bin Binary files differnew file mode 100644 index 0000000..7ff2c98 --- /dev/null +++ b/macros/Hardware/AVR/AVRDigitalIn.bin diff --git a/macros/Hardware/AVR/AVRDigitalIn.sci b/macros/Hardware/AVR/AVRDigitalIn.sci new file mode 100644 index 0000000..ef57564 --- /dev/null +++ b/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/macros/Hardware/AVR/AVRReadADC.bin b/macros/Hardware/AVR/AVRReadADC.bin Binary files differnew file mode 100644 index 0000000..c106708 --- /dev/null +++ b/macros/Hardware/AVR/AVRReadADC.bin diff --git a/macros/Hardware/AVR/lib b/macros/Hardware/AVR/lib Binary files differindex 097a89f..d08afbd 100644 --- a/macros/Hardware/AVR/lib +++ b/macros/Hardware/AVR/lib diff --git a/macros/Hardware/AVR/names b/macros/Hardware/AVR/names index 4b941e9..6e5b61b 100644 --- a/macros/Hardware/AVR/names +++ b/macros/Hardware/AVR/names @@ -1,5 +1,8 @@ +AVRADCSetup +AVRDigitalIn AVRDigitalOut AVRDigitalSetup +AVRReadADC GetAVRSupportFunctions GetPeripheral InsertPeripheralInList diff --git a/macros/SymbolTable/ST_AnalyzeScope.bin b/macros/SymbolTable/ST_AnalyzeScope.bin Binary files differindex db6f03f..950f704 100644 --- a/macros/SymbolTable/ST_AnalyzeScope.bin +++ b/macros/SymbolTable/ST_AnalyzeScope.bin diff --git a/macros/SymbolTable/ST_Del.bin b/macros/SymbolTable/ST_Del.bin Binary files differindex 97af45e..c26e2e5 100644 --- a/macros/SymbolTable/ST_Del.bin +++ b/macros/SymbolTable/ST_Del.bin diff --git a/macros/SymbolTable/ST_FindPos.bin b/macros/SymbolTable/ST_FindPos.bin Binary files differindex bdfd1b2..c7003f3 100644 --- a/macros/SymbolTable/ST_FindPos.bin +++ b/macros/SymbolTable/ST_FindPos.bin diff --git a/macros/SymbolTable/ST_Get.bin b/macros/SymbolTable/ST_Get.bin Binary files differindex b746dbf..512e72b 100644 --- a/macros/SymbolTable/ST_Get.bin +++ b/macros/SymbolTable/ST_Get.bin diff --git a/macros/SymbolTable/ST_GetInArgInfo.bin b/macros/SymbolTable/ST_GetInArgInfo.bin Binary files differindex 725a788..46c2154 100644 --- a/macros/SymbolTable/ST_GetInArgInfo.bin +++ b/macros/SymbolTable/ST_GetInArgInfo.bin diff --git a/macros/SymbolTable/ST_GetSymbolInfo.bin b/macros/SymbolTable/ST_GetSymbolInfo.bin Binary files differindex 66cf57a..b8a7cf7 100644 --- a/macros/SymbolTable/ST_GetSymbolInfo.bin +++ b/macros/SymbolTable/ST_GetSymbolInfo.bin diff --git a/macros/SymbolTable/ST_InsForCntVars.bin b/macros/SymbolTable/ST_InsForCntVars.bin Binary files differindex 0404b5a..12882fc 100644 --- a/macros/SymbolTable/ST_InsForCntVars.bin +++ b/macros/SymbolTable/ST_InsForCntVars.bin diff --git a/macros/SymbolTable/ST_InsOutArg.bin b/macros/SymbolTable/ST_InsOutArg.bin Binary files differindex a4c9be9..94bcd3a 100644 --- a/macros/SymbolTable/ST_InsOutArg.bin +++ b/macros/SymbolTable/ST_InsOutArg.bin diff --git a/macros/SymbolTable/ST_Load.bin b/macros/SymbolTable/ST_Load.bin Binary files differindex 4d9be56..f158c2b 100644 --- a/macros/SymbolTable/ST_Load.bin +++ b/macros/SymbolTable/ST_Load.bin diff --git a/macros/SymbolTable/ST_MatchSymbol.bin b/macros/SymbolTable/ST_MatchSymbol.bin Binary files differindex 08d6571..bf3fb98 100644 --- a/macros/SymbolTable/ST_MatchSymbol.bin +++ b/macros/SymbolTable/ST_MatchSymbol.bin diff --git a/macros/SymbolTable/ST_Save.bin b/macros/SymbolTable/ST_Save.bin Binary files differindex a0e1b0c..4aa50a2 100644 --- a/macros/SymbolTable/ST_Save.bin +++ b/macros/SymbolTable/ST_Save.bin diff --git a/macros/SymbolTable/ST_Set.bin b/macros/SymbolTable/ST_Set.bin Binary files differindex 3efdc24..cbd2627 100644 --- a/macros/SymbolTable/ST_Set.bin +++ b/macros/SymbolTable/ST_Set.bin diff --git a/macros/SymbolTable/lib b/macros/SymbolTable/lib Binary files differindex 3b181b8..7ff755e 100644 --- a/macros/SymbolTable/lib +++ b/macros/SymbolTable/lib diff --git a/macros/SymbolTable/names b/macros/SymbolTable/names index 0fdad1c..b5a7d65 100644 --- a/macros/SymbolTable/names +++ b/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/macros/ToolInitialization/INIT_CreateDirs.bin b/macros/ToolInitialization/INIT_CreateDirs.bin Binary files differindex 2d6fb62..16ebab8 100644 --- a/macros/ToolInitialization/INIT_CreateDirs.bin +++ b/macros/ToolInitialization/INIT_CreateDirs.bin diff --git a/macros/ToolInitialization/INIT_FillSCI2LibCDirs.bin b/macros/ToolInitialization/INIT_FillSCI2LibCDirs.bin Binary files differindex a85721c..b2642d4 100644 --- a/macros/ToolInitialization/INIT_FillSCI2LibCDirs.bin +++ b/macros/ToolInitialization/INIT_FillSCI2LibCDirs.bin diff --git a/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci b/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci index 067a332..6d829ce 100644 --- a/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci +++ b/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/macros/ToolInitialization/INIT_GenAnnFLFunctions.bin b/macros/ToolInitialization/INIT_GenAnnFLFunctions.bin Binary files differindex 62ea01a..f7d2aa5 100644 --- a/macros/ToolInitialization/INIT_GenAnnFLFunctions.bin +++ b/macros/ToolInitialization/INIT_GenAnnFLFunctions.bin diff --git a/macros/ToolInitialization/INIT_GenFileInfo.bin b/macros/ToolInitialization/INIT_GenFileInfo.bin Binary files differindex ab778fa..8f114a7 100644 --- a/macros/ToolInitialization/INIT_GenFileInfo.bin +++ b/macros/ToolInitialization/INIT_GenFileInfo.bin diff --git a/macros/ToolInitialization/INIT_GenLibraries.bin b/macros/ToolInitialization/INIT_GenLibraries.bin Binary files differindex 5752c04..bc3bc87 100644 --- a/macros/ToolInitialization/INIT_GenLibraries.bin +++ b/macros/ToolInitialization/INIT_GenLibraries.bin diff --git a/macros/ToolInitialization/INIT_GenSharedInfo.bin b/macros/ToolInitialization/INIT_GenSharedInfo.bin Binary files differindex 577d0d6..4a82f12 100644 --- a/macros/ToolInitialization/INIT_GenSharedInfo.bin +++ b/macros/ToolInitialization/INIT_GenSharedInfo.bin diff --git a/macros/ToolInitialization/INIT_LoadLibraries.bin b/macros/ToolInitialization/INIT_LoadLibraries.bin Binary files differindex 3e87dfb..4cf0283 100644 --- a/macros/ToolInitialization/INIT_LoadLibraries.bin +++ b/macros/ToolInitialization/INIT_LoadLibraries.bin diff --git a/macros/ToolInitialization/INIT_RemoveDirs.bin b/macros/ToolInitialization/INIT_RemoveDirs.bin Binary files differindex 84268c3..5b11b8d 100644 --- a/macros/ToolInitialization/INIT_RemoveDirs.bin +++ b/macros/ToolInitialization/INIT_RemoveDirs.bin diff --git a/macros/ToolInitialization/INIT_SCI2C.bin b/macros/ToolInitialization/INIT_SCI2C.bin Binary files differindex 615ca83..72623b2 100644 --- a/macros/ToolInitialization/INIT_SCI2C.bin +++ b/macros/ToolInitialization/INIT_SCI2C.bin diff --git a/macros/ToolInitialization/INIT_SharedInfoEqual.bin b/macros/ToolInitialization/INIT_SharedInfoEqual.bin Binary files differindex 37ed1ac..31238a3 100644 --- a/macros/ToolInitialization/INIT_SharedInfoEqual.bin +++ b/macros/ToolInitialization/INIT_SharedInfoEqual.bin diff --git a/macros/ToolInitialization/ManageNextConversion.bin b/macros/ToolInitialization/ManageNextConversion.bin Binary files differindex 2bddc80..a34ee4f 100644 --- a/macros/ToolInitialization/ManageNextConversion.bin +++ b/macros/ToolInitialization/ManageNextConversion.bin diff --git a/macros/ToolInitialization/UpdateSCI2CInfo.bin b/macros/ToolInitialization/UpdateSCI2CInfo.bin Binary files differindex 8abfbaf..16e99c9 100644 --- a/macros/ToolInitialization/UpdateSCI2CInfo.bin +++ b/macros/ToolInitialization/UpdateSCI2CInfo.bin diff --git a/macros/ToolInitialization/lib b/macros/ToolInitialization/lib Binary files differindex 6d909b0..6240d3d 100644 --- a/macros/ToolInitialization/lib +++ b/macros/ToolInitialization/lib diff --git a/macros/cb_sci2c_gui.bin b/macros/cb_sci2c_gui.bin Binary files differindex 00bf368..3c70ac3 100644 --- a/macros/cb_sci2c_gui.bin +++ b/macros/cb_sci2c_gui.bin diff --git a/macros/cb_sci2c_gui.sci b/macros/cb_sci2c_gui.sci index 9d1770f..b6fbd1a 100644 --- a/macros/cb_sci2c_gui.sci +++ b/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/macros/findDeps/findDeps.bin b/macros/findDeps/findDeps.bin Binary files differindex 92fb755..fb11e00 100644 --- a/macros/findDeps/findDeps.bin +++ b/macros/findDeps/findDeps.bin diff --git a/macros/findDeps/getAllHeaders.bin b/macros/findDeps/getAllHeaders.bin Binary files differindex 9bedf9f..4314c53 100644 --- a/macros/findDeps/getAllHeaders.bin +++ b/macros/findDeps/getAllHeaders.bin diff --git a/macros/findDeps/getAllInterfaces.bin b/macros/findDeps/getAllInterfaces.bin Binary files differindex 3bde73d..b49fdbf 100644 --- a/macros/findDeps/getAllInterfaces.bin +++ b/macros/findDeps/getAllInterfaces.bin diff --git a/macros/findDeps/getAllSources.bin b/macros/findDeps/getAllSources.bin Binary files differindex 9cfa087..4943977 100644 --- a/macros/findDeps/getAllSources.bin +++ b/macros/findDeps/getAllSources.bin diff --git a/macros/findDeps/getArduinoFiles.bin b/macros/findDeps/getArduinoFiles.bin Binary files differindex 7c698ba..f8937bf 100644 --- a/macros/findDeps/getArduinoFiles.bin +++ b/macros/findDeps/getArduinoFiles.bin diff --git a/macros/findDeps/lib b/macros/findDeps/lib Binary files differindex 7c151b2..8d3728f 100644 --- a/macros/findDeps/lib +++ b/macros/findDeps/lib diff --git a/macros/findDeps/names b/macros/findDeps/names index 88d610b..dc32fef 100644 --- a/macros/findDeps/names +++ b/macros/findDeps/names @@ -1,6 +1,6 @@ -getAllSources -getAllHeaders -getAllInterfaces Scilab2CDeps findDeps +getAllHeaders +getAllInterfaces +getAllSources getArduinoFiles Binary files differdiff --git a/macros/runsci2c.bin b/macros/runsci2c.bin Binary files differindex 053c331..afe6e7d 100644 --- a/macros/runsci2c.bin +++ b/macros/runsci2c.bin diff --git a/macros/runsci2c.sci b/macros/runsci2c.sci index ac826a3..9158703 100644 --- a/macros/runsci2c.sci +++ b/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/macros/sci2c_gui.bin b/macros/sci2c_gui.bin Binary files differindex 9bdf607..2e72ec4 100644 --- a/macros/sci2c_gui.bin +++ b/macros/sci2c_gui.bin diff --git a/macros/sci2c_gui.sci b/macros/sci2c_gui.sci index 3abe497..cb75b15 100644 --- a/macros/sci2c_gui.sci +++ b/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/macros/scilab2c.bin b/macros/scilab2c.bin Binary files differindex e9fb5fa..6defd94 100644 --- a/macros/scilab2c.bin +++ b/macros/scilab2c.bin diff --git a/macros/scilab2c.sci b/macros/scilab2c.sci index 64d5753..3eab16e 100644 --- a/macros/scilab2c.sci +++ b/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 |