Index: dialin/dg/events.py =================================================================== diff -u -r107697bd31dc87e450f18cca334025c631a6825d -r61c2cc18c9fe1c4d02eabade578ae65fe3cb1d02 --- dialin/dg/events.py (.../events.py) (revision 107697bd31dc87e450f18cca334025c631a6825d) +++ dialin/dg/events.py (.../events.py) (revision 61c2cc18c9fe1c4d02eabade578ae65fe3cb1d02) @@ -54,7 +54,7 @@ self._dg_event_data_type[event_data_type] = struct_unpack_type - def get_dg_events(self, event_id, number_of_events): + def get_dg_events(self, event_id, number_of_events=1): """ Returns the requested number of a certain DG event ID @@ -108,6 +108,7 @@ # Convert the event ID to enum event_state_name = DGEventList(event_id).name + # Get the current timestamp and create a tuple of the current events event_tuple = (str(datetime.now()), event_state_name, event_data_1, event_data_2) Index: dialin/hd/ui_proxy.py =================================================================== diff -u -r8474f8e345f165187d4dde17840575ee4e98a9b4 -r61c2cc18c9fe1c4d02eabade578ae65fe3cb1d02 --- dialin/hd/ui_proxy.py (.../ui_proxy.py) (revision 8474f8e345f165187d4dde17840575ee4e98a9b4) +++ dialin/hd/ui_proxy.py (.../ui_proxy.py) (revision 61c2cc18c9fe1c4d02eabade578ae65fe3cb1d02) @@ -243,11 +243,11 @@ self.treatment_end_cmd_succeeded = False self.treatment_end_cmd_reject_reason = 0 -# self.reject_reasons = OrderedDict() -# for attr in RequestRejectReasons.__members__: -# attr: RequestRejectReasons = attr -# self.reject_reasons[attr.name] = attr.value -# self.reject_reasons = OrderedDict(sorted(self.reject_reasons.items(), key=lambda key: key[1])) + #self.reject_reasons = OrderedDict() + #for attr in RequestRejectReasons.__members__: + # attr: RequestRejectReasons = attr + # self.reject_reasons[attr.name] = attr.value + #self.reject_reasons = OrderedDict(sorted(self.reject_reasons.items(), key=lambda key: key[1])) def get_hd_version(self): """ Index: tests/dg_heat_and_chemical_disinfect_test.py =================================================================== diff -u -r107697bd31dc87e450f18cca334025c631a6825d -r61c2cc18c9fe1c4d02eabade578ae65fe3cb1d02 --- tests/dg_heat_and_chemical_disinfect_test.py (.../dg_heat_and_chemical_disinfect_test.py) (revision 107697bd31dc87e450f18cca334025c631a6825d) +++ tests/dg_heat_and_chemical_disinfect_test.py (.../dg_heat_and_chemical_disinfect_test.py) (revision 61c2cc18c9fe1c4d02eabade578ae65fe3cb1d02) @@ -26,7 +26,7 @@ from dialin.dg.temperature_sensors import TemperatureSensorsNames from dialin.dg.dialysate_generator import DGOperationModes from dialin.hd.temperatures import HDTemperaturesNames -from dialin.dg.events import DGEvents +from dialin.common.dg_defs import DGEventList from time import sleep from datetime import datetime import sys @@ -74,7 +74,7 @@ info = ('DG_op_mode, {}, DG_sub_mode, {}, DG_event, {}, '.format(DGOperationModes(dg.dg_operation_mode).name, dg.dg_operation_sub_mode, - dg.events.get_dg_events())) + dg.events.get_dg_events(DGEventList(1).value, 4))) return info