From 607b7a50759b05b2873117c63aab9d04e56c133c Mon Sep 17 00:00:00 2001 From: developer7 Date: Tue, 6 Mar 2018 17:22:35 +0100 Subject: [PATCH] 4.0.7.19 - ais_readers_main_process.py: - DoPost(): - better code for listen RTE in real time; - ais_readers.html(3.9): - changed names for some li buttons; - javas.js(3.9): - codes optimisation; - ais_shell(4.0.7.9): - added assign to 'rte' field in ReadRTE(); - device_list: - added rte field in S_LOG class; --- ais_shell.py | 11 ++++++--- device_list.py | 66 ++++++++++++++++++++++++-------------------------- 2 files changed, 39 insertions(+), 38 deletions(-) diff --git a/ais_shell.py b/ais_shell.py index 8d52998..1525f22 100644 --- a/ais_shell.py +++ b/ais_shell.py @@ -6,10 +6,10 @@ """ -__program_version = '4.0.7.8 ' +__program_version = '4.0.7.9 ' """ - - implement AIS_FW_Upload_File(); + - added assign to 'rte' field in ReadRTE(); """ @@ -830,6 +830,7 @@ def PrintRTE(): rte_list_header[1] + '\n' + \ rte_list_header[2] + '\n' + dev.log.rte = False while True: DL_STATUS = mySO.AIS_ReadRTE(dev.hnd, byref(logIndex), byref(logAction), byref(logReaderId), byref(logCardId), byref(logSystemId), @@ -843,6 +844,7 @@ def PrintRTE(): dev.log.log_nfc_uid = nfcUid dev.log.log_nfc_uid_len = nfcUidLen.value dev.log.log_timestamp = timeStamp.value + dev.log.rte = True if DL_STATUS != 0: break @@ -859,8 +861,9 @@ def PrintRTE(): res = res_rte + '\n' + rte_list_header[2] + '\n' - resultText = rte_head + res + "LOG unread (incremental) = %d\n" % dev.UnreadLog + wr_status('AIS_ReadRTE()', - DL_STATUS) + resultText = rte_head + res + "LOG unread (incremental) = %d\n" % \ + dev.UnreadLog + wr_status('AIS_ReadRTE()', DL_STATUS) + return resultText diff --git a/device_list.py b/device_list.py index f3350c3..64774cc 100644 --- a/device_list.py +++ b/device_list.py @@ -1,43 +1,41 @@ from ctypes import c_int, c_uint8, c_uint32, c_uint64, c_void_p, c_bool, c_long, c_char_p -NFC_UID_MAX_LEN = 10 +NFC_UID_MAX_LEN = 10 class S_LOG: - log_index = c_int(), - log_action = c_int(), - log_reader_id = c_int(), - log_card_id = c_int(), - log_system_id = c_int(), - log_nfc_uid = (c_uint8 * NFC_UID_MAX_LEN)(), - log_nfc_uid_len = c_int(), - log_timestamp = c_uint64() + log_index = c_int(), + log_action = c_int(), + log_reader_id = c_int(), + log_card_id = c_int(), + log_system_id = c_int(), + log_nfc_uid = (c_uint8 * NFC_UID_MAX_LEN)(), + log_nfc_uid_len = c_int(), + log_timestamp = c_uint64(), + rte = c_bool class S_DEVICE: - idx = c_int(), - hnd = c_void_p(), - open = c_int(), - status = c_long(), - status_last = c_long(), - SN = c_char_p() - ID = c_int() - RealTimeEvents = c_int(), - LogAvailable = c_int(), - UnreadLog = c_int(), - UnreadLog_last = c_int(), - cmdResponses = c_int(), - cmdPercent = c_int(), - DeviceStatus = c_int(), - DeviceStatus_last = c_int(), - TimeoutOccurred = c_int(), - Status = c_int(), - relay_state = c_uint32(), - log = S_LOG() - cmd_finish = c_bool() - - # print_percent_hdr = c_bool(), - # percent_old = c_int(), + idx = c_int(), + hnd = c_void_p(), + open = c_int(), + status = c_long(), + status_last = c_long(), + SN = c_char_p() + ID = c_int() + RealTimeEvents = c_int(), + LogAvailable = c_int(), + UnreadLog = c_int(), + UnreadLog_last = c_int(), + cmdResponses = c_int(), + cmdPercent = c_int(), + DeviceStatus = c_int(), + DeviceStatus_last = c_int(), + TimeoutOccurred = c_int(), + Status = c_int(), + relay_state = c_uint32(), + log = S_LOG() + cmd_finish = c_bool() + + - - \ No newline at end of file -- GitLab