From dcd27743366049635b443eed3e08933af8b2d400 Mon Sep 17 00:00:00 2001
From: Emanuele <ema.trabattoni@gmail.com>
Date: Mon, 30 Sep 2019 11:01:25 +0200
Subject: [PATCH] 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

---
 MkpWIFI/commands.py | 4 ++--
 MkpWIFI/protocol.py | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/MkpWIFI/commands.py b/MkpWIFI/commands.py
index e27009a..1ecbc57 100644
--- a/MkpWIFI/commands.py
+++ b/MkpWIFI/commands.py
@@ -45,8 +45,8 @@ MKPcommands = {
         'begin': '\x02',  # STX
         'end': '\x03',  # ETX
         'command': 'TZ{imageName};{printMode};{queueNo};{delay}\r{fieldContent}\r{counterStart}',
-        'success': '\x06\x02([0-9])OK\x03',
-        'error': '([0-9])E([0-9])',
+        'success': '([0-9]OK)',
+        'error': '([0-9]E[0-9])',
         'args': ['imageName', 'printMode', 'fieldContent'],
         'optArgs': ['queueNo', 'delay', 'counterStart']
     },
diff --git a/MkpWIFI/protocol.py b/MkpWIFI/protocol.py
index 3c06706..37ebf7a 100644
--- a/MkpWIFI/protocol.py
+++ b/MkpWIFI/protocol.py
@@ -40,9 +40,9 @@ def _cmdString(cmdName, **cmdArgs):
 def _checkError(cmdName, response):
 	errKey = 'error'
 	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
-	error_codes = re.match(cmdDict[errKey], response, re.I)
+	error_codes = re.search(cmdDict[errKey], response, re.I)
 	if error_codes:
 		return error_codes.groups()
 	return None
@@ -57,7 +57,7 @@ def checkResponse(cmdName, response):
 				return None
 			else:
 				return error
-		if re.match(cmdDict[sucKey], response, re.I):
+		if re.search(cmdDict[sucKey], response, re.I):
 			return True
 		error = _checkError(cmdName, response)
 		if error is None: