Commit b4cb9e06 authored by TheDebbio's avatar TheDebbio
Browse files

Merge branch 'master' of https://github.com/discos/discos into feature-med-c-band-srv

parents 659a7110 7c068130

CHANGELOG.md

+1 −1
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/ 
   issue #518 - KBand receivers cryo temperature read wrongly with connection problems. More information:

    https://github.com/discos/discos/issues/518#issuecomment-590838480

   issue #530 - New Fitszilla versione 1.21 online. The subscan offsets related keywords added to the primary header.



	issue #556 - Added API to send emails to local system administrators. This feature is now exploted when a servo system oscillation is detected at Noto and Medicina

## Fixed

    issue #518 - In case of communication error we set a dummy value (100000) for the temperature properties, and the related timestamp keeps the value of the last communication timestamp.

    issue #525 - When in LOCAL mode the receivers can turn on/off the noise mark and LNAs. There is no more MNG_FAILURE logging in case of LOCAL mode: only the LOCAL/REMOTE status (during component activation) and the change of status (LOCAL to REMOTE and viceversa) are written to the logfile.

Common/Clients/SystemTerminal/src/_tui_SysTerm.py

+1 −2
Original line number Diff line number Diff line
@@ -40,8 +40,7 @@ def usage(): 
    print "[-h|--help]           displays this help"



def handler(num, stack):

    global stopAll

    stopAll=True

    raise EOFError



def get_history_items():

    return [readline.get_history_item(i) for i in xrange(1,readline.get_current_history_length()+1)]

Common/Interfaces/AntennaInterface/config/CDB/schemas/Station.xsd

+0 −2
Original line number Diff line number Diff line
@@ -33,8 +33,6 @@ 
	<xs:attribute name="xPolarMotion" type="xs:double" use="required"/>

	<!--  allow to configure the startup geodetic model  -->

	<xs:attribute name="geodeticModel" type="xs:long" use="required"/>

	<!-- The message to be displayed whenever a new 'project' command is issued -->

	<xs:attribute name="welcomeMessage" type="xs:string" use="required" />

	

</xs:complexType>

Common/Libraries/DiscosLocals/config/CDB/schemas/LocalSettings.xsd

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

<!--

	- Author: Andrea Orlati

	-

	- History:

	-   06-11-2020  Created

-->



<xs:schema

	targetNamespace="urn:schemas-cosylab-com:LocalSettings:1.0"

	xmlns="urn:schemas-cosylab-com:LocalSettings:1.0"

	xmlns:xs="http://www.w3.org/2001/XMLSchema"

	xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0"

	xmlns:baci="urn:schemas-cosylab-com:BACI:1.0"	

	elementFormDefault="qualified"

	attributeFormDefault="unqualified">



<xs:complexType name="LocalSettingsType">



	<!-- The message to be displayed whenever a new 'project' command is issued -->

	<xs:attribute name="welcomeMessage" type="xs:string" use="required" />

	<!-- list of name of the system administrators, in the form of name dot surname -->

	<xs:attribute name="admins" type="xs:string" use="required" />

	<!-- domain name -->

	<xs:attribute name="domain" type="xs:string" use="required" />

</xs:complexType>



<xs:element name="LocalSettings" type="LocalSettingsType"/>



</xs:schema>
 
 No newline at end of file

Common/Libraries/DiscosLocals/include/StationConfig.h

0 → 100644
+37 −0
Original line number Diff line number Diff line 
/* ************************************************************************************************************* */

/* DISCOS project                                                                                                */

/*                                                                                                               */

/* This code is under GNU General Public Licence (GPL).                                                          */

/*                                                                                                               */

/* Who                                    when            What                                                   */

/* Andrea Orlati (andrea.orlati@inaf.it)  30/10/2020

*/



#include <IRA>



#ifndef DISCOSLOCALS_H_

#define DISCOSLOCALS_H_





namespace DiscosLocals {



class StationConfig {

public:

	StationConfig();

	~StationConfig();

	bool initialize(maci::ContainerServices *Services);

	bool sendMail(const IRA::CString& subject,const IRA::CString& body);

	const IRA::CString& getWelcomeMessage() const { return m_welcome; }

	const IRA::CString& getAdmins() const { return m_admins; }

	const IRA::CString& getDomain() const { return m_domain; }

private:

	IRA::CString m_welcome;

	IRA::CString m_admins;

	IRA::CString m_domain;

	IRA::CString m_receipients;	

};

 

}





#endif /* DISCOSLOCALS_H_ */
 
 No newline at end of file