Remove support for RapidX based firmware for link lock.

CMakeLists.txt

@@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 2.8)
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/Modules)
 
 set(${PROJECT_NAME}_MAJOR_VERSION 01)
-set(${PROJECT_NAME}_MINOR_VERSION 15)
+set(${PROJECT_NAME}_MINOR_VERSION 16)
 set(${PROJECT_NAME}_PATCH_VERSION 00)
 include(cmake/set_version_numbers.cmake)
 
@@ -32,7 +32,7 @@ set(${PROJECT_NAME}_CMAKE_CXX_FLAGS "${${PROJECT_NAME}_CMAKE_CXX_FLAGS} -O3")
 
 include(cmake/add_dependency.cmake)
 
-add_dependency(Consatt-apps 00.21 REQUIRED)
+add_dependency(Consatt-apps 00.22 REQUIRED)
 add_dependency(Consatt-doocs 00.17 REQUIRED)
 
 add_dependency(Boost COMPONENTS chrono thread system filesystem REQUIRED)

include/EqLinkLockCtrlFMC25RapidXServer.h

-/* 
- * File:   Dma_read_dummy.h
- * Author: tsk
- *
- * Created on September 25, 2014, 2:34 PM
- */
-
-#ifndef EQ_LINK_LOCK_CTRL_RAPIDX_FMC25_SERVER
-#define	EQ_LINK_LOCK_CTRL_RAPIDX_FMC25_SERVER
-
-
-
-#include "eq_fct.h"
-#include "eq_client.h"
-
-#include "DoocsHelper.h"
-
-#include "Consatt-apps/CsaLinkLockCtrlFMC25RapidX.h"
-#include "Consatt-doocs/Doocs_CsaAdapter.h"
-
-
-#define LINKS_AMOUNT 4
-
-#define CODE_CSA_LINK_LOCK_CTRL_RAPIDX_FMC25_SERVER 5650
-
-
-//void sig_usr1_zmq_cb_for_laser_lock_server(void *, EqData *, dmsg_info_t *);
-
-
-class EqLinkLockCtrlFMC25RapidXServer : public EqFct {
-protected: //filds
-
-    //ZMQ communication for X2timer
-    //D_zmqstring sig_usr1_name_zmq;
-    //D_int _triggerSource;
-    
-    boost::shared_ptr <DoocsHelper>  _helper;
-    
-public:
-
-    boost::shared_ptr <Doocs_CsaAppManager> appManager;
-    
-    
-    EqLinkLockCtrlFMC25RapidXServer();
-    virtual ~EqLinkLockCtrlFMC25RapidXServer();
-    virtual int fct_code();
-    void update();
-    void init();
-
-    void interrupt_usr1(int sig_no);
-    void interrupt_usr1_core(dmsg_info_t *msginfo);
-    void post_init(void);
-    static int conf_done;
-};
-
-
-#endif	/* EQ_LSU_TEST_SERVER */
-

linklock_rpc_server.cc

@@ -4,7 +4,6 @@
 #include "EqLinkLockServer.h"
 #include "EqCsaLSynchFmc20.h"
 #include "EqLllDataHubServer.h"
-#include "EqLinkLockCtrlFMC25RapidXServer.h"
 #include "EqLinkLockCtrlFMC25VhdlServer.h"
 #include "EqLinkLockStatusServer.h"
 
@@ -55,11 +54,7 @@ EqFct* eq_create(int eq_code, void *) { //
          case CODE_CSA_LINK_LOCK_SERVER:
             eqn = new EqLinkLockServer();
             break;      
-                     
-        case CODE_CSA_LINK_LOCK_CTRL_RAPIDX_FMC25_SERVER:
-            eqn = new EqLinkLockCtrlFMC25RapidXServer();
-            break;         
-                       
+   
         case CODE_CSA_LINK_LOCK_CTRL_VHDL_FMC25_SERVER:  
            eqn = new EqLinkLockCtrlFMC25VhdlServer();
            break; 

src/EqLinkLockCtrlFMC25RapidXServer.cc

-
-#include "EqLinkLockCtrlFMC25RapidXServer.h"
-#include <chrono>
-
-int EqLinkLockCtrlFMC25RapidXServer::fct_code() {
-    return CODE_CSA_LINK_LOCK_CTRL_RAPIDX_FMC25_SERVER;
-}
-
-
-EqLinkLockCtrlFMC25RapidXServer::EqLinkLockCtrlFMC25RapidXServer() :
-EqFct("NAME = location") {
-    printftostderr("EqLinkLockCtrlFMC25RapidXServer::EqLinkLockCtrlFMC25RapidXServer()", "Location: %s, Start of DOOCS server constructor.", EqFct::name().c_str());
-    Doocs_CsaAdapter::getInstance().setParent(this);
-    appManager = Doocs_CsaAdapter::getInstance().createApplicationManager( new CsaLinkLockCtrlFMC25RapidX(std::string(EqFct::name())) ); 
-    appManager->create();
-    _helper.reset(new DoocsHelper(this));
-   printftostderr("EqLinkLockCtrlFMC25RapidXServer::EqLinkLockCtrlFMC25RapidXServer()", "Location: %s, End of DOOCS server constructor.", EqFct::name().c_str());
-}
-
-
-
-void EqLinkLockCtrlFMC25RapidXServer::init() {
-    appManager->init();
-    online();
-}
-
-void EqLinkLockCtrlFMC25RapidXServer::update() {
-    //std::cout << "EqLinkLockCtrlFMC25RapidXServer::update(): Return from update" << std::endl;
-    //return;
-    
-    if (_helper->triggerSource.value() != 0) {        
-        Doocs_CsaAdapter::getInstance().setCurrentTimeStampStructure();
-        appManager->execute();
-        _helper->update();
-    }
-    
-    
-    g_sts_.error(0);
-
-    g_sts_.newerror(0);
-    g_sts_.online(1);
-
-}
-
-void EqLinkLockCtrlFMC25RapidXServer::interrupt_usr1_core(dmsg_info_t *msginfo) {
-    //std::cout << "EqLinkLockCtrlFMC25RapidXServer::interrupt_usr1_core(): Return from interupt" << std::endl;
-    //return;
-    
-    if (_helper->triggerSource.value() == 0) {
-        Doocs_CsaAdapter::getInstance().setCurrentTimeStampStructure(msginfo);
-        appManager->execute();
-        _helper->update();
-    }
-}
-
-
-EqLinkLockCtrlFMC25RapidXServer::~EqLinkLockCtrlFMC25RapidXServer() {
-}
-
-
-void EqLinkLockCtrlFMC25RapidXServer::interrupt_usr1(int) {
-
-}
-
-
-int EqLinkLockCtrlFMC25RapidXServer::conf_done = 0;
-
-
-
-void sig_usr1_zmq_cb_for_link_lock_ctrl_rapidx_fmc25_server(void *pp, EqData*, dmsg_info_t *ip) {
-
-    EqLinkLockCtrlFMC25RapidXServer* location = (EqLinkLockCtrlFMC25RapidXServer*) pp;
-    if (location) {
-        location->interrupt_usr1_core(ip);
-    }
-}
-
-void EqLinkLockCtrlFMC25RapidXServer::post_init(void) {
-    printftostderr("EqLinkLockCtrlFMC25RapidXServer::post_init()", "Location: %s.", name_.value());    
-    printftostderr("EqLinkLockCtrlFMC25RapidXServer::post_init()", "Location: %s, Attach to ZMQ system for x2timer.", name_.value());
-    //sig_usr1_name_zmq.attach(sig_usr1_zmq_cb_for_link_lock_ctrl_rapidx_fmc25_server);
-    _helper->interruptAddressZmq.attach(sig_usr1_zmq_cb_for_link_lock_ctrl_rapidx_fmc25_server);
-    
-    std::ostringstream doocsParrentUniqueId;
-    doocsParrentUniqueId << this << "::" << this->name();
-    Doocs_CsaAdapter::getInstance().applyExposePolicy(doocsParrentUniqueId.str());
-}
-
-
-