Subscription refactoring

CMakeLists.txt

@@ -58,12 +58,15 @@ set(
     src/v1_0/rw/rapid.cpp
     src/v1_0/rw/panel.cpp
     src/v1_0/rw/io.cpp
+    src/v1_0/subscription.cpp
 
     src/v2_0/rws.cpp
     src/v2_0/rws_client.cpp
     src/v2_0/rws_interface.cpp
     src/v2_0/rw/rapid.cpp
     src/v2_0/rw/panel.cpp
+    src/v2_0/rw/io.cpp
+    src/v2_0/subscription.cpp
 )
 
 add_library(${PROJECT_NAME} ${SRC_FILES})

include/abb_librws/rws_resource.h

@@ -7,130 +7,6 @@
 
 namespace abb :: rws
 {
-  /**
-   * \brief IO signal as a resource.
-   */
-  struct IOSignalResource
-  {
-    /**
-     * \brief A constructor.
-     *
-     * \param name name of the IO signal.
-     */
-    explicit IOSignalResource(std::string const& name)
-    : name(name)
-    {
-    }
-
-    /**
-     * \brief IO signal name.
-     */
-    std::string name;
-  };
-
-
-  /**
-   * \brief A class for representing a RAPID symbol resource.
-   */
-  struct RAPIDSymbolResource
-  {
-    /**
-     * \brief A constructor.
-     *
-     * \param module specifying the name of the RAPID module containing the symbol.
-     * \param name specifying the name of the RAPID symbol.
-     */
-    RAPIDSymbolResource(const std::string& module, const std::string& name)
-    :
-    module(module),
-    name(name)
-    {}
-
-    /**
-     * \brief The RAPID module name.
-     */
-    std::string module;
-
-    /**
-     * \brief The RAPID symbol name.
-     */
-    std::string name;
-  };
-
-
-  /**
-   * \brief A class for representing a RAPID resource.
-   */
-  struct RAPIDResource
-  {
-    /**
-     * \brief A constructor.
-     *
-     * \param task specifying the name of the RAPID task containing the symbol.
-     * \param module specifying the name of the RAPID module containing the symbol.
-     * \param name specifying the name of the RAPID symbol.
-     */
-    RAPIDResource(const std::string& task, const std::string& module, const std::string& name)
-    :
-    task(task),
-    module(module),
-    name(name)
-    {}
-
-    /**
-     * \brief A constructor.
-     *
-     * \param task specifying the name of the RAPID task containing the symbol.
-     * \param symbol specifying the names of the RAPID module and the the symbol.
-     */
-    RAPIDResource(const std::string& task, const RAPIDSymbolResource& symbol)
-    :
-    task(task),
-    module(symbol.module),
-    name(symbol.name)
-    {}
-
-    /**
-     * \brief The RAPID task name.
-     */
-    std::string task;
-
-    /**
-     * \brief The RAPID module name.
-     */
-    std::string module;
-
-    /**
-     * \brief The RAPID symbol name.
-     */
-    std::string name;
-  };
-
-
-  /**
-   * \brief RAPID execution state subscription resource
-   */
-  struct RAPIDExecutionStateResource
-  {
-  };
-
-
-  /**
-   * \brief Controller operation mode subscription resource
-   */
-  struct OperationModeResource
-  {
-  };
-
-
-  /**
-   * \brief Controller state subscription resource
-   */
-  struct ControllerStateResource
-  {
-  };
-
-
   /**
    * \brief A class for representing a file resource.
    */

include/abb_librws/rws_state_machine_interface.h

@@ -277,6 +277,8 @@ class RWSStateMachineInterface : public v1_0::RWSInterface
        */
       struct ABB_LIBRWS_EXPORT Symbols
       {
+        using RAPIDSymbolResource = v1_0::rw::rapid::RAPIDSymbolResource;
+
         /**
          * \brief RAPID symbol indicating the current EGM action of a RAPID motion task.
          *