Commit 37d9cb60 authored by Giuseppe Carboni's avatar Giuseppe Carboni
Browse files

Merge branch 'master' of https://github.com/discos/discos into centos_7_compatibility

parents de3d709b c0bdaddc

.gitignore

+2 −0
Original line number Diff line number Diff line
@@ -41,7 +41,9 @@ Common/Interfaces/CommonInterface/idl/ReceiversDefinitions.idl 
Common/Interfaces/ManagmentInterface/idl/CustomLogger.idl

Common/Interfaces/ReceiversInterface/idl/DewarPositionerDefinitions.idl

Common/Interfaces/XBackendInterface/idl/XBackends.idl

Common/Interfaces/ActiveSurfaceInterface/idl/ActiveSurfaceCommon.idl

Common/Misc/PMUpdate/src/PMUpdate_gui.py

Medicina/Interfaces/MedicinaActiveSurfaceInterface/idl/MedicinaActiveSurfaceBoss.idl

Noto/Errors/NotoActiveSurfaceErrors/idl/ASErrors.idl

Noto/Interfaces/NotoActiveSurfaceInterface/idl/NotoActiveSurfaceBoss.idl

SRT/Clients/SRTActiveSurfaceGUIClient/include/SRTActiveSurfaceGUI.h

CHANGELOG.md

+8 −2
Original line number Diff line number Diff line
@@ -97,8 +97,14 @@ and this project adheres to [Semantic Versioning](http://semver.org/ 
	              

## [Next Release] - 

## Added

    issue #806   Added supprto for the C-band receiver at the SRT

    issue #625 - Added Medicina Active Surface. Both component and GUIs were implemented.

    issue #791 - Nodding added for TotalPower and Sardara components via the `enable` command. This command can only be issued from a schedule and not via the operatorInput CLI.

                 The syntax for the command is the following: `enable=X;Y` with X and Y representing the 2 feeds the user would like to use for the Nodding observation.

                 This command must be placed in the <schedule_name>.bck file in order to work properly.

    issue #619 - Active surface components are now capable of changing look-up tables on the fly via the `asSetLUT` command

    issue #806   Added support for the C-band receiver at the SRT



## Fixed

## Changed

	 issue #689 - The dataset provided by wether station has been enlarged by the wind direction. The correctponding RAL 'wx' command will noe provided wind direction readout, as well

	issue #689 - The dataset provided by weather station has been enlarged by the wind direction. The correctponding RAL 'wx' command will noe provided wind direction readout, as well

    issue #621 - The maximum number of chars of the schedule file name is now 37 (extension included). This is done for fits file and archive issue with the lenght of the schedule name.

Common/Interfaces/BackendsInterface/idl/GenericBackend.idl

+11 −0
Original line number Diff line number Diff line
@@ -351,6 +351,17 @@ module Backends { 
		 * it is not allowed to call this method.  

		 */



		/*

		 * It allows to set a range where to calculate a Tsys.

		 * @throw ComponentErrors::ComponentErrorsEx

		 * @throw BackendsErrors::BackendsErrorsEx

		 * @throw CORBA::SystemException

		 * @param freq starting frequency (MHz).

		 * @param bw portion of the backend bandwith (MHz) where calculate the Tsys.

		 */

		 void setTsysRange(in double freq,in double bw) raises (ComponentErrors::ComponentErrorsEx,BackendsErrors::BackendsErrorsEx);



		

	};

	

};

Common/Libraries/DiscosBackendProtocol/include/command.hpp

+2 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ namespace DiscosBackend{ 
            static Message setConfiguration(string conf);

            static Message getIntegration(){return Message(REQUEST, "get-integration");};

            static Message setIntegration(int integration);

            static Message getTpi(){return Message(REQUEST, "get-tpi");};

            static Message getTpi(double frequency = 0, double bandwidth = 0);

            static Message getTp0(){return Message(REQUEST, "get-tp0");};

            static Message time(){return Message(REQUEST, "time");};

            static Message start(unsigned long long utctimestamp = 0);
@@ -27,6 +27,7 @@ namespace DiscosBackend{ 
            static Message setFilename(string filename);

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

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

            static Message setEnable(int feed1, int feed2);

    }; //class Command

}; //namespace DiscosBackend

Common/Libraries/DiscosBackendProtocol/src/command.cpp

+17 −0
Original line number Diff line number Diff line
@@ -18,6 +18,15 @@ Command::setIntegration(int integration) 
    return command;

}



Message

Command::getTpi(double frequency, double bandwidth)

{

    Message command(REQUEST, "get-tpi");

    command.add_argument<double>(frequency);

    command.add_argument<double>(bandwidth);

    return command;

}



Message

Command::start(unsigned long long utctimestamp)

{
@@ -69,3 +78,11 @@ Command::setFilename(string filename) 
    return command;

}



Message

Command::setEnable(int feed1, int feed2)

{

    Message command(REQUEST, "set-enable");

    command.add_argument<int>(feed1);

    command.add_argument<int>(feed2);

    return command;

}