Commit 06d03a81 authored by Giuseppe Carboni's avatar Giuseppe Carboni Committed by aorlati
Browse files

Fix #228. Renamed `roach` to `sardara` and integrated it. (#229)

parent 5e513680

Common/Clients/SystemTerminal/src/nuraghe_commands.py

+6 −0
Original line number Diff line number Diff line
@@ -354,6 +354,12 @@ def getTpi(): 
    and lists them according to increasing section number

    """



def getRms():

    """

    getRms reads rms value of the signal for the active sections, 

    and lists them according to increasing section number

    """



def goOff():

    """

    goOff=frame,offset

Common/Interfaces/BackendsInterface/idl/GenericBackend.idl

+2 −0
Original line number Diff line number Diff line
@@ -301,6 +301,8 @@ module Backends { 
		 */

		ACS::doubleSeq getTpi() raises (ComponentErrors::ComponentErrorsEx,BackendsErrors::BackendsErrorsEx);



		ACS::doubleSeq getRms() raises (ComponentErrors::ComponentErrorsEx,BackendsErrors::BackendsErrorsEx);

		

		/**

		 * Call this method in order to read the total power from each input when the input are connected directly to the 50 Ohm. 

		 * This method must be available also if the backend in the <i>busy</i> status.

Common/Interfaces/BackendsInterface/idl/Roach.idl→Common/Interfaces/BackendsInterface/idl/Sardara.idl

+5 −5
Original line number Diff line number Diff line 
/* ******************************************************************************************* */

/* OAC Osservatorio Astronomico di Cagliari                                                    */

/* $Id: Roach.idl,v 1.1 2011-03-14 14:54:11 c.migoni Exp $				       */

/* $Id: Sardara.idl,v 1.1 2011-03-14 14:54:11 c.migoni Exp $				       */

/*                                                                                             */

/* This code is under GNU General Public Licence (GPL).                                        */

/*                                                                                             */
@@ -8,8 +8,8 @@ 
/* Carlo Migoni (migoni@oa-cagliari.inaf.it)	12/05/2015      Creation                       */





#ifndef _ROACH_IDL_

#define _ROACH_IDL_

#ifndef _SARDARA_IDL_

#define _SARDARA_IDL_



#include <baci.idl>

#include <enumpropMACRO.idl>
@@ -20,7 +20,7 @@ 
module Backends {

	

	/**

	 * The Roach2 is a digital backend. bla bla bla

	 * The Sardara is a digital backend. bla bla bla

	 * <br>

	 * <table border=2>

	 *	<tr><th>Feed</th><th>Carier board</th><th>Backend channel</th></tr>
@@ -101,7 +101,7 @@ module Backends { 
	 * Since this measure requires an input signal switching the backend is forced to wait two times the integration to allow the

	 * new signal level to stabilize.

	*/

	interface Roach : GenericBackend {

	interface Sardara : GenericBackend {

				

		/**

		 * This method can be called to activate or disactivate the switching of the calibration noise diode. The mode the switching is done is controlled

Common/Interfaces/BackendsInterface/src/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ CDB_SCHEMAS = GenericBackend DigitalXCorrelator Holography 
# 

# IDL Files and flags

# 

IDL_FILES = GenericBackend BackendsBoss TotalPower NoiseGenerator DigitalXCorrelator Holography DBBC DFBInterface Roach

IDL_FILES = GenericBackend BackendsBoss TotalPower NoiseGenerator DigitalXCorrelator Holography DBBC DFBInterface Sardara

IDL_TAO_FLAGS =

USER_IDL =
@@ -48,7 +48,7 @@ DigitalXCorrelatorStubs_LIBS = acscomponentStubs ACSErrTypeFPGAConnectionStubs \ 
HolographyStubs_LIBS = baciStubs GenericBackendStubs

DBBCStubs_LIBS = baciStubs GenericBackendStubs

DFBInterfaceStubs_LIBS = baciStubs GenericBackendStubs

RoachStubs_LIBS = baciStubs GenericBackendStubs

SardaraStubs_LIBS = baciStubs GenericBackendStubs



#

# list of all possible C-sources (used to create automatic dependencies)

Common/Libraries/DiscosBackendProtocol/include/command.hpp

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ namespace DiscosBackend{ 
            static Message calOn(long interleave = 0);

            static Message setFilename(string filename);

            static Message convertData(){return Message(REQUEST, "convert-data");};

            static Message getRms(){return Message(REQUEST, "get-rms");};

    }; //class Command

}; //namespace DiscosBackend