SecsGemPro 1.0.2__tar.gz → 1.2.0__tar.gz

{secsgempro-1.0.2 → secsgempro-1.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: SecsGemPro
-Version: 1.0.2
+Version: 1.2.0
 Summary: secs/gem
 Author: LiuWei
 Author-email: 183074632@qq.com

{secsgempro-1.0.2 → secsgempro-1.2.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "SecsGemPro"
-version = "1.0.2"
+version = "1.2.0"
 description = "secs/gem"
 authors = ["LiuWei <183074632@qq.com>"]
 readme = "README.md"

secsgempro-1.2.0/secsgem/secs/data_items/caack.py

@@ -0,0 +1,49 @@
+"""CAACK data item."""
+from .. import variables
+from .base import DataItemBase
+
+
+class CAACK(DataItemBase):
+    """Carrier Action Acknowledge Code.
+
+    :Type: :class:`Binary <secsgem.secs.variables.Binary>`
+    :Length: 1
+
+    **Values**
+        +-------+--------------------------------------------------------------+-------------------------------------------------------------+
+        | Value | Description                                                  | Constant                                                    |
+        +=======+==============================================================+=============================================================+
+        | 0     | Acknowledge, command has been performed                      | :const:`secsgem.secs.data_items.CAACK.ACCEPTED`             |
+        +-------+--------------------------------------------------------------+-------------------------------------------------------------+
+        | 1     | Invalid command                                              | :const:`secsgem.secs.data_items.CAACK.INVALID_COMMAND`      |
+        +-------+--------------------------------------------------------------+-------------------------------------------------------------+
+        | 2     | Can not perform now                                          | :const:`secsgem.secs.data_items.CAACK.CANNOT_PERFORM_NOW`   |
+        +-------+--------------------------------------------------------------+-------------------------------------------------------------+
+        | 3     | Invalid data or argument                                     | :const:`secsgem.secs.data_items.CAACK.INVALID_DATA`         |
+        +-------+--------------------------------------------------------------+-------------------------------------------------------------+
+        | 4     | Acknowledge, request will be performed with completion       | :const:`secsgem.secs.data_items.CAACK.COMPLETION_SIGNALED`  |
+        |       | signaled later by an event                                   |                                                             |
+        +-------+--------------------------------------------------------------+-------------------------------------------------------------+
+        | 5     | Rejected. Invalid state                                      | :const:`secsgem.secs.data_items.CAACK.INVALID_STATE`        |
+        +-------+--------------------------------------------------------------+-------------------------------------------------------------+
+        | 6-63  | Reserved                                                     |                                                             |
+        +-------+--------------------------------------------------------------+-------------------------------------------------------------+
+
+    **Used In Function**
+        - :class:`SecsS03F18 <secsgem.secs.functions.SecsS03F18>`
+        - :class:`SecsS03F20 <secsgem.secs.functions.SecsS03F20>`
+        - :class:`SecsS03F22 <secsgem.secs.functions.SecsS03F22>`
+        - :class:`SecsS03F24 <secsgem.secs.functions.SecsS03F24>`
+        - :class:`SecsS03F26 <secsgem.secs.functions.SecsS03F26>`
+
+    """
+
+    __type__ = variables.U1
+    __count__ = 1
+
+    ACCEPTED = 0
+    INVALID_COMMAND = 1
+    CANNOT_PERFORM_NOW = 2
+    INVALID_DATA = 3
+    COMPLETION_SIGNALED = 4
+    INVALID_STATE = 5

{secsgempro-1.0.2 → secsgempro-1.2.0}/secsgem/secs/handler.py

@@ -132,6 +132,10 @@ class SecsHandler:  # pylint: disable=too-many-instance-attributes,too-many-publ
             if result is not None:
                 self.send_response(result, message.header.system)
 
+            # 回复后是否要发送事件
+            if func := getattr(self, f"send_event_after_response_s{stream_num}f{function_num + 1}", None):
+                func()
+
         except Exception:  # pylint: disable=broad-except
             self.logger.exception("Callback aborted because of exception, abort sent")
             self.send_response(self.stream_function(message.header.stream, 0)(), message.header.system)

secsgempro-1.0.2/secsgem/secs/data_items/caack.py

@@ -1,23 +0,0 @@
-"""CAACK data item."""
-from .. import variables
-from .base import DataItemBase
-
-
-class CAACK(DataItemBase):
-    """Carrier Action Request acknowledge code.
-
-    :Type: :class:`Binary <secsgem.secs.variables.Binary>`
-    :Length: 1
-
-    **Values**
-        +-------+------------------------+-------------------------------------------------------------+
-        | Value | Description            | Constant                                                    |
-        +=======+========================+=============================================================+
-        | 0     | Accepted               | :const:`secsgem.secs.data_items.CAACK.ACCEPTED`             |
-        +-------+------------------------+-------------------------------------------------------------+
-    """
-
-    __type__ = variables.U1
-    __count__ = 1
-
-    ACCEPTED = 0