Pi function changes and gui mods

22 files changed, 45 insertions, 15 deletions

diff --git a/macros/ASTManagement/AST2Ccode.sci b/macros/ASTManagement/AST2Ccode.sci
index 563f313..6fe190e 100644
--- a/macros/ASTManagement/AST2Ccode.sci
+++ b/macros/ASTManagement/AST2Ccode.sci
@@ -145,7 +145,6 @@ while ~meof(fidAST)
          [disp_isthere,FileInfo,SharedInfo] = AST_HandleEndGenFun(disp_isthere,FileInfo,SharedInfo,'Operation');
       case 'EndFuncall' then
          [disp_isthere,FileInfo,SharedInfo] = AST_HandleEndGenFun(disp_isthere,FileInfo,SharedInfo,'Funcall');
-	 disp(disp_isthere);
 
       // --------------
       // --- Equal. ---
@@ -174,7 +173,6 @@ while ~meof(fidAST)
          SharedInfo.Equal.Enabled = 1; // 1 means enabled -> we are inside an equal AST block.
          AST_PushASTStack(treeline);
       case 'Lhs       :' then
-		disp(disp_isthere);
 		if rc_count > 0 & cc_count == 0
 		SharedInfo.Equal.Lhs = 1;
 		[EqualInArgName,EqualInArgScope,EqualNInArg] = AST_HandleRC(FileInfo,SharedInfo);
diff --git a/macros/ASTManagement/AST_HandleEndGenFun.sci b/macros/ASTManagement/AST_HandleEndGenFun.sci
index 96830aa..41caa2a 100644
--- a/macros/ASTManagement/AST_HandleEndGenFun.sci
+++ b/macros/ASTManagement/AST_HandleEndGenFun.sci
@@ -127,8 +127,10 @@ NOutArg_mod = NOutArg
 		  PrintStringInfo(' ',ReportFileName,'both','y');
 		  error(9999, 'SCI2CERROR: Unexpected number of output arguments for global function.');
 	   end
-	 elseif(ASTFunName == 'raspi' | ASTFunName == 'raspi_close')
-	   SharedInfo.SkipNextFun = 1;
+	//To skip the functions for Raspberry Pi connections 
+    elseif(ASTFunName == 'raspi' | ASTFunName == 'raspi_close' | ASTFunName == 'i2cdetect')
+       disp_isthere=1;  // Skips the corresponding Lhs argument declaration
+       return           // Skips the function call
 	end
 
 	// #RNU_RES_B
@@ -142,8 +144,8 @@ NOutArg_mod = NOutArg
 	
 	if ASTFunName == '%sn'
 		ASTFunName='modsn';
-	end
-	
+	end	
+
 	if (ASTFunName == 'OpEqual')
 	   FunTypeAnnot = '';
 	   FunSizeAnnot = '';
diff --git a/macros/ASTManagement/lib b/macros/ASTManagement/lib
deleted file mode 100644
index f34860a..0000000
--- a/macros/ASTManagement/lib
+++ /dev/null
diff --git a/macros/CCodeGeneration/GetClsFileName.sci b/macros/CCodeGeneration/GetClsFileName.sci
index d92a431..4220410 100644
--- a/macros/CCodeGeneration/GetClsFileName.sci
+++ b/macros/CCodeGeneration/GetClsFileName.sci
@@ -78,7 +78,6 @@ elseif (SCI2Cfileexist(FileInfo.SCI2CLibSCIAnnFun,tmpannfilename))
    SCI2CClassName     = FL_GetFunctionClass(AnnFileName,SCI2CClassSpecifier,ReportFileName);
    SCI2CClassFileName = fullfile(FileInfo.SCI2CLibSCIAnnCls,SCI2CClassName+'.acls');
 end
-
 if (FlagFoundAnnFile == 0)
    [FlagFoundAnnFile,fullpathscifilename] = SCI2CFindFile(FileInfo.UserSciFilesPaths,FunName+'.sci');
    if (FlagFoundAnnFile == 0)
diff --git a/macros/CCodeGeneration/lib b/macros/CCodeGeneration/lib
deleted file mode 100644
index 3d4fed1..0000000
--- a/macros/CCodeGeneration/lib
+++ /dev/null
diff --git a/macros/ErrorMessages/lib b/macros/ErrorMessages/lib
deleted file mode 100644
index ba3b9a5..0000000
--- a/macros/ErrorMessages/lib
+++ /dev/null
diff --git a/macros/FunctionAnnotation/lib b/macros/FunctionAnnotation/lib
deleted file mode 100644
index 239105c..0000000
--- a/macros/FunctionAnnotation/lib
+++ /dev/null
diff --git a/macros/FunctionList/lib b/macros/FunctionList/lib
deleted file mode 100644
index 1c722dd..0000000
--- a/macros/FunctionList/lib
+++ /dev/null
diff --git a/macros/GeneralFunctions/lib b/macros/GeneralFunctions/lib
deleted file mode 100644
index 7586a91..0000000
--- a/macros/GeneralFunctions/lib
+++ /dev/null
diff --git a/macros/Hardware/AVR/lib b/macros/Hardware/AVR/lib
deleted file mode 100644
index ed4c52b..0000000
--- a/macros/Hardware/AVR/lib
+++ /dev/null
diff --git a/macros/Hardware/RasberryPi/lib b/macros/Hardware/RasberryPi/lib
deleted file mode 100644
index eec912f..0000000
--- a/macros/Hardware/RasberryPi/lib
+++ /dev/null
diff --git a/macros/ImageProcessing/core/lib b/macros/ImageProcessing/core/lib
deleted file mode 100644
index 40b7b0a..0000000
--- a/macros/ImageProcessing/core/lib
+++ /dev/null
diff --git a/macros/ImageProcessing/highgui/lib b/macros/ImageProcessing/highgui/lib
deleted file mode 100644
index 0d7f88a..0000000
--- a/macros/ImageProcessing/highgui/lib
+++ /dev/null
diff --git a/macros/ImageProcessing/imgproc/lib b/macros/ImageProcessing/imgproc/lib
deleted file mode 100644
index 63b5e7e..0000000
--- a/macros/ImageProcessing/imgproc/lib
+++ /dev/null
diff --git a/macros/Scilab-Arduino/lib b/macros/Scilab-Arduino/lib
deleted file mode 100644
index a62fd4e..0000000
--- a/macros/Scilab-Arduino/lib
+++ /dev/null
diff --git a/macros/SymbolTable/lib b/macros/SymbolTable/lib
deleted file mode 100644
index 4379c83..0000000
--- a/macros/SymbolTable/lib
+++ /dev/null
diff --git a/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci b/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci
index dfebfdf..a588ec5 100644
--- a/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci
+++ b/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci
@@ -5868,6 +5868,7 @@ PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
 // --- Function List Class. ---

 ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);

 PrintStringInfo('u80'+ArgSeparator+'',ClassFileName,'file','y');

+PrintStringInfo('d0'+ArgSeparator+'',ClassFileName,'file','y');

 

 // --- Annotation Function And Function List Function. ---

 FunctionName = 'RPI_digitalWriteByte'; 

@@ -5920,6 +5921,7 @@ PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
 // --- Function List Class. ---

 ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);

 PrintStringInfo('u160'+ArgSeparator+'',ClassFileName,'file','y');

+PrintStringInfo('d0'+ArgSeparator+'',ClassFileName,'file','y');

 

 // --- Annotation Function And Function List Function. ---

 FunctionName = 'RPI_pwmClock'; 

@@ -5944,6 +5946,7 @@ PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
 // --- Function List Class. ---

 ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);

 PrintStringInfo('u320'+ArgSeparator+'',ClassFileName,'file','y');

+PrintStringInfo('d0'+ArgSeparator+'',ClassFileName,'file','y');

 

 // --- Annotation Function And Function List Function. ---

 FunctionName = 'RPI_pwmRange'; 

@@ -6000,6 +6003,7 @@ PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
 // --- Function List Class. ---

 ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);

 PrintStringInfo('u80'+ArgSeparator+'i80',ClassFileName,'file','y');

+PrintStringInfo('d0'+ArgSeparator+'i80',ClassFileName,'file','y');

 

 // --- Annotation Function And Function List Function. ---

 FunctionName = 'RPI_I2CSetup'; 

@@ -6032,6 +6036,7 @@ PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
 // --- Function List Class. ---

 ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);

 PrintStringInfo('u160'+ArgSeparator+'i80',ClassFileName,'file','y');

+PrintStringInfo('d0'+ArgSeparator+'i80',ClassFileName,'file','y');

 

 // --- Annotation Function And Function List Function. ---

 FunctionName = 'RPI_I2CRead'; 

@@ -6088,6 +6093,7 @@ PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
 // --- Function List Class. ---

 ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);

 PrintStringInfo('u80'+ArgSeparator+'u80',ClassFileName,'file','y');

+PrintStringInfo('d0'+ArgSeparator+'u80',ClassFileName,'file','y');

 

 // --- Annotation Function And Function List Function. ---

 FunctionName = 'RPI_getAlt'; 

@@ -6124,6 +6130,7 @@ PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
 // --- Function List Class. ---

 ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);

 PrintStringInfo('u160'+ArgSeparator+'u160',ClassFileName,'file','y');

+PrintStringInfo('d0'+ArgSeparator+'u160',ClassFileName,'file','y');

 

 // --- Annotation Function And Function List Function. ---

 FunctionName = 'RPI_gertboardAnalogRead'; 

@@ -6148,6 +6155,7 @@ PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
 // --- Function List Class. ---

 ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);

 PrintStringInfo('u80'+ArgSeparator+'g2',ClassFileName,'file','y');

+PrintStringInfo('d0'+ArgSeparator+'g2',ClassFileName,'file','y');

 

 // --- Annotation Function And Function List Function. ---

 FunctionName = 'RPI_serialGetchar'; 

@@ -6169,6 +6177,7 @@ PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
 // --- Function List Class. ---

 ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);

 PrintStringInfo('u80u80'+ArgSeparator+'',ClassFileName,'file','y');

+PrintStringInfo('d0d0'+ArgSeparator+'',ClassFileName,'file','y');

 

 // --- Annotation Function And Function List Function. ---

 FunctionName = 'RPI_pinModeAlt'; 

@@ -6233,6 +6242,7 @@ PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
 // --- Function List Class. ---

 ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);

 PrintStringInfo('u80u160'+ArgSeparator+'',ClassFileName,'file','y');

+PrintStringInfo('d0d0'+ArgSeparator+'',ClassFileName,'file','y');

 

 // --- Annotation Function And Function List Function. ---

 FunctionName = 'RPI_pwmWrite'; 

@@ -6265,6 +6275,7 @@ PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
 // --- Function List Class. ---

 ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);

 PrintStringInfo('u160u160'+ArgSeparator+'',ClassFileName,'file','y');

+PrintStringInfo('d0d0'+ArgSeparator+'',ClassFileName,'file','y');

 

 // --- Annotation Function And Function List Function. ---

 FunctionName = 'RPI_gertboardAnalogWrite'; 

@@ -6289,6 +6300,7 @@ PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
 // --- Function List Class. ---

 ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);

 PrintStringInfo('u80g2'+ArgSeparator+'',ClassFileName,'file','y');

+PrintStringInfo('d0g2'+ArgSeparator+'',ClassFileName,'file','y');

 

 // --- Annotation Function And Function List Function. ---

 FunctionName = 'RPI_pinMode'; 

@@ -6333,6 +6345,7 @@ PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
 // --- Function List Class. ---

 ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);

 PrintStringInfo('u80u320'+ArgSeparator+'',ClassFileName,'file','y');

+PrintStringInfo('d0d0'+ArgSeparator+'',ClassFileName,'file','y');

 

 // --- Annotation Function And Function List Function. ---

 FunctionName = 'RPI_softToneWrite'; 

@@ -6357,6 +6370,7 @@ PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
 // --- Function List Class. ---

 ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);

 PrintStringInfo('u80i160'+ArgSeparator+'i80',ClassFileName,'file','y');

+PrintStringInfo('d0d0'+ArgSeparator+'i80',ClassFileName,'file','y');

 

 // --- Annotation Function And Function List Function. ---

 FunctionName = 'RPI_waitForInterrupt'; 

@@ -6381,6 +6395,7 @@ PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
 // --- Function List Class. ---

 ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);

 PrintStringInfo('u160u160'+ArgSeparator+'i80',ClassFileName,'file','y');

+PrintStringInfo('d0d0'+ArgSeparator+'i80',ClassFileName,'file','y');

 

 // --- Annotation Function And Function List Function. ---

 FunctionName = 'RPI_I2CWrite'; 

@@ -6413,6 +6428,7 @@ PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
 // --- Function List Class. ---

 ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);

 PrintStringInfo('g2u320'+ArgSeparator+'i80',ClassFileName,'file','y');

+PrintStringInfo('g2d0'+ArgSeparator+'i80',ClassFileName,'file','y');

 

 // --- Annotation Function And Function List Function. ---

 FunctionName = 'RPI_serialOpen'; 

@@ -6437,6 +6453,7 @@ PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
 // --- Function List Class. ---

 ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);

 PrintStringInfo('u160u80'+ArgSeparator+'u80',ClassFileName,'file','y');

+PrintStringInfo('d0d0'+ArgSeparator+'u80',ClassFileName,'file','y');

 

 // --- Annotation Function And Function List Function. ---

 FunctionName = 'RPI_pcf8574Setup'; 

@@ -6474,6 +6491,7 @@ PrintStringInfo('NOUT=        1',ClassFileName,'file','y');
 // --- Function List Class. ---

 ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);

 PrintStringInfo('u80u80u80'+ArgSeparator+'',ClassFileName,'file','y');

+PrintStringInfo('d0d0d0'+ArgSeparator+'',ClassFileName,'file','y');

 

 // --- Annotation Function And Function List Function. ---

 FunctionName = 'RPI_lcdPosition'; 

@@ -6499,6 +6517,7 @@ PrintStringInfo('NOUT=        1',ClassFileName,'file','y');
 // --- Function List Class. ---

 ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);

 PrintStringInfo('u160u160u160'+ArgSeparator+'i80',ClassFileName,'file','y');

+PrintStringInfo('d0d0d0'+ArgSeparator+'i80',ClassFileName,'file','y');

 

 // --- Annotation Function And Function List Function. ---

 FunctionName = 'RPI_I2CWriteReg8'; 

@@ -6524,6 +6543,7 @@ PrintStringInfo('NOUT=        1',ClassFileName,'file','y');
 // --- Function List Class. ---

 ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);

 PrintStringInfo('u80u80u80'+ArgSeparator+'u80',ClassFileName,'file','y');

+PrintStringInfo('d0d0d0'+ArgSeparator+'u80',ClassFileName,'file','y');

 

 // --- Annotation Function And Function List Function. ---

 FunctionName = 'RPI_shiftIn'; 

@@ -6548,6 +6568,7 @@ PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
 // --- Function List Class. ---

 ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);

 PrintStringInfo('u80u160u160'+ArgSeparator+'u80',ClassFileName,'file','y');

+PrintStringInfo('d0d0d0'+ArgSeparator+'u80',ClassFileName,'file','y');

 

 // --- Annotation Function And Function List Function. ---

 FunctionName = 'RPI_softPwmCreate'; 

@@ -6572,6 +6593,7 @@ PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
 // --- Function List Class. ---

 ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);

 PrintStringInfo('u160u160u160'+ArgSeparator+'u80',ClassFileName,'file','y');

+PrintStringInfo('d0d0d0'+ArgSeparator+'u80',ClassFileName,'file','y');

 

 // --- Annotation Function And Function List Function. ---

 FunctionName = 'RPI_mcp23s08Setup'; 

@@ -6600,6 +6622,7 @@ PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
 // --- Function List Class. ---

 ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);

 PrintStringInfo('u80u80u80u80'+ArgSeparator+'',ClassFileName,'file','y');

+PrintStringInfo('d0d0d0d0'+ArgSeparator+'',ClassFileName,'file','y');

 

 // --- Annotation Function And Function List Function. ---

 FunctionName = 'RPI_shiftOut'; 

@@ -6624,6 +6647,7 @@ PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
 // --- Function List Class. ---

 ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);

 PrintStringInfo('u160u80u80u80u80'+ArgSeparator+'i80',ClassFileName,'file','y');

+PrintStringInfo('d0d0d0d0d0'+ArgSeparator+'i80',ClassFileName,'file','y');

 

 // --- Annotation Function And Function List Function. ---

 FunctionName = 'RPI_sr595Setup'; 

@@ -6648,6 +6672,7 @@ PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
 // --- Function List Class. ---

 ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);

 PrintStringInfo('u80u80u80u80u80u80u80u80u80u80'+ArgSeparator+'',ClassFileName,'file','y');

+PrintStringInfo('d0d0d0d0d0d0d0d0d0d0'+ArgSeparator+'',ClassFileName,'file','y');

 

 // --- Annotation Function And Function List Function. ---

 FunctionName = 'RPI_lcdCharDef'; 

@@ -6672,6 +6697,7 @@ PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');
 // --- Function List Class. ---

 ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);

 PrintStringInfo('u80u80u80u80u80u80u80u80u80u80u80u80u80'+ArgSeparator+'u80',ClassFileName,'file','y');

+PrintStringInfo('d0d0d0d0d0d0d0d0d0d0d0d0d0'+ArgSeparator+'u80',ClassFileName,'file','y');

 

 // --- Annotation Function And Function List Function. ---

 FunctionName = 'RPI_lcdInit'; 

diff --git a/macros/ToolInitialization/lib b/macros/ToolInitialization/lib
deleted file mode 100644
index 670a52e..0000000
--- a/macros/ToolInitialization/lib
+++ /dev/null
diff --git a/macros/cb_sci2c_gui.sci b/macros/cb_sci2c_gui.sci
index 2267c6c..bf77c25 100644
--- a/macros/cb_sci2c_gui.sci
+++ b/macros/cb_sci2c_gui.sci
@@ -200,12 +200,17 @@ elseif get(gcbo, "tag")=="convertbtn" then
 
   // -*- DEBUG ONLY -*-
 
-  //mprintf("UserScilabMainFile = {%s}\n", UserScilabMainFile);
-  //mprintf("UserSciFilesPaths = {%s}\n", UserSciFilesPaths);
-  //mprintf("UserSciCodeMainDir = {%s}\n", UserSciCodeMainDir);
-  //mprintf("RunMode = {%s}\n", RunMode);
-  //mprintf("CopySciCodeIntoCCode = {%d}\n", bool2s(CopySciCodeIntoCCode));
-  //mprintf("NativeBuild = {%s}\n", NativeBuild);
+  mprintf("UserScilabMainFile = {%s}\n", UserScilabMainFile);
+  mprintf("UserSciFilesPaths = {%s}\n", UserSciFilesPaths);
+  mprintf("UserSciCodeMainDir = {%s}\n", UserSciCodeMainDir);
+  mprintf("RunMode = {%s}\n", RunMode);
+  mprintf("CopySciCodeIntoCCode = {%d}\n", bool2s(CopySciCodeIntoCCode));
+  mprintf("NativeBuild = {%s}\n", NativeBuild);
+  mprintf("Target = {%s}\n", Target);
+  mprintf("Board Name = {%s}\n", Board_name);
+//  disp("Variable Names:")
+//  disp(UserScilabMainFile, UserSciCodeMainDir, UserSciFilesPaths, RunMode, NativeBuild,Target,Board_name)
+//  disp("Done")
   scilab2c(UserScilabMainFile, UserSciCodeMainDir, UserSciFilesPaths, RunMode, NativeBuild,Target,Board_name);
 //
 // --- sci2c help ---
diff --git a/macros/findDeps/lib b/macros/findDeps/lib
deleted file mode 100644
index 88df35f..0000000
--- a/macros/findDeps/lib
+++ /dev/null
diff --git a/macros/lib b/macros/lib
deleted file mode 100644
index 551263e..0000000
--- a/macros/lib
+++ /dev/null
diff --git a/macros/sci2c_gui.sci b/macros/sci2c_gui.sci
index bee6fe4..cad8b24 100644
--- a/macros/sci2c_gui.sci
+++ b/macros/sci2c_gui.sci
@@ -216,7 +216,7 @@ outformatlabel = uicontrol("parent", sci2cfig,...
 outformatradiostalone = uicontrol("parent", sci2cfig,...
     "style", "radiobutton",...
     "string", gettext("Stand-alone"),...
-    "position",[2*margin+widgetLabelWidth outformaty 2*radiow widgeth],...
+    "position",[2*margin+widgetLabelWidth outformaty 2*radiow-10 widgeth],...
     "horizontalalignment", "left",...
     "fontname", defaultfont,...
     "fontunits", "points",...
@@ -309,7 +309,7 @@ runradiotranslate = uicontrol("parent", sci2cfig,...
 runradiogenlib = uicontrol("parent", sci2cfig,...
     "style", "radiobutton",...
     "string", gettext("Generate library"),...
-    "position",[2*margin+widgetLabelWidth+2*radiow runy 120 widgeth],...
+    "position",[2*margin+widgetLabelWidth+2*radiow+20 runy 150 widgeth],...
     "horizontalalignment", "left",...
     "fontname", defaultfont,...
     "fontunits", "points",...