RPi-PWM and basic imaage processing

4 files changed, 191 insertions, 43 deletions

diff --git a/macros/ToolInitialization/INIT_FillSCI2LibCDirs.bin b/macros/ToolInitialization/INIT_FillSCI2LibCDirs.bin
index f9c8482..ab16036 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 72652e0..5e4eb03 100644
--- a/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci
+++ b/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci
@@ -4769,30 +4769,40 @@ PrintStringInfo('      Adding Function: '+FunctionName+'.',GeneralReport,'file',
 INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);

 INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);

 

+FunctionName = 'RPI_DigitalOut'; 

+PrintStringInfo('      Adding Function: '+FunctionName+'.',GeneralReport,'file','y');

+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);

+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);

+

+FunctionName = 'RPI_HardPWMWrite'; 

+PrintStringInfo('      Adding Function: '+FunctionName+'.',GeneralReport,'file','y');

+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);

+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);

+

 //------------------------------------

 //---- Class RPI_DigitalOut ----------

 //------------------------------------

-ClassName = 'RPI_DigitalOut';

+//ClassName = 'RPI_DigitalOut';

 

 // --- 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');

+//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);

+//ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);

 

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

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

 

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

-FunctionName = 'RPI_DigitalOut'; 

-PrintStringInfo('      Adding Function: '+FunctionName+'.',GeneralReport,'file','y');

-INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);

-INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);

+//FunctionName = 'RPI_DigitalOut'; 

+//PrintStringInfo('      Adding Function: '+FunctionName+'.',GeneralReport,'file','y');

+//INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);

+//INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);

 

 //------------------------------------

 //---- Class RPI_DigitalIn -----------

@@ -4822,21 +4832,21 @@ INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,Ex
 //------------------------------------

 //---- Class RPI_DelayMilli ----------

 //------------------------------------

-ClassName = 'RPI_DelayMilli';

+//ClassName = 'RPI_DelayMilli';

 

 // --- 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=    ''u8''',ClassFileName,'file','y');

-PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y');

-PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');

+//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=    ''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);

+//ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);

 

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

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

 

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

 FunctionName = 'RPI_DelayMilli'; 

@@ -4849,6 +4859,31 @@ PrintStringInfo('      Adding Function: '+FunctionName+'.',GeneralReport,'file',
 INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);

 INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);

 

+FunctionName = 'RPI_SerialClose'; 

+PrintStringInfo('      Adding Function: '+FunctionName+'.',GeneralReport,'file','y');

+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);

+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);

+

+FunctionName = 'RPI_SerialFlush'; 

+PrintStringInfo('      Adding Function: '+FunctionName+'.',GeneralReport,'file','y');

+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);

+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);

+

+FunctionName = 'RPI_HardPWMSetRange'; 

+PrintStringInfo('      Adding Function: '+FunctionName+'.',GeneralReport,'file','y');

+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);

+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);

+

+FunctionName = 'RPI_HardPWMSetClock'; 

+PrintStringInfo('      Adding Function: '+FunctionName+'.',GeneralReport,'file','y');

+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);

+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);

+

+FunctionName = 'RPI_HardPWMSetMode'; 

+PrintStringInfo('      Adding Function: '+FunctionName+'.',GeneralReport,'file','y');

+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);

+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);

+

 //------------------------------------

 //---- Class RPI_GetMilli ----------

 //------------------------------------

@@ -4907,31 +4942,31 @@ INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,Ex
 //------------------------------------

 //---- Class RPI_SetupClose ----------

 //------------------------------------

-ClassName = 'RPI_SetupClose';

+//ClassName = 'RPI_SetupClose';

 

 // --- 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=    ''u8''',ClassFileName,'file','y');

-PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y');

-PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');

+//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=    ''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);

+//ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);

 

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

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

 

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

-FunctionName = 'RPI_SerialClose'; 

-PrintStringInfo('      Adding Function: '+FunctionName+'.',GeneralReport,'file','y');

-INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);

-INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);

-FunctionName = 'RPI_SerialFlush'; 

-PrintStringInfo('      Adding Function: '+FunctionName+'.',GeneralReport,'file','y');

-INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);

-INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);

+//FunctionName = 'RPI_SerialClose'; 

+//PrintStringInfo('      Adding Function: '+FunctionName+'.',GeneralReport,'file','y');

+//INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);

+//INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);

+//FunctionName = 'RPI_SerialFlush'; 

+//PrintStringInfo('      Adding Function: '+FunctionName+'.',GeneralReport,'file','y');

+//INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);

+//INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);

 

 //------------------------------------

 //---- Class RPI_SerialSendData ----------

@@ -5500,6 +5535,118 @@ PrintStringInfo('      Adding Function: '+FunctionName+'.',GeneralReport,'file',
 INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);

 INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);

 

+//------------------------------------

+//---- Class cvCreateImage --------------------

+//------------------------------------

+ClassName = 'CV_CreateImage';

+

+// --- 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=    ''im''',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');

+

+ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);

+PrintStringInfo('d0d0g2d0'+ArgSeparator+'im0',ClassFileName,'file','y');

+

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

+FunctionName = 'CV_CreateImage'; 

+PrintStringInfo('      Adding Function: '+FunctionName+'.',GeneralReport,'file','y');

+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);

+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);

+

+//------------------------------------

+//---- Class cvLoadImage --------------------

+//------------------------------------

+ClassName = 'CV_LoadImage';

+

+// --- 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=         2',ClassFileName,'file','y');

+PrintStringInfo('NOUT=         1',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).TP=    ''im''',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y');

+PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y');

+

+ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);

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

+

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

+FunctionName = 'CV_LoadImage'; 

+PrintStringInfo('      Adding Function: '+FunctionName+'.',GeneralReport,'file','y');

+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);

+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);

+

+//------------------------------------

+//---- Class cvShowImage -------------

+//------------------------------------

+ClassName = 'CV_ShowImage';

+

+// --- 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=         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');

+

+PrintStringInfo('NIN=         1',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');

+

+ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);

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

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

+

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

+FunctionName = 'CV_ShowImage'; 

+PrintStringInfo('      Adding Function: '+FunctionName+'.',GeneralReport,'file','y');

+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);

+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);

+

+FunctionName = 'CV_SaveImage'; 

+PrintStringInfo('      Adding Function: '+FunctionName+'.',GeneralReport,'file','y');

+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);

+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);

+

+//------------------------------------

+//---- Class CV_WaitKey --------------

+//------------------------------------

+ClassName = 'CV_WaitKey';

+

+// --- 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=         1',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');

+

+ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);

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

+

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

+FunctionName = 'CV_WaitKey'; 

+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_GenSharedInfo.bin b/macros/ToolInitialization/INIT_GenSharedInfo.bin
index f0955c3..7263830 100644
--- a/macros/ToolInitialization/INIT_GenSharedInfo.bin
+++ b/macros/ToolInitialization/INIT_GenSharedInfo.bin
diff --git a/macros/ToolInitialization/INIT_GenSharedInfo.sci b/macros/ToolInitialization/INIT_GenSharedInfo.sci
index 2aeec08..abe813c 100644
--- a/macros/ToolInitialization/INIT_GenSharedInfo.sci
+++ b/macros/ToolInitialization/INIT_GenSharedInfo.sci
@@ -62,7 +62,7 @@ SharedInfo.NFilesToTranslate = 1;
 

 // --- Annotations. ---

 SharedInfo.Annotations.GBLVAR   = 'global';

-SharedInfo.Annotations.DataPrec = {'uint8','int8','uint16','int16','int','float','double'};

+SharedInfo.Annotations.DataPrec = {'uint8','int8','uint16','int16','int','float','double','IplImage'};

 SharedInfo.Annotations.FUNNIN   = 'NIN=';

 SharedInfo.Annotations.FUNNOUT  = 'NOUT=';

 SharedInfo.Annotations.FUNTYPE  = '''OUT(''+string(SCI2C_nout)+'').TP='''; // Type includes also precision.

@@ -130,5 +130,6 @@ SharedInfo.Target = Target; // Specifies code generation target.
 

 SharedInfo.Includelist = list(); //Maintains list of functions being used in code

 								// to add their header files to main function.

+SharedInfo.OpenCVUsed = %F; 	// Specifies if opencv library is used or not

 

 endfunction