Commit e5f13819 authored by Marco De Marco's avatar Marco De Marco
Browse files

Alarm state added

parent 42caf2cc

src/FitsImporter.xmi

+5 −1
Original line number Diff line number Diff line
@@ -140,6 +140,7 @@ 
      <status abstract="false" inherited="false" concrete="true" concreteHere="true"/>

      <excludedStates>ON</excludedStates>

      <excludedStates>FAULT</excludedStates>

      <excludedStates>ALARM</excludedStates>

    </commands>

    <commands name="Off" description="Deactivate fits importer" execMethod="off" displayLevel="OPERATOR" polledPeriod="0">

      <argin description="">
@@ -198,6 +199,9 @@ 
    <states name="FAULT" description="Fits importer is in FAULT state (not ready to ingest data)">

      <status abstract="false" inherited="false" concrete="true" concreteHere="true"/>

    </states>

    <states name="ALARM" description="">

      <status abstract="false" inherited="false" concrete="true" concreteHere="true"/>

    </states>

    <preferences docHome="./doc_html" makefileHome="/usr/local/tango-8.1.2/share/pogo/preferences"/>

  </classes>

</pogoDsl:PogoSystem>

src/FitsImporterStateMachine.cpp

+3 −1
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ static const char *RcsId = "$Id: $"; 
//  OFF     |  Fits importer is not active (not ready ingest data)

//  ON      |  Fits importer is in ON state (ready to ingest data)

//  FAULT   |  Fits importer is in FAULT state (not ready to ingest data)

//  ALARM   |  





namespace FitsImporter_ns
@@ -142,7 +143,8 @@ bool FitsImporter::is_On_allowed(TANGO_UNUSED(const CORBA::Any &any)) 
{

	//	Compare device state with not allowed states.

	if (get_state()==Tango::ON ||

		get_state()==Tango::FAULT)

		get_state()==Tango::FAULT ||

		get_state()==Tango::ALARM)

	{

	/*----- PROTECTED REGION ID(FitsImporter::OnStateAllowed) ENABLED START -----*/

src/FitsImporter.cpp

+3 −3

File changed.

Contains only whitespace changes.

src/FitsImporter.h

+1 −1

File changed.

Contains only whitespace changes.

src/FitsImporterClass.cpp

+1 −1

File changed.

Contains only whitespace changes.