Index: leahi_dialin/td/modules/events.py =================================================================== diff -u -r3b0a81ce7a7bee195a26fdcb9f1ad387088fb26d -rd0dedd8e720be5de357176ffb095484ec082c830 --- leahi_dialin/td/modules/events.py (.../events.py) (revision 3b0a81ce7a7bee195a26fdcb9f1ad387088fb26d) +++ leahi_dialin/td/modules/events.py (.../events.py) (revision d0dedd8e720be5de357176ffb095484ec082c830) @@ -61,25 +61,25 @@ td_enum_repository.TDOpModes.MODE_NLEG.name: td_enum_repository.TDNotLegalStates } # Dictionary of the sub-mode as key and the state enum class as the value - self._sub_mode_2_states = {td_enum_repository.TDPreTreatmentModesStates.TD_PRE_TREATMENT_SELF_TEST_DRY_STATE.name: td_enum_repository.TDPreTreaDrySelfTestStates, - td_enum_repository.TDPreTreatmentModesStates.TD_PRE_TREATMENT_PRIME_STATE.name: td_enum_repository.TDPreTreaPrimeStates, - td_enum_repository.TDPreTreatmentModesStates.TD_PRE_TREATMENT_RECIRCULATE_STATE.name: td_enum_repository.TDPreTreaRecircStates, - td_enum_repository.TDPreTreatmentModesStates.TD_PRE_TREATMENT_PATIENT_CONNECTION_STATE.name: td_enum_repository.TDPreTreaPatientConnectStates, - td_enum_repository.TDTreatmentStates.TREATMENT_BLOOD_PRIME_STATE.name: td_enum_repository.TDTreaBloodPrimeStates, - td_enum_repository.TDTreatmentStates.TREATMENT_DIALYSIS_STATE.name:td_enum_repository.TDTreaDialysisStates, - td_enum_repository.TDTreatmentStates.TREATMENT_PAUSED_STATE.name:td_enum_repository.TDTreaPausedStates, - td_enum_repository.TDTreatmentStates.TREATMENT_RINSEBACK_STATE.name:td_enum_repository.TDTreaRinsebackStates, - td_enum_repository.TDTreatmentStates.TREATMENT_RECIRC_STATE.name:td_enum_repository.TDTreaRecircStates, - td_enum_repository.TDTreatmentStates.TREATMENT_END_STATE.name:td_enum_repository.TDTreaEndStates, - td_enum_repository.TDTreatmentStates.TREATMENT_SALINE_BOLUS_STATE.name:td_enum_repository.TDTreaBolusStates } + self._sub_mode_2_states = {td_enum_repository.TDPreTreatmentModesStates.SELF_TEST_DRY_STATE.name: td_enum_repository.TDPreTreaDrySelfTestStates, + td_enum_repository.TDPreTreatmentModesStates.PRIME_STATE.name: td_enum_repository.TDPreTreaPrimeStates, + td_enum_repository.TDPreTreatmentModesStates.RECIRCULATE_STATE.name: td_enum_repository.TDPreTreaRecircStates, + td_enum_repository.TDPreTreatmentModesStates.PATIENT_CONNECTION_STATE.name: td_enum_repository.TDPreTreaPatientConnectStates, + td_enum_repository.TDTreatmentStates.BLOOD_PRIME_STATE.name: td_enum_repository.TDTreaBloodPrimeStates, + td_enum_repository.TDTreatmentStates.DIALYSIS_STATE.name:td_enum_repository.TDTreaDialysisStates, + td_enum_repository.TDTreatmentStates.PAUSED_STATE.name:td_enum_repository.TDTreaPausedStates, + td_enum_repository.TDTreatmentStates.RINSEBACK_STATE.name:td_enum_repository.TDTreaRinsebackStates, + td_enum_repository.TDTreatmentStates.RECIRC_STATE.name:td_enum_repository.TDTreaRecircStates, + td_enum_repository.TDTreatmentStates.END_STATE.name:td_enum_repository.TDTreaEndStates, + td_enum_repository.TDTreatmentStates.SALINE_BOLUS_STATE.name:td_enum_repository.TDTreaBolusStates } # Dictionary of the state as key and the sub state enum class as the value - self._state_2_sub_states = {td_enum_repository.TDPreTreaSampleWaterStates.SAMPLE_WATER_STATE.name: td_enum_repository.TDPreTreaSamplWaterUserActionStates, - td_enum_repository.TDPreTreaPrimeStates.TD_PRIME_WET_SELF_TESTS_STATE.name: td_enum_repository.TDWetSelfTestsStates, - td_enum_repository.TDTreaBloodPrimeStates.BLOOD_PRIME_RUN_STATE.name: td_enum_repository.TDTreaBloodPrimeUserActionStates, - td_enum_repository.TDTreaRinsebackStates.RINSEBACK_RUN_STATE.name: td_enum_repository.TDTreaRinsebackUserActionStates, - td_enum_repository.TDTreaRecircStates.TREATMENT_RECIRC_RECIRC_STATE.name: td_enum_repository.TDTreaRecircUserActionStates, - td_enum_repository.TDTreaEndStates.TREATMENT_END_WAIT_FOR_RINSEBACK_STATE.name: td_enum_repository.TDTreaEndUserActionStates } + self._state_2_sub_states = {td_enum_repository.TDPreTreaSampleWaterStates.STATE.name: td_enum_repository.TDPreTreaSamplWaterUserActionStates, + td_enum_repository.TDPreTreaPrimeStates.WET_SELF_TESTS_STATE.name: td_enum_repository.TDWetSelfTestsStates, + td_enum_repository.TDTreaBloodPrimeStates.RUN_STATE.name: td_enum_repository.TDTreaBloodPrimeUserActionStates, + td_enum_repository.TDTreaRinsebackStates.RUN_STATE.name: td_enum_repository.TDTreaRinsebackUserActionStates, + td_enum_repository.TDTreaRecircStates.RECIRC_STATE.name: td_enum_repository.TDTreaRecircUserActionStates, + td_enum_repository.TDTreaEndStates.WAIT_FOR_RINSEBACK_STATE.name: td_enum_repository.TDTreaEndUserActionStates } # 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. @@ -120,7 +120,7 @@ event_enum = td_enum_repository.TDEventList(event_id.value) msg_list_2 = [] - if event_enum is td_enum_repository.TDEventList.TD_EVENT_OPERATION_STATUS: + if event_enum is td_enum_repository.TDEventList.OPERATION_STATUS: msg_list_2.append((data_typ_1, DataTypes.U32)) # It's not used in operation status case msg_list_2.append((op_mode, DataTypes.U08)) msg_list_2.append((sub_mode, DataTypes.U08)) @@ -142,14 +142,14 @@ # 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: data_1 = td_enum_repository.TDOpModes(data_1.value).name data_2 = td_enum_repository.TDOpModes(data_2.value).name event_tuple = (current_timestamp, event_enum.name, data_1.value, data_2.value) # Check if the event state name is sub mode change. - elif event_enum is td_enum_repository.TDEventList.TD_EVENT_SUB_MODE_CHANGE: + 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.TD_EVENT_OP_MODE_CHANGE.name] + 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: @@ -159,7 +159,7 @@ # 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.TD_EVENT_SUB_MODE_CHANGE.name] + sub_mode_list = self._event_dictionary[td_enum_repository.TDEventList.SUB_MODE_CHANGE.name] last_op_mode_message = op_modes_list[-1] # Check if this is not the very first Sub Mode Change message @@ -190,7 +190,7 @@ # to identify the Op Modes for the Sub Modes else: # Get the Operation Status Change messages - op_status_list = self._event_dictionary[td_enum_repository.TDEventList.TD_EVENT_OPERATION_STATUS.name] + op_status_list = self._event_dictionary[td_enum_repository.TDEventList.OPERATION_STATUS.name] data_2_found = False event_1_op_mode = self.UNKNOWN_STATE @@ -230,7 +230,7 @@ # Update the tuple event_tuple = (current_timestamp, event_enum.name, data_1.value, data_2.value) - elif event_enum is td_enum_repository.TDEventList.TD_EVENT_OPERATION_STATUS: + elif event_enum is td_enum_repository.TDEventList.OPERATION_STATUS: op_mode_enum, sub_mode_enum, state_enum, _ = self._operation_status_match(op_mode=op_mode.value, sub_mode=sub_mode.value, state=sub_state.value) event_tuple = (current_timestamp, op_mode_enum, sub_mode_enum, state_enum)