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

reviw with missing bits from macca's specs

parent b0d46ee9

Common/Libraries/IRALibrary/include/ReceiverControl.h

+6 −4
Original line number Diff line number Diff line
@@ -909,7 +909,7 @@ public: 
    ) throw (ReceiverControlEx);





private:

protected:

    

	/** Send the request to the board and receive the answer

     * @param board_ptr pointer to the board (dewar of LNA board)
@@ -924,6 +924,7 @@ private: 
            const BYTE command, size_t len, ...

    ) throw(MicroControllerBoardEx);



private:



        /** Return the requested value computed from a vector<BYTE> of parameters

	 * @param parameters a vector of BYTEs to join to compute the final value
@@ -995,6 +996,7 @@ private: 
     */

    bool m_reliable_comm;



 protected:

 

    /** Dewar MicroControllerBoard pointer */

    MicroControllerBoard *m_dewar_board_ptr;

Common/Libraries/IRALibrary/src/ReceiverControl.cpp

+0 −5
Original line number Diff line number Diff line
@@ -514,7 +514,6 @@ bool ReceiverControl::isVacuumSensorOn( 
    }

}





void ReceiverControl::setVacuumPumpOn(

            const BYTE data_type,

            const BYTE port_type,
@@ -539,7 +538,6 @@ void ReceiverControl::setVacuumPumpOn( 
    }

}





void ReceiverControl::setVacuumPumpOff(

            const BYTE data_type,

            const BYTE port_type,
@@ -564,7 +562,6 @@ void ReceiverControl::setVacuumPumpOff( 
    }

}





bool ReceiverControl::isVacuumPumpOn(

            const BYTE data_type,

            const BYTE port_type,
@@ -593,7 +590,6 @@ bool ReceiverControl::isVacuumPumpOn( 
    }

}





bool ReceiverControl::hasVacuumPumpFault(

        const BYTE data_type,

        const BYTE port_type,
@@ -1804,7 +1800,6 @@ void ReceiverControl::setSkyPath( 
}







std::vector<BYTE> ReceiverControl::makeRequest(MicroControllerBoard *board_ptr, BYTE command, size_t len, ...) 

    throw (MicroControllerBoardEx)

{

Medicina/Interfaces/MedicinaReceiversInterface/idl/MedicinaCBand.idl

+2 −3
Original line number Diff line number Diff line
@@ -140,10 +140,9 @@ module Receivers { 
			* Vacuum valve opening, it can act in two different ways:

			*   * Applying delay starting from pump activation

			*   * Applying delay starting from when pump is up to speed

			* @param[in] p_mode Delay mode

			* @param[in] p_dealy_sec Delay in seconds

			* @param[in] p_mode DELAY string requests delayed start	

			*/

          void openVacuumValve(in string p_mode, in double p_delay_sec) raises (ComponentErrors::ComponentErrorsEx,ReceiversErrors::ReceiversErrorsEx);

          void openVacuumValve(in string p_mode) raises (ComponentErrors::ComponentErrorsEx,ReceiversErrors::ReceiversErrorsEx);

          

          /**

          * Heating resistor turn on request, helping dewar to raise temperature quickly

Medicina/Servers/MedicinaCBand/include/ComponentCore.h

+5 −3
Original line number Diff line number Diff line
@@ -320,8 +320,9 @@ public: 


 	 /**

 	  * @brief Turn on vacuum pump

      * @param p_mode SOFT or NORMAL

 	 */	

	 void vacuumPumpOn() throw (ReceiversErrors::ReceiverControlBoardErrorExImpl);

	 void vacuumPumpOn(const char * p_mode) throw (ReceiversErrors::ReceiverControlBoardErrorExImpl);



	 /**

 	 * @brief Turn off vacuum pump
@@ -343,9 +344,10 @@ public: 


	/**

 	 * @brief Turn on vacuum valve with delay

      * @param p_mode DELAY for delayed opening

 	 * @todo check how it works

 	 */	

	 void openVacuumValve(const char * p_mode, double p_delay) throw (ReceiversErrors::ReceiverControlBoardErrorExImpl);

	 void openVacuumValve(const char * p_mode) throw (ReceiversErrors::ReceiverControlBoardErrorExImpl);

	 

	 /**

	 * @brief Close vaccum valve

Medicina/Servers/MedicinaCBand/include/MedicinaCBandImpl.h

+1 −1
Original line number Diff line number Diff line
@@ -433,7 +433,7 @@ public: 
    /**

    * @brief Vacuum valve opening

    */

    virtual void openVacuumValve(const char *, CORBA::Double) throw  (CORBA::SystemException,ComponentErrors::ComponentErrorsEx,ReceiversErrors::ReceiversErrorsEx);

    virtual void openVacuumValve(const char *) throw  (CORBA::SystemException,ComponentErrors::ComponentErrorsEx,ReceiversErrors::ReceiversErrorsEx);



	/**

    * @brief Heat resistors on