Index: leahi_dialin/td/modules/events.py =================================================================== diff -u -r27cd8e0e7b47617083e8c12f73306f0ba648e687 -r0f2a49f1bbe0de4a16cd22c87b7ee38d8f606e88 --- leahi_dialin/td/modules/events.py (.../events.py) (revision 27cd8e0e7b47617083e8c12f73306f0ba648e687) +++ leahi_dialin/td/modules/events.py (.../events.py) (revision 0f2a49f1bbe0de4a16cd22c87b7ee38d8f606e88) @@ -53,26 +53,26 @@ message_id = MsgIds.MSG_ID_TD_OP_MODE_DATA.value, function = self._handler_td_op_mode_sync) - self.td_events_timestamp = 0.0 #: The timestamp of the last Event message - self.td_event_op_mode = 0 #: The new Operation Mode value - self.td_event_sub_mode = 0 #: The new Operation Sub-Mode value - self.td_event_op_mode_timestamp = 0.0 #: The timestamp of the last Operation Mode change message + self.events_timestamp = 0.0 #: The timestamp of the last Event message + self.op_mode = 0 #: The new Operation Mode value + self.sub_mode = 0 #: The new Operation Sub-Mode value + self.event_op_mode_timestamp = 0.0 #: The timestamp of the last Operation Mode change message - # Dictionary of the mode as key and the sub mode states enum class as the value - self._td_op_mode_2_sub_mode = {td_enum_repository.TDOpModes.MODE_FAUL.name: td_enum_repository.TDFaultStates, - td_enum_repository.TDOpModes.MODE_SERV.name: td_enum_repository.TDServiceStates, - td_enum_repository.TDOpModes.MODE_INIT.name: td_enum_repository.TDInitStates, - td_enum_repository.TDOpModes.MODE_STAN.name: td_enum_repository.TDStandbyStates, - td_enum_repository.TDOpModes.MODE_PRET.name: td_enum_repository.TDPreTreatmentModesStates, - td_enum_repository.TDOpModes.MODE_TREA.name: td_enum_repository.TDTreatmentStates, - td_enum_repository.TDOpModes.MODE_POST.name: td_enum_repository.TDPostTreatmentStates, - td_enum_repository.TDOpModes.MODE_NLEG.name: td_enum_repository.TDNotLegalStates} + # Dictionary of the mode as key and the sub mode states enum class as the valued + self._op_mode_2_sub_mode = {td_enum_repository.TDOpModes.MODE_FAUL.name: td_enum_repository.TDFaultStates, + td_enum_repository.TDOpModes.MODE_SERV.name: td_enum_repository.TDServiceStates, + td_enum_repository.TDOpModes.MODE_INIT.name: td_enum_repository.TDInitStates, + td_enum_repository.TDOpModes.MODE_STAN.name: td_enum_repository.TDStandbyStates, + td_enum_repository.TDOpModes.MODE_PRET.name: td_enum_repository.TDPreTreatmentModesStates, + td_enum_repository.TDOpModes.MODE_TREA.name: td_enum_repository.TDTreatmentStates, + td_enum_repository.TDOpModes.MODE_POST.name: td_enum_repository.TDPostTreatmentStates, + td_enum_repository.TDOpModes.MODE_NLEG.name: td_enum_repository.TDNotLegalStates} # Loop through the list of the TD events enums and initial the event dictionary. Each event is a key in the # dictionary and the value is a list. - self._td_event_dictionary = dict() + self._event_dictionary = dict() for event in td_enum_repository.TDEventList: - self._td_event_dictionary[td_enum_repository.TDEventList(event).name] = [] + self._event_dictionary[td_enum_repository.TDEventList(event).name] = [] def get_td_nth_event(self, event_id, event_number=0): @@ -84,14 +84,14 @@ @returns the requested TD event number """ - list_length = len(self._td_event_dictionary[td_enum_repository.TDEventList(event_id).name]) + list_length = len(self._event_dictionary[td_enum_repository.TDEventList(event_id).name]) if list_length == 0: event = [] elif event_number > list_length: - event = self._td_event_dictionary[td_enum_repository.TDEventList(event_id).name][list_length - 1] + event = self._event_dictionary[td_enum_repository.TDEventList(event_id).name][list_length - 1] else: - event = self._td_event_dictionary[td_enum_repository.TDEventList(event_id).name][list_length - event_number - 1] + event = self._event_dictionary[td_enum_repository.TDEventList(event_id).name][list_length - event_number - 1] return event @@ -102,8 +102,8 @@ @returns none """ - for key in self._td_event_dictionary: - self._td_event_dictionary[key].clear() + for key in self._event_dictionary: + self._event_dictionary[key].clear() def get_td_events(self, event_id, number_of_events=1): @@ -118,23 +118,23 @@ list_of_events = [] # If there are not enough event lists send all the events that are available - if len(self._td_event_dictionary[td_enum_repository.TDEventList(event_id).name]) <= number_of_events: - list_of_events = self._td_event_dictionary[td_enum_repository.TDEventList(event_id).name] + if len(self._event_dictionary[td_enum_repository.TDEventList(event_id).name]) <= number_of_events: + list_of_events = self._event_dictionary[td_enum_repository.TDEventList(event_id).name] else: # Get the all the events - complete_list = self._td_event_dictionary[td_enum_repository.TDEventList(event_id).name] + complete_list = self._event_dictionary[td_enum_repository.TDEventList(event_id).name] # Since the last are located at the end of the list, iterate backwards for the defined # event messages for i in range(len(complete_list) - 1, len(complete_list) - number_of_events - 1, -1): list_of_events.append(complete_list[i]) if number_of_events == 0: - list_of_events = self._td_event_dictionary[td_enum_repository.TDEventList(event_id).name] + list_of_events = self._event_dictionary[td_enum_repository.TDEventList(event_id).name] return list_of_events - @publish(["msg_id_td_event", "td_events_timestamp", '_td_event_dictionary']) + @publish(["msg_id_td_event", "events_timestamp", '_event_dictionary']) def _handler_events_sync(self, message, timestamp=0.0): """ Handles published events message @@ -147,7 +147,6 @@ op_mode = 0 sub_mode = 0 sub_state = 0 - current_sub_tuple = [] event_id = struct.unpack(DataTypes.U32.unpack_attrib(), bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))[0] @@ -190,89 +189,103 @@ event_tuple = (current_timestamp, event_enum.name, event_data_1, event_data_2) # Check if the event state name is operation mode change. If it is, get the name of the operation modes # from the op modes enum class - if event_enum is td_enum_repository.TDEventList.TD_EVENT_OP_MODE_CHANGE: + if event_enum is td_enum_repository.TDEventList.op_mode_CHANGE: event_data_1 = td_enum_repository.TDOpModes(event_data_1).name event_data_2 = td_enum_repository.TDOpModes(event_data_2).name event_tuple = (current_timestamp, event_enum.name, event_data_1, event_data_2) # Check if the event state name is sub mode change. - elif event_enum is td_enum_repository.TDEventList.TD_EVENT_OP_MODE_CHANGE: - # Get the length of the list of the op mode list - op_list_len = len(self._td_event_dictionary[td_enum_repository.TDEventList.TD_EVENT_OP_MODE_CHANGE.name]) - # Get the last tuple of the op mode - # It is a list of tuples that each tuple is (timestamp, event type, prev op mode, current op mode) - if op_list_len != 0: - last_op_tuple = self._td_event_dictionary[td_enum_repository.TDEventList.TD_EVENT_OP_MODE_CHANGE.name][op_list_len - 1] + elif event_enum is td_enum_repository.TDEventList.sub_mode_CHANGE: + # Get the Op Mode Change messages + op_modes_list = self._event_dictionary[td_enum_repository.TDEventList.op_mode_CHANGE.name] + + # If there are Op mode change messages, use it to determine the operation mode for the current submode change + # Index description: + # 0: Timestamp + # 1: Name + # 2: Previous Op / Sub Mode + # 3: Current Op / Sub Mode + if len(op_modes_list) != 0: + # Get the Sub Mode Change messages + sub_mode_list = self._event_dictionary[td_enum_repository.TDEventList.sub_mode_CHANGE.name] + last_op_mode_message = op_modes_list[-1] - else: - # No op mode event has been received before the submode event was received. Use broadcast messages to - # determine current op mode. Previous mode can not be known - last_op_tuple = (current_timestamp, - td_enum_repository.TDEventList.TD_EVENT_OP_MODE_CHANGE.name, TDEvents.UNKNOWN_STATE, - td_enum_repository.TDOpModes(self.td_event_op_mode).name) - # Get the current and previous operation modes of the last tuple in the list of the sub modes - # i.e. (timestamp, event type, prev, current) - current_op_mode = last_op_tuple[len(last_op_tuple) - 1] - current_op_mode_timestamp = datetime.strptime(last_op_tuple[0], '%Y-%m-%d %H:%M:%S.%f') + # Check if this is not the very first Sub Mode Change message + if len(sub_mode_list != 0): + # Get the timestamps of the last messages of both list for comparison + prev_op_mode_timestamp = datetime.strptime(last_op_mode_message[0], '%Y-%m-%d %H:%M:%S.%f') + prev_sub_mode_timestamp = datetime.strptime(sub_mode_list[-1][0], '%Y-%m-%d %H:%M:%S.%f') - sub_mode_list_len = len(self._td_event_dictionary[td_enum_repository.TDEventList.TD_EVENT_SUB_MODE_CHANGE.name]) + # In case the Op Mode Change is older then the previous Sub Mode Change, + # use the current Op Mode from the previous Op Mode Change message for both data + if prev_op_mode_timestamp <= prev_sub_mode_timestamp: + event_data_1 = self._op_mode_2_sub_mode[last_op_mode_message[3]] + event_data_2 = self._op_mode_2_sub_mode[last_op_mode_message[3]] + + # In case the Op Mode Change is newer then the previous Sub Mode Change, + # use the operation mode informations from the last Op Mode Change message + else: + event_data_1 = self._op_mode_2_sub_mode[last_op_mode_message[2]] + event_data_2 = self._op_mode_2_sub_mode[last_op_mode_message[3]] + + # In case this is the very first Sub Mode Change message, + # use the operation mode informations from the last Op Mode Change message + else: + event_data_1 = self._op_mode_2_sub_mode[last_op_mode_message[2]] + event_data_2 = self._op_mode_2_sub_mode[last_op_mode_message[3]] - if sub_mode_list_len != 0: - # Get the tuple prior to the last tuple and get its previous and current operation modes - current_sub_tuple = self._td_event_dictionary[td_enum_repository.TDEventList.TD_EVENT_SUB_MODE_CHANGE.name][ - sub_mode_list_len - 1] - - current_sub_mode_timestamp = datetime.strptime(current_sub_tuple[0], '%Y-%m-%d %H:%M:%S.%f') + # In case there are no Op Mode Change messages, use the Operations States messages + # to identify the Op Modes for the Sub Modes else: - current_sub_mode_timestamp = 0 + # Get the Operation Status Change messages + op_status_list = self._event_dictionary[td_enum_repository.TDEventList.TD_EVENT_OPERATION_STATUS.name] + + data_2_found = False + event_1_op_mode = self.UNKNOWN_STATE + event_2_op_mode = self.UNKNOWN_STATE - # Get the class of the states enums of the current operation mode that is running - current_sub_mode_enum_class = self._td_op_mode_2_sub_mode[current_op_mode] - - # Check if the operation modes of the two tuples match - # i.e. last = (timestamp, event type, prev, current) and one before = (timestamp, event type, prev, current) - # If the prev and current match respectively, it means the current operation mode has not changed so the - # operation mode states can be converted from the current sub mode enum class - if current_sub_mode_timestamp != 0: - if current_op_mode_timestamp <= current_sub_mode_timestamp: - event_data_1 = current_sub_mode_enum_class(event_data_1).name - event_data_2 = current_sub_mode_enum_class(event_data_2).name - - elif current_op_mode_timestamp > current_sub_mode_timestamp: - # If the previous and current of the last two tuples do not match, then an operation mode transition - # has occurred and the previous state is converted from the previous class and the current op mode - # is converted from current operation states enum class. - # i.e last = (timestamp, event type, 3, 8) and one before = (timestamp, event type, 8, 3) - # previous and current do not match so in the last type (timestamp, event type, 8, 3) the prev state - # should be from op mode 8 and the current state should be from op mode 3 - previous_op_mode = last_op_tuple[len(last_op_tuple) - 2] - if previous_op_mode != TDEvents.UNKNOWN_STATE: - previous_sub_mode_enum_class = self._td_op_mode_2_sub_mode[previous_op_mode] - event_data_1 = previous_sub_mode_enum_class(event_data_1).name - # Unknown previous state. Display value instead of name. + # Go through the Operation Status Change message list starting from the back + # Index description: + # 0: Timestamp + # 1: Op Mode + # 2: Sub Mode + # 3: State + for i in range(len(op_status_list) - 1, -1, -1): + op_status_msg = op_status_list[i] + + # Look for a match for event_data_2 + if not data_2_found: + if op_status_msg[2] == event_data_2: + event_2_op_mode = td_enum_repository.TDOpModes(op_status_msg[1]).name + data_2_found = True + + # Look for a match for event_data_1 after event_data_2 is found + # Criteria is that the opmode, submode pair can't be the same as the one found for event_data_2 else: - event_data_1 = str(event_data_1) - event_data_2 = current_sub_mode_enum_class(event_data_2).name - else: + if op_status_msg[2] == event_data_1 and \ + (op_status_msg[2] != event_data_2 or td_enum_repository.TDOpModes(op_status_msg[1]).name != event_2_op_mode): + event_1_op_mode = td_enum_repository.TDOpModes(op_status_msg[1]).name + + # If op mode for event_data_2 found but not found for event_data_1 and run out of operation states + # assume it's the start of the unit start up and the going to standby is not logged yet + if event_2_op_mode != self.UNKNOWN_STATE and event_1_op_mode == self.UNKNOWN_STATE: + event_1_op_mode = td_enum_repository.TDOpModes.MODE_STAN.name - if event_data_2 != 0: - event_data_1 = current_sub_mode_enum_class(event_data_1).name - event_data_2 = current_sub_mode_enum_class(event_data_2).name - else: - previous_sub_mode = current_sub_tuple[len(current_sub_tuple) - 2] - previous_sub_mode_enum_class = self._td_op_mode_2_sub_mode[previous_sub_mode] - event_data_1 = previous_sub_mode_enum_class(event_data_1).name - event_data_2 = current_sub_mode_enum_class(event_data_2).name + # Update the event_data values + event_data_1 = self._op_mode_2_sub_mode[event_1_op_mode] + event_data_2 = self._op_mode_2_sub_mode[event_2_op_mode] + + # Update the tuple event_tuple = (current_timestamp, event_enum.name, event_data_1, event_data_2) elif event_enum is td_enum_repository.TDEventList.TD_EVENT_OPERATION_STATUS: event_tuple = (current_timestamp, op_mode, sub_mode, sub_state) # Update event dictionary - self._td_event_dictionary[event_enum.name].append(event_tuple) - self.td_events_timestamp = timestamp + self._event_dictionary[event_enum.name].append(event_tuple) + self.events_timestamp = timestamp - @publish(["msg_id_td_op_mode_data", "td_event_op_mode_timestamp", "td_event_op_mode", "td_event_sub_mode"]) + @publish(["msg_id_td_op_mode_data", "event_op_mode_timestamp", "op_mode", "sub_mode"]) def _handler_td_op_mode_sync(self, message, timestamp=0.0): """ Handles published TD operation mode messages. Current TD operation mode @@ -282,9 +295,9 @@ @return: None """ msg_list = [] - msg_list.append(('self.td_event_op_mode', DataTypes.U32)) - msg_list.append(('self.td_event_sub_mode', DataTypes.U32)) + msg_list.append(('self.op_mode', DataTypes.U32)) + msg_list.append(('self.sub_mode', DataTypes.U32)) self.process_into_vars(decoder_list = msg_list, message = message) - self.td_event_op_mode_timestamp = timestamp + self.event_op_mode_timestamp = timestamp