Commit caff56b1 authored by Andrea Orlati's avatar Andrea Orlati Committed by GitHub
Browse files

fix issue #325 (#326) 

* fix issue #325: DMed supported form Medicina IF signal distribution. The singal levels are managed through
predefined configurations.

* issue #325: fixed indentation according the review
parent ca184d5b

CHANGELOG.md

+4 −0
Original line number Diff line number Diff line
@@ -11,6 +11,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/ 
	'discos --start'. Also command line scripts are now avialble 'discosup' and 'discosdown'. The console

	can be start with 'discosConsole --start'. 

	

	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.



### Changed



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

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

+2 −0
Original line number Diff line number Diff line
@@ -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/Servers/Scheduler/src/Core.cpp

+1 −0
Original line number Diff line number Diff line
@@ -115,6 +115,7 @@ void CCore::execute() throw (ComponentErrors::TimerErrorExImpl,ComponentErrors:: 
	m_parser->add("skydip",new function3<CCore,non_constant,void_type,I<elevation_type<rad,false> >,I<elevation_type<rad,false> >,I<interval_type> >(this,&CCore::skydip),3);

	m_parser->add("agc","_tp_agc",2,"NONE");

	m_parser->add("ifd","_ifd",1,"SRT");

	m_parser->add("dmed","_dmed",1,"Medicina");

	m_parser->add("restFrequency",new function1<CCore,non_constant,void_type,I<doubleSeq_type> >(this,&CCore::_setRestFrequency),1);

	m_parser->add("fTrack",new function1<CCore,non_constant,void_type,I<string_type> >(this,&CCore::_fTrack),1);

	m_parser->add("peaker",new function3<CCore,non_constant,void_type,I<string_type>,I<double_type>,I<interval_type> >(this,&CCore::_peaker),3);

Medicina/Configuration/CDB/alma/DataBlock/DMed/DMed.xml

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



<DMedConfiguration xmlns="urn:schemas-cosylab-com:DMedConfiguration: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"

				IP="192.168.51.28"

				PORT="5003">



    <Configuration name="sole">

    	<Board number="6">

    		<Attenuator ID="0" Value="10.0"/>

    		<Attenuator ID="1" Value="7.0"/>

    		<Attenuator ID="2" Value="0.0"/>

    		<Attenuator ID="3" Value="10.0"/>    		

    	</Board>

    	<Board number="8">

    		<Attenuator ID="0" Value="26.0"/>

    		<Attenuator ID="1" Value="10.0"/>

    		<Attenuator ID="2" Value="29.0"/>

    		<Attenuator ID="3" Value="10.0"/> 

    	</Board>

    	<Board number="9">

    		<Attenuator ID="0" Value="15.0"/>

    		<Attenuator ID="1" Value="10.0"/>

    		<Attenuator ID="2" Value="13.0"/>

    		<Attenuator ID="3" Value="10.0"/>     	

    	</Board>

     	<Board number="10">

    		<Attenuator ID="0" Value="23.0"/>

    		<Attenuator ID="1" Value="10.0"/>

    		<Attenuator ID="2" Value="22.0"/>

    		<Attenuator ID="3" Value="10.0"/>      	

    	</Board>  	

    </Configuration>





    <Configuration name="KKC">

    	<Board number="6">

    		<Attenuator ID="0" Value="10.0"/>

    		<Attenuator ID="1" Value="10.0"/>

    		<Attenuator ID="2" Value="10.0"/>

    		<Attenuator ID="3" Value="10.0"/>    		

    	</Board>

    	<Board number="8">

    		<Attenuator ID="0" Value="10.0"/>

    		<Attenuator ID="1" Value="10.0"/>

    		<Attenuator ID="2" Value="10.0"/>

    		<Attenuator ID="3" Value="10.0"/> 

    	</Board>

    	<Board number="9">

    		<Attenuator ID="0" Value="10.0"/>

    		<Attenuator ID="1" Value="10.0"/>

    		<Attenuator ID="2" Value="10.0"/>

    		<Attenuator ID="3" Value="10.0"/>     	

    	</Board>

     	<Board number="10">

    		<Attenuator ID="0" Value="10.0"/>

    		<Attenuator ID="1" Value="10.0"/>

    		<Attenuator ID="2" Value="10.0"/>

    		<Attenuator ID="3" Value="10.0"/>      	

    	</Board>  	

    </Configuration> 

 

 



</DMedConfiguration>
 
 No newline at end of file