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

Fix issue #316: New component for Medicina K band receivers (#318) 

* working issue #316: the SRT component for the K band receiver has been adapted for Medicina one. The Reciever are, in theroy, identical from the control
point of view. In order to do that SRT interface has been ported into Medicina. The component has been split into two main parts, a part contains code that could be shared and has been put in the Common repository, the other one has been implemented on both lines. Also component configuration has been duplicated. Some work still necessary as the readouts in Medicina still do not match the expected. Probably a check of how the values maps into digital I/O is needed.

* fixed he readout for Medicina K band Receivers. Control of the local oscllator still missing.
The receivers boss component must be modified accordingly.

* fix issue 316: Added python component to control the Medicina synthetiser. Also is configuration and functiona tests added.

* fix issue #316: Medicina KKc configuration done. Also the Receivers Boss has been changed in order to rely on the new KKC MF component for
all the K-band relatad operations.
This closes the issue. Some tests needed though.
parent bf52799c

CHANGELOG.md

+4 −0
Original line number Diff line number Diff line
@@ -13,6 +13,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/ 


### 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/Errors/ComponentErrors/idl/ComponentErrors.xml

+1 −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>

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=" "/>

Common/Libraries/IRALibrary/include/MicroControllerBoard.h

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ public: 
     * @throw MicroControllerBoardEx

	*/

    MicroControllerBoard(std::string IP, unsigned short port=8000,

            BYTE master_address=0x7C, BYTE slave_address=0x7D, 

            BYTE master_address=0x7C, BYTE slave_address=0x7F, 

            DWORD timeout=MCB_TOUT

    ) throw (MicroControllerBoardEx);

Common/Libraries/IRALibrary/include/ReceiverControl.h

+6 −6
Original line number Diff line number Diff line
@@ -151,11 +151,11 @@ public: 
     * @param number_of_feeds number of feeds (default 1)

	 * @param switch_ip the IP address of the switches control board

	 * @param switch_port the port of the switches control board

     * @params dewar_maddr the dewar board master address (default 0x7D)

     * @params dewar_maddr the dewar board master address (default 0x7C)

     * @params dewar_saddr the dewar board slave address (default 0x7F)

     * @params lna_maddr the LNA board master address (default 0x7D)

     * @params lna_maddr the LNA board master address (default 0x7C)

     * @params lna_saddr the LNA board slave address (default 0x7F)

     * @params switch_maddr the switches board master address (default 0x7D)

     * @params switch_maddr the switches board master address (default 0x7C)

     * @params switch_saddr the switches board slave address (default 0x7F)

     * @param reliable_comm when it is true then the communication

     * to the board is reliable because there is a checksum field in
@@ -173,11 +173,11 @@ public: 
            const std::string switch_ip="", 

            const unsigned short switch_port=0, 

            const BYTE dewar_madd=0x7C, // Dewar board master address

            const BYTE dewar_sadd=0x7D, // Dewar board slave address

            const BYTE dewar_sadd=0x7F, // Dewar board slave address - We use broadcast address

            const BYTE lna_madd=0x7C,   // LNA board master address

            const BYTE lna_sadd=0x7D,   // LNA board slave address

            const BYTE lna_sadd=0x7F,   // LNA board slave address - We use broadcast address

            const BYTE switch_madd=0x7C,   // Switch board master address

            const BYTE switch_sadd=0x7D,   // Switch board slave address

            const BYTE switch_sadd=0x7F,   // Switch board slave address - We use broadcast address

            bool reliable_comm=false

    ) throw (ReceiverControlEx);