diff --git a/test.py b/test.py index e58ef11..72508a6 100644 --- a/test.py +++ b/test.py @@ -8,6 +8,7 @@ zk = zk.ZK('192.168.1.201') status, message = zk.connect() if status: print 'Firmware Version: : {}'.format(zk.get_firmware_version()) + zk.restart() print zk.disconnect() else: print message diff --git a/zk/__init__.py b/zk/__init__.py index 47a5db9..fdcd189 100644 --- a/zk/__init__.py +++ b/zk/__init__.py @@ -1,3 +1,4 @@ +# -*- coding: utf-8 -*- from base import ZK __all__ = ['ZK'] \ No newline at end of file diff --git a/zk/base.py b/zk/base.py index 402d0ed..68d3e3e 100644 --- a/zk/base.py +++ b/zk/base.py @@ -53,6 +53,10 @@ class ZK(object): return pack('H', chksum) + def __sending_packet(self, buf): + self.__sock.sendto(buf, self.__address) + self.__data_recv, addr = self.__sock.recvfrom(1024) + @property def __response(self): ''' @@ -76,8 +80,7 @@ class ZK(object): command = const.CMD_CONNECT try: buf = self.__create_header(command=command) - self.__sock.sendto(buf, self.__address) - self.__data_recv, addr = self.__sock.recvfrom(1024) + self.__sending_packet(buf) if self.__response == const.CMD_ACK_OK: return (True, self.__response) @@ -94,8 +97,7 @@ class ZK(object): command = const.CMD_EXIT try: buf = self.__create_header(command=command, session_id=self.__sesion_id, reply_id=self.__reply_id) - self.__sock.sendto(buf, self.__address) - self.__data_recv, addr = self.__sock.recvfrom(1024) + self.__sending_packet(buf) if self.__response == const.CMD_ACK_OK: return (True, self.__response) else: @@ -107,8 +109,7 @@ class ZK(object): command = const.CMD_GET_VERSION try: buf = self.__create_header(command=command, session_id=self.__sesion_id, reply_id=self.__reply_id) - self.__sock.sendto(buf, self.__address) - self.__data_recv, addr = self.__sock.recvfrom(1024) + self.__sending_packet(buf) if self.__response == const.CMD_ACK_OK: return self.__data_recv[8:] else: @@ -124,8 +125,7 @@ class ZK(object): command = const.CMD_RESTART try: buf = self.__create_header(command=command, session_id=self.__sesion_id, reply_id=self.__reply_id) - self.__sock.sendto(buf, self.__address) - self.__data_recv, addr = self.__sock.recvfrom(1024) + self.__sending_packet(buf) if self.__response == const.CMD_ACK_OK: return (True, self.__response) else: @@ -142,8 +142,7 @@ class ZK(object): command = const.CMD_POWEROFF try: buf = self.__create_header(command=command, session_id=self.__sesion_id, reply_id=self.__reply_id) - self.__sock.sendto(buf, self.__address) - self.__data_recv, addr = self.__sock.recvfrom(1024) + self.__sending_packet(buf) if self.__response == const.CMD_ACK_OK: return (True, self.__response) else: