Index: leahi_dialin/td/modules/treatment.py =================================================================== diff -u -r18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df -rc5bfcf84ed942ca5841bf9de155aa0f495b4d28d --- leahi_dialin/td/modules/treatment.py (.../treatment.py) (revision 18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df) +++ leahi_dialin/td/modules/treatment.py (.../treatment.py) (revision c5bfcf84ed942ca5841bf9de155aa0f495b4d28d) @@ -20,7 +20,7 @@ from leahi_dialin.common.constants import NO_RESET from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions from leahi_dialin.common.override_templates import cmd_generic_override -from leahi_dialin.common.td_defs import TDTreatmentParameters +from leahi_dialin.common.td_defs import td_enum_repository from leahi_dialin.protocols.CAN import DenaliChannels from leahi_dialin.utils.base import AbstractSubSystem, publish from leahi_dialin.utils.conversions import integer_to_bytearray, float_to_bytearray @@ -306,10 +306,10 @@ @return: 1 if successful, zero otherwise """ - if tx_param_id <= TDTreatmentParameters.TREATMENT_PARAM_RINSEBACK_VOLUME.value: + if tx_param_id <= td_enum_repository.TDTreatmentParameters.TREATMENT_PARAM_RINSEBACK_VOLUME.value: tpv = integer_to_bytearray(tx_param_value) - elif tx_param_id >= TDTreatmentParameters.TREATMENT_PARAM_DIALYSATE_TEMPERATURE.value: + elif tx_param_id >= td_enum_repository.TDTreatmentParameters.TREATMENT_PARAM_DIALYSATE_TEMPERATURE.value: tpv = float_to_bytearray(tx_param_value) else: @@ -318,7 +318,7 @@ idx = integer_to_bytearray(tx_param_id) payload = idx + tpv - param_name = TDTreatmentParameters(tx_param_id).name + param_name = td_enum_repository.TDTreatmentParameters(tx_param_id).name return cmd_generic_override( payload = payload, reset = NO_RESET,