gravity-controller-operator 2.2.3__py3-none-any.whl → 2.2.5__py3-none-any.whl

gravity_controller_operator/controllers/sigur.py

@@ -2,47 +2,18 @@ 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()
-
-    def get_response(self):
-        time.sleep(0.15)
-        self.mutex.acquire()
-        response = self.sock.recv(1024)
-        self.mutex.release()
-        return responses
+    def __init__(self):
+        pass
 
 class SigurDI(DIInterface, SigurBase):
     map_keys_amount = 5
     starts_with = 3
 
-    def __init__(self, sock):
-        SigurBase.__init__(self, sock)
+    def __init__(self):
+        SigurBase.__init__(self)
         DIInterface.__init__(self)
 
     def get_phys_dict(self):
@@ -56,8 +27,8 @@ class SigurRelay(RelayInterface, SigurBase):
     map_keys_amount = 3
     starts_with = 1
 
-    def __init__(self, sock):
-        SigurBase.__init__(self, sock)
+    def __init__(self):
+        SigurBase.__init__(self)
         RelayInterface.__init__(self)
 
     def get_phys_dict(self):
@@ -76,6 +47,6 @@ class Sigur:
 
     def __init__(self, sock, login="Administrator", password="",
                  name="Sigur", *args, **kwargs):
-        di = SigurDI(sock)
-        relay = SigurRelay(sock)
+        di = SigurDI()
+        relay = SigurRelay()
         self.interface = ControllerInterface(di_interface=di, relay_interface=relay)

gravity_controller_operator/main.py

@@ -47,4 +47,4 @@ class ControllerOperator:
         return self.get_point("relays", ch)
 
     def get_model(self):
-        return self.controller.model
+        return self.controller.model

{gravity_controller_operator-2.2.3.dist-info → gravity_controller_operator-2.2.5.dist-info}/METADATA

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

{gravity_controller_operator-2.2.3.dist-info → gravity_controller_operator-2.2.5.dist-info}/RECORD

@@ -2,21 +2,21 @@ gravity_controller_operator/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMp
 gravity_controller_operator/controller_factory.py,sha256=QQHym-fPhWCBCOFUp7MHrecjXcRy9dXVnUbg6LvwvDo,1111
 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/main.py,sha256=NMEukJrei6xbxoDxHyJyBL2GB4uOjRoUO9ffDi2vKxA,1586
 gravity_controller_operator/controllers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 gravity_controller_operator/controllers/arm_k210.py,sha256=qlpQoqoLfZddTVJ-Dzdvk_59-0E4FEays3kE8V2Xd1I,2036
 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=BAhu86MZn9siToudGHPOnSIiuEnjYdXk2xaF5J_9648,2475
+gravity_controller_operator/controllers/sigur.py,sha256=o0n7Oc4AJSvRBpiVNae7QBM-MXWD4lq0hnAuYMuGQa0,1504
 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.3.dist-info/licenses/LICENSE,sha256=6kbiFSfobTZ7beWiKnHpN902HgBx-Jzgcme0SvKqhKY,1091
-gravity_controller_operator-2.2.3.dist-info/METADATA,sha256=7JdMgLSFqVBGpZ5N21At31JI7fhHVCv2nVK00tFB2zI,4124
-gravity_controller_operator-2.2.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-gravity_controller_operator-2.2.3.dist-info/top_level.txt,sha256=krapbz1cEDGquDJf0DnoTbnybUwi7J_8OgoIumEc0OM,28
-gravity_controller_operator-2.2.3.dist-info/RECORD,,
+gravity_controller_operator-2.2.5.dist-info/licenses/LICENSE,sha256=6kbiFSfobTZ7beWiKnHpN902HgBx-Jzgcme0SvKqhKY,1091
+gravity_controller_operator-2.2.5.dist-info/METADATA,sha256=x4WQnlL4BXk0yeXpmFkclhD44Xia9AtT2PNIq1yBHAc,4124
+gravity_controller_operator-2.2.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+gravity_controller_operator-2.2.5.dist-info/top_level.txt,sha256=krapbz1cEDGquDJf0DnoTbnybUwi7J_8OgoIumEc0OM,28
+gravity_controller_operator-2.2.5.dist-info/RECORD,,