cubetiq/ pyztk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

added 0 end string

This commit is contained in:
Arturo Hernandez 2018-09-13 12:38:52 -04:00
parent ded7b1d395
commit 2603513ce3
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
zk/base.py
View File

@ -397,7 +397,7 @@ class ZK(object):
return the serial number return the serial number
''' '''
command = const.CMD_OPTIONS_RRQ command = const.CMD_OPTIONS_RRQ
command_string = b'~SerialNumber' command_string = b'~SerialNumber\x00'
response_size = 1024 response_size = 1024
cmd_response = self.__send_command(command, command_string, response_size) cmd_response = self.__send_command(command, command_string, response_size)
if cmd_response.get('status'): if cmd_response.get('status'):
@ -412,7 +412,7 @@ class ZK(object):
return the platform name return the platform name
''' '''
command = const.CMD_OPTIONS_RRQ command = const.CMD_OPTIONS_RRQ
command_string = b'~Platform' command_string = b'~Platform\x00'
response_size = 1024 response_size = 1024
cmd_response = self.__send_command(command, command_string, response_size) cmd_response = self.__send_command(command, command_string, response_size)
@ -428,7 +428,7 @@ class ZK(object):
return the mac return the mac
''' '''
command = const.CMD_OPTIONS_RRQ command = const.CMD_OPTIONS_RRQ
command_string = b'MAC' command_string = b'MAC\x00'
response_size = 1024 response_size = 1024
cmd_response = self.__send_command(command, command_string, response_size) cmd_response = self.__send_command(command, command_string, response_size)
@ -443,7 +443,7 @@ class ZK(object):
return the device name return the device name
''' '''
command = const.CMD_OPTIONS_RRQ command = const.CMD_OPTIONS_RRQ
command_string = b'~DeviceName' command_string = b'~DeviceName\x00'
response_size = 1024 response_size = 1024
cmd_response = self.__send_command(command, command_string, response_size) cmd_response = self.__send_command(command, command_string, response_size)
@ -459,7 +459,7 @@ class ZK(object):
return the face version return the face version
''' '''
command = const.CMD_OPTIONS_RRQ command = const.CMD_OPTIONS_RRQ
command_string = b'ZKFaceVersion' command_string = b'ZKFaceVersion\x00'
response_size = 1024 response_size = 1024
cmd_response = self.__send_command(command, command_string, response_size) cmd_response = self.__send_command(command, command_string, response_size)
@ -474,7 +474,7 @@ class ZK(object):
return the fingerprint version return the fingerprint version
''' '''
command = const.CMD_OPTIONS_RRQ command = const.CMD_OPTIONS_RRQ
command_string = b'~ZKFPVersion' command_string = b'~ZKFPVersion\x00'
response_size = 1024 response_size = 1024
cmd_response = self.__send_command(command, command_string, response_size) cmd_response = self.__send_command(command, command_string, response_size)
@ -497,7 +497,7 @@ class ZK(object):
determine extend fmt determine extend fmt
''' '''
command = const.CMD_OPTIONS_RRQ command = const.CMD_OPTIONS_RRQ
command_string = b'~ExtendFmt' command_string = b'~ExtendFmt\x00'
response_size = 1024 response_size = 1024
cmd_response = self.__send_command(command, command_string, response_size) cmd_response = self.__send_command(command, command_string, response_size)
@ -515,7 +515,7 @@ class ZK(object):
determine user extend fmt determine user extend fmt
''' '''
command = const.CMD_OPTIONS_RRQ command = const.CMD_OPTIONS_RRQ
command_string = b'~UserExtFmt' command_string = b'~UserExtFmt\x00'
response_size = 1024 response_size = 1024
cmd_response = self.__send_command(command, command_string, response_size) cmd_response = self.__send_command(command, command_string, response_size)
@ -532,7 +532,7 @@ class ZK(object):
determine extend fmt determine extend fmt
''' '''
command = const.CMD_OPTIONS_RRQ command = const.CMD_OPTIONS_RRQ
command_string = b'FaceFunOn' command_string = b'FaceFunOn\x00'
response_size = 1024 response_size = 1024
cmd_response = self.__send_command(command, command_string, response_size) cmd_response = self.__send_command(command, command_string, response_size)
@ -549,7 +549,7 @@ class ZK(object):
determine old firmware determine old firmware
''' '''
command = const.CMD_OPTIONS_RRQ command = const.CMD_OPTIONS_RRQ
command_string = b'CompatOldFirmware' command_string = b'CompatOldFirmware\x00'
response_size = 1024 response_size = 1024
cmd_response = self.__send_command(command, command_string, response_size) cmd_response = self.__send_command(command, command_string, response_size)
@ -565,13 +565,13 @@ class ZK(object):
ip = self.__address[0] ip = self.__address[0]
mask = b'' mask = b''
gate = b'' gate = b''
cmd_response = self.__send_command(const.CMD_OPTIONS_RRQ, b'IPAddress', 1024) cmd_response = self.__send_command(const.CMD_OPTIONS_RRQ, b'IPAddress\x00', 1024)
if cmd_response.get('status'): if cmd_response.get('status'):
ip = (self.__data.split(b'=', 1)[-1].split(b'\x00')[0]) ip = (self.__data.split(b'=', 1)[-1].split(b'\x00')[0])
cmd_response = self.__send_command(const.CMD_OPTIONS_RRQ, b'NetMask', 1024) cmd_response = self.__send_command(const.CMD_OPTIONS_RRQ, b'NetMask\x00', 1024)
if cmd_response.get('status'): if cmd_response.get('status'):
mask = (self.__data.split(b'=', 1)[-1].split(b'\x00')[0]) mask = (self.__data.split(b'=', 1)[-1].split(b'\x00')[0])
cmd_response = self.__send_command(const.CMD_OPTIONS_RRQ, b'GATEIPAddress', 1024) cmd_response = self.__send_command(const.CMD_OPTIONS_RRQ, b'GATEIPAddress\x00', 1024)
if cmd_response.get('status'): if cmd_response.get('status'):
gate = (self.__data.split(b'=', 1)[-1].split(b'\x00')[0]) gate = (self.__data.split(b'=', 1)[-1].split(b'\x00')[0])
return {'ip': ip.decode(), 'mask': mask.decode(), 'gateway': gate.decode()} return {'ip': ip.decode(), 'mask': mask.decode(), 'gateway': gate.decode()}