diff options
| author | imushir | 2016-01-18 14:10:56 +0530 |
|---|---|---|
| committer | imushir | 2016-01-18 14:10:56 +0530 |
| commit | 2803a0bccff2ca4f4b5b81d3ef7f7cf3c75e0ec9 (patch) | |
| tree | 80d03589495b3a109013e267c42c7d6235c2c9e8 /2.3-1/macros/ToolInitialization | |
| parent | bcb2bf1c014a1078f4306cd0111f4e596fe934ce (diff) | |
| parent | 1e87b6e62cfe8e0889cd677b8406ab89809f53da (diff) | |
| download | Scilab2C-2803a0bccff2ca4f4b5b81d3ef7f7cf3c75e0ec9.tar.gz Scilab2C-2803a0bccff2ca4f4b5b81d3ef7f7cf3c75e0ec9.tar.bz2 Scilab2C-2803a0bccff2ca4f4b5b81d3ef7f7cf3c75e0ec9.zip | |
merged pulled
Diffstat (limited to '2.3-1/macros/ToolInitialization')
| -rw-r--r-- | 2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.bin | bin | 1000968 -> 0 bytes | |||
| -rw-r--r-- | 2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci | 8 | ||||
| -rw-r--r-- | 2.3-1/macros/ToolInitialization/UpdateSCI2CInfo.sci | 7 |
3 files changed, 10 insertions, 5 deletions
diff --git a/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.bin b/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.bin Binary files differdeleted file mode 100644 index a92ebcf0..00000000 --- a/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.bin +++ /dev/null diff --git a/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci b/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci index 1f9b2c99..55c43ad2 100644 --- a/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci +++ b/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci @@ -4418,8 +4418,8 @@ PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y'); // --- Function List Class. ---
ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
-PrintStringInfo('d0d0d0d0'+ArgSeparator+'u80',ClassFileName,'file','y');
-
+//PrintStringInfo('d0d0d0d0'+ArgSeparator+'u80',ClassFileName,'file','y');
+PrintStringInfo(''+ArgSeparator+'',ClassFileName,'file','y');
// --- Annotation Function And Function List Function. ---
FunctionName = 'AVRPWMSetup';
@@ -4443,8 +4443,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 = 'AVRPWMSetDuty';
diff --git a/2.3-1/macros/ToolInitialization/UpdateSCI2CInfo.sci b/2.3-1/macros/ToolInitialization/UpdateSCI2CInfo.sci index 445507bb..253299a3 100644 --- a/2.3-1/macros/ToolInitialization/UpdateSCI2CInfo.sci +++ b/2.3-1/macros/ToolInitialization/UpdateSCI2CInfo.sci @@ -61,7 +61,12 @@ FileInfo.Funct(funnumber).PfxP1WhileEpilFileName = fullfile(FileInfo.WorkingDir, FileInfo.Funct(funnumber).CPass1FreeFileName = fullfile(FileInfo.WorkingDir,funname,SharedInfo.NextCFunName+'_pass1free.c'); FileInfo.Funct(funnumber).CPass2FileName = fullfile(FileInfo.WorkingDir,funname,SharedInfo.NextCFunName+'_pass2.c'); FileInfo.Funct(funnumber).Pass1HeaderFileName = fullfile(FileInfo.WorkingDir,funname,SharedInfo.NextCFunName+'.h'); -FileInfo.Funct(funnumber).FinalCFileName = fullfile(FileInfo.OutCCCodeDir,SharedInfo.NextCFunName+'.c'); +if (SharedInfo.OutFormat == 'Arduino') +//In case of "Arduino" target, *.cpp files should be generated, not *.c files. + FileInfo.Funct(funnumber).FinalCFileName = fullfile(FileInfo.OutCCCodeDir,SharedInfo.NextCFunName+'.cpp'); +else + FileInfo.Funct(funnumber).FinalCFileName = fullfile(FileInfo.OutCCCodeDir,SharedInfo.NextCFunName+'.c'); +end FileInfo.Funct(funnumber).FinalHeaderFileName = fullfile(FileInfo.OutCCCodeDir,SharedInfo.NextCFunName+'.h'); FileInfo.Funct(funnumber).CInitVarsFileName = fullfile(FileInfo.WorkingDir,funname,SharedInfo.NextCFunName+'_initvars.c'); FileInfo.Funct(funnumber).CDeclarationFileName = fullfile(FileInfo.WorkingDir,funname,SharedInfo.NextCFunName+'_declarations.c'); |