summaryrefslogtreecommitdiff
path: root/2.3-1/macros/CCodeGeneration
diff options
context:
space:
mode:
Diffstat (limited to '2.3-1/macros/CCodeGeneration')
-rw-r--r--2.3-1/macros/CCodeGeneration/C_GenDeclarations_Dup.sci187
-rw-r--r--2.3-1/macros/CCodeGeneration/C_GenerateMakefile.sci21
-rw-r--r--2.3-1/macros/CCodeGeneration/C_GenerateMkfle_arduino.sci12
-rw-r--r--2.3-1/macros/CCodeGeneration/C_IfExpression.sci31
-rw-r--r--2.3-1/macros/CCodeGeneration/C_WhileExpression.sci28
-rw-r--r--2.3-1/macros/CCodeGeneration/GetClsFileName.sci4
-rw-r--r--2.3-1/macros/CCodeGeneration/JoinDeclarAndCcode.sci6
-rw-r--r--2.3-1/macros/CCodeGeneration/libbin1032 -> 1040 bytes
-rw-r--r--2.3-1/macros/CCodeGeneration/names2
9 files changed, 15 insertions, 276 deletions
diff --git a/2.3-1/macros/CCodeGeneration/C_GenDeclarations_Dup.sci b/2.3-1/macros/CCodeGeneration/C_GenDeclarations_Dup.sci
deleted file mode 100644
index 475e2e0c..00000000
--- a/2.3-1/macros/CCodeGeneration/C_GenDeclarations_Dup.sci
+++ /dev/null
@@ -1,187 +0,0 @@
-function Cdeclaration = C_GenDeclarations_Dup(InArg,NInArg,com_type,ArgStruct,CDeclarationFileName,IndentLevel,ReportFileName,FlagExt,ResizeApproach)
-// function Cdeclaration = C_GenDeclarations(ArgStruct,CDeclarationFileName,IndentLevel,ReportFileName,FlagExt,ResizeApproach)
-// -----------------------------------------------------------------
-// //NUT: add description here
-//
-// Input data:
-// //NUT: add description here
-//
-// Output data:
-// //NUT: add description here
-//
-// Status:
-// 27-Oct-2007 -- Raffaele Nutricato: Author.
-// 10-Jun-2008 -- Raffaele Nutricato: adapted to work with realloc function.
-//
-// Copyright 2007 Raffaele Nutricato.
-// Contact: raffaele.nutricato@tiscali.it
-// -----------------------------------------------------------------
-
-// Generate C corresponding declaration given some information in ArgStruct
-//
-
-// ------------------------------
-// --- Check input arguments. ---
-// ------------------------------
-SCI2CNInArgCheck(argn(2),9,9);
-// #RNU_RES_B
-//NUT: ilnome di questa funzione va cambiato perche' le dichiarazioni le fanno anche i for e i while.
-
-PrintStringInfo(' ',ReportFileName,'file','y');
-PrintStringInfo('***Generating C declaration***',ReportFileName,'file','y');
-// #RNU_RES_E
-
-Cdeclaration = '';
-if (ArgStruct.Dimension > 0)
- if (FlagExt == 1)
- Cdeclaration(1) = 'extern ';
- Cdeclaration(2) = 'extern ';
- else
- Cdeclaration(1) = '';
- Cdeclaration(2) = '';
- end
-// #RNU_RES_B
-//NUT: vedi Mem_Alloc_Out per maggiori info sulla rimozione della temp nella if
-// if ((ArgStruct.Scope=='Temp') | (ArgStruct.FindLike == -1) | (isnum(ArgStruct.Size(1))==%F) | (isnum(ArgStruct.Size(2))==%F))
-// #RNU_RES_E
- if (ArgStruct.Type=='g')
-// if (isnan(ArgStruct.Value) )
- if ((isnum(ArgStruct.Size(1))==%F) | (isnum(ArgStruct.Size(2))==%F) )
- Cdeclaration(1) = Cdeclaration(1)+C_Type(ArgStruct.Type)+...
- ' * '+ArgStruct.Name+';';
- else
- if ((FlagExt == 1) | (isnan(ArgStruct.Value)))
- Cdeclaration(1) = Cdeclaration(1)+C_Type(ArgStruct.Type)+...
- ' '+ArgStruct.Name+'['+ArgStruct.Size(1)+'*'+ArgStruct.Size(2)+'];';
- else
- Cdeclaration(1) = Cdeclaration(1)+C_Type(ArgStruct.Type)+...
- ' '+ArgStruct.Name+'['+ArgStruct.Size(1)+'*'+ArgStruct.Size(2)+'] = {'+ArgStruct.Value+'};';
- end
- end
- Cdeclaration(2) = Cdeclaration(2)+C_Type('i')+' __'+ArgStruct.Name+'Size[2] = {'+ArgStruct.Size(1)+','+ArgStruct.Size(2)+'};';
- elseif ((ArgStruct.FindLike == -1) | ...
- (isnum(ArgStruct.Size(1))==%F) | (isnum(ArgStruct.Size(2))==%F) | ...
- (ResizeApproach=='REALLOC_ALL_RESIZE_ALL' & ArgStruct.Type~='g'))
-// #RNU_RES_B
-//RNU sulle stringhe non ho ancora deciso se applicare la realloc.
-// Generate only the pointer that will be used by the malloc function.
-// #RNU_RES_E
- if (FlagExt == 1)
- Cdeclaration(1) = Cdeclaration(1)+C_Type(ArgStruct.Type)+'* '+...
- ArgStruct.Name+';';
- else
- Cdeclaration(1) = Cdeclaration(1)+C_Type(ArgStruct.Type)+'* '+...
- ArgStruct.Name+' = NULL;';
- end
-// Declare the Size array
- Cdeclaration(2) = Cdeclaration(2)+C_Type('i')+' __'+ArgStruct.Name+'Size[2];';
- else
-// Declare the array with its size.
- computedSize = ArgStruct.Size(1);
- computedSizeLength = size(ArgStruct.Size, '*');
- computedSizeField = ArgStruct.Size(1);
- for sizeIterator = 2:computedSizeLength;
- computedSize = computedSize + ' * ' + ArgStruct.Size(sizeIterator);
- computedSizeField = computedSizeField + ', ' + ArgStruct.Size(sizeIterator);
- end
- Cdeclaration(1) = Cdeclaration(1)+C_Type(ArgStruct.Type)+' '+ArgStruct.Name+'['+computedSize+']={';
- row = eval(ArgStruct.Size(1))
- col = eval(ArgStruct.Size(2))
- if row == 1
- if com_type == 0
- for i = 1:NInArg-1
- Cdeclaration(1) = Cdeclaration(1)+InArg(i).Name+',';
- end
- Cdeclaration(1) = Cdeclaration(1)+InArg(NInArg).Name+'};';
- else
- for i=1:NInArg-1
- if InArg(i).Type <> 'z' & InArg(i).Type <> 'c'
- Cdeclaration(1) = Cdeclaration(1)+InArg(i).Name+',0,';
- else
- Cdeclaration(1) = Cdeclaration(1)+InArg(i).Name+',';
- end
- end
- if InArg(NInArg).Type <> 'z' & InArg(NInArg).Type <> 'c'
- Cdeclaration(1) = Cdeclaration(1) + InArg(NInArg).Name + ',0};'
- else
- Cdeclaration(1) = Cdeclaration(1) + InArg(NInArg).Name + '};'
- end
- end
- else
- if com_type == 0
- for i = 1:col
- for j = 0:row-1
- if (j*col)+i ~= row*col
- Cdeclaration(1) = Cdeclaration(1) + InArg(((j*col)+i)).Name + ',';
- end
- end
- end
- Cdeclaration(1) = Cdeclaration(1) + InArg(NInArg).Name + '};';
- else
- for i = 1:col
- for j = 0:row-1
- if (j*col)+i ~= row*col
- if InArg(((j*col)+i)).Type <> 'z' & InArg(((j*col)+i)).Type <> 'c'
- Cdeclaration(1) = Cdeclaration(1) + InArg(((j*col)+i)).Name + ',0,';
- else
- Cdeclaration(1) = Cdeclaration(1) + InArg(((j*col)+i)).Name + ',';
- end
- end
- end
- end
- if InArg(NInArg).Type <> 'z' & InArg(NInArg).Type <> 'c'
- Cdeclaration(1) = Cdeclaration(1) + InArg(NInArg).Name + ',0};';
- else
- Cdeclaration(1) = Cdeclaration(1) + InArg(NInArg).Name + '};';
- end
- end
- end
- Cdeclaration(2) = Cdeclaration(2)+C_Type('i')+' __'+ArgStruct.Name+'Size['+string(computedSizeLength)+']';
- if (FlagExt <> 1)
- Cdeclaration(2) = Cdeclaration(2)+' = {'+computedSizeField+'}';
- end
- Cdeclaration(2) = Cdeclaration(2)+';';
- end
-else
- if (ArgStruct.Type == 'fn')
- //do nothing. This is a function name. Will be declared in header file.
- else
- if (FlagExt == 1)
- Cdeclaration(1) = 'extern ';
- else
- Cdeclaration(1) = '';
- end
- Cdeclaration(1) = Cdeclaration(1)+C_Type(ArgStruct.Type)+' '+ArgStruct.Name;
- if (~isnan(ArgStruct.Value) & (FlagExt == 0))
- if isreal(ArgStruct.Value)
- Cdeclaration(1) = Cdeclaration(1)+' = '+SCI2Cstring(ArgStruct.Value);
- else
- if (ArgStruct.Type == 'z')
- Cdeclaration(1) = Cdeclaration(1)+' = DoubleComplex('+SCI2Cstring(real(ArgStruct.Value))+','+SCI2Cstring(imag(ArgStruct.Value))+')';
- else
- Cdeclaration(1) = Cdeclaration(1)+' = FloatComplex('+SCI2Cstring(real(ArgStruct.Value))+','+SCI2Cstring(imag(ArgStruct.Value))+')';
- end
- end
- end
- Cdeclaration(1) = Cdeclaration(1)+';';
- end
-end
-
-
-// --------------------------------------------
-// --- Write C declaration into the C file. ---
-// --------------------------------------------
-PrintStringInfo(' ',CDeclarationFileName,'file','y');
-for cntdecl = 1:size(Cdeclaration, '*')
- PrintStringInfo(' '+Cdeclaration(cntdecl),ReportFileName,'file','y');
- PrintStringInfo(C_IndentBlanks(IndentLevel)+Cdeclaration(cntdecl),CDeclarationFileName,'file','y');
-end
-
-PrintStringInfo(' Writing C declaration in: '+CDeclarationFileName,ReportFileName,'file','y');
-PrintStringInfo(' ',CDeclarationFileName,'file','y');
-
-endfunction
-// #RNU_RES_B
-//NUT: dove sta il controllo che verifica se dopo aver dichiarato una local A[10] essa viene utilizzata
-//NUT: per memorizzare un A = sin(B) dove B[11]??
-// #RNU_RES_E
diff --git a/2.3-1/macros/CCodeGeneration/C_GenerateMakefile.sci b/2.3-1/macros/CCodeGeneration/C_GenerateMakefile.sci
index 3b977bd6..7dfb4da4 100644
--- a/2.3-1/macros/CCodeGeneration/C_GenerateMakefile.sci
+++ b/2.3-1/macros/CCodeGeneration/C_GenerateMakefile.sci
@@ -70,7 +70,7 @@ else
PrintStringInfo('CXX = arm-linux-gnueabihf-g++ ',FileInfo.MakefileFilename,'file','y','y');
PrintStringInfo('CFLAGS = -Wall -pedantic -g -I $(HSRCDIR) -I $(ISRCDIR) -L $(LIBDIR)',FileInfo.MakefileFilename,'file','y','y');
PrintStringInfo('CXXFLAGS = -Wall -pedantic -g -I $(HSRCDIR) -I $(ISRCDIR) -L $(LIBDIR)',FileInfo.MakefileFilename,'file','y','y');
- PrintStringInfo('LDFLAGS = -llapack -lrefblas -lgfortran -lwiringPi -lwiringPiDev -lrt -lpthread',FileInfo.MakefileFilename,'file','y','y');
+ PrintStringInfo('LDFLAGS = -llapack -lrefblas -lgfortran -lwiringPi',FileInfo.MakefileFilename,'file','y','y');
else
PrintStringInfo('CC = gcc',FileInfo.MakefileFilename,'file','y','y');
PrintStringInfo('CXX = g++',FileInfo.MakefileFilename,'file','y','y');
@@ -78,25 +78,6 @@ else
PrintStringInfo('CXXFLAGS = -Wall -pedantic -g -I $(HSRCDIR) -I $(ISRCDIR) -L $(LIBDIR)',FileInfo.MakefileFilename,'file','y','y');
PrintStringInfo('LDFLAGS = -lblas -llapack -lm ',FileInfo.MakefileFilename,'file','y','y');
end
-
- //If ode function is used, add libgsl.
- if(size(SharedInfo.Includelist) <> 0)
- if((mtlb_strcmp(part(SharedInfo.Includelist(1),1:5),'odefn') == %T))
- if(target == 'RPi')
- PrintStringInfo('LDFLAGS = -lgsl -lcblas',FileInfo.MakefileFilename,'file','y','y');
- else
- PrintStringInfo('LDFLAGS = -lgsl',FileInfo.MakefileFilename,'file','y','y');
- end
-
- end
- end
-
- if (target == 'RPi')
- PrintStringInfo('LDFLAGS += -llapack -lrefblas -lgfortran -lwiringPi',FileInfo.MakefileFilename,'file','y','y');
- else
- PrintStringInfo('LDFLAGS += -lblas -llapack -lm ',FileInfo.MakefileFilename,'file','y','y');
- end
-
if(SharedInfo.OpenCVUsed == %T)
PrintStringInfo('LDFLAGS += -lopencv_calib3d -lopencv_contrib -lopencv_features2d -lopencv_flann -lopencv_gpu',FileInfo.MakefileFilename,'file','y','y');
PrintStringInfo('LDFLAGS += -lopencv_highgui -lopencv_imgproc -lopencv_legacy -lopencv_ml -lopencv_nonfree',FileInfo.MakefileFilename,'file','y','y');
diff --git a/2.3-1/macros/CCodeGeneration/C_GenerateMkfle_arduino.sci b/2.3-1/macros/CCodeGeneration/C_GenerateMkfle_arduino.sci
deleted file mode 100644
index b43eb442..00000000
--- a/2.3-1/macros/CCodeGeneration/C_GenerateMkfle_arduino.sci
+++ /dev/null
@@ -1,12 +0,0 @@
-function C_GenerateMkfle_arduino(FileInfo,SharedInfo)
-
- PrintStringInfo('ARDUINO_DIR = /usr/share/arduino',FileInfo.MakefileFilename,'file','y','y');
- PrintStringInfo('ARDMK_DIR = /usr/share/arduino',FileInfo.MakefileFilename,'file','y','y');
- PrintStringInfo('AVR_TOOLS_DIR = /usr',FileInfo.MakefileFilename,'file','y','y');
- PrintStringInfo('BOARD_TAG = ' + SharedInfo.Board_name ,FileInfo.MakefileFilename,'file','y','y');
- PrintStringInfo('USER_LIB_PATH = ../',FileInfo.MakefileFilename,'file','y','y');
- PrintStringInfo('ARDUINO_LIBS = ../src/c ../includes ../interfaces ../ Wire',FileInfo.MakefileFilename,'file','y','y');
- PrintStringInfo('ARDUINO_PORT = /dev/ttyACM0',FileInfo.MakefileFilename,'file','y','y');
- PrintStringInfo('include /usr/share/arduino/Arduino.mk',FileInfo.MakefileFilename,'file','y','y');
-
-endfunction
diff --git a/2.3-1/macros/CCodeGeneration/C_IfExpression.sci b/2.3-1/macros/CCodeGeneration/C_IfExpression.sci
index 359b7882..48a05383 100644
--- a/2.3-1/macros/CCodeGeneration/C_IfExpression.sci
+++ b/2.3-1/macros/CCodeGeneration/C_IfExpression.sci
@@ -1,4 +1,4 @@
-function SharedInfo = C_IfExpression(IfCondArg,NIfCondArg,Op,NOp,ASTIfExpType,FileInfo,SharedInfo)
+function SharedInfo = C_IfExpression(IfCondArg,NIfCondArg,ASTIfExpType,FileInfo,SharedInfo)
// function SharedInfo = C_IfExpression(IfCondArg,NIfCondArg,ASTIfExpType,FileInfo,SharedInfo)
// -----------------------------------------------------------------
// //NUT: add description here
@@ -19,16 +19,12 @@ function SharedInfo = C_IfExpression(IfCondArg,NIfCondArg,Op,NOp,ASTIfExpType,Fi
// ------------------------------
// --- Check input arguments. ---
// ------------------------------
-SCI2CNInArgCheck(argn(2),7,7);
-
-//global SCI2CSTACK
-//global StackPosition;
-//global STACKDEDUG
+SCI2CNInArgCheck(argn(2),5,5);
// --- Check NIfCondArg value. ---
-//if ((NIfCondArg ~= 1) & (ASTIfExpType~='else'))
- // error(9999, 'Cannot manage ""if/elseif"" with a number of condition variables not equal to 1.');
-//end
+if ((NIfCondArg ~= 1) & (ASTIfExpType~='else'))
+ error(9999, 'Cannot manage ""if/elseif"" with a number of condition variables not equal to 1.');
+end
// -----------------------
// --- Initialization. ---
@@ -41,7 +37,7 @@ CPass1FileName = FileInfo.Funct(nxtscifunnumber).CPass1FileName;
// #RNU_RES_B
PrintStringInfo(' ',ReportFileName,'file','y');
-PrintStringInfo('***Generating C code***'+ string(NIfCondArg),ReportFileName,'file','y');
+PrintStringInfo('***Generating C code***',ReportFileName,'file','y');
// #RNU_RES_E
// ---------------------------
// --- End Initialization. ---
@@ -70,23 +66,10 @@ if SCI2Cstrncmps1size(ASTIfExpType,'else')
SharedInfo = C_IfElseBlocks(FileInfo,SharedInfo,'out');
end
-i=1;
-k=1;
CCall ='';
CCall = CCall+CFunName;
if (ASTIfExpType~='else')
- CCall = CCall+'(';
- while i <= NIfCondArg
- CCall = CCall + IfCondArg(i) + ' ';
- //d = modulo(i,3);
- //PrintStringInfo(' '+string(i)+string(d),'file','y');
- if (modulo(i,3)==0 & i<>NIfCondArg)
- CCall = CCall + Op(k) + ' ';
- k = k + 1;
- end
- i = i + 1;
- end
- CCall = CCall+')';
+ CCall = CCall+'('+IfCondArg(1)+')';
end
PrintStringInfo(' '+CCall,ReportFileName,'file','y');
PrintStringInfo(C_IndentBlanks(SharedInfo.NIndent)+CCall,CPass1FileName,'file','y');
diff --git a/2.3-1/macros/CCodeGeneration/C_WhileExpression.sci b/2.3-1/macros/CCodeGeneration/C_WhileExpression.sci
index 368ccffa..edd2830e 100644
--- a/2.3-1/macros/CCodeGeneration/C_WhileExpression.sci
+++ b/2.3-1/macros/CCodeGeneration/C_WhileExpression.sci
@@ -1,4 +1,4 @@
-function SharedInfo = C_WhileExpression(IfCondArg,NIfCondArg,Op,NOp,FileInfo,SharedInfo)
+function SharedInfo = C_WhileExpression(FileInfo,SharedInfo)
// function SharedInfo = C_WhileExpression(FileInfo,SharedInfo)
// -----------------------------------------------------------------
// //NUT: add description here
@@ -19,7 +19,7 @@ function SharedInfo = C_WhileExpression(IfCondArg,NIfCondArg,Op,NOp,FileInfo,Sha
// ------------------------------
// --- Check input arguments. ---
// ------------------------------
-SCI2CNInArgCheck(argn(2),6,6);
+SCI2CNInArgCheck(argn(2),2,2);
// -----------------------
// --- Initialization. ---
@@ -63,7 +63,7 @@ for cntstr = 1:NumCStrings
// Epilogue
if (length(C_Strings(cntstr)) == 0)
C_Strings(cntstr) = ' '; // RNU for Bruno: If I don't do that I get a PrintStringInfo error related to mputstr.
- // Function not defined for given argument type(s),
+ // Function not defined for given argument type(s),
// check arguments or define function %0_mputstr for overloading.
end
PrintStringInfo(C_Strings(cntstr),CPass1WhileEpilFileName ,'file','y','n');
@@ -76,27 +76,7 @@ PrintStringInfo('}',CPass1WhileEpilFileName ,'file','y');
// ------------------------------
// --- Insert for expression. ---
// ------------------------------
-//CCall = 'while('+SharedInfo.WhileExpr.CondVar+')';
-//PrintStringInfo(C_IndentBlanks(SharedInfo.NIndent)+CCall,CPass1FileName,'file','y');
-
-i=1;
-k=1;
-CCall ='';
-CCall = CCall+'while';
- CCall = CCall+'(';
- while i <= NIfCondArg
- CCall = CCall + IfCondArg(i) + ' ';
- //d = modulo(i,3);
- //PrintStringInfo(' '+string(i)+string(d),'file','y');
- if (modulo(i,3)==0 & i<>NIfCondArg)
- CCall = CCall + Op(k) + ' ';
- k = k + 1;
- end
- i = i + 1;
- end
- CCall = CCall+')';
-
-PrintStringInfo(' '+CCall,ReportFileName,'file','y');
+CCall = 'while('+SharedInfo.WhileExpr.CondVar+')';
PrintStringInfo(C_IndentBlanks(SharedInfo.NIndent)+CCall,CPass1FileName,'file','y');
// -------------------
diff --git a/2.3-1/macros/CCodeGeneration/GetClsFileName.sci b/2.3-1/macros/CCodeGeneration/GetClsFileName.sci
index d92a431c..46f08201 100644
--- a/2.3-1/macros/CCodeGeneration/GetClsFileName.sci
+++ b/2.3-1/macros/CCodeGeneration/GetClsFileName.sci
@@ -45,7 +45,6 @@ if SCI2Cfileexist(FileInfo.USER2CLibCAnnFun,tmpannfilename)
// #RNU_RES_B
// It is a C function of the USER2C library.
// #RNU_RES_E
- PrintStringInfo('cUser2c',ReportFileName,'file','y');
FlagFoundAnnFile = 1;
AnnFileName = fullfile(FileInfo.USER2CLibCAnnFun,tmpannfilename);
SCI2CClassName = FL_GetFunctionClass(AnnFileName,SCI2CClassSpecifier,ReportFileName);
@@ -54,7 +53,6 @@ elseif SCI2Cfileexist(FileInfo.USER2CLibSCIAnnFun,tmpannfilename)
// #RNU_RES_B
// It is a scilab function of the USER2C library.
// #RNU_RES_E
- PrintStringInfo('fUser2c',ReportFileName,'file','y');
FlagFoundAnnFile = 1;
AnnFileName = fullfile(FileInfo.USER2CLibSCIAnnFun,tmpannfilename);
SCI2CClassName = FL_GetFunctionClass(AnnFileName,SCI2CClassSpecifier,ReportFileName);
@@ -63,7 +61,6 @@ elseif (SCI2Cfileexist(FileInfo.SCI2CLibCAnnFun,tmpannfilename))
// #RNU_RES_B
// It is a C function of the SCI2C library.
// #RNU_RES_E
- PrintStringInfo('csci2c',ReportFileName,'file','y');
FlagFoundAnnFile = 1;
AnnFileName = fullfile(FileInfo.SCI2CLibCAnnFun,tmpannfilename);
SCI2CClassName = FL_GetFunctionClass(AnnFileName,SCI2CClassSpecifier,ReportFileName);
@@ -72,7 +69,6 @@ elseif (SCI2Cfileexist(FileInfo.SCI2CLibSCIAnnFun,tmpannfilename))
// #RNU_RES_B
// It is a scilab function of the SCI2C library.
// #RNU_RES_E
- PrintStringInfo('fsci2c',ReportFileName,'file','y');
FlagFoundAnnFile = 1;
AnnFileName = fullfile(FileInfo.SCI2CLibSCIAnnFun,tmpannfilename);
SCI2CClassName = FL_GetFunctionClass(AnnFileName,SCI2CClassSpecifier,ReportFileName);
diff --git a/2.3-1/macros/CCodeGeneration/JoinDeclarAndCcode.sci b/2.3-1/macros/CCodeGeneration/JoinDeclarAndCcode.sci
index 35607f6d..2c69f46e 100644
--- a/2.3-1/macros/CCodeGeneration/JoinDeclarAndCcode.sci
+++ b/2.3-1/macros/CCodeGeneration/JoinDeclarAndCcode.sci
@@ -146,10 +146,10 @@ PrintStringInfo('** --- C code. ---',CPass2FileName,'file','y');
PrintStringInfo('** ---------------',CPass2FileName,'file','y');
PrintStringInfo('*/',CPass2FileName,'file','y');
-//if((SharedInfo.Target == "RPi") & (nxtscifunname == SharedInfo.SCIMainFunName))
+if((SharedInfo.Target == "RPi") & (nxtscifunname == SharedInfo.SCIMainFunName))
//Add wiringPiSetup() function as it is required
-// PrintStringInfo('wiringPiSetup();',CPass2FileName,'file','y');
-//end
+ PrintStringInfo('wiringPiSetup();',CPass2FileName,'file','y');
+end
// --- Copy the remaining part of V1 in V2. ---
while (~meof(CPass1V1FileFid))
// #RNU_RES_B
diff --git a/2.3-1/macros/CCodeGeneration/lib b/2.3-1/macros/CCodeGeneration/lib
index c5f171db..2d5aef48 100644
--- a/2.3-1/macros/CCodeGeneration/lib
+++ b/2.3-1/macros/CCodeGeneration/lib
Binary files differ
diff --git a/2.3-1/macros/CCodeGeneration/names b/2.3-1/macros/CCodeGeneration/names
index 56caa81d..efbb400a 100644
--- a/2.3-1/macros/CCodeGeneration/names
+++ b/2.3-1/macros/CCodeGeneration/names
@@ -2,12 +2,10 @@ C_FinalizeCode
C_ForExpression
C_Funcall
C_GenDeclarations
-C_GenDeclarations_Dup
C_GenerateFunName
C_GenerateLaunchScript
C_GenerateMakefile
C_GenerateMakefile_msvc
-C_GenerateMkfle_arduino
C_GenerateSCI2CHeader
C_IfElseBlocks
C_IfExpression