Commit ed90d0a5 authored by Sergio Poppi's avatar Sergio Poppi Committed by GitHub
Browse files

Merge branch 'master' into fix-issue-298

parents 404a067a 762f7ab8

CHANGELOG.md

+13 −4
Original line number Diff line number Diff line
@@ -4,15 +4,24 @@ All notable changes to this project will be documented in this file. 
The format is based on [Keep a Changelog](http://keepachangelog.com/)

and this project adheres to [Semantic Versioning](http://semver.org/



## [Unreleased]

## [discos1.0] 07-11-2018

### Added

	

### Changed

	issue #261 - Added startup procedure scripts also for Noto and Medicina. The startup command is 

	'discos --start'. Also command line scripts are now avialble 'discosup' and 'discosdown'. The console

	can be start with 'discosConsole --start'. 

	

### Fixed 

	issue #325 - added command 'dmed=config' to control the Medicina DMed (IF distributor). The device just 

	allows to setup a set of programmable attenuators in order to control the singal levels. config select

	which configuration to apply between a set of predefined one.



- InjectCommand blocks if the system is down @aorlati

### Changed



	issue #316 - several related commits. The operation releated to the Medicina K band receivers now relys on a

	new componet which is derived directly form the SRT one. larg part of the code is shared between the two

	servants.



### Fixed 



##

Common/Clients/ReceiversBossTextClient/src/ReceiversBossTextClient.cpp

+39 −12
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
	ACS_LOG(LM_FULL_INFO,MODULE_NAME"::Main()",(LM_INFO,"Trying to get property "#NAME"...")); \

	NAME=component->NAME(); \

	if (NAME.ptr()!=TYPE::_nil()) { \

		ACS_LOG(LM_FULL_INFO,MODULE_NAME"::Main()",(LM_DEBUG,"OK, reference is: %x",NAME.ptr())); \

		ACS_LOG(LM_FULL_INFO,MODULE_NAME"::Main()",(LM_DEBUG,"OK, reference is: %lx",(long)NAME.ptr())); \

	} \

	else { \

		_EXCPT(ClientErrors::CouldntAccessPropertyExImpl,impl,MODULE_NAME"::Main()"); \
@@ -208,6 +208,7 @@ int main(int argc, char *argv[]) { 
	// Component declaration 

	COMPONENT_DECLARATION component;

	DEWAR_DECLARATION dewar;

	bool dewarReady=false;

		



	/* Add frame controls declaration */
@@ -310,9 +311,30 @@ int main(int argc, char *argv[]) { 
		goto ErrorLabel;

	}

	component=COMPONENT_INTERFACE::_narrow(obj.in());

	ACS_LOG(LM_FULL_INFO,MODULE_NAME"::Main()",(LM_DEBUG,"Receivers Boss reference is: %d",component.ptr()));

	ACS_LOG(LM_FULL_INFO,MODULE_NAME"::Main()",(LM_DEBUG,"Receivers Boss reference is: %ld",(long)component.ptr()));

	ACE_OS::sleep(1);



	try {

		maci::ComponentInfoSeq_var cInfo;

		maci::HandleSeq handles;

		handles.length(0);

		IRA::CString cName,cType;

		cName="";

		cType=DEWAR_INTERFACE_TPYE;

		cInfo=client.manager()->get_component_info(client.handle(),handles,(const char *)cName,

			(const char *)cType,(CORBA::Boolean)false);

		for(unsigned k=0;k<cInfo->length();k++) {

			printf("type: %s\n",(const char *)cInfo[k].type);

			if (cInfo[k].type==DEWAR_INTERFACE_TPYE) {

				ACS_LOG(LM_FULL_INFO,MODULE_NAME"::Main()",(LM_NOTICE,"Dewar positioner found"));

				dewarReady=true;

				break;

			}

		}		

	}

	catch (...) {

		dewarReady=false;

	}

	if (dewarReady) {

		try {

			info=client.manager()->get_default_component(client.handle(),DEWAR_INTERFACE_TPYE);

			obj=info->reference;
@@ -322,11 +344,16 @@ int main(int argc, char *argv[]) { 
			}

			else {

				dewar=DEWAR_INTERFACE::_narrow(obj.in());

			ACS_LOG(LM_FULL_INFO,MODULE_NAME"::Main()",(LM_DEBUG,"Dewar reference is: %d",dewar.ptr()));

				ACS_LOG(LM_FULL_INFO,MODULE_NAME"::Main()",(LM_DEBUG,"Dewar reference is: %ld",(long)dewar.ptr()));

			}

		}

		catch(...) {

			ACS_LOG(LM_FULL_INFO,MODULE_NAME"::Main()",(LM_NOTICE,"Dewar positioner not available"));

			dewar=DEWAR_INTERFACE::_nil();

		}

	}

	else {

		dewar=DEWAR_INTERFACE::_nil();

	}

	ACE_OS::sleep(1);

	try {

Common/Errors/ClientErrors/idl/ClientErrors.xml

+4 −0
Original line number Diff line number Diff line
@@ -41,4 +41,8 @@ 


<ErrorCode name="InvalidArgument" shortDescription="An invalid argument was given" description=" "/>



<ErrorCode name="ConfigurationDataBaseError" shortDescription="Configuration database error" description=" "/>



<ErrorCode name="InvalidConfiguration" shortDescription="The configuration is unknown or not supported" description=" "/>



</Type>

Common/Errors/ComponentErrors/idl/ComponentErrors.xml

+3 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ 


<ErrorCode name="Unexpected" shortDescription="An unexpected exception was encountered" description=" "/>



<ErrorCode name="IRALibraryResource" shortDescription="Error encountered while accessing an IRAlibrary resource" description=" ">

<ErrorCode name="IRALibraryResource" shortDescription="Error encountered while accessing a resource or remote device" description=" ">

	<Member name="Code" type="long" description="Code" />

	<Member name="Description" type="string" description="Description" />

</ErrorCode>
@@ -110,4 +110,6 @@ 
	<Member name="ServiceName" type="string" description="Name of the Service" />

</ErrorCode>



<ErrorCode name="Nak" shortDescription="Device does not acknowledge" description=" " />



</Type>

Common/Errors/ReceiversErrors/idl/ReceiversErrors.xml

+4 −0
Original line number Diff line number Diff line
@@ -36,6 +36,10 @@ 
		<Member name="Details" type="string" description="more details from the board" />   

	</ErrorCode>

	

	<ErrorCode name="SynthetiserError" shortDescription="Error while communicating with sythetiser" description=" ">

		<Member name="Details" type="string" description="more details about the error" />   

	</ErrorCode>

	

	<ErrorCode name="NoRemoteControlError" shortDescription="The receiver is not remotely controllable" description=" "/>

	

	<ErrorCode name="NoDewarPositioning" shortDescription="Dewar positioning and derotation is not supported by this release" description=" "/>