Index: leahi_dialin/td/modules/valves.py =================================================================== diff -u -r1813f6556e8a726a6e300caffe0bcafc40010aa9 -r38e8dd31728056dbb7f9304c98ab16d7147b75a2 --- leahi_dialin/td/modules/valves.py (.../valves.py) (revision 1813f6556e8a726a6e300caffe0bcafc40010aa9) +++ leahi_dialin/td/modules/valves.py (.../valves.py) (revision 38e8dd31728056dbb7f9304c98ab16d7147b75a2) @@ -20,7 +20,7 @@ from leahi_dialin.common.constants import NO_RESET from leahi_dialin.common.msg_defs import MsgIds from leahi_dialin.common.override_templates import cmd_generic_broadcast_interval_override, cmd_generic_override -from leahi_dialin.common.td_defs import TDValvesEnum, TDValvesPositions, TDValvesStates +from leahi_dialin.common.td_defs import td_enum_repository from leahi_dialin.protocols.CAN import DenaliMessage, DenaliChannels from leahi_dialin.utils.base import AbstractSubSystem, publish from leahi_dialin.utils.conversions import integer_to_bytearray @@ -77,8 +77,8 @@ self.td_valves_timestamp = 0.0 # A dictionary of the valves with the status - self.valves_status = {TDValvesEnum.H1_VALV.name: {}, - TDValvesEnum.H19_VALV.name: {}} + self.valves_status = {td_enum_repository.TDValveNames.H1_VALV.name: {}, + td_enum_repository.TDValveNames.H19_VALV.name: {}} @publish(["msg_id_td_valves_data", "valves_status", "td_valves_timestamp"]) @@ -109,11 +109,11 @@ message['message'][self.START_MAX_HOMING_ENC:self.END_MAX_HOMING_ENC]))[0] # To make sure values of the enums are not out of range - if TDValvesEnum.has_value(vlv_id) and TDValvesPositions.has_value(pos_id) and TDValvesStates.has_value(pos_id): - vlv_name = TDValvesEnum(vlv_id).name + if td_enum_repository.TDValveNames.has_value(vlv_id) and td_enum_repository.TDValvePositions.has_value(pos_id) and td_enum_repository.TDValveStates.has_value(pos_id): + vlv_name = td_enum_repository.TDValveNames(vlv_id).name # Update the valves dictionary - self.valves_status[vlv_name] = {'Valve': vlv_name, 'PosID': TDValvesPositions(pos_id).name, 'PosCnt': pos_cnt, - 'Cmd': cmd_pos, 'State': TDValvesStates(state_id).name, 'PosA': pos_a, + self.valves_status[vlv_name] = {'Valve': vlv_name, 'PosID': td_enum_repository.TDValvePositions(pos_id).name, 'PosCnt': pos_cnt, + 'Cmd': cmd_pos, 'State': td_enum_repository.TDValveStates(state_id).name, 'PosA': pos_a, 'PosB': pos_b, 'PosC': pos_c, 'PosD': pos_d, 'Max_homing_enc': max_homing_enc} self.td_valves_timestamp = timestamp @@ -143,16 +143,16 @@ """ Constructs and sends the TD valves set position for a valve - @param valve: integer - Valve number. Defined in TDValvesEnum class - @param position: integer - Position number: Defined in TDValvesPositions class + @param valve: integer - Valve number. Defined in td_enum_repository.TDValveNames class + @param position: integer - Position number: Defined in td_enum_repository.TDValvePositions class @returns 1 if successful, zero otherwise """ vlv = integer_to_bytearray(valve) pos = integer_to_bytearray(position) payload = vlv + pos - valve_name = TDValvesEnum(valve).name.split('_')[0] + valve_name = td_enum_repository.TDValveNames(valve).name.split('_')[0] return cmd_generic_override( payload = payload, reset = NO_RESET, @@ -168,7 +168,7 @@ """ Constructs and sends the TD valves home command - @param valve: integer - Valve number. Defined in TDValvesEnum class + @param valve: integer - Valve number. Defined in td_enum_repository.TDValveNames class @param force_home: integer - 1 to force valve to home position, 0 for normal homing @param cartridge: integer - 1 to use cartridge settings, 0 to use settings for system use without cartridge @returns 1 if successful, zero otherwise @@ -178,7 +178,7 @@ cart = integer_to_bytearray(cartridge) payload = vlv + frc + cart - valve_name = TDValvesEnum(valve).name.split('_')[0] + valve_name = td_enum_repository.TDValveNames(valve).name.split('_')[0] return cmd_generic_override( payload = payload, reset = NO_RESET, @@ -194,7 +194,7 @@ """ Constructs and sends the TD valves set position for a valve - @@param valve: integer - Valve number. Defined in TDValvesEnum class + @@param valve: integer - Valve number. Defined in td_enum_repository.TDValveNames class @param position_count: integer value @param reset: integer - 1 to reset a previous override, 0 to override @returns 1 if successful, zero otherwise @@ -204,7 +204,7 @@ pos = integer_to_bytearray(position_count) payload = reset_value + pos + vlv - valve_name = TDValvesEnum(valve).name.split('_')[0] + valve_name = td_enum_repository.TDValveNames(valve).name.split('_')[0] return cmd_generic_override( payload = payload, reset = NO_RESET, @@ -220,7 +220,7 @@ """ Constructs and sends the TD valves set position for a valve - @@param valve: integer - Valve number. Defined in TDValvesEnum class + @@param valve: integer - Valve number. Defined in td_enum_repository.TDValveNames class @param status: integer value @param reset: integer - 1 to reset a previous override, 0 to override @returns 1 if successful, zero otherwise @@ -230,7 +230,7 @@ sts = integer_to_bytearray(status) payload = reset_value + sts + vlv - valve_name = TDValvesEnum(valve).name.split('_')[0] + valve_name = td_enum_repository.TDValveNames(valve).name.split('_')[0] return cmd_generic_override( payload = payload, reset = NO_RESET, @@ -247,15 +247,15 @@ Constructs and sends a given valve to change position by a given number of encoder counts. - @@param valve: integer - Valve number. Defined in TDValvesEnum class + @@param valve: integer - Valve number. Defined in td_enum_repository.TDValveNames class @param count: integer value @returns 1 if successful, zero otherwise """ vlv = integer_to_bytearray(valve) pos = integer_to_bytearray(counts) payload = pos + vlv - valve_name = TDValvesEnum(valve).name.split('_')[0] + valve_name = td_enum_repository.TDValveNames(valve).name.split('_')[0] return cmd_generic_override( payload = payload, reset = NO_RESET,