Commit ae89f492 authored by SRT Operator's avatar SRT Operator
Browse files

patched windpark

parent 09b0ab76

SRT/Servers/SRTWeatherStation/src/SRTWeatherStationImpl.cpp

+12 −8
Original line number Diff line number Diff line
@@ -274,9 +274,15 @@ void SRTWeatherStationImpl::initialize() throw (ACSErr::ACSbaseExImpl) 
{



	SRTWeatherSocket *sock;

        ACSErr::Completion_var completion;

        m_property=m_mount->elevationMode();

        m_elevationStatus=m_property->get_sync(completion);



        

    

	try {

		  if 			(CIRATools::getDBValue(getContainerServices(),"IPAddress",ADDRESS) && CIRATools::getDBValue(getContainerServices(),"port",PORT)) &&

                  CIRATools::getDBValue(getContainerServices(),"windthreshold",m_threshold)) &&

		  if  (CIRATools::getDBValue(getContainerServices(),"IPAddress",ADDRESS) && CIRATools::getDBValue(getContainerServices(),"port",PORT) &&

                  CIRATools::getDBValue(getContainerServices(),"windthreshold",m_threshold))

                  

		  	  {

			  	  ACS_LOG(LM_FULL_INFO,"SRTWeatherStationImpl::initialize()",(LM_INFO,"IP address %s, Port %d ",(const char *) ADDRESS,PORT));
@@ -447,19 +453,17 @@ void SRTWeatherStationImpl::parkAntenna() 
    

    Antenna::ROTCommonModes_ptr property;

    

    property=m_mount->elevationMode();



   double status;

   status=property->get_sync(completion);

   if (status !=Antenna::ACU_STOW) 

   m_elevationStatus=m_property->get_sync(completion);

   if (m_elevationStatus !=Antenna::ACU_STOW) 

     {

                  m_scheduler->stopSchedule();

                  m_antennaBoss->park();

        ACS_LOG(LM_FULL_INFO,"SRTWeatherStationImpl::parkAntenna()",(LM_WARNING,"Wind above limit:"));



     }

     

     

   ACS_LOG(LM_FULL_INFO,"SRTWeatherStationImpl::parkAntenna()",(LM_WARNING,"AUTOSTOWING!!!!!!"));

SRT/Servers/SRTWeatherStation/src/WindCheckerThread.cpp

+6 −5
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ CWindCheckerThread::CWindCheckerThread (const ACE_CString& name, 
			ACS_TRACE("CWindCheckerThread::CWindCheckerThread");

			loopCounter_m = 0;

			m_srtweatherstation_p = (SRTWeatherStationImpl  *) weatherStation;

                        m_threshold=m_srtweatherstation_p->m_threshold;





		}
@@ -26,13 +27,13 @@ CWindCheckerThread::runLoop() 
	IRA::CIRATools::getTime(now);

  

     wdata = m_srtweatherstation_p->getData();

    wind=wdata.wind; // converts wind speed from m/s to km/h

    wind=wdata.wind; 

     AUTO_TRACE("WindCheckerThread::runLoop()");

     if (wind > 0){

     if (wind >m_threshold){

     

         m_srtweatherstation_p->parkAntenna();

         

         ACS_LOG(LM_FULL_INFO,"SRTWeatherStationImpl::initialize()",(LM_WARNING,"WINDSPEED=%f ", wdata.wind));



     }



}