Emanuele
/
MarkoprintWiFi
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Corretto il match delle stinge per la risposta di successo o errore: 

re.search() invece di re.match() ed eliminati i caratteri speciali del
pattern da cercare
master
Emanuele Trabattoni 2019-09-30 11:01:25 +02:00
parent 82d18aee26
commit dcd2774336
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
MkpWIFI/commands.py
View File

@ -45,8 +45,8 @@ MKPcommands = {
'begin': '\x02', # STX 'begin': '\x02', # STX
'end': '\x03', # ETX 'end': '\x03', # ETX
'command': 'TZ{imageName};{printMode};{queueNo};{delay}\r{fieldContent}\r{counterStart}', 'command': 'TZ{imageName};{printMode};{queueNo};{delay}\r{fieldContent}\r{counterStart}',
'success': '\x06\x02([0-9])OK\x03', 'success': '([0-9]OK)',
'error': '([0-9])E([0-9])', 'error': '([0-9]E[0-9])',
'args': ['imageName', 'printMode', 'fieldContent'], 'args': ['imageName', 'printMode', 'fieldContent'],
'optArgs': ['queueNo', 'delay', 'counterStart'] 'optArgs': ['queueNo', 'delay', 'counterStart']
}, },

6
MkpWIFI/protocol.py
View File

@ -40,9 +40,9 @@ def _cmdString(cmdName, **cmdArgs):
def _checkError(cmdName, response): def _checkError(cmdName, response):
errKey = 'error' errKey = 'error'
cmdDict = cmd.MKPcommands[cmdName] cmdDict = cmd.MKPcommands[cmdName]
if errKey in cmdDict and cmdDict[errKey] is not None: if errKey in cmdDict and cmdDict[errKey] is None:
return None return None
error_codes = re.match(cmdDict[errKey], response, re.I) error_codes = re.search(cmdDict[errKey], response, re.I)
if error_codes: if error_codes:
return error_codes.groups() return error_codes.groups()
return None return None
@ -57,7 +57,7 @@ def checkResponse(cmdName, response):
return None return None
else: else:
return error return error
if re.match(cmdDict[sucKey], response, re.I): if re.search(cmdDict[sucKey], response, re.I):
return True return True
error = _checkError(cmdName, response) error = _checkError(cmdName, response)
if error is None: if error is None: