From d4a4045b5dff59c799ee846052152298dfe6c210 Mon Sep 17 00:00:00 2001 From: siddhu8990 Date: Mon, 7 Mar 2016 20:42:23 +0530 Subject: Errors in bit***.h files fixed --- .../ToolInitialization/INIT_FillSCI2LibCDirs.bin | Bin 992640 -> 1074784 bytes .../ToolInitialization/INIT_FillSCI2LibCDirs.sci | 58 +++++++++++++++++---- macros/ToolInitialization/INIT_RemoveDirs.bin | Bin 11880 -> 12372 bytes macros/ToolInitialization/INIT_RemoveDirs.sci | 3 +- macros/ToolInitialization/INIT_SCI2C.bin | Bin 24408 -> 24416 bytes macros/ToolInitialization/lib | Bin 976 -> 980 bytes 6 files changed, 50 insertions(+), 11 deletions(-) (limited to 'macros/ToolInitialization') diff --git a/macros/ToolInitialization/INIT_FillSCI2LibCDirs.bin b/macros/ToolInitialization/INIT_FillSCI2LibCDirs.bin index a4c9a3fb..1db8f2be 100644 Binary files a/macros/ToolInitialization/INIT_FillSCI2LibCDirs.bin and b/macros/ToolInitialization/INIT_FillSCI2LibCDirs.bin differ diff --git a/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci b/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci index 3fd2ae76..07d1127c 100644 --- a/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci +++ b/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci @@ -4559,8 +4559,9 @@ PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y'); // --- Function List Class. --- ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); -PrintStringInfo('d0d0d0'+ArgSeparator+'u80',ClassFileName,'file','y'); -PrintStringInfo('d0d0u80'+ArgSeparator+'u80',ClassFileName,'file','y'); +//PrintStringInfo('d0d0d0'+ArgSeparator+'u80',ClassFileName,'file','y'); +//PrintStringInfo('d0d0u80'+ArgSeparator+'u80',ClassFileName,'file','y'); +PrintStringInfo(''+ArgSeparator+'',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. --- FunctionName = 'AVRDigitalSetup'; @@ -4585,8 +4586,9 @@ PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y'); // --- Function List Class. --- ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); -PrintStringInfo('d0d0d0'+ArgSeparator+'u80',ClassFileName,'file','y'); -PrintStringInfo('d0d0u80'+ArgSeparator+'u80',ClassFileName,'file','y'); +//PrintStringInfo('d0d0d0'+ArgSeparator+'u80',ClassFileName,'file','y'); +//PrintStringInfo('d0d0u80'+ArgSeparator+'u80',ClassFileName,'file','y'); +PrintStringInfo(''+ArgSeparator+'',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. --- FunctionName = 'AVRDigitalOut'; @@ -4610,8 +4612,9 @@ PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y'); // --- Function List Class. --- ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); -PrintStringInfo('d0d0'+ArgSeparator+'u80',ClassFileName,'file','y'); -PrintStringInfo('d0u80'+ArgSeparator+'u80',ClassFileName,'file','y'); +//PrintStringInfo('d0d0'+ArgSeparator+'u80',ClassFileName,'file','y'); +//PrintStringInfo('d0u80'+ArgSeparator+'u80',ClassFileName,'file','y'); +PrintStringInfo(''+ArgSeparator+'',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. --- FunctionName = 'AVRDigitalIn'; @@ -4637,8 +4640,8 @@ PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y'); // --- Function List Class. --- ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); -PrintStringInfo('d0d0'+ArgSeparator+'u80',ClassFileName,'file','y'); - +//PrintStringInfo('d0d0'+ArgSeparator+'u80',ClassFileName,'file','y'); +PrintStringInfo(''+ArgSeparator+'',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. --- FunctionName = 'AVRADCSetup'; @@ -4662,8 +4665,8 @@ PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y'); // --- Function List Class. --- ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); -PrintStringInfo('d0'+ArgSeparator+'u160',ClassFileName,'file','y'); - +//PrintStringInfo('d0'+ArgSeparator+'u160',ClassFileName,'file','y'); +PrintStringInfo(''+ArgSeparator+'',ClassFileName,'file','y'); // --- Annotation Function And Function List Function. --- FunctionName = 'AVRReadADC'; @@ -4827,6 +4830,41 @@ PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file', INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun); +//------------------------------------ +//---- Class ODE --------------------- +//------------------------------------ +ClassName = 'ODE'; + +// --- Class Annotation. --- +PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y'); +ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls); + +//Arguements specified: initial value, start time, time vector, ode function +PrintStringInfo('NIN= 4',ClassFileName,'file','y'); +PrintStringInfo('NOUT= 1 ',ClassFileName,'file','y'); +PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y'); +PrintStringInfo('OUT(1).SZ(1)= IN(3).SZ(1)',ClassFileName,'file','y'); +PrintStringInfo('OUT(1).SZ(2)= IN(3).SZ(2)',ClassFileName,'file','y'); + +//Arguements specified: initial value, start time, end time, ode function +PrintStringInfo('NIN= 4',ClassFileName,'file','y'); +PrintStringInfo('NOUT= 1 ',ClassFileName,'file','y'); +PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y'); +PrintStringInfo('OUT(1).SZ(1)= IN(3).SZ(1)',ClassFileName,'file','y'); +PrintStringInfo('OUT(1).SZ(2)= IN(3).SZ(2)',ClassFileName,'file','y'); + +// --- Function List Class. --- +ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); +PrintStringInfo('d0d0d2g2'+ArgSeparator+'d0',ClassFileName,'file','y'); +PrintStringInfo('d0d0d0g2'+ArgSeparator+'d0',ClassFileName,'file','y'); +PrintStringInfo('d2d0d2g2'+ArgSeparator+'d0',ClassFileName,'file','y'); +PrintStringInfo('d2d0d0g2'+ArgSeparator+'d0',ClassFileName,'file','y'); + +// --- Annotation Function And Function List Function. --- +FunctionName = 'ode'; +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_RemoveDirs.bin b/macros/ToolInitialization/INIT_RemoveDirs.bin index 5b11b8dd..ac8f7085 100644 Binary files a/macros/ToolInitialization/INIT_RemoveDirs.bin and b/macros/ToolInitialization/INIT_RemoveDirs.bin differ diff --git a/macros/ToolInitialization/INIT_RemoveDirs.sci b/macros/ToolInitialization/INIT_RemoveDirs.sci index 536b909e..93ebafbf 100644 --- a/macros/ToolInitialization/INIT_RemoveDirs.sci +++ b/macros/ToolInitialization/INIT_RemoveDirs.sci @@ -39,7 +39,8 @@ if (SharedInfoRunMode == 'GenLibraryStructure' | SharedInfoRunMode == 'All') if (yesno=='y') rmdir(FileInfo.WorkingDir,'s'); // delete WorkingDir if it exists due to previous translations... mdelete(FileInfo.OutCCCodeDir+'/*.h'); // delete .h files generated in previous translations (if any). - mdelete(FileInfo.OutCCCodeDir+'/*.c'); // delete .h files generated in previous translations (if any). + mdelete(FileInfo.OutCCCodeDir+'/*.c'); // delete .c files generated in previous translations (if any). + mdelete(FileInfo.OutCCCodeDir+'/*.cpp'); // delete .cpp files generated in previous translations (if any). mdelete(FileInfo.OutCCCodeDir+'/Makefile'); // delete .h files generated in previous translations (if any). // Note I don't delete includes, interfaces and and src directories to avoid recompiling them every time // a new translation is launched. I only delete source files generated by user. diff --git a/macros/ToolInitialization/INIT_SCI2C.bin b/macros/ToolInitialization/INIT_SCI2C.bin index 91a0d91c..19402302 100644 Binary files a/macros/ToolInitialization/INIT_SCI2C.bin and b/macros/ToolInitialization/INIT_SCI2C.bin differ diff --git a/macros/ToolInitialization/lib b/macros/ToolInitialization/lib index 0b3bb8ea..6240d3dd 100644 Binary files a/macros/ToolInitialization/lib and b/macros/ToolInitialization/lib differ -- cgit