gravity-controller-operator 2.2.2__py3-none-any.whl → 2.2.4__py3-none-any.whl

gravity_controller_operator/controllers/sigur.py

@@ -1,34 +1,12 @@
 import time
+from http.client import responses
 
 from gravity_controller_operator.controllers_super import DIInterface, RelayInterface, ControllerInterface
-from _thread import allocate_lock
-from socket import socket
 
 
 class SigurBase:
     def __init__(self, sock):
-        self.sock = sock
-        self.mutex = allocate_lock()
-        self.login()
-        self.subscribe_ce()
-
-    def login(self, login="Administrator", password=""):
-        return self._send_command(f'"LOGIN" 1.8 "{login}" "{password}"')
-
-    def subscribe_ce(self):
-        return self._send_command(f'"SUBSCRIBE" CE')
-
-    def _send_command(self, command, get_response=True):
-        time.sleep(0.15)
-        self.mutex.acquire()
-        command = f'{command}\r\n'
-        self.sock.send(command.encode("utf-8"))
-        if get_response:
-            response = self.sock.recv(1024)
-            self.mutex.release()
-            return response
-        self.mutex.release()
-
+        self.sock = None
 
 class SigurDI(DIInterface, SigurBase):
     map_keys_amount = 5
@@ -41,14 +19,7 @@ class SigurDI(DIInterface, SigurBase):
     def get_phys_dict(self):
         result = {}
         for point in range(self.starts_with, self.starts_with + self.map_keys_amount):
-            while True:
-                raw = self._send_command(f'"GETAPINFO" {point}')
-                response = raw.decode()
-                if "OK" in response:
-                    continue
-                break
-            status = response.split(" ")[-2]
-            result[point] = 0 if status in ("ONLINE_UNLOCKED", "ONLINE_NORMAL") else 1
+            result[point] = 0
         return result
 
 
@@ -63,14 +34,7 @@ class SigurRelay(RelayInterface, SigurBase):
     def get_phys_dict(self):
         result = {}
         for point in range(self.starts_with, self.starts_with + self.map_keys_amount):
-            while True:
-                raw = self._send_command(f'"GETAPINFO" {point}')
-                response = raw.decode()
-                if "OK" in response:
-                    continue
-                break
-            status = response.split(" ")[-2]
-            result[point] = 0 if status in ("ONLINE_UNLOCKED", "ONLINE_NORMAL") else 1
+            result[point] = 0
         return result
 
     def change_phys_relay_state(self, addr, state: bool):

gravity_controller_operator/controllers_super.py

@@ -81,7 +81,7 @@ class RelayInterface(SoftStateMixin, RelayPhysInterface):
         for addr, value in values.items():
             self.update_state(addr, value, mark_time=False)
 
-    def change_relay_stated(self, logical_ch: int, state: bool):
+    def change_relay_state(self, logical_ch: int, state: bool):
         self.update_state(logical_ch, state)
         phys_addr = self.spec_addr.get(logical_ch, logical_ch)
         return self.change_phys_relay_state(phys_addr, state)

{gravity_controller_operator-2.2.2.dist-info → gravity_controller_operator-2.2.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gravity_controller_operator
-Version: 2.2.2
+Version: 2.2.4
 Summary: SDK предоставляющий универсальный интерфейс для работы со многими промышленными контроллерами ввода-вывода (количество расширяемо)
 Author: PunchyArchy
 Author-email: ksmdrmvscthny@gmail.com

{gravity_controller_operator-2.2.2.dist-info → gravity_controller_operator-2.2.4.dist-info}/RECORD

@@ -1,6 +1,6 @@
 gravity_controller_operator/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 gravity_controller_operator/controller_factory.py,sha256=QQHym-fPhWCBCOFUp7MHrecjXcRy9dXVnUbg6LvwvDo,1111
-gravity_controller_operator/controllers_super.py,sha256=9GkJRDDGLkbl9aOBnIolLWOv6qCdQk837NtjE0JzLUY,3786
+gravity_controller_operator/controllers_super.py,sha256=xn_66lJbyT9CQ-mMVy_QkUYEPc3nPoiI9zBuIo_yFzk,3785
 gravity_controller_operator/exceptions.py,sha256=tAuviQbnrZh_T5E31RBeEnagwbvdi7x23uQJ8v4XRtM,647
 gravity_controller_operator/main.py,sha256=2xp4cM0zzgxUW0otXrDNVTk93ftYKeGmBW7KbwoJYRk,1584
 gravity_controller_operator/controllers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -8,15 +8,15 @@ gravity_controller_operator/controllers/arm_k210.py,sha256=qlpQoqoLfZddTVJ-Dzdvk
 gravity_controller_operator/controllers/emulator_contr.py,sha256=SGZBzUeCXDwWXHcYdMDvErwIj1L81ycnObHvCjB86Sk,943
 gravity_controller_operator/controllers/moxa.py,sha256=OGvEB6ggDi1NZh7OOEfjxVUTKC-opi0hIcAKTJJAMi0,2407
 gravity_controller_operator/controllers/netping_relay.py,sha256=0cpioEQbZ19BApAPJT2fXWTKDEB9zf2GU9OUfbBGkAY,2572
-gravity_controller_operator/controllers/sigur.py,sha256=30T35U_pHK4j6jywO4ABuvALVVIys1_6t1Ie4AlF2so,2908
+gravity_controller_operator/controllers/sigur.py,sha256=nljHk1nRu1ijJPp_ApwGPNucdR_z4AWxMJeeIHF6nTk,1554
 gravity_controller_operator/controllers/wb_mr6lv.py,sha256=qDmb71t7KXX_w8nhguUpEoMgkPOZcoVs83We5kTgFfk,2358
 gravity_controller_operator/controllers/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 gravity_controller_operator/controllers/tests/test_moxa_controller.py,sha256=RKwpE4WI6QylPD6qGrse6iv6X8ybzf45oTHHTjlCLXA,1068
 gravity_controller_operator/docs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 gravity_controller_operator/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 gravity_controller_operator/tests/main_tests.py,sha256=BkgWDKUXVmK4WIYY_5CAHazYmqkKumYPtfbnyxcm_UU,575
-gravity_controller_operator-2.2.2.dist-info/licenses/LICENSE,sha256=6kbiFSfobTZ7beWiKnHpN902HgBx-Jzgcme0SvKqhKY,1091
-gravity_controller_operator-2.2.2.dist-info/METADATA,sha256=J1NATp-3719MgB7dct3sBP5y8suwYKOO8cA8yvK9w34,4124
-gravity_controller_operator-2.2.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-gravity_controller_operator-2.2.2.dist-info/top_level.txt,sha256=krapbz1cEDGquDJf0DnoTbnybUwi7J_8OgoIumEc0OM,28
-gravity_controller_operator-2.2.2.dist-info/RECORD,,
+gravity_controller_operator-2.2.4.dist-info/licenses/LICENSE,sha256=6kbiFSfobTZ7beWiKnHpN902HgBx-Jzgcme0SvKqhKY,1091
+gravity_controller_operator-2.2.4.dist-info/METADATA,sha256=YhROoX40gBs1UIzqhijUF4pk_yE12mbT1OIv6Vn5KmA,4124
+gravity_controller_operator-2.2.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+gravity_controller_operator-2.2.4.dist-info/top_level.txt,sha256=krapbz1cEDGquDJf0DnoTbnybUwi7J_8OgoIumEc0OM,28
+gravity_controller_operator-2.2.4.dist-info/RECORD,,