added new commands,methods

CMakeLists.txt

@@ -19,7 +19,7 @@ message(STATUS "library output path is:${LIBRARY_OUTPUT_PATH}")
 
 #install path
 set(CMAKE_INSTALL_LIB_PATH "${CMAKE_INSTALL_PREFIX}/lib")
-set(CMAKE_INSTALL_INC_PATH "${CMAKE_INSTALL_PREFIX}/include/fsdetector/agipdrecv")
+set(CMAKE_INSTALL_INC_PATH "${CMAKE_INSTALL_PREFIX}/include/fsdetector/agipdctrl")
 message(STATUS "install path is:${CMAKE_INSTALL_PREFIX}")
 
 #add module

src/AGIPDComm.cpp

@@ -40,6 +40,13 @@ namespace AGIPDCtrlNS
     {
         LOG_TRACE(__FUNCTION__);
     }
+
+    string AGIPDComm::GetFirmwareVersion()
+    {
+        LOG_TRACE(__FUNCTION__);
+
+        return string("unknown");
+    }
     
     void AGIPDComm::Set10GElinkMAC(string mac)
     {
@@ -64,6 +71,8 @@ namespace AGIPDCtrlNS
         for(auto val : macaddr)
             cmd.push_back(static_cast<uint8>(val));
 
+        PrintCmd(cmd);
+        
         m_tcp->SendData(cmd);
         
     }
@@ -90,6 +99,8 @@ namespace AGIPDCtrlNS
         for(auto val : ipaddr)
             cmd.push_back(static_cast<uint8>(val));
 
+        PrintCmd(cmd);
+        
         m_tcp->SendData(cmd);
     }
     
@@ -110,4 +121,9 @@ namespace AGIPDCtrlNS
         
         return static_cast<uint8>(((m_tag++ == 255)?0:m_tag) & 0xff);
     }
+
+    void AGIPDComm::PrintCmd(vector<uint8>& cmd)
+    {
+        LOG_STREAM1(__FUNCTION__,INFO,cmd);
+    }
 }

src/AGIPDComm.h

@@ -52,6 +52,12 @@ namespace AGIPDCtrlNS
          */
         bool Init(sptr_network& tcp);
 
+        /**
+         *  \brief get firmware version
+         *  \return firmware version
+         */
+        string GetFirmwareVersion();
+
          /**
          *  \brief set 10GE link MAC
          *  \param mac mac address
@@ -83,6 +89,12 @@ namespace AGIPDCtrlNS
          *  \return sequence tag
          */
         uint8 GetSequenceTag();
+
+        /**
+         *  \brief print command
+         *  \param cmd
+         */
+        void PrintCmd(vector<uint8>& cmd);
         
         // member variables
         sptr_network m_tcp;

src/AGIPDCtrlGlobals.h

@@ -45,8 +45,7 @@ namespace AGIPDCtrlNS
         ZYNC,
         FF
     };
-
-
+    
     // command header length
     const int32 COMMAND_HEADER_LENGTH = 6;
     

src/AGIPDCtrlInterface.cpp

@@ -59,11 +59,32 @@ namespace AGIPDCtrlNS
         {
             LOG_STREAM(__FUNCTION__,ERROR,"detector control init failed");
             return false;
-        }    
+        }
 
         return true;
     }
     
+    string AGIPDCtrlInterface::GetDetCoreVersion()
+    {
+        LOG_TRACE(__FUNCTION__);
+
+        return FSDetCoreNS::FSDETCORE_VERSION;
+    }
+
+    string AGIPDCtrlInterface::GetLibAGIPDCtrlVersion()
+    {
+        LOG_TRACE(__FUNCTION__);
+
+        return AGIPDCTRL_VERSION;
+    }
+
+    string AGIPDCtrlInterface::GetFirmwareVersion()
+    {
+        LOG_TRACE(__FUNCTION__);
+
+        return m_communication->GetFirmwareVersion();
+    }
+    
     Enum_detector_state AGIPDCtrlInterface::GetStatus()
     {
         LOG_TRACE(__FUNCTION__);

src/AGIPDCtrlInterface.h

@@ -57,6 +57,24 @@ namespace AGIPDCtrlNS
          */
         bool InitAGIPDCtrl();
 
+        /**
+         *  \brief get core library version
+         *  \return the core library version
+         */
+        string GetDetCoreVersion();
+
+        /**
+         *  \brief get agipd control library version
+         *  \return the agipd control library version
+         */
+        string GetLibAGIPDCtrlVersion();
+
+        /**
+         *  \brief get firmware version
+         *  \return firmware version
+         */
+        string GetFirmwareVersion();
+
         /**
          *  \brief get status
          *           

src/CMakeLists.txt

@@ -46,6 +46,7 @@ install(FILES ${EXECUTABLE_OUTPUT_PATH}/${PROJECT_NAME}.pc
 set(HEADERS
    AGIPDCtrlInterface.h
    AGIPDComm.h
+   AGIPDCtrlGlobals.h
    Version.h)