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

fix issue #545: the operation that checks for oscilaltion is the azimuth axis... 

fix issue #545: the operation that checks for oscilaltion is the azimuth axis at Mc and Nt is now enabled and under the control (#546)

of a CDB parameter. Also some annoying compilation warnings corrected.
parent 01377eae

CHANGELOG.md

+2 −1
Original line number Diff line number Diff line
@@ -92,3 +92,4 @@ and this project adheres to [Semantic Versioning](http://semver.org/ 
    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.

## Changed  

    issue #545 - Oscillation checks enabled for Mc and Nt telescopes, this setting is now under control of a CDB argument

Medicina/CDB/alma/ANTENNA/Mount/Mount.xml

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
               ControlThreadPeriod="200000"

               RepetitionCacheTime="2000000"

               RepetitionExpireTime="5000000"

               CheckOscillation="true"

			   OscillationThreshold="0.01"

			   OscillationAlarmDuration="2000000"	

			   OscillationNumberThreshold="4"

Medicina/Configuration/CDB/alma/ANTENNA/Mount/Mount.xml

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
               ControlThreadPeriod="200000"

               RepetitionCacheTime="2000000"

               RepetitionExpireTime="5000000"

               CheckOscillation="true"

			   OscillationThreshold="0.01"

			   OscillationAlarmDuration="2000000"	

			   OscillationNumberThreshold="4"

Medicina/Servers/MedicinaMount/config/CDB/schemas/MedicinaMount.xsd

+3 −1
Original line number Diff line number Diff line
@@ -101,6 +101,8 @@ 
		<xs:attribute name="RepetitionCacheTime" type="xs:unsignedLong" use="required" />

		<!-- the expire time (microseconds) for logging repetition filter -->

		<xs:attribute name="RepetitionExpireTime" type="xs:unsignedLong" use="required" />

		<!-- This flag is "true" or "false" to control the oscillattion check is active or not -->

      <xs:attribute name="CheckOscillation" type="xs:boolean" use="required" />	

		<!-- the oscillation threshold as azimuth tracking error (degrees) -->

		<xs:attribute name="OscillationThreshold" type="xs:double" use="required" />	

		<!-- duration of the oscillation alarm window (microseconds) -->

Medicina/Servers/MedicinaMount/include/Configuration.h

+4 −0
Original line number Diff line number Diff line
@@ -99,6 +99,9 @@ public: 
	/** Gets the number of times the oscillation has to be hit before an oscillation is declared*/

	inline DWORD oscillationNumberThreashold() const { return m_dwoscNumberThreshold; }

	

	/** Flag that indicates whether the oscillation chek must performed or not. */

	inline bool checkForOscillation() const { return m_checkOsc; }

	

	/**

    * This member function is used to configure component by reading the configuration parameter from the CDB.

	 * This must be the first call before using any other function of this class.
@@ -147,6 +150,7 @@ private: 
	DDWORD m_dwoscAlarmDuration;

	WORD m_dwoscNumberThreshold;

	DDWORD m_dwoscRecoverTime;

	bool m_checkOsc;

};