Commit 0e4968cc authored by TheDebbio's avatar TheDebbio
Browse files

broken: mixeroperator in progress

parent 19df6bd0

.vscode/c_cpp_properties.json

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
            "windowsSdkVersion": "10.0.17763.0",

            "compilerPath": "C:/Program Files (x86)/Microsoft Visual Studio/2017/Community/VC/Tools/MSVC/14.16.27023/bin/Hostx64/x64/cl.exe",

            "cStandard": "c11",

            "cppStandard": "c++17"

            "cppStandard": "c++03"

        }

    ],

    "version": 4

.vscode/settings.json

+2 −1
Original line number Diff line number Diff line 
{

    "files.associations": {

        "*.idl": "cpp",

        "ira": "cpp"

        "ira": "cpp",

        "map": "cpp"

    }

}
 
 No newline at end of file

Medicina/Servers/MedicinaCBand/include/Commons.h

+10 −0
Original line number Diff line number Diff line
@@ -7,6 +7,16 @@ 
#include <ReceiversDefinitionsC.h>





	/**

	 * @brief Calibration mark data repr

	 * 

	 */

	typedef struct {

		double skyFrequency;

		double markValue;

		Receivers::TPolarization polarization;

	} TMarkValue;



    /**

     * @brief Synth data repr. 

     */

Medicina/Servers/MedicinaCBand/include/ComponentCore.h

+4 −10
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include <LocalOscillatorInterfaceC.h>

#include <ReceiversErrors.h>

#include <ManagmentDefinitionsC.h>

#include "MixerOperator.h"



/**

 * This class contains the code of almost all the features  of the component
@@ -424,7 +425,7 @@ private: 
        UNLOCKED=11

    };



    /**@brief LO device anda data collector */        

    /**@brief LO device and data collector */        



    CConfiguration m_configuration;

    maci::ContainerServices* m_services;
@@ -435,16 +436,9 @@ private: 
    ACS::doubleSeq m_bandwidth;

    ACS::longSeq m_polarization;

    ACS::doubleSeq m_localOscillatorValue;  /**< Frequency Value */

    IRA::CString m_setupMode;

    IRA::CString m_setupMode;   /**< Setup mode string */



    struct LO{

        Receivers::LocalOscillator_var m_localOscillatorDevice; /**< LO  connected device */

        bool m_localOscillatorFault;    /**< Falut flag */

        double m_value;                 /**< Freq Value */

    };



    LO m_lo_1st;        /**< 1st stage mixer */

    LO m_lo_2nd;        /**< 2st stage mixer */

    MixerOperator m_mixer;  /**< LOs manager */



    double m_vacuum;

    CConfiguration::BoardValue m_environmentTemperature;

Medicina/Servers/MedicinaCBand/include/Configuration.h

+5 −4
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include "Commons.h"

#include "ReceiverConfHandler.h"





/**

 * This class implements the component configuration. The data inside this class are initialized at the startup from the

 * configuration database and then are used (read) inside the component.
@@ -219,10 +220,6 @@ public: 
	 */

	inline double const * const  getLOMax() const { return  &m_conf_hnd.getCurrentSetup().m_LOMax[0]; }



public: 



	ReceiverConfHandler m_conf_hnd;	/**< Receiver Configuration  helper */	



private:



	/**
@@ -264,6 +261,10 @@ private: 
	 */

	void readSyntTable(std::vector<TLOValue> & p_synt_table, IRA::CString p_table_file) throw (ComponentErrors::CDBAccessExImpl, ComponentErrors::MemoryAllocationExImpl);



public: 



	ReceiverConfHandler m_conf_hnd;	/**< Receiver Configuration  helper */	



private:



	IRA::CString m_dewarIPAddress;