Commit 14c0db76 authored by marco-buttu's avatar marco-buttu
Browse files

Fix issue #525

parent 58f24bfa

Common/Servers/MFKBandBaseReceiver/src/MFKBandBaseCore.cpp

+20 −20
Original line number Original line Diff line number Diff line
@@ -188,10 +188,10 @@ void CComponentCore::externalCalOn() throw ( 
        throw impl;

        throw impl;

    }

    }

    guard.release();

    guard.release();

    if (checkStatusBit(LOCAL)) {

    // if (checkStatusBit(LOCAL)) {

        _EXCPT(ReceiversErrors::NoRemoteControlErrorExImpl,impl,"CComponentCore::externalCalOn()");

    //     _EXCPT(ReceiversErrors::NoRemoteControlErrorExImpl,impl,"CComponentCore::externalCalOn()");

        throw impl;

    //     throw impl;

    }

    // }

    try {

    try {

        m_control->setExtCalibrationOn();

        m_control->setExtCalibrationOn();

    }

    }
@@ -227,10 +227,10 @@ void CComponentCore::externalCalOff() throw ( 
        throw impl;

        throw impl;

    }

    }

    guard.release();

    guard.release();

    if (checkStatusBit(LOCAL)) {

    // if (checkStatusBit(LOCAL)) {

        _EXCPT(ReceiversErrors::NoRemoteControlErrorExImpl,impl,"CComponentCore::externalCalOff()");

    //     _EXCPT(ReceiversErrors::NoRemoteControlErrorExImpl,impl,"CComponentCore::externalCalOff()");

        throw impl;

    //     throw impl;

    }

    // }

    try {

    try {

        m_control->setExtCalibrationOff();

        m_control->setExtCalibrationOff();

    }

    }
@@ -277,10 +277,10 @@ void CComponentCore::calOn() throw ( 
        throw impl;

        throw impl;

    }

    }

    // guard.release();

    // guard.release();

    if (checkStatusBit(LOCAL)) {

    // if (checkStatusBit(LOCAL)) {

        _EXCPT(ReceiversErrors::NoRemoteControlErrorExImpl,impl,"CComponentCore::calOn()");

    //     _EXCPT(ReceiversErrors::NoRemoteControlErrorExImpl,impl,"CComponentCore::calOn()");

        throw impl;

    //     throw impl;

    }

    // }

    try {

    try {

        m_control->setCalibrationOn();

        m_control->setCalibrationOn();

        m_calDiode=true;

        m_calDiode=true;
@@ -317,10 +317,10 @@ void CComponentCore::calOff() throw ( 
        throw impl;

        throw impl;

    }

    }

    // guard.release();

    // guard.release();

    if (checkStatusBit(LOCAL)) {

    // if (checkStatusBit(LOCAL)) {

        _EXCPT(ReceiversErrors::NoRemoteControlErrorExImpl,impl,"CComponentCore::calOff()");

    //     _EXCPT(ReceiversErrors::NoRemoteControlErrorExImpl,impl,"CComponentCore::calOff()");

        throw impl;

    //     throw impl;

    }

    // }

    try {

    try {

        m_control->setCalibrationOff();

        m_control->setCalibrationOff();

        m_calDiode=false;

        m_calDiode=false;
@@ -834,10 +834,10 @@ void CComponentCore::updateComponent() 
{

{

    baci::ThreadSyncGuard guard(&m_mutex);

    baci::ThreadSyncGuard guard(&m_mutex);

    m_componentStatus=Management::MNG_OK;

    m_componentStatus=Management::MNG_OK;

    if (checkStatusBit(LOCAL)) {

    // if (checkStatusBit(LOCAL)) {

        setComponentStatus(Management::MNG_FAILURE);

    //     setComponentStatus(Management::MNG_FAILURE);

        _IRA_LOGFILTER_LOG(LM_CRITICAL,"CComponentCore::updateComponent()","RECEVER_NOT_REMOTELY_CONTROLLABLE");

    //     _IRA_LOGFILTER_LOG(LM_CRITICAL,"CComponentCore::updateComponent()","RECEVER_NOT_REMOTELY_CONTROLLABLE");

    }

    // }

    if (checkStatusBit(VACUUMPUMPFAULT)) {

    if (checkStatusBit(VACUUMPUMPFAULT)) {

        setComponentStatus(Management::MNG_WARNING);

        setComponentStatus(Management::MNG_WARNING);

        _IRA_LOGFILTER_LOG(LM_WARNING,"CComponentCore::updateComponent()","VACUUM_PUMP_FAILURE");

        _IRA_LOGFILTER_LOG(LM_WARNING,"CComponentCore::updateComponent()","VACUUM_PUMP_FAILURE");