Commit 122cc8bf authored by mfioren's avatar mfioren
Browse files

Added get_firm, changed addr values and clrmode name

parent ed77f93b

SRT/CDB/alma/BACKENDS/SRTDBESM/SRTDBESM.xml

+1 −1
Original line number Diff line number Diff line 
<?xml version='1.0' encoding='ISO-8859-1'?>



<SRTDBESM xmlns="urn:schemas-cosylab-com:SRTDBESM:1.0" xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" addr_1="15" addr_2="14" addr_3="13" addr_4="12" DBESM_IPAddress="127.0.0.1" DBESM_Port="11111">

<SRTDBESM xmlns="urn:schemas-cosylab-com:SRTDBESM:1.0" xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" addr_1="0" addr_2="1" addr_3="2" addr_4="3" DBESM_IPAddress="127.0.0.1" DBESM_Port="11111">

    <addr_1 description="address of board 1" />	

    <addr_2 description="address of board 2" />

    <addr_3 description="address of board 3" />

SRT/Interfaces/SRTDBESMInterface/idl/SRTDBESM.idl

+6 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ module Backends { 
        /*

	 delete DBESM configuration

        */

	void clr_mode(in string cfg_name) raises (BackendsErrors::BackendsErrorsEx);

	void delete_file(in string cfg_name) raises (BackendsErrors::BackendsErrorsEx);



        /*

	 get single DBESM board status: registers and attenuators values
@@ -118,6 +118,11 @@ module Backends { 
        */

        void get_dbeatt(in string out_dbe) raises (BackendsErrors::BackendsErrorsEx);



        /*

	 get single DBESM board firmware version info 

        */

	void get_firm(in short b_addr) raises (BackendsErrors::BackendsErrorsEx);

	

};



};

SRT/Servers/SRTDBESM/include/CommandSocket.h

+6 −2
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ public: 


	void store_allmode(const char * cfg_name); //throw (BackendsErrors::BackendsErrorsEx);

	

	void clr_mode(const char * cfg_name); //throw (BackendsErrors::BackendsErrorsEx);

	void delete_file(const char * cfg_name); //throw (BackendsErrors::BackendsErrorsEx);

	

	string get_status(short b_addr); //throw (BackendsErrors::BackendsErrorsEx);
@@ -88,6 +88,8 @@ public: 
   

   void CCommandSocket::parse_string_response(string status_str, string start, string end, string* val);

   

   string get_firm(short b_addr);

      

protected:

	/**

	 * Automatically called by the framework as a result of a connection request. See super-class for more details.
@@ -126,7 +128,7 @@ private: 
	

	void store_allmode_command(const char * cfg_name); //throw (BackendsErrors::BackendsErrorsEx);

	

	void clr_mode_command(const char * cfg_name); //throw (BackendsErrors::BackendsErrorsEx);

	void delete_file_command(const char * cfg_name); //throw (BackendsErrors::BackendsErrorsEx);

	

	string get_status_command(short b_addr); //throw (BackendsErrors::BackendsErrorsEx);
@@ -140,6 +142,8 @@ private: 
	

	string get_dbeatt_command(const char * out_dbe);

	

	string get_firm_command(short b_addr);

	

};



#endif /*COMMANDSOCKET_H_*/
 
 No newline at end of file

SRT/Servers/SRTDBESM/include/DBESMprotocol.h

+6 −4
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ class CDBESMCommand 
        inline static string comm_set_allmode(string cfg_name){return Commands::m_set_all + " " + cfg_name + TAIL;}

        inline static string comm_set_mode(string b_addr, string cfg_name){return Commands::m_set_mode + " " + "BOARD" + " " + b_addr + " " + cfg_name + TAIL;}

        inline static string comm_store_allmode(string cfg_name){return Commands::m_store_allmode + " " + cfg_name + TAIL;}

        inline static string comm_clr_mode(string cfg_name){return Commands::m_clr_mode + " " + cfg_name + TAIL;}

        inline static string comm_delete_file(string cfg_name){return Commands::m_delete_file + " " + cfg_name + TAIL;}

        inline static string comm_get_status(string b_addr){return Commands::m_get_status + " BOARD " + b_addr + TAIL;}

        inline static string comm_set_att(string b_addr, string out_ch, string att_val){return Commands::m_set_att + " " + out_ch + " BOARD " + b_addr + " VALUE " + att_val + TAIL;}

       // inline static string comm_get_diag_all(){return Commands::m_get_diag_all + TAIL;}
@@ -34,6 +34,7 @@ class CDBESMCommand 
        inline static string comm_get_cfg(){return Commands::m_get_cfg + TAIL;}

        inline static string comm_set_dbeatt(string out_dbe, string att_val){return Commands::m_set_dbeatt + " " + out_dbe + " " + att_val + TAIL;}

        inline static string comm_get_dbeatt(string out_dbe){return Commands::m_get_dbeatt + " " + out_dbe + TAIL;}

        inline static string comm_get_firm(string b_addr){return Commands::m_get_firm + " BOARD " + b_addr + TAIL;}

        

    private:

        /*
@@ -43,15 +44,16 @@ class CDBESMCommand 
            inline static const string m_set_all {"DBE SETALLMODE"};

            inline static const string m_set_mode { "DBE MODE" };

            inline static const string m_store_allmode { "DBE STOREALLMODE" };

            inline static const string m_clr_mode { "DBE CLRMODE" };

            inline static const string m_delete_file { "DBE DELETEFILE" };

            inline static const string m_get_status { "DBE GETSTATUS" };

            inline static const string m_set_att { "DBE SETATT" };

            //inline static const string m_get_diag_all { "DBE ALLDIAG" };

            inline static const string m_get_diag { "DBE DIAG" };

            //inline static const string m_get_diag_all { "DBE ReadALLReadDIAG" };

            inline static const string m_get_diag { "DBE ReadDIAG" };

            inline static const string m_get_comp { "DBE GETCOMP" };

            inline static const string m_get_cfg { "DBE GETCFG" };

            inline static const string m_set_dbeatt { "DBE SETDBEATT" };

            inline static const string m_get_dbeatt { "DBE GETDBEATT" };

            inline static const string m_get_firm { "DBE FIRM" };

    };    

}; //class CDBESMCommand

SRT/Servers/SRTDBESM/include/SRTDBESMImpl.h

+3 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ public: 
   

   virtual void store_allmode(const char * cfg_name); //throw (BackendsErrors::BackendsErrorsEx);

   

   virtual void clr_mode(const char * cfg_name); //throw (BackendsErrors::BackendsErrorsEx);

   virtual void delete_file(const char * cfg_name); //throw (BackendsErrors::BackendsErrorsEx);

 	

 	virtual void get_status(short b_addr); //throw (BackendsErrors::BackendsErrorsEx);
@@ -86,6 +86,8 @@ public: 
 	

 	virtual void get_dbeatt(const char * out_dbe); //throw (BackendsErrors::BackendsErrorsEx);

 	

 	virtual void get_firm(short b_addr);



	/** 

	 * Returns a reference to addr_1.

	 * @return pointer to long property addr_1