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

gravity_controller_operator/controllers/sigur.py

@@ -19,7 +19,7 @@ class SigurBase:
         return self._send_command(f'"SUBSCRIBE" CE')
 
     def _send_command(self, command, get_response=True):
-        time.sleep(0.3)
+        time.sleep(0.15)
         self.mutex.acquire()
         command = f'{command}\r\n'
         self.sock.send(command.encode("utf-8"))
@@ -41,10 +41,14 @@ class SigurDI(DIInterface, SigurBase):
     def get_phys_dict(self):
         result = {}
         for point in range(self.starts_with, self.starts_with + self.map_keys_amount):
-            raw = self._send_command(f'"GETAPINFO" {point}')
-            response = raw.decode()
+            while True:
+                raw = self._send_command(f'"GETAPINFO" {point}')
+                response = raw.decode()
+                if "OK" in response:
+                    continue
+                break
             status = response.split(" ")[-2]
-            result[point] = status
+            result[point] = 0 if status in ("ONLINE_UNLOCKED", "ONLINE_NORMAL") else 1
         return result
 
 
@@ -59,10 +63,14 @@ class SigurRelay(RelayInterface, SigurBase):
     def get_phys_dict(self):
         result = {}
         for point in range(self.starts_with, self.starts_with + self.map_keys_amount):
-            raw = self._send_command(f'"GETAPINFO" {point}')
-            response = raw.decode()
+            while True:
+                raw = self._send_command(f'"GETAPINFO" {point}')
+                response = raw.decode()
+                if "OK" in response:
+                    continue
+                break
             status = response.split(" ")[-2]
-            result[point] = status
+            result[point] = 0 if status in ("ONLINE_UNLOCKED", "ONLINE_NORMAL") else 1
         return result
 
     def change_phys_relay_state(self, addr, state: bool):

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

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

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

@@ -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=UjpCpntfT2hZFgiD7RPjmRcd37gb6qsYvMSj4gvRxZE,2555
+gravity_controller_operator/controllers/sigur.py,sha256=30T35U_pHK4j6jywO4ABuvALVVIys1_6t1Ie4AlF2so,2908
 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.0.dist-info/licenses/LICENSE,sha256=6kbiFSfobTZ7beWiKnHpN902HgBx-Jzgcme0SvKqhKY,1091
-gravity_controller_operator-2.2.0.dist-info/METADATA,sha256=TbLtMRc5ln_EIuBDDtPqa9DY9V0D0zp5QN3ESBzJso8,4124
-gravity_controller_operator-2.2.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-gravity_controller_operator-2.2.0.dist-info/top_level.txt,sha256=krapbz1cEDGquDJf0DnoTbnybUwi7J_8OgoIumEc0OM,28
-gravity_controller_operator-2.2.0.dist-info/RECORD,,
+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,,