Unverified Commit c062c97d authored by Giuseppe Carboni's avatar Giuseppe Carboni Committed by GitHub
Browse files

Porting latest hot fixes into master

parents fb21eb19 73bf2f50

CHANGELOG.md

+3 −2
Original line number Diff line number Diff line
@@ -81,10 +81,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/ 


## [discos1.0.6] - 09-02-2022

## Added

    issue #655 - ACU Component for Noto and Medicina is now capble to prevent seldom mode changes coming from ACU reset

    issue #655 - ACU Component for Noto and Medicina is now capable to prevent seldom mode changes coming from ACU reset

    issue #653 - added a couple of scriptsto ease vnc conection from remote a file copying. The scripts support 

                 linux and macos

	issue #588 - added the control of the new Noto subreflector and primary focus receiver box servo system.     

    issue #758 - Sardara enabled for Medicina

    

## Fixed

    issue #448 - Added Sky Offsets to calibration tool client

Common/Servers/ReceiversBoss/src/RecvBossCore_mc.i

+22 −4
Original line number Diff line number Diff line
@@ -101,8 +101,17 @@ void CRecvBossCore::calOn() throw (ComponentErrors::ValidationErrorExImpl,Compon 
			throw impl;

		}

	}

	else */if ((m_currentRecvCode=="XXP") || (m_currentRecvCode=="CCC") || (m_currentRecvCode=="CHC") || (m_currentRecvCode=="KKC"))  {

	else */

	if ((m_currentRecvCode=="XXP") || (m_currentRecvCode=="CCC") || (m_currentRecvCode=="CHC") || (m_currentRecvCode=="KKC"))  {

		try {

			m_calMux_proxy->calOn();

		}

		catch (ComponentErrors::ComponentErrorsEx& ex) {

			_ADD_BACKTRACE(ReceiversErrors::UnavailableReceiverOperationExImpl,impl,ex,"CRecvBossCore::calOn()");

			impl.setReceiverCode((const char *)m_currentRecvCode);

			changeBossStatus(Management::MNG_FAILURE);

			throw impl;			

		}

		// turn the marca on through the FS

		/*IRA::CString fsBuffer("calon\n");

		if (!sendToFS((const void *)fsBuffer,fsBuffer.GetLength())) {
@@ -158,7 +167,8 @@ void CRecvBossCore::calOff() throw (ComponentErrors::ValidationErrorExImpl,Compo 
			throw impl;

		}

	}

	else*/ if ((m_currentRecvCode=="XXP") || (m_currentRecvCode=="CCC") || (m_currentRecvCode=="CHC") || (m_currentRecvCode=="KKC")) {

	else*/ 

	if ((m_currentRecvCode=="XXP") || (m_currentRecvCode=="CCC") || (m_currentRecvCode=="CHC") || (m_currentRecvCode=="KKC")) {

		// turn the marca on through thr FS

		/*IRA::CString fsBuffer("caloff\n");

		if (!sendToFS((const void *)fsBuffer,fsBuffer.GetLength())) {
@@ -166,8 +176,16 @@ void CRecvBossCore::calOff() throw (ComponentErrors::ValidationErrorExImpl,Compo 
			m_status=Management::MNG_FAILURE;

			throw impl;

		}*/

		try {

			m_calMux_proxy->calOff();

		}

		catch (ComponentErrors::ComponentErrorsEx& ex) {

			_ADD_BACKTRACE(ReceiversErrors::UnavailableReceiverOperationExImpl,impl,ex,"CRecvBossCore::calOff()");

			impl.setReceiverCode((const char *)m_currentRecvCode);

			changeBossStatus(Management::MNG_FAILURE);

			throw impl;			

		}	

	}

	else {

		_EXCPT(ComponentErrors::ValidationErrorExImpl,impl,"CRecvBossCore::calOff()");

		impl.setReason("Receiver not configured yet");

Medicina/CDB/alma/BACKENDS/Sardara/Sardara.xml

+5 −5
Original line number Diff line number Diff line
@@ -8,17 +8,17 @@ 
               xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0"

               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

               sender_protocols="TCP=${HOST}:14000"

               IPAddress="192.168.1.10"

               Port="10000"

               CommandLineTimeout="10000000"

               ConnectTimeout="3000000"

               IPAddress="192.168.10.10"

               Port="10001"

               CommandLineTimeout="100000000"

               ConnectTimeout="300000000"

               PropertyRefreshTime="1000000"

               Configuration="SC00"

               TimeTollerance="250000"

               RepetitionCacheTime="2000000"

               RepetitionExpireTime="5000000"

               DataPort="6001"

               DataIPAddress="192.168.1.98"            	   

               DataIPAddress="192.168.10.10"            	   

               DataLatency="3000000"

               SenderSleepTime="300000"

               SenderResponseTime="1000000"

Medicina/Configuration/CDB/alma/BACKENDS/Sardara/Sardara.xml

+5 −5
Original line number Diff line number Diff line
@@ -8,17 +8,17 @@ 
               xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0"

               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

               sender_protocols="TCP=${HOST}:14000"

               IPAddress="192.168.1.10"

               Port="10000"

               CommandLineTimeout="10000000"

               ConnectTimeout="3000000"

               IPAddress="192.168.10.10"

               Port="10001"

               CommandLineTimeout="100000000"

               ConnectTimeout="300000000"

               PropertyRefreshTime="1000000"

               Configuration="SCC00"

               TimeTollerance="250000"

               RepetitionCacheTime="2000000"

               RepetitionExpireTime="5000000"

               DataPort="6001"

               DataIPAddress="192.168.1.98"            	   

               DataIPAddress="192.168.10.10"            	   

               DataLatency="3000000"

               SenderSleepTime="300000"

               SenderResponseTime="1000000"

Medicina/Misc/MedScripts/app-defaults/discosStartup.xml

+9 −0
Original line number Diff line number Diff line
@@ -145,6 +145,15 @@ 
            <remoteHost>MASTERHOST</remoteHost>

            <remoteAccount>discos</remoteAccount>

        </container>

        <container>

            <name>SardaraContainer</name>

            <type>cpp</type>

            <heapSizeMB></heapSizeMB>

            <useDedicatedSettings>true</useDedicatedSettings>

            <scriptBase>0</scriptBase>

            <remoteHost>MASTERHOST</remoteHost>

            <remoteAccount>discos</remoteAccount>

        </container>        

        <container>

            <name>XContainer</name>

            <type>cpp</type>