Commit d90015c3 authored by Andrea Orlati's avatar Andrea Orlati
Browse files

fix issue #655: feature implemented but a test is required before merging into the repository

parent c8379f52

CHANGELOG.md

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


## [next release]

## Added

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

## Fixed

    issue #448 - Added Sky Offsets to calibration tool client

    issue #585 - Fixed misshandled schedule with NULL as backend (Dry Run)

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"

               CheckMode="false"

               CheckOscillation="true"

			   OscillationThreshold="0.01"

			   OscillationAlarmDuration="2000000"

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"

               CheckMode="false"

               CheckOscillation="true"

			   OscillationThreshold="0.01"

			   OscillationAlarmDuration="2000000"

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

+2 −0
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 enable the check of the ACU mode -->

      <xs:attribute name="CheckMode" type="xs:boolean" 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) -->

Medicina/Servers/MedicinaMount/include/Configuration.h

+7 −3
Original line number Diff line number Diff line
@@ -99,9 +99,12 @@ 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. */

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

	inline bool checkForOscillation() const { return m_checkOsc; }

	

	/** Flag that indicates whether the ACU check mode must performed or not. */

	inline bool checkForMode() const { return m_checkMode; }

	

	/**

    * 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.
@@ -139,9 +142,9 @@ private: 
	DWORD m_dwcontrolThreadPeriod;

	/** This is the precision (degree) of the antenna */

	//double m_dtrackingPrecision; 

	/** This indicates the cache time for the repetion log filter */

	/** This indicates the cache time for the repetition log filter */

	DDWORD m_dwrepetitionCacheTime;

	/** This indicates the expire time for the repetion log filter */

	/** This indicates the expire time for the repetition log filter */

	DDWORD m_dwexpireCacheTime;

	/** this number is the separation value between the CW and CCW, if the azimuth is greater than this the section is CW */

	double m_cwLimit;
@@ -151,6 +154,7 @@ private: 
	WORD m_dwoscNumberThreshold;

	DDWORD m_dwoscRecoverTime;

	bool m_checkOsc;

	bool m_checkMode;

};