diff --git a/MkpWIFI/commands.py b/MkpWIFI/commands.py index 99695dd..e1e4cc5 100644 --- a/MkpWIFI/commands.py +++ b/MkpWIFI/commands.py @@ -44,15 +44,15 @@ MKPcommands = { 'defPrefix': False, 'begin': '\x02', #STX 'end': '\x03', #ETX - 'command': 'TZ', + 'command': 'TZ{imagename};{printMode};{queueNo};{delay}\r{fieldContent}{counterStart}', 'success': '\x06\x02([0-9])OK\x03', 'error': '([0-9])E([0-9])', - 'args': ['imageName', 'printMode', 'fieldContent'] - + 'args': ['imageName', 'printMode', 'fieldContent'], + 'optArgs': ['queueNo', 'delay', 'counterStart'] }, 'sendImage': { 'defPrefix': True, - 'command': 'EW----;', + 'command': 'EW----;{imageName}', 'success': None, 'error': None, 'args': ['imageName'] @@ -77,14 +77,14 @@ MKPcommands = { }, 'deleteImage': { 'defPrefix': True, - 'command': 'EQ----;', + 'command': 'EQ----;{imageName}', 'success': 'OK\r', 'error': 'Err\r', 'args': ['imageName'] }, 'sendDate': { 'defPrefix': True, - 'command': '*STD', + 'command': '*STD{dateTime};{offset}', 'success': 'Ok\r', 'error': 'Err\r', 'args': ['dateTime','offset'] @@ -94,7 +94,6 @@ MKPcommands = { 'command': '*GSTD', 'success': True, 'error': None, - 'args': ['dateTime'] }, 'status': { 'defPrefix': True, diff --git a/MkpWIFI/log/dimelog.log b/MkpWIFI/log/dimelog.log index 85d1694..e450ba9 100644 --- a/MkpWIFI/log/dimelog.log +++ b/MkpWIFI/log/dimelog.log @@ -1,2 +1,9 @@ 09-27 15:54:43|WARNING| |36 : MarcaturaDime Started! 09-27 15:55:11|WARNING| |36 : MarcaturaDime Started! +09-27 16:42:33|WARNING| |49 : MarcaturaDime Started! +09-27 16:42:46|WARNING| |50 : MarcaturaDime Started! +09-27 16:42:57|WARNING| |50 : MarcaturaDime Started! +09-27 16:43:07|WARNING| |50 : MarcaturaDime Started! +09-27 16:44:46|WARNING| |50 : MarcaturaDime Started! +09-27 16:48:41|WARNING| |50 : MarcaturaDime Started! +09-27 17:24:19|WARNING| |50 : MarcaturaDime Started! diff --git a/MkpWIFI/mainDime.py b/MkpWIFI/mainDime.py index 95b1d31..322bbd3 100644 --- a/MkpWIFI/mainDime.py +++ b/MkpWIFI/mainDime.py @@ -20,7 +20,7 @@ def main(): lastTimestamp = int(time.time()*100) commandString = test.cmdString('callPrintImage', {'imageName': 'TM2.00I', 'printMode': '10', - 'fieldContent': '\r{0}\r{0}\r'.format(lastTimestamp) + 'fieldContent': '{0}\r{0}\r'.format(lastTimestamp) } ) LOGGER.debug(commandString)