Index: leahi_dialin/common/dd_defs.py =================================================================== diff -u -r7f5fb62247b517554f7a9e13a5ef47caf1d5609f -r52aa7af16b98730ba59fc2577dbe8f73b5959775 --- leahi_dialin/common/dd_defs.py (.../dd_defs.py) (revision 7f5fb62247b517554f7a9e13a5ef47caf1d5609f) +++ leahi_dialin/common/dd_defs.py (.../dd_defs.py) (revision 52aa7af16b98730ba59fc2577dbe8f73b5959775) @@ -128,7 +128,7 @@ NUM_OF_BAL_CHAMBER_SW = 2 # Number of balancing chamber states @unique -class BloodLeakStates(DialinEnum): +class DDBloodLeakStates(DialinEnum): """ DD blood leak embedded mode state machine states """ @@ -142,7 +142,7 @@ NUM_OF_BLOOD_LEAK_STATES = 7 @unique -class ConcentratePumpsEnum(DialinEnum): +class DDConcentratePumpsEnum(DialinEnum): D11_CP1_ACID = 0 # Acid Concentrate Pump D10_CP2_BICARB = 1 # Bicarbonate Concentrate Pump D76_UF = 2 # Ultrafiltration Concentrate Pump @@ -169,7 +169,7 @@ NUM_OF_D10_D11_CONCENTRATE_PUMP_ATTRIBUTES = 9 # Number of Acid (D11) and Bicarbonate (D10) Concentrate Pump Attributes @unique -class ConductivitySensorsEnum(DialinEnum): +class DDConductivitySensorsEnum(DialinEnum): D17_COND = 0 # Closed Loop Control of Dosing for D74 Conductivity Sensor D27_COND = 1 # Closed Loop Control of Dosing for D29 Conductivity Sensor D29_COND = 2 # Water, Bicarbonate, and Acid Collective Conductivity Sensor @@ -178,13 +178,13 @@ NUM_OF_CONDUCTIVITY_SENSORS = 5 # Number of Conductivity Sensors @unique -class DialysatePumpsEnum(DialinEnum): +class DDDialysatePumpsEnum(DialinEnum): D12_PUMP = 0 # Fresh Dialysate Pump D48_PUMP = 1 # Spent Dialysate Pump NUM_OF_DIALYSATE_PUMPS = 2 # Number of Dialysate Pumps @unique -class DialysatePumpAttributesEnum(DialinEnum): +class DDDialysatePumpAttributesEnum(DialinEnum): TARGET_RPM = 0 # Target RPM Dialysate Pump Attribute MEASURED_SPEED = 1 # Measured Speed Dialysate Pump Attribute CURRENT_SPEED = 2 # Current Speed Dialysate Pump Attribute @@ -205,26 +205,26 @@ NUM_OF_DIALYSATE_PUMP_STATES = 3 # Number of Dialysate Pump States @unique -class HeatersStartStop(DialinEnum): +class DDHeatersStartStop(DialinEnum): STOP = 0 START = 1 @unique -class HeatersState(DialinEnum): +class DDHeatersState(DialinEnum): HEATER_EXEC_STATE_OFF = 0 # Heater Execution Off State HEATER_EXEC_STATE_RAMP_TO_TARGET = 1 # Heater Execution Ramp to Target State HEATER_EXEC_STATE_CONTROL_TO_TARGET = 2 # Heater Execution Control to Target State HEATER_EXEC_STATE_CONTROL_TO_DISINFECT_TARGET = 3 # Heater Execution Control to Disinfection State NUM_OF_HEATERS_STATE = 4 @unique -class HeatersNames(DialinEnum): +class DDHeatersNames(DialinEnum): D5_HEAT = 0 # Primary heater D45_HEAT = 1 # Trimmer heater NUM_OF_DD_HEATERS = 2 # Number of Heaters @unique -class HeatersAttributesEnum(DialinEnum): +class DDHeatersAttributesEnum(DialinEnum): HEAT_DUTY_CYCLE = 0 # Heat Duty Cycle Attribute for Heaters HEAT_TARGET_TEMP = 1 # Target Temperature Attribute for Heaters HEAT_STATE = 2 # State to command Attribute for Heaters @@ -256,7 +256,7 @@ NUM_OF_PISTON_PUMP_ATTRIBUTES = 3 # Number of Piston Pump Attributes @unique -class PressureNames(DialinEnum): +class DDPressureNames(DialinEnum): # Pressure Sensor IDs M1_PRES = 0 # Water Inlet pressure before regulator (PRi) M3_PRES = 1 # Water Inlet pressure after regulator (PRo) @@ -269,7 +269,7 @@ NUM_OF_PRESSURE_SENSORS = 8 # Number of pressure sensors @unique -class PressureAttributesEnum (DialinEnum): +class DDPressureAttributesEnum (DialinEnum): PRES = 0 # Pressure Attribute for Pressure Sensors TEMP = 1 # Temperature Attribute for Pressure Sensors NUM_OF_PRES_SENSOR_ATTRIBUTES = 2 # Number of Pressure Sensor Attributes Index: leahi_dialin/common/fp_defs.py =================================================================== diff -u -r956757fac807b52aec078e84127089db5dff069f -r52aa7af16b98730ba59fc2577dbe8f73b5959775 --- leahi_dialin/common/fp_defs.py (.../fp_defs.py) (revision 956757fac807b52aec078e84127089db5dff069f) +++ leahi_dialin/common/fp_defs.py (.../fp_defs.py) (revision 52aa7af16b98730ba59fc2577dbe8f73b5959775) @@ -58,7 +58,7 @@ NUM_OF_EVENT_DATA_TYPES = 5 # Number of Event Data Types @unique -class BoostPumpNames(DialinEnum): +class FPBoostPumpNames(DialinEnum): P40_PUMP = 0 # FP Boost Pump NUM_OF_BOOST_PUMPS = 1 # Number of FP Boost Pumps Index: leahi_dialin/common/td_defs.py =================================================================== diff -u -r956757fac807b52aec078e84127089db5dff069f -r52aa7af16b98730ba59fc2577dbe8f73b5959775 --- leahi_dialin/common/td_defs.py (.../td_defs.py) (revision 956757fac807b52aec078e84127089db5dff069f) +++ leahi_dialin/common/td_defs.py (.../td_defs.py) (revision 52aa7af16b98730ba59fc2577dbe8f73b5959775) @@ -191,30 +191,30 @@ NUM_OF_AIR_PUMP_ATTRIBUTES = 2 # Number of Air Pump attributes @unique -class AirTrapValves(DialinEnum): +class TDAirTrapValves(DialinEnum): H13_VALV = 0 # Air trap intake valve H20_VALV = 1 # Air trap outlet valve NUM_OF_AIR_TRAP_VALVES = 2 # Number of Air Trap Valves @unique -class AirTrapLevelSensors(DialinEnum): +class TDAirTrapLevelSensors(DialinEnum): H17_LEVEL = 0 # Lower Level Sensor H16_LEVEL = 1 # Upper Level Sensor NUM_OF_AIR_TRAP_LEVEL_SENSORS = 2 # Number of TD Air Trap Level Sensors @unique -class AirTrapLevelSensorsAttributes(DialinEnum): +class TDAirTrapLevelSensorsAttributes(DialinEnum): LEVEL = 0 # Level attribute for Air Trap Level Sensor RAW = 1 # Raw reading attribute for Air Trap Level Sensor NUM_OF_AIR_TRAP_LEVEL_SENSOR_ATTRIBUTES = 2 # Number of Air Trap Level Sensor attributes @unique -class AirTrapState(DialinEnum): +class TDAirTrapState(DialinEnum): STATE_CLOSED = 0 # Closed state for Air Trap STATE_OPEN = 1 # Open state for Air Trap @unique -class BloodFlowMotorAttributes(DialinEnum): +class TDBloodFlowMotorAttributes(DialinEnum): SET_BLOOD_FLOW_RATE = 0 # Set Blood Flow Rate for Blood Flow Motor MEASURED_BLOOD_FLOW_RATE = 1 # Measured Blood Flow Rate for Blood Flow Motor MEASURED_BLOOD_PUMP_ROTOR_SPEED = 2 # Measured Bloop Pump Rotor Speed for Blood Flow Motor @@ -238,12 +238,12 @@ NUM_OF_AIR_BUBBLE_DETECTOR_ATTRIBUTES = 2 # Number of Air Bubble Detector Attributes @unique -class EjectorNames(DialinEnum): +class TDEjectorNames(DialinEnum): H5_MOTOR = 0 # TD Ejector Motor NUM_OF_EJECTOR_MOTORS = 1 # Number of Ejector Motors @unique -class EjectorAttributes(DialinEnum): +class TDEjectorAttributes(DialinEnum): STATE = 0 # Ejector State to command SET_SPEED = 1 # Ejector Set Speed NUM_OF_EJECTOR_ATTRIBUTES = 2 # Number of Ejector Attributes @@ -297,19 +297,19 @@ NUM_OF_TREATMENT_PARAMS = 20 # Total number of treatment parameters @unique -class ValvesEnum(DialinEnum): +class TDValvesEnum(DialinEnum): H1_VALV = 0 # H1 Valve for TD H19_VALV = 1 # H19 Valve for TD @unique -class ValvesPositions(DialinEnum): +class TDValvesPositions(DialinEnum): VALVE_POSITION_NOT_IN_POSITION = 0 # Valve not in Position VALVE_POSITION_A_INSERT_EJECT = 1 # Insert/Eject Valve Position VALVE_POSITION_B_OPEN = 2 # Open Valve Position VALVE_POSITION_C_CLOSE = 3 # Closed Valve Position @unique -class ValvesStates(DialinEnum): +class TDValvesStates(DialinEnum): VALVE_STATE_WAIT_FOR_POST = 0 # Waiting for POST Valve State VALVE_STATE_HOMING_NOT_STARTED = 1 # Homing not started Valve State VALVE_STATE_HOMING_FIND_ENERGIZED_EDGE = 2 # Homing Find Energized Edge Valve State Index: leahi_dialin/dd/modules/blood_leak.py =================================================================== diff -u -r6dcbbc4df1069665696caea1cb96cbc163ae69b0 -r52aa7af16b98730ba59fc2577dbe8f73b5959775 --- leahi_dialin/dd/modules/blood_leak.py (.../blood_leak.py) (revision 6dcbbc4df1069665696caea1cb96cbc163ae69b0) +++ leahi_dialin/dd/modules/blood_leak.py (.../blood_leak.py) (revision 52aa7af16b98730ba59fc2577dbe8f73b5959775) @@ -5,7 +5,7 @@ from .constants import RESET, NO_RESET from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions -from leahi_dialin.common.dd_defs import BloodLeakStates +from leahi_dialin.common.dd_defs import DDBloodLeakStates from leahi_dialin.protocols.CAN import DenaliMessage, DenaliChannels from leahi_dialin.utils.base import AbstractSubSystem, publish, DialinEnum from leahi_dialin.utils.conversions import integer_to_bytearray, bytearray_to_byte, bytearray_to_integer, \ @@ -60,7 +60,7 @@ self.hd_blood_leak_status_timestamp = 0.0 self.hd_blood_leak_emb_mode_response_timestamp = 0.0 self.blood_leak_status = self.NO_BLOOD_LEAK_DETECTED - self.blood_leak_state = BloodLeakStates.BLOOD_LEAK_INIT_STATE.value + self.blood_leak_state = DDBloodLeakStates.BLOOD_LEAK_INIT_STATE.value self.blood_leak_emb_mode_cmds = dict() self.blood_leak_error_persistent_ctr = 0 self.blood_leak_serial_comm_state = 0 Index: leahi_dialin/dd/modules/concentrate_pump.py =================================================================== diff -u -r956757fac807b52aec078e84127089db5dff069f -r52aa7af16b98730ba59fc2577dbe8f73b5959775 --- leahi_dialin/dd/modules/concentrate_pump.py (.../concentrate_pump.py) (revision 956757fac807b52aec078e84127089db5dff069f) +++ leahi_dialin/dd/modules/concentrate_pump.py (.../concentrate_pump.py) (revision 52aa7af16b98730ba59fc2577dbe8f73b5959775) @@ -19,7 +19,7 @@ from .constants import RESET, NO_RESET from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions -from leahi_dialin.common.dd_defs import ConcentratePumpsEnum, DDConcentratePumpsStates, DDConcentratePumpAttributesEnum +from leahi_dialin.common.dd_defs import DDConcentratePumpsEnum, DDConcentratePumpsStates, DDConcentratePumpAttributesEnum from leahi_dialin.protocols.CAN import DenaliMessage, DenaliChannels from leahi_dialin.utils.base import AbstractSubSystem, publish, DialinEnum from leahi_dialin.utils.checks import check_broadcast_interval_override_ms @@ -48,7 +48,7 @@ self._handler_concentrate_pumps_sync) self.dd_concentrate_pumps = { - ConcentratePumpsEnum.D10_CP2_BICARB.name: { + DDConcentratePumpsEnum.D10_CP2_BICARB.name: { DDConcentratePumpAttributesEnum.CURRENT_STATE.name: 0, DDConcentratePumpAttributesEnum.CURRENT_SET_SPEED.name: 0.0, DDConcentratePumpAttributesEnum.MEASURED_SPEED.name: 0.0, @@ -59,7 +59,7 @@ DDConcentratePumpAttributesEnum.PARKED.name: False, DDConcentratePumpAttributesEnum.PARK_FAULT.name: False }, - ConcentratePumpsEnum.D11_CP1_ACID.name: { + DDConcentratePumpsEnum.D11_CP1_ACID.name: { DDConcentratePumpAttributesEnum.CURRENT_STATE.name: 0, DDConcentratePumpAttributesEnum.CURRENT_SET_SPEED.name: 0.0, DDConcentratePumpAttributesEnum.MEASURED_SPEED.name: 0.0, @@ -70,7 +70,7 @@ DDConcentratePumpAttributesEnum.PARKED.name: False, DDConcentratePumpAttributesEnum.PARK_FAULT.name: False }, - ConcentratePumpsEnum.D76_UF.name: { + DDConcentratePumpsEnum.D76_UF.name: { DDConcentratePumpAttributesEnum.CURRENT_STATE.name: 0, DDConcentratePumpAttributesEnum.CURRENT_SET_SPEED.name: 0.0, DDConcentratePumpAttributesEnum.MEASURED_SPEED.name: 0.0, @@ -95,55 +95,55 @@ @return: None """ - self.dd_concentrate_pumps[ConcentratePumpsEnum.D11_CP1_ACID.name][DDConcentratePumpAttributesEnum.CURRENT_SET_SPEED.name] = ( + self.dd_concentrate_pumps[DDConcentratePumpsEnum.D11_CP1_ACID.name][DDConcentratePumpAttributesEnum.CURRENT_SET_SPEED.name] = ( struct.unpack('f', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1])))[0] - self.dd_concentrate_pumps[ConcentratePumpsEnum.D11_CP1_ACID.name][DDConcentratePumpAttributesEnum.MEASURED_SPEED.name] = ( + self.dd_concentrate_pumps[DDConcentratePumpsEnum.D11_CP1_ACID.name][DDConcentratePumpAttributesEnum.MEASURED_SPEED.name] = ( struct.unpack('f', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2])))[0] - self.dd_concentrate_pumps[ConcentratePumpsEnum.D10_CP2_BICARB.name][DDConcentratePumpAttributesEnum.CURRENT_SET_SPEED.name] = ( + self.dd_concentrate_pumps[DDConcentratePumpsEnum.D10_CP2_BICARB.name][DDConcentratePumpAttributesEnum.CURRENT_SET_SPEED.name] = ( struct.unpack('f', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3])))[0] - self.dd_concentrate_pumps[ConcentratePumpsEnum.D10_CP2_BICARB.name][DDConcentratePumpAttributesEnum.MEASURED_SPEED.name] = ( + self.dd_concentrate_pumps[DDConcentratePumpsEnum.D10_CP2_BICARB.name][DDConcentratePumpAttributesEnum.MEASURED_SPEED.name] = ( struct.unpack('f', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4])))[0] - self.dd_concentrate_pumps[ConcentratePumpsEnum.D11_CP1_ACID.name][DDConcentratePumpAttributesEnum.TARGET_REV_COUNT.name] = ( + self.dd_concentrate_pumps[DDConcentratePumpsEnum.D11_CP1_ACID.name][DDConcentratePumpAttributesEnum.TARGET_REV_COUNT.name] = ( struct.unpack('i', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5])))[0] - self.dd_concentrate_pumps[ConcentratePumpsEnum.D11_CP1_ACID.name][DDConcentratePumpAttributesEnum.MEASURED_REV_COUNT.name] = ( + self.dd_concentrate_pumps[DDConcentratePumpsEnum.D11_CP1_ACID.name][DDConcentratePumpAttributesEnum.MEASURED_REV_COUNT.name] = ( struct.unpack('i', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_6:MsgFieldPositions.END_POS_FIELD_6])))[0] - self.dd_concentrate_pumps[ConcentratePumpsEnum.D10_CP2_BICARB.name][DDConcentratePumpAttributesEnum.TARGET_REV_COUNT.name] = ( + self.dd_concentrate_pumps[DDConcentratePumpsEnum.D10_CP2_BICARB.name][DDConcentratePumpAttributesEnum.TARGET_REV_COUNT.name] = ( struct.unpack('i', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_7:MsgFieldPositions.END_POS_FIELD_7])))[0] - self.dd_concentrate_pumps[ConcentratePumpsEnum.D10_CP2_BICARB.name][DDConcentratePumpAttributesEnum.MEASURED_REV_COUNT.name] = ( + self.dd_concentrate_pumps[DDConcentratePumpsEnum.D10_CP2_BICARB.name][DDConcentratePumpAttributesEnum.MEASURED_REV_COUNT.name] = ( struct.unpack('i', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_8:MsgFieldPositions.END_POS_FIELD_8])))[0] - self.dd_concentrate_pumps[ConcentratePumpsEnum.D11_CP1_ACID.name][DDConcentratePumpAttributesEnum.CURRENT_STATE.name] = ( + self.dd_concentrate_pumps[DDConcentratePumpsEnum.D11_CP1_ACID.name][DDConcentratePumpAttributesEnum.CURRENT_STATE.name] = ( struct.unpack('i', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_9:MsgFieldPositions.END_POS_FIELD_9])))[0] - self.dd_concentrate_pumps[ConcentratePumpsEnum.D10_CP2_BICARB.name][DDConcentratePumpAttributesEnum.CURRENT_STATE.name] = ( + self.dd_concentrate_pumps[DDConcentratePumpsEnum.D10_CP2_BICARB.name][DDConcentratePumpAttributesEnum.CURRENT_STATE.name] = ( struct.unpack('i', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_10:MsgFieldPositions.END_POS_FIELD_10])))[0] - self.dd_concentrate_pumps[ConcentratePumpsEnum.D11_CP1_ACID.name][DDConcentratePumpAttributesEnum.PULSE_US.name] = ( + self.dd_concentrate_pumps[DDConcentratePumpsEnum.D11_CP1_ACID.name][DDConcentratePumpAttributesEnum.PULSE_US.name] = ( struct.unpack('f', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_11:MsgFieldPositions.END_POS_FIELD_11])))[0] - self.dd_concentrate_pumps[ConcentratePumpsEnum.D10_CP2_BICARB.name][DDConcentratePumpAttributesEnum.PULSE_US.name] = ( + self.dd_concentrate_pumps[DDConcentratePumpsEnum.D10_CP2_BICARB.name][DDConcentratePumpAttributesEnum.PULSE_US.name] = ( struct.unpack('f', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_12:MsgFieldPositions.END_POS_FIELD_12])))[0] - self.dd_concentrate_pumps[ConcentratePumpsEnum.D11_CP1_ACID.name][DDConcentratePumpAttributesEnum.TARGET_SPEED.name] = ( + self.dd_concentrate_pumps[DDConcentratePumpsEnum.D11_CP1_ACID.name][DDConcentratePumpAttributesEnum.TARGET_SPEED.name] = ( struct.unpack('f', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_13:MsgFieldPositions.END_POS_FIELD_13])))[0] - self.dd_concentrate_pumps[ConcentratePumpsEnum.D10_CP2_BICARB.name][DDConcentratePumpAttributesEnum.TARGET_SPEED.name] = ( + self.dd_concentrate_pumps[DDConcentratePumpsEnum.D10_CP2_BICARB.name][DDConcentratePumpAttributesEnum.TARGET_SPEED.name] = ( struct.unpack('f', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_14:MsgFieldPositions.END_POS_FIELD_14])))[0] - self.dd_concentrate_pumps[ConcentratePumpsEnum.D11_CP1_ACID.name][DDConcentratePumpAttributesEnum.PARKED.name] = \ + self.dd_concentrate_pumps[DDConcentratePumpsEnum.D11_CP1_ACID.name][DDConcentratePumpAttributesEnum.PARKED.name] = \ True if struct.unpack('I', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_15:MsgFieldPositions.END_POS_FIELD_15]))[0] == 1 else False - self.dd_concentrate_pumps[ConcentratePumpsEnum.D10_CP2_BICARB.name][DDConcentratePumpAttributesEnum.PARKED.name] = \ + self.dd_concentrate_pumps[DDConcentratePumpsEnum.D10_CP2_BICARB.name][DDConcentratePumpAttributesEnum.PARKED.name] = \ True if struct.unpack('I', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_16:MsgFieldPositions.END_POS_FIELD_16]))[0] == 1 else False - self.dd_concentrate_pumps[ConcentratePumpsEnum.D11_CP1_ACID.name][DDConcentratePumpAttributesEnum.PARK_FAULT.name] = \ + self.dd_concentrate_pumps[DDConcentratePumpsEnum.D11_CP1_ACID.name][DDConcentratePumpAttributesEnum.PARK_FAULT.name] = \ True if struct.unpack('I', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_17:MsgFieldPositions.END_POS_FIELD_17]))[0] == 1 else False - self.dd_concentrate_pumps[ConcentratePumpsEnum.D10_CP2_BICARB.name][DDConcentratePumpAttributesEnum.PARK_FAULT.name] = \ + self.dd_concentrate_pumps[DDConcentratePumpsEnum.D10_CP2_BICARB.name][DDConcentratePumpAttributesEnum.PARK_FAULT.name] = \ True if struct.unpack('I', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_18:MsgFieldPositions.END_POS_FIELD_18]))[0] == 1 else False - self.dd_concentrate_pumps[ConcentratePumpsEnum.D76_UF.name][DDConcentratePumpAttributesEnum.TARGET_SPEED.name] = ( + self.dd_concentrate_pumps[DDConcentratePumpsEnum.D76_UF.name][DDConcentratePumpAttributesEnum.TARGET_SPEED.name] = ( struct.unpack('f', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_19:MsgFieldPositions.END_POS_FIELD_19])))[0] - self.dd_concentrate_pumps[ConcentratePumpsEnum.D76_UF.name][DDConcentratePumpAttributesEnum.CURRENT_SET_SPEED.name] = ( + self.dd_concentrate_pumps[DDConcentratePumpsEnum.D76_UF.name][DDConcentratePumpAttributesEnum.CURRENT_SET_SPEED.name] = ( struct.unpack('f', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_20:MsgFieldPositions.END_POS_FIELD_20])))[0] - self.dd_concentrate_pumps[ConcentratePumpsEnum.D76_UF.name][DDConcentratePumpAttributesEnum.MEASURED_SPEED.name] = ( + self.dd_concentrate_pumps[DDConcentratePumpsEnum.D76_UF.name][DDConcentratePumpAttributesEnum.MEASURED_SPEED.name] = ( struct.unpack('f', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_21:MsgFieldPositions.END_POS_FIELD_21])))[0] - self.dd_concentrate_pumps[ConcentratePumpsEnum.D76_UF.name][DDConcentratePumpAttributesEnum.TARGET_REV_COUNT.name] = ( + self.dd_concentrate_pumps[DDConcentratePumpsEnum.D76_UF.name][DDConcentratePumpAttributesEnum.TARGET_REV_COUNT.name] = ( struct.unpack('i', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_22:MsgFieldPositions.END_POS_FIELD_22])))[0] - self.dd_concentrate_pumps[ConcentratePumpsEnum.D76_UF.name][DDConcentratePumpAttributesEnum.MEASURED_REV_COUNT.name] = ( + self.dd_concentrate_pumps[DDConcentratePumpsEnum.D76_UF.name][DDConcentratePumpAttributesEnum.MEASURED_REV_COUNT.name] = ( struct.unpack('i', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_23:MsgFieldPositions.END_POS_FIELD_23])))[0] - self.dd_concentrate_pumps[ConcentratePumpsEnum.D76_UF.name][DDConcentratePumpAttributesEnum.CURRENT_STATE.name] = ( + self.dd_concentrate_pumps[DDConcentratePumpsEnum.D76_UF.name][DDConcentratePumpAttributesEnum.CURRENT_STATE.name] = ( struct.unpack('i', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_24:MsgFieldPositions.END_POS_FIELD_24])))[0] - self.dd_concentrate_pumps[ConcentratePumpsEnum.D76_UF.name][DDConcentratePumpAttributesEnum.PULSE_US.name] = ( + self.dd_concentrate_pumps[DDConcentratePumpsEnum.D76_UF.name][DDConcentratePumpAttributesEnum.PULSE_US.name] = ( struct.unpack('f', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_25:MsgFieldPositions.END_POS_FIELD_25])))[0] self.dd_concentrate_pump_timestamp = timestamp Index: leahi_dialin/dd/modules/conductivity_sensors.py =================================================================== diff -u -re7d16bd6881619e5fc2a0bc1a7fd578a9978498e -r52aa7af16b98730ba59fc2577dbe8f73b5959775 --- leahi_dialin/dd/modules/conductivity_sensors.py (.../conductivity_sensors.py) (revision e7d16bd6881619e5fc2a0bc1a7fd578a9978498e) +++ leahi_dialin/dd/modules/conductivity_sensors.py (.../conductivity_sensors.py) (revision 52aa7af16b98730ba59fc2577dbe8f73b5959775) @@ -19,7 +19,7 @@ from .constants import RESET, NO_RESET from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions -from leahi_dialin.common.dd_defs import ConductivitySensorsEnum +from leahi_dialin.common.dd_defs import DDConductivitySensorsEnum from leahi_dialin.protocols.CAN import DenaliMessage, DenaliChannels from leahi_dialin.utils.base import AbstractSubSystem, publish, DialinEnum from leahi_dialin.utils.checks import check_broadcast_interval_override_ms @@ -50,11 +50,11 @@ self._handler_conductivity_sensors_sync) self.dd_conductivity = { - ConductivitySensorsEnum.D17_COND.name: 0.0, - ConductivitySensorsEnum.D27_COND.name: 0.0, - ConductivitySensorsEnum.D29_COND.name: 0.0, - ConductivitySensorsEnum.D43_COND.name: 0.0, - ConductivitySensorsEnum.D74_COND.name: 0.0 + DDConductivitySensorsEnum.D17_COND.name: 0.0, + DDConductivitySensorsEnum.D27_COND.name: 0.0, + DDConductivitySensorsEnum.D29_COND.name: 0.0, + DDConductivitySensorsEnum.D43_COND.name: 0.0, + DDConductivitySensorsEnum.D74_COND.name: 0.0 } self.dd_conductivity_timestamp = 0.0 @@ -69,19 +69,19 @@ @return: None """ - self.dd_conductivity[ConductivitySensorsEnum.D17_COND.name] = struct.unpack('f', bytearray( + self.dd_conductivity[DDConductivitySensorsEnum.D17_COND.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))[0] - self.dd_conductivity[ConductivitySensorsEnum.D27_COND.name] = struct.unpack('f', bytearray( + self.dd_conductivity[DDConductivitySensorsEnum.D27_COND.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2]))[0] - self.dd_conductivity[ConductivitySensorsEnum.D29_COND.name] = struct.unpack('f', bytearray( + self.dd_conductivity[DDConductivitySensorsEnum.D29_COND.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3]))[0] - self.dd_conductivity[ConductivitySensorsEnum.D43_COND.name] = struct.unpack('f', bytearray( + self.dd_conductivity[DDConductivitySensorsEnum.D43_COND.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4]))[0] - self.dd_conductivity[ConductivitySensorsEnum.D74_COND.name] = struct.unpack('f', bytearray( + self.dd_conductivity[DDConductivitySensorsEnum.D74_COND.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))[0] self.dd_conductivity_timestamp = timestamp @@ -155,7 +155,7 @@ str_res = "reset back to normal" else: str_res = str(conductivity) + " microsiemens/cm" - self.logger.debug("override conductivity sensor value for sensor " + ConductivitySensorsEnum[str(sensor_index)].name + self.logger.debug("override conductivity sensor value for sensor " + DDConductivitySensorsEnum[str(sensor_index)].name + ": " + str_res) # Send message @@ -196,7 +196,7 @@ str_res = "reset back to normal" else: str_res = str(temperature) - self.logger.debug("override temperature value for conductivity sensor " + ConductivitySensorsEnum[str(sensor_index)].name + self.logger.debug("override temperature value for conductivity sensor " + DDConductivitySensorsEnum[str(sensor_index)].name + ": " + str_res) # Send message @@ -237,7 +237,7 @@ str_res = "reset back to normal" else: str_res = str(counter) - self.logger.debug("override conductivity sensor value for sensor " + ConductivitySensorsEnum[str(sensor_index)].name + self.logger.debug("override conductivity sensor value for sensor " + DDConductivitySensorsEnum[str(sensor_index)].name + ": " + str_res) # Send message @@ -275,7 +275,7 @@ str_res = "reset back to normal" else: str_res = str(counter) - self.logger.debug("override conductivity sensor value for sensor " + ConductivitySensorsEnum[str(sensor_index)].name + self.logger.debug("override conductivity sensor value for sensor " + DDConductivitySensorsEnum[str(sensor_index)].name + ": " + str_res) # Send message Index: leahi_dialin/dd/modules/dialysate_pump.py =================================================================== diff -u -re7d16bd6881619e5fc2a0bc1a7fd578a9978498e -r52aa7af16b98730ba59fc2577dbe8f73b5959775 --- leahi_dialin/dd/modules/dialysate_pump.py (.../dialysate_pump.py) (revision e7d16bd6881619e5fc2a0bc1a7fd578a9978498e) +++ leahi_dialin/dd/modules/dialysate_pump.py (.../dialysate_pump.py) (revision 52aa7af16b98730ba59fc2577dbe8f73b5959775) @@ -19,7 +19,7 @@ from .constants import RESET, NO_RESET from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions -from leahi_dialin.common.dd_defs import DialysatePumpsEnum, DialysatePumpAttributesEnum, DDDialysatePumpsStates +from leahi_dialin.common.dd_defs import DDDialysatePumpsEnum, DDDialysatePumpAttributesEnum, DDDialysatePumpsStates from leahi_dialin.protocols.CAN import DenaliMessage, DenaliChannels from leahi_dialin.utils.base import AbstractSubSystem, publish, DialinEnum from leahi_dialin.utils.checks import check_broadcast_interval_override_ms @@ -50,29 +50,29 @@ self._handler_dialysate_pumps_sync) self.dd_dialysate_pumps = { - DialysatePumpsEnum.D12_PUMP.name: { - DialysatePumpAttributesEnum.TARGET_RPM.name: 0.0, - DialysatePumpAttributesEnum.MEASURED_SPEED.name: 0.0, - DialysatePumpAttributesEnum.CURRENT_SPEED.name: 0.0, - DialysatePumpAttributesEnum.STATE.name: 0.0, - DialysatePumpAttributesEnum.TARGET_PRESSURE.name: 0.0, - DialysatePumpAttributesEnum.MEASURED_PRESSURE.name: 0.0, - DialysatePumpAttributesEnum.MEASURED_CURRENT.name: 0.0, - DialysatePumpAttributesEnum.CONTROL.name: 0.0, - DialysatePumpAttributesEnum.DIRECTION_ERROR_COUNT.name: 0.0, - DialysatePumpAttributesEnum.MEASURED_DIRECTION.name: 0.0 + DDDialysatePumpsEnum.D12_PUMP.name: { + DDDialysatePumpAttributesEnum.TARGET_RPM.name: 0.0, + DDDialysatePumpAttributesEnum.MEASURED_SPEED.name: 0.0, + DDDialysatePumpAttributesEnum.CURRENT_SPEED.name: 0.0, + DDDialysatePumpAttributesEnum.STATE.name: 0.0, + DDDialysatePumpAttributesEnum.TARGET_PRESSURE.name: 0.0, + DDDialysatePumpAttributesEnum.MEASURED_PRESSURE.name: 0.0, + DDDialysatePumpAttributesEnum.MEASURED_CURRENT.name: 0.0, + DDDialysatePumpAttributesEnum.CONTROL.name: 0.0, + DDDialysatePumpAttributesEnum.DIRECTION_ERROR_COUNT.name: 0.0, + DDDialysatePumpAttributesEnum.MEASURED_DIRECTION.name: 0.0 }, - DialysatePumpsEnum.D48_PUMP.name: { - DialysatePumpAttributesEnum.TARGET_RPM.name: 0.0, - DialysatePumpAttributesEnum.MEASURED_SPEED.name: 0.0, - DialysatePumpAttributesEnum.CURRENT_SPEED.name: 0.0, - DialysatePumpAttributesEnum.STATE.name: 0.0, - DialysatePumpAttributesEnum.TARGET_PRESSURE.name: 0.0, - DialysatePumpAttributesEnum.MEASURED_PRESSURE.name: 0.0, - DialysatePumpAttributesEnum.MEASURED_CURRENT.name: 0.0, - DialysatePumpAttributesEnum.CONTROL.name: 0.0, - DialysatePumpAttributesEnum.DIRECTION_ERROR_COUNT.name: 0.0, - DialysatePumpAttributesEnum.MEASURED_DIRECTION.name: 0.0 + DDDialysatePumpsEnum.D48_PUMP.name: { + DDDialysatePumpAttributesEnum.TARGET_RPM.name: 0.0, + DDDialysatePumpAttributesEnum.MEASURED_SPEED.name: 0.0, + DDDialysatePumpAttributesEnum.CURRENT_SPEED.name: 0.0, + DDDialysatePumpAttributesEnum.STATE.name: 0.0, + DDDialysatePumpAttributesEnum.TARGET_PRESSURE.name: 0.0, + DDDialysatePumpAttributesEnum.MEASURED_PRESSURE.name: 0.0, + DDDialysatePumpAttributesEnum.MEASURED_CURRENT.name: 0.0, + DDDialysatePumpAttributesEnum.CONTROL.name: 0.0, + DDDialysatePumpAttributesEnum.DIRECTION_ERROR_COUNT.name: 0.0, + DDDialysatePumpAttributesEnum.MEASURED_DIRECTION.name: 0.0 } } @@ -88,54 +88,54 @@ @return: None """ - self.dd_dialysate_pumps[DialysatePumpsEnum.D12_PUMP.name][DialysatePumpAttributesEnum.TARGET_RPM.name] = ( + self.dd_dialysate_pumps[DDDialysatePumpsEnum.D12_PUMP.name][DDDialysatePumpAttributesEnum.TARGET_RPM.name] = ( struct.unpack('f', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1])))[0] - self.dd_dialysate_pumps[DialysatePumpsEnum.D48_PUMP.name][DialysatePumpAttributesEnum.TARGET_RPM.name] = ( + self.dd_dialysate_pumps[DDDialysatePumpsEnum.D48_PUMP.name][DDDialysatePumpAttributesEnum.TARGET_RPM.name] = ( struct.unpack('f', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2])))[0] - self.dd_dialysate_pumps[DialysatePumpsEnum.D12_PUMP.name][DialysatePumpAttributesEnum.MEASURED_SPEED.name] = ( + self.dd_dialysate_pumps[DDDialysatePumpsEnum.D12_PUMP.name][DDDialysatePumpAttributesEnum.MEASURED_SPEED.name] = ( struct.unpack('f', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3])))[0] - self.dd_dialysate_pumps[DialysatePumpsEnum.D48_PUMP.name][DialysatePumpAttributesEnum.MEASURED_SPEED.name] = ( + self.dd_dialysate_pumps[DDDialysatePumpsEnum.D48_PUMP.name][DDDialysatePumpAttributesEnum.MEASURED_SPEED.name] = ( struct.unpack('f', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4])))[0] - self.dd_dialysate_pumps[DialysatePumpsEnum.D12_PUMP.name][DialysatePumpAttributesEnum.CURRENT_SPEED.name] = ( + self.dd_dialysate_pumps[DDDialysatePumpsEnum.D12_PUMP.name][DDDialysatePumpAttributesEnum.CURRENT_SPEED.name] = ( struct.unpack('f', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5])))[0] - self.dd_dialysate_pumps[DialysatePumpsEnum.D48_PUMP.name][DialysatePumpAttributesEnum.CURRENT_SPEED.name] = ( + self.dd_dialysate_pumps[DDDialysatePumpsEnum.D48_PUMP.name][DDDialysatePumpAttributesEnum.CURRENT_SPEED.name] = ( struct.unpack('f', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_6:MsgFieldPositions.END_POS_FIELD_6])))[0] - self.dd_dialysate_pumps[DialysatePumpsEnum.D12_PUMP.name][DialysatePumpAttributesEnum.STATE.name] = ( + self.dd_dialysate_pumps[DDDialysatePumpsEnum.D12_PUMP.name][DDDialysatePumpAttributesEnum.STATE.name] = ( struct.unpack('i', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_7:MsgFieldPositions.END_POS_FIELD_7])))[0] - self.dd_dialysate_pumps[DialysatePumpsEnum.D48_PUMP.name][DialysatePumpAttributesEnum.STATE.name] = ( + self.dd_dialysate_pumps[DDDialysatePumpsEnum.D48_PUMP.name][DDDialysatePumpAttributesEnum.STATE.name] = ( struct.unpack('i', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_8:MsgFieldPositions.END_POS_FIELD_8])))[0] - self.dd_dialysate_pumps[DialysatePumpsEnum.D12_PUMP.name][DialysatePumpAttributesEnum.TARGET_PRESSURE.name] = ( + self.dd_dialysate_pumps[DDDialysatePumpsEnum.D12_PUMP.name][DDDialysatePumpAttributesEnum.TARGET_PRESSURE.name] = ( struct.unpack('f', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_9:MsgFieldPositions.END_POS_FIELD_9])))[0] - self.dd_dialysate_pumps[DialysatePumpsEnum.D48_PUMP.name][DialysatePumpAttributesEnum.TARGET_PRESSURE.name] = ( + self.dd_dialysate_pumps[DDDialysatePumpsEnum.D48_PUMP.name][DDDialysatePumpAttributesEnum.TARGET_PRESSURE.name] = ( struct.unpack('f', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_10:MsgFieldPositions.END_POS_FIELD_10])))[0] - self.dd_dialysate_pumps[DialysatePumpsEnum.D12_PUMP.name][DialysatePumpAttributesEnum.MEASURED_PRESSURE.name] = ( + self.dd_dialysate_pumps[DDDialysatePumpsEnum.D12_PUMP.name][DDDialysatePumpAttributesEnum.MEASURED_PRESSURE.name] = ( struct.unpack('f', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_11:MsgFieldPositions.END_POS_FIELD_11])))[0] - self.dd_dialysate_pumps[DialysatePumpsEnum.D48_PUMP.name][DialysatePumpAttributesEnum.MEASURED_PRESSURE.name] = ( + self.dd_dialysate_pumps[DDDialysatePumpsEnum.D48_PUMP.name][DDDialysatePumpAttributesEnum.MEASURED_PRESSURE.name] = ( struct.unpack('f', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_12:MsgFieldPositions.END_POS_FIELD_12])))[0] - self.dd_dialysate_pumps[DialysatePumpsEnum.D12_PUMP.name][DialysatePumpAttributesEnum.MEASURED_CURRENT.name] = ( + self.dd_dialysate_pumps[DDDialysatePumpsEnum.D12_PUMP.name][DDDialysatePumpAttributesEnum.MEASURED_CURRENT.name] = ( struct.unpack('f', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_13:MsgFieldPositions.END_POS_FIELD_13])))[0] - self.dd_dialysate_pumps[DialysatePumpsEnum.D48_PUMP.name][DialysatePumpAttributesEnum.MEASURED_CURRENT.name] = ( + self.dd_dialysate_pumps[DDDialysatePumpsEnum.D48_PUMP.name][DDDialysatePumpAttributesEnum.MEASURED_CURRENT.name] = ( struct.unpack('f', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_14:MsgFieldPositions.END_POS_FIELD_14])))[0] - self.dd_dialysate_pumps[DialysatePumpsEnum.D12_PUMP.name][DialysatePumpAttributesEnum.CONTROL.name] = ( + self.dd_dialysate_pumps[DDDialysatePumpsEnum.D12_PUMP.name][DDDialysatePumpAttributesEnum.CONTROL.name] = ( struct.unpack('i', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_15:MsgFieldPositions.END_POS_FIELD_15])))[0] - self.dd_dialysate_pumps[DialysatePumpsEnum.D48_PUMP.name][DialysatePumpAttributesEnum.CONTROL.name] = ( + self.dd_dialysate_pumps[DDDialysatePumpsEnum.D48_PUMP.name][DDDialysatePumpAttributesEnum.CONTROL.name] = ( struct.unpack('i', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_16:MsgFieldPositions.END_POS_FIELD_16])))[0] - self.dd_dialysate_pumps[DialysatePumpsEnum.D12_PUMP.name][DialysatePumpAttributesEnum.DIRECTION_ERROR_COUNT.name] = ( + self.dd_dialysate_pumps[DDDialysatePumpsEnum.D12_PUMP.name][DDDialysatePumpAttributesEnum.DIRECTION_ERROR_COUNT.name] = ( struct.unpack('i', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_17:MsgFieldPositions.END_POS_FIELD_17])))[0] - self.dd_dialysate_pumps[DialysatePumpsEnum.D48_PUMP.name][DialysatePumpAttributesEnum.DIRECTION_ERROR_COUNT.name] = ( + self.dd_dialysate_pumps[DDDialysatePumpsEnum.D48_PUMP.name][DDDialysatePumpAttributesEnum.DIRECTION_ERROR_COUNT.name] = ( struct.unpack('i', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_18:MsgFieldPositions.END_POS_FIELD_18])))[0] - self.dd_dialysate_pumps[DialysatePumpsEnum.D12_PUMP.name][DialysatePumpAttributesEnum.MEASURED_DIRECTION.name] = ( + self.dd_dialysate_pumps[DDDialysatePumpsEnum.D12_PUMP.name][DDDialysatePumpAttributesEnum.MEASURED_DIRECTION.name] = ( struct.unpack('i', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_19:MsgFieldPositions.END_POS_FIELD_19])))[0] - self.dd_dialysate_pumps[DialysatePumpsEnum.D48_PUMP.name][DialysatePumpAttributesEnum.MEASURED_DIRECTION.name] = ( + self.dd_dialysate_pumps[DDDialysatePumpsEnum.D48_PUMP.name][DDDialysatePumpAttributesEnum.MEASURED_DIRECTION.name] = ( struct.unpack('i', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_20:MsgFieldPositions.END_POS_FIELD_20])))[0] self.dd_dialysate_pump_timestamp = timestamp Index: leahi_dialin/dd/modules/heaters.py =================================================================== diff -u -r956757fac807b52aec078e84127089db5dff069f -r52aa7af16b98730ba59fc2577dbe8f73b5959775 --- leahi_dialin/dd/modules/heaters.py (.../heaters.py) (revision 956757fac807b52aec078e84127089db5dff069f) +++ leahi_dialin/dd/modules/heaters.py (.../heaters.py) (revision 52aa7af16b98730ba59fc2577dbe8f73b5959775) @@ -20,7 +20,7 @@ from .constants import NO_RESET from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions -from leahi_dialin.common.dd_defs import HeatersStartStop, HeatersState, HeatersNames, HeatersAttributesEnum +from leahi_dialin.common.dd_defs import DDHeatersStartStop, DDHeatersState, DDHeatersNames, DDHeatersAttributesEnum from leahi_dialin.protocols.CAN import DenaliMessage, DenaliChannels from leahi_dialin.utils.base import AbstractSubSystem, publish, DialinEnum from leahi_dialin.utils.checks import check_broadcast_interval_override_ms @@ -45,23 +45,23 @@ self.logger = logger self.dd_heaters = { - HeatersNames.D5_HEAT.name: { - HeatersAttributesEnum.HEAT_DUTY_CYCLE.name: 0.0, - HeatersAttributesEnum.HEAT_TARGET_TEMP.name: 0.0, - HeatersAttributesEnum.HEAT_STATE.name: 0, - HeatersAttributesEnum.DUTY_CYCLE_COUNT.name: 0.0, - HeatersAttributesEnum.PWM_PERIOD.name: 0.0, - HeatersAttributesEnum.ADJUSTED_TARGET_TEMP.name: 0.0, - HeatersAttributesEnum.TARGET_TEMP_TD.name: 0.0 + DDHeatersNames.D5_HEAT.name: { + DDHeatersAttributesEnum.HEAT_DUTY_CYCLE.name: 0.0, + DDHeatersAttributesEnum.HEAT_TARGET_TEMP.name: 0.0, + DDHeatersAttributesEnum.HEAT_STATE.name: 0, + DDHeatersAttributesEnum.DUTY_CYCLE_COUNT.name: 0.0, + DDHeatersAttributesEnum.PWM_PERIOD.name: 0.0, + DDHeatersAttributesEnum.ADJUSTED_TARGET_TEMP.name: 0.0, + DDHeatersAttributesEnum.TARGET_TEMP_TD.name: 0.0 }, - HeatersNames.D45_HEAT.name: { - HeatersAttributesEnum.HEAT_DUTY_CYCLE.name: 0.0, - HeatersAttributesEnum.HEAT_TARGET_TEMP.name: 0.0, - HeatersAttributesEnum.HEAT_STATE.name: 0, - HeatersAttributesEnum.DUTY_CYCLE_COUNT.name: None, # D45 Heater doesn't use this attribute - HeatersAttributesEnum.PWM_PERIOD.name: None, # D45 Heater doesn't use this attribute - HeatersAttributesEnum.ADJUSTED_TARGET_TEMP.name: None, # D45 Heater doesn't use this attribute - HeatersAttributesEnum.TARGET_TEMP_TD.name: None # D45 Heater doesn't use this attribute + DDHeatersNames.D45_HEAT.name: { + DDHeatersAttributesEnum.HEAT_DUTY_CYCLE.name: 0.0, + DDHeatersAttributesEnum.HEAT_TARGET_TEMP.name: 0.0, + DDHeatersAttributesEnum.HEAT_STATE.name: 0, + DDHeatersAttributesEnum.DUTY_CYCLE_COUNT.name: None, # D45 Heater doesn't use this attribute + DDHeatersAttributesEnum.PWM_PERIOD.name: None, # D45 Heater doesn't use this attribute + DDHeatersAttributesEnum.ADJUSTED_TARGET_TEMP.name: None, # D45 Heater doesn't use this attribute + DDHeatersAttributesEnum.TARGET_TEMP_TD.name: None # D45 Heater doesn't use this attribute } } @@ -91,25 +91,25 @@ @param message: published DD heaters data message @returns none """ - self.dd_heaters[HeatersNames.D5_HEAT.name][HeatersAttributesEnum.HEAT_DUTY_CYCLE.name] = ( + self.dd_heaters[DDHeatersNames.D5_HEAT.name][DDHeatersAttributesEnum.HEAT_DUTY_CYCLE.name] = ( struct.unpack('f', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1])))[0] - self.dd_heaters[HeatersNames.D45_HEAT.name][HeatersAttributesEnum.HEAT_DUTY_CYCLE.name] = ( + self.dd_heaters[DDHeatersNames.D45_HEAT.name][DDHeatersAttributesEnum.HEAT_DUTY_CYCLE.name] = ( struct.unpack('f', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2])))[0] - self.dd_heaters[HeatersNames.D5_HEAT.name][HeatersAttributesEnum.HEAT_TARGET_TEMP.name] = ( + self.dd_heaters[DDHeatersNames.D5_HEAT.name][DDHeatersAttributesEnum.HEAT_TARGET_TEMP.name] = ( struct.unpack('f', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3])))[0] - self.dd_heaters[HeatersNames.D45_HEAT.name][HeatersAttributesEnum.HEAT_TARGET_TEMP.name] = ( + self.dd_heaters[DDHeatersNames.D45_HEAT.name][DDHeatersAttributesEnum.HEAT_TARGET_TEMP.name] = ( struct.unpack('f', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4])))[0] - self.dd_heaters[HeatersNames.D5_HEAT.name][HeatersAttributesEnum.HEAT_STATE.name] = ( + self.dd_heaters[DDHeatersNames.D5_HEAT.name][DDHeatersAttributesEnum.HEAT_STATE.name] = ( struct.unpack('i', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5])))[0] - self.dd_heaters[HeatersNames.D45_HEAT.name][HeatersAttributesEnum.HEAT_STATE.name] = ( + self.dd_heaters[DDHeatersNames.D45_HEAT.name][DDHeatersAttributesEnum.HEAT_STATE.name] = ( struct.unpack('i', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_6:MsgFieldPositions.END_POS_FIELD_6])))[0] - self.dd_heaters[HeatersNames.D5_HEAT.name][HeatersAttributesEnum.DUTY_CYCLE_COUNT.name] = ( + self.dd_heaters[DDHeatersNames.D5_HEAT.name][DDHeatersAttributesEnum.DUTY_CYCLE_COUNT.name] = ( struct.unpack('f', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_7:MsgFieldPositions.END_POS_FIELD_7])))[0] - self.dd_heaters[HeatersNames.D5_HEAT.name][HeatersAttributesEnum.PWM_PERIOD.name] = ( + self.dd_heaters[DDHeatersNames.D5_HEAT.name][DDHeatersAttributesEnum.PWM_PERIOD.name] = ( struct.unpack('f', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_8:MsgFieldPositions.END_POS_FIELD_8])))[0] - self.dd_heaters[HeatersNames.D5_HEAT.name][HeatersAttributesEnum.ADJUSTED_TARGET_TEMP.name] = ( + self.dd_heaters[DDHeatersNames.D5_HEAT.name][DDHeatersAttributesEnum.ADJUSTED_TARGET_TEMP.name] = ( struct.unpack('f', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_9:MsgFieldPositions.END_POS_FIELD_9])))[0] - self.dd_heaters[HeatersNames.D5_HEAT.name][HeatersAttributesEnum.TARGET_TEMP_TD.name] = ( + self.dd_heaters[DDHeatersNames.D5_HEAT.name][DDHeatersAttributesEnum.TARGET_TEMP_TD.name] = ( struct.unpack('f', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_10:MsgFieldPositions.END_POS_FIELD_10])))[0] self.dbg1 = struct.unpack('f', bytearray( @@ -185,7 +185,7 @@ message_id=MsgIds.MSG_ID_DD_HEATERS_DUTY_CYCLE_OVERRIDE_REQUEST.value, payload=payload) - self.logger.debug("Overriding {} heater's duty cycle to {:5.3f} %".format(HeatersNames(heater).name, duty_cycle)) + self.logger.debug("Overriding {} heater's duty cycle to {:5.3f} %".format(DDHeatersNames(heater).name, duty_cycle)) # Send message received_message = self.can_interface.send(message) Index: leahi_dialin/dd/modules/pressure_sensors.py =================================================================== diff -u -re7d16bd6881619e5fc2a0bc1a7fd578a9978498e -r52aa7af16b98730ba59fc2577dbe8f73b5959775 --- leahi_dialin/dd/modules/pressure_sensors.py (.../pressure_sensors.py) (revision e7d16bd6881619e5fc2a0bc1a7fd578a9978498e) +++ leahi_dialin/dd/modules/pressure_sensors.py (.../pressure_sensors.py) (revision 52aa7af16b98730ba59fc2577dbe8f73b5959775) @@ -19,7 +19,7 @@ from .constants import NO_RESET, RESET from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions -from leahi_dialin.common.dd_defs import PressureNames, PressureAttributesEnum +from leahi_dialin.common.dd_defs import DDPressureNames, DDPressureAttributesEnum from leahi_dialin.protocols.CAN import DenaliMessage, DenaliChannels from leahi_dialin.utils.base import AbstractSubSystem, publish, DialinEnum from leahi_dialin.utils.checks import check_broadcast_interval_override_ms @@ -49,33 +49,33 @@ self._handler_pressures_sync) self.dd_pressures = { - PressureNames.M1_PRES.name: { - PressureAttributesEnum.PRES.name: 0.0, - PressureAttributesEnum.TEMP.name: 0.0 + DDPressureNames.M1_PRES.name: { + DDPressureAttributesEnum.PRES.name: 0.0, + DDPressureAttributesEnum.TEMP.name: 0.0 }, - PressureNames.M3_PRES.name: { - PressureAttributesEnum.PRES.name: 0.0, - PressureAttributesEnum.TEMP.name: 0.0 + DDPressureNames.M3_PRES.name: { + DDPressureAttributesEnum.PRES.name: 0.0, + DDPressureAttributesEnum.TEMP.name: 0.0 }, - PressureNames.D9_PRES.name: { - PressureAttributesEnum.PRES.name: 0.0, - PressureAttributesEnum.TEMP.name: 0.0 + DDPressureNames.D9_PRES.name: { + DDPressureAttributesEnum.PRES.name: 0.0, + DDPressureAttributesEnum.TEMP.name: 0.0 }, - PressureNames.D66_PRES.name: { - PressureAttributesEnum.PRES.name: 0.0, - PressureAttributesEnum.TEMP.name: 0.0 + DDPressureNames.D66_PRES.name: { + DDPressureAttributesEnum.PRES.name: 0.0, + DDPressureAttributesEnum.TEMP.name: 0.0 }, - PressureNames.D51_PRES.name: { - PressureAttributesEnum.PRES.name: 0.0, - PressureAttributesEnum.TEMP.name: 0.0 + DDPressureNames.D51_PRES.name: { + DDPressureAttributesEnum.PRES.name: 0.0, + DDPressureAttributesEnum.TEMP.name: 0.0 }, - PressureNames.D18_PRES.name: { - PressureAttributesEnum.PRES.name: 0.0, - PressureAttributesEnum.TEMP.name: 0.0 + DDPressureNames.D18_PRES.name: { + DDPressureAttributesEnum.PRES.name: 0.0, + DDPressureAttributesEnum.TEMP.name: 0.0 }, - PressureNames.D41_PRES.name: { - PressureAttributesEnum.PRES.name: 0.0, - PressureAttributesEnum.TEMP.name: 0.0 + DDPressureNames.D41_PRES.name: { + DDPressureAttributesEnum.PRES.name: 0.0, + DDPressureAttributesEnum.TEMP.name: 0.0 } } @@ -90,33 +90,33 @@ @param message: published DD pressure data message @return: none """ - self.dd_pressures[PressureNames.M1_PRES.name][PressureAttributesEnum.PRES.name] = struct.unpack('f', bytearray( + self.dd_pressures[DDPressureNames.M1_PRES.name][DDPressureAttributesEnum.PRES.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))[0] - self.dd_pressures[PressureNames.M3_PRES.name][PressureAttributesEnum.PRES.name] = struct.unpack('f', bytearray( + self.dd_pressures[DDPressureNames.M3_PRES.name][DDPressureAttributesEnum.PRES.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2]))[0] - self.dd_pressures[PressureNames.D9_PRES.name][PressureAttributesEnum.PRES.name] = struct.unpack('f', bytearray( + self.dd_pressures[DDPressureNames.D9_PRES.name][DDPressureAttributesEnum.PRES.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3]))[0] - self.dd_pressures[PressureNames.D66_PRES.name][PressureAttributesEnum.PRES.name] = struct.unpack('f', bytearray( + self.dd_pressures[DDPressureNames.D66_PRES.name][DDPressureAttributesEnum.PRES.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4]))[0] - self.dd_pressures[PressureNames.D51_PRES.name][PressureAttributesEnum.PRES.name]= struct.unpack('f', bytearray( + self.dd_pressures[DDPressureNames.D51_PRES.name][DDPressureAttributesEnum.PRES.name]= struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))[0] - self.dd_pressures[PressureNames.D18_PRES.name][PressureAttributesEnum.PRES.name] = struct.unpack('f', bytearray( + self.dd_pressures[DDPressureNames.D18_PRES.name][DDPressureAttributesEnum.PRES.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_6:MsgFieldPositions.END_POS_FIELD_6]))[0] - self.dd_pressures[PressureNames.D41_PRES.name][PressureAttributesEnum.PRES.name] = struct.unpack('f', bytearray( + self.dd_pressures[DDPressureNames.D41_PRES.name][DDPressureAttributesEnum.PRES.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_7:MsgFieldPositions.END_POS_FIELD_7]))[0] - self.dd_pressures[PressureNames.M1_PRES.name][PressureAttributesEnum.TEMP.name] = struct.unpack('f', bytearray( + self.dd_pressures[DDPressureNames.M1_PRES.name][DDPressureAttributesEnum.TEMP.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_8:MsgFieldPositions.END_POS_FIELD_8]))[0] - self.dd_pressures[PressureNames.M3_PRES.name][PressureAttributesEnum.TEMP.name] = struct.unpack('f', bytearray( + self.dd_pressures[DDPressureNames.M3_PRES.name][DDPressureAttributesEnum.TEMP.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_9:MsgFieldPositions.END_POS_FIELD_9]))[0] - self.dd_pressures[PressureNames.D9_PRES.name][PressureAttributesEnum.TEMP.name] = struct.unpack('f', bytearray( + self.dd_pressures[DDPressureNames.D9_PRES.name][DDPressureAttributesEnum.TEMP.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_10:MsgFieldPositions.END_POS_FIELD_10]))[0] - self.dd_pressures[PressureNames.D66_PRES.name][PressureAttributesEnum.TEMP.name] = struct.unpack('f', bytearray( + self.dd_pressures[DDPressureNames.D66_PRES.name][DDPressureAttributesEnum.TEMP.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_11:MsgFieldPositions.END_POS_FIELD_11]))[0] - self.dd_pressures[PressureNames.D51_PRES.name][PressureAttributesEnum.TEMP.name] = struct.unpack('f', bytearray( + self.dd_pressures[DDPressureNames.D51_PRES.name][DDPressureAttributesEnum.TEMP.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_12:MsgFieldPositions.END_POS_FIELD_12]))[0] - self.dd_pressures[PressureNames.D18_PRES.name][PressureAttributesEnum.TEMP.name] = struct.unpack('f', bytearray( + self.dd_pressures[DDPressureNames.D18_PRES.name][DDPressureAttributesEnum.TEMP.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_13:MsgFieldPositions.END_POS_FIELD_13]))[0] - self.dd_pressures[PressureNames.D41_PRES.name][PressureAttributesEnum.TEMP.name] = struct.unpack('f', bytearray( + self.dd_pressures[DDPressureNames.D41_PRES.name][DDPressureAttributesEnum.TEMP.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_14:MsgFieldPositions.END_POS_FIELD_14]))[0] self.dd_pressures_timestamp = timestamp Index: leahi_dialin/fp/modules/boost_pump.py =================================================================== diff -u -ra5b83ae0f9728df7705cda897c4d02cfea4dd017 -r52aa7af16b98730ba59fc2577dbe8f73b5959775 --- leahi_dialin/fp/modules/boost_pump.py (.../boost_pump.py) (revision a5b83ae0f9728df7705cda897c4d02cfea4dd017) +++ leahi_dialin/fp/modules/boost_pump.py (.../boost_pump.py) (revision 52aa7af16b98730ba59fc2577dbe8f73b5959775) @@ -21,7 +21,7 @@ from leahi_dialin.utils.base import DialinEnum from .constants import RESET, NO_RESET from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions -from leahi_dialin.common.fp_defs import BoostPumpNames, FPPumpAttributes +from leahi_dialin.common.fp_defs import FPBoostPumpNames, FPPumpAttributes from leahi_dialin.protocols.CAN import DenaliMessage, DenaliChannels from leahi_dialin.utils.base import AbstractSubSystem, publish, DialinEnum from leahi_dialin.utils.checks import check_broadcast_interval_override_ms @@ -47,7 +47,7 @@ self._handler_pump_sync) self.boost_pump_timestamp = 0.0 self.boost_pump = { - BoostPumpNames.P40_PUMP.name: { + FPBoostPumpNames.P40_PUMP.name: { FPPumpAttributes.STATE.name: 0, FPPumpAttributes.DUTY_CYCLE.name: 0, FPPumpAttributes.FB_DUTY_CYCLE.name: 0, @@ -70,23 +70,23 @@ @return: none """ - self.boost_pump[BoostPumpNames.P40_PUMP.name][FPPumpAttributes.STATE.name] = struct.unpack('i', bytearray( + self.boost_pump[FPBoostPumpNames.P40_PUMP.name][FPPumpAttributes.STATE.name] = struct.unpack('i', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))[0] - self.boost_pump[BoostPumpNames.P40_PUMP.name][FPPumpAttributes.DUTY_CYCLE.name] = struct.unpack('i', bytearray( + self.boost_pump[FPBoostPumpNames.P40_PUMP.name][FPPumpAttributes.DUTY_CYCLE.name] = struct.unpack('i', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2]))[0] - self.boost_pump[BoostPumpNames.P40_PUMP.name][FPPumpAttributes.FB_DUTY_CYCLE.name] = struct.unpack('i', bytearray( + self.boost_pump[FPBoostPumpNames.P40_PUMP.name][FPPumpAttributes.FB_DUTY_CYCLE.name] = struct.unpack('i', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3]))[0] - self.boost_pump[BoostPumpNames.P40_PUMP.name][FPPumpAttributes.SPEED.name] = struct.unpack('f', bytearray( + self.boost_pump[FPBoostPumpNames.P40_PUMP.name][FPPumpAttributes.SPEED.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4]))[0] - self.boost_pump[BoostPumpNames.P40_PUMP.name][FPPumpAttributes.TARGET_PRESSURE.name] = struct.unpack('f', bytearray( + self.boost_pump[FPBoostPumpNames.P40_PUMP.name][FPPumpAttributes.TARGET_PRESSURE.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))[0] - self.boost_pump[BoostPumpNames.P40_PUMP.name][FPPumpAttributes.TARGET_FLOW.name] = struct.unpack('f', bytearray( + self.boost_pump[FPBoostPumpNames.P40_PUMP.name][FPPumpAttributes.TARGET_FLOW.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_6:MsgFieldPositions.END_POS_FIELD_6]))[0] - self.boost_pump[BoostPumpNames.P40_PUMP.name][FPPumpAttributes.TARGET_DUTY_CYCLE.name] = struct.unpack('f', bytearray( + self.boost_pump[FPBoostPumpNames.P40_PUMP.name][FPPumpAttributes.TARGET_DUTY_CYCLE.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_7:MsgFieldPositions.END_POS_FIELD_7]))[0] - self.boost_pump[BoostPumpNames.P40_PUMP.name][FPPumpAttributes.DUTY_CYCLE_PCT.name] = struct.unpack('f', bytearray( + self.boost_pump[FPBoostPumpNames.P40_PUMP.name][FPPumpAttributes.DUTY_CYCLE_PCT.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_8:MsgFieldPositions.END_POS_FIELD_8]))[0] - self.boost_pump[BoostPumpNames.P40_PUMP.name][FPPumpAttributes.FB_DUTY_CYCLE_PCT.name] = struct.unpack('f', bytearray( + self.boost_pump[FPBoostPumpNames.P40_PUMP.name][FPPumpAttributes.FB_DUTY_CYCLE_PCT.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_9:MsgFieldPositions.END_POS_FIELD_9]))[0] self.boost_pump_timestamp = timestamp Index: leahi_dialin/td/modules/air_trap.py =================================================================== diff -u -re7d16bd6881619e5fc2a0bc1a7fd578a9978498e -r52aa7af16b98730ba59fc2577dbe8f73b5959775 --- leahi_dialin/td/modules/air_trap.py (.../air_trap.py) (revision e7d16bd6881619e5fc2a0bc1a7fd578a9978498e) +++ leahi_dialin/td/modules/air_trap.py (.../air_trap.py) (revision 52aa7af16b98730ba59fc2577dbe8f73b5959775) @@ -19,7 +19,7 @@ from .constants import RESET, NO_RESET from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions -from leahi_dialin.common.td_defs import AirTrapValves, AirTrapLevelSensors, AirTrapLevelSensorsAttributes, AirTrapState +from leahi_dialin.common.td_defs import TDAirTrapValves, TDAirTrapLevelSensors, TDAirTrapLevelSensorsAttributes, TDAirTrapState from leahi_dialin.protocols.CAN import DenaliMessage, DenaliChannels from leahi_dialin.utils.base import AbstractSubSystem, publish, DialinEnum from leahi_dialin.utils.checks import check_broadcast_interval_override_ms @@ -53,18 +53,18 @@ self._handler_air_trap_sync) self.air_trap_level_sensors = { - AirTrapLevelSensors.H17_LEVEL.name: { - AirTrapLevelSensorsAttributes.LEVEL.name: self.AIR_DETECTED_AT_LEVEL, - AirTrapLevelSensorsAttributes.RAW.name: self.AIR_DETECTED_AT_LEVEL + TDAirTrapLevelSensors.H17_LEVEL.name: { + TDAirTrapLevelSensorsAttributes.LEVEL.name: self.AIR_DETECTED_AT_LEVEL, + TDAirTrapLevelSensorsAttributes.RAW.name: self.AIR_DETECTED_AT_LEVEL }, - AirTrapLevelSensors.H16_LEVEL.name: { - AirTrapLevelSensorsAttributes.LEVEL.name: self.AIR_DETECTED_AT_LEVEL, - AirTrapLevelSensorsAttributes.RAW.name: self.AIR_DETECTED_AT_LEVEL + TDAirTrapLevelSensors.H16_LEVEL.name: { + TDAirTrapLevelSensorsAttributes.LEVEL.name: self.AIR_DETECTED_AT_LEVEL, + TDAirTrapLevelSensorsAttributes.RAW.name: self.AIR_DETECTED_AT_LEVEL } } self.air_trap_valve_states = { - AirTrapValves.H13_VALV.name: 0, - AirTrapValves.H20_VALV.name: 0 + TDAirTrapValves.H13_VALV.name: 0, + TDAirTrapValves.H20_VALV.name: 0 } self.air_control = 0 self.td_air_trap_timestamp = 0.0 @@ -97,12 +97,12 @@ controlling = struct.unpack('i', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_7:MsgFieldPositions.END_POS_FIELD_7])) - self.air_trap_level_sensors[AirTrapLevelSensors.H17_LEVEL.name][AirTrapLevelSensorsAttributes.LEVEL.name] = lower[0] - self.air_trap_level_sensors[AirTrapLevelSensors.H16_LEVEL.name][AirTrapLevelSensorsAttributes.LEVEL.name] = upper[0] - self.air_trap_level_sensors[AirTrapLevelSensors.H17_LEVEL.name][AirTrapLevelSensorsAttributes.RAW.name] = raw_lower[0] - self.air_trap_level_sensors[AirTrapLevelSensors.H16_LEVEL.name][AirTrapLevelSensorsAttributes.RAW.name] = raw_upper[0] - self.air_trap_valve_states[AirTrapValves.H13_VALV.name] = h13_vlv_st[0] - self.air_trap_valve_states[AirTrapValves.H20_VALV.name] = h20_vlv_st[0] + self.air_trap_level_sensors[TDAirTrapLevelSensors.H17_LEVEL.name][TDAirTrapLevelSensorsAttributes.LEVEL.name] = lower[0] + self.air_trap_level_sensors[TDAirTrapLevelSensors.H16_LEVEL.name][TDAirTrapLevelSensorsAttributes.LEVEL.name] = upper[0] + self.air_trap_level_sensors[TDAirTrapLevelSensors.H17_LEVEL.name][TDAirTrapLevelSensorsAttributes.RAW.name] = raw_lower[0] + self.air_trap_level_sensors[TDAirTrapLevelSensors.H16_LEVEL.name][TDAirTrapLevelSensorsAttributes.RAW.name] = raw_upper[0] + self.air_trap_valve_states[TDAirTrapValves.H13_VALV.name] = h13_vlv_st[0] + self.air_trap_valve_states[TDAirTrapValves.H20_VALV.name] = h20_vlv_st[0] self.air_control = controlling[0] self.td_air_trap_timestamp = timestamp @@ -218,8 +218,8 @@ self.logger.debug("Timeout!!!!") return False - def cmd_set_td_air_trap_valve(self, valve: int = AirTrapValves.H13_VALV.value, - valve_state: int = AirTrapState.STATE_CLOSED.value) -> int: + def cmd_set_td_air_trap_valve(self, valve: int = TDAirTrapValves.H13_VALV.value, + valve_state: int = TDAirTrapState.STATE_CLOSED.value) -> int: """ Constructs and sends an open/close command to the TD air trap valves. Index: leahi_dialin/td/modules/blood_flow.py =================================================================== diff -u -r956757fac807b52aec078e84127089db5dff069f -r52aa7af16b98730ba59fc2577dbe8f73b5959775 --- leahi_dialin/td/modules/blood_flow.py (.../blood_flow.py) (revision 956757fac807b52aec078e84127089db5dff069f) +++ leahi_dialin/td/modules/blood_flow.py (.../blood_flow.py) (revision 52aa7af16b98730ba59fc2577dbe8f73b5959775) @@ -19,7 +19,7 @@ from .constants import PUMP_CONTROL_MODE_CLOSED_LOOP, PUMP_CONTROL_MODE_OPEN_LOOP from .constants import RESET, NO_RESET from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions -from leahi_dialin.common.td_defs import BloodFlowMotorAttributes +from leahi_dialin.common.td_defs import TDBloodFlowMotorAttributes from leahi_dialin.protocols.CAN import DenaliMessage, DenaliChannels from leahi_dialin.utils.base import AbstractSubSystem, publish from leahi_dialin.utils.checks import check_broadcast_interval_override_ms @@ -46,15 +46,15 @@ self._handler_blood_flow_sync) self.td_blood_flow_timestamp = 0.0 self.h4_motor = { - BloodFlowMotorAttributes.SET_BLOOD_FLOW_RATE.name: 0, - BloodFlowMotorAttributes.MEASURED_BLOOD_FLOW_RATE.name: 0.0, - BloodFlowMotorAttributes.MEASURED_BLOOD_PUMP_ROTOR_SPEED.name: 0.0, - BloodFlowMotorAttributes.MEASURED_BLOOD_PUMP_SPEED.name: 0.0, - BloodFlowMotorAttributes.MEASURED_BLOOD_PUMP_MOTOR_CURRENT.name: 0.0, - BloodFlowMotorAttributes.SET_RPM.name: 0.0, - BloodFlowMotorAttributes.ROTOR_COUNT.name: 0, - BloodFlowMotorAttributes.PRES_BLOOD_FLOW_RATE.name: 0, - BloodFlowMotorAttributes.ROTOR_HALL_STATE.name: 0 + TDBloodFlowMotorAttributes.SET_BLOOD_FLOW_RATE.name: 0, + TDBloodFlowMotorAttributes.MEASURED_BLOOD_FLOW_RATE.name: 0.0, + TDBloodFlowMotorAttributes.MEASURED_BLOOD_PUMP_ROTOR_SPEED.name: 0.0, + TDBloodFlowMotorAttributes.MEASURED_BLOOD_PUMP_SPEED.name: 0.0, + TDBloodFlowMotorAttributes.MEASURED_BLOOD_PUMP_MOTOR_CURRENT.name: 0.0, + TDBloodFlowMotorAttributes.SET_RPM.name: 0.0, + TDBloodFlowMotorAttributes.ROTOR_COUNT.name: 0, + TDBloodFlowMotorAttributes.PRES_BLOOD_FLOW_RATE.name: 0, + TDBloodFlowMotorAttributes.ROTOR_HALL_STATE.name: 0 } @publish(["td_blood_flow_timestamp", "h4_motor"]) @@ -67,23 +67,23 @@ @return: none """ - self.h4_motor[BloodFlowMotorAttributes.SET_BLOOD_FLOW_RATE.name] = struct.unpack('i', bytearray( + self.h4_motor[TDBloodFlowMotorAttributes.SET_BLOOD_FLOW_RATE.name] = struct.unpack('i', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))[0] - self.h4_motor[BloodFlowMotorAttributes.MEASURED_BLOOD_FLOW_RATE.name] = struct.unpack('f', bytearray( + self.h4_motor[TDBloodFlowMotorAttributes.MEASURED_BLOOD_FLOW_RATE.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2]))[0] - self.h4_motor[BloodFlowMotorAttributes.MEASURED_BLOOD_PUMP_ROTOR_SPEED.name] = struct.unpack('f', bytearray( + self.h4_motor[TDBloodFlowMotorAttributes.MEASURED_BLOOD_PUMP_ROTOR_SPEED.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3]))[0] - self.h4_motor[BloodFlowMotorAttributes.MEASURED_BLOOD_PUMP_SPEED.name] = struct.unpack('f', bytearray( + self.h4_motor[TDBloodFlowMotorAttributes.MEASURED_BLOOD_PUMP_SPEED.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4]))[0] - self.h4_motor[BloodFlowMotorAttributes.MEASURED_BLOOD_PUMP_MOTOR_CURRENT.name] = struct.unpack('f', bytearray( + self.h4_motor[TDBloodFlowMotorAttributes.MEASURED_BLOOD_PUMP_MOTOR_CURRENT.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))[0] - self.h4_motor[BloodFlowMotorAttributes.SET_RPM.name] = struct.unpack('f', bytearray( + self.h4_motor[TDBloodFlowMotorAttributes.SET_RPM.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_6:MsgFieldPositions.END_POS_FIELD_6]))[0] - self.h4_motor[BloodFlowMotorAttributes.ROTOR_COUNT.name] = struct.unpack('I', bytearray( + self.h4_motor[TDBloodFlowMotorAttributes.ROTOR_COUNT.name] = struct.unpack('I', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_7:MsgFieldPositions.END_POS_FIELD_7]))[0] - self.h4_motor[BloodFlowMotorAttributes.PRES_BLOOD_FLOW_RATE.name] = struct.unpack('I', bytearray( + self.h4_motor[TDBloodFlowMotorAttributes.PRES_BLOOD_FLOW_RATE.name] = struct.unpack('I', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_8:MsgFieldPositions.END_POS_FIELD_8]))[0] - self.h4_motor[BloodFlowMotorAttributes.ROTOR_HALL_STATE.name] = struct.unpack('I', bytearray( + self.h4_motor[TDBloodFlowMotorAttributes.ROTOR_HALL_STATE.name] = struct.unpack('I', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_9:MsgFieldPositions.END_POS_FIELD_9]))[0] self.td_blood_flow_timestamp = timestamp Index: leahi_dialin/td/modules/ejector.py =================================================================== diff -u -r956757fac807b52aec078e84127089db5dff069f -r52aa7af16b98730ba59fc2577dbe8f73b5959775 --- leahi_dialin/td/modules/ejector.py (.../ejector.py) (revision 956757fac807b52aec078e84127089db5dff069f) +++ leahi_dialin/td/modules/ejector.py (.../ejector.py) (revision 52aa7af16b98730ba59fc2577dbe8f73b5959775) @@ -19,7 +19,7 @@ from .constants import RESET, NO_RESET from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions -from leahi_dialin.common.td_defs import EjectorNames, EjectorAttributes +from leahi_dialin.common.td_defs import TDEjectorNames, TDEjectorAttributes from leahi_dialin.protocols.CAN import DenaliMessage, DenaliChannels from leahi_dialin.utils.base import AbstractSubSystem, publish from leahi_dialin.utils.checks import check_broadcast_interval_override_ms @@ -49,9 +49,9 @@ self._handler_ejector_sync) self.h5_motor = { - EjectorNames.H5_MOTOR.name: { - EjectorAttributes.STATE.name: 0, - EjectorAttributes.SET_SPEED.name: 0.0 + TDEjectorNames.H5_MOTOR.name: { + TDEjectorAttributes.STATE.name: 0, + TDEjectorAttributes.SET_SPEED.name: 0.0 } } self.td_ejector_timestamp = 0 @@ -64,9 +64,9 @@ @param message: published ejector data message as: ejector state @return: None """ - self.h5_motor[EjectorNames.H5_MOTOR.name][EjectorAttributes.STATE.name] = struct.unpack('i', bytearray( + self.h5_motor[TDEjectorNames.H5_MOTOR.name][TDEjectorAttributes.STATE.name] = struct.unpack('i', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))[0] - self.h5_motor[EjectorNames.H5_MOTOR.name][EjectorAttributes.SET_SPEED.name] = struct.unpack('f', bytearray( + self.h5_motor[TDEjectorNames.H5_MOTOR.name][TDEjectorAttributes.SET_SPEED.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2]))[0] self.td_ejector_timestamp = timestamp Index: leahi_dialin/td/modules/valves.py =================================================================== diff -u -rfd7b62032ac50f7ce1026d4e22ea83f6271b812c -r52aa7af16b98730ba59fc2577dbe8f73b5959775 --- leahi_dialin/td/modules/valves.py (.../valves.py) (revision fd7b62032ac50f7ce1026d4e22ea83f6271b812c) +++ leahi_dialin/td/modules/valves.py (.../valves.py) (revision 52aa7af16b98730ba59fc2577dbe8f73b5959775) @@ -21,7 +21,7 @@ from .constants import NO_RESET from leahi_dialin.common import MsgIds -from leahi_dialin.common.td_defs import ValvesEnum, ValvesPositions, ValvesStates +from leahi_dialin.common.td_defs import TDValvesEnum, TDValvesPositions, TDValvesStates from leahi_dialin.protocols.CAN import DenaliMessage, DenaliChannels from leahi_dialin.utils.base import AbstractSubSystem, publish, DialinEnum from leahi_dialin.utils.checks import check_broadcast_interval_override_ms @@ -70,8 +70,8 @@ self.td_valves_timestamp = 0.0 # A dictionary of the valves with the status - self.valves_status = {ValvesEnum.H1_VALV.name: {}, - ValvesEnum.H19_VALV.name: {}} + self.valves_status = {TDValvesEnum.H1_VALV.name: {}, + TDValvesEnum.H19_VALV.name: {}} @publish(["td_valves_timestamp","valves_status"]) def _handler_valves_sync(self, message: dict, timestamp=0.0) -> None: @@ -94,11 +94,11 @@ message['message'][self.START_POS_VALVES_NEXT_POS:self.END_POS_VALVES_NEXT_POS]))[0] # To make sure values of the enums are not out of range - if ValvesEnum.has_value(vlv_id) and ValvesPositions.has_value(pos_id) and ValvesStates.has_value(pos_id): - vlv_name = ValvesEnum(vlv_id).name + if TDValvesEnum.has_value(vlv_id) and TDValvesPositions.has_value(pos_id) and TDValvesStates.has_value(pos_id): + vlv_name = TDValvesEnum(vlv_id).name # Update the valves dictionary - self.valves_status[vlv_name] = {'Valve': vlv_name, 'PosID': ValvesPositions(pos_id).name, 'PosCnt': pos_cnt, - 'Cmd': next_pos, 'State': ValvesStates(state_id).name} + self.valves_status[vlv_name] = {'Valve': vlv_name, 'PosID': TDValvesPositions(pos_id).name, 'PosCnt': pos_cnt, + 'Cmd': next_pos, 'State': TDValvesStates(state_id).name} self.td_valves_timestamp = timestamp def cmd_valves_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int: @@ -139,8 +139,8 @@ """ Constructs and sends the TD valves set position for a valve - @param valve: integer - Valve number. Defined in ValvesEnum class - @param position: integer - Position number: Defined in ValvesPositions class + @param valve: integer - Valve number. Defined in TDValvesEnum class + @param position: integer - Position number: Defined in TDValvesPositions class @returns 1 if successful, zero otherwise """ @@ -166,7 +166,7 @@ """ Constructs and sends the TD valves home command - @param valve: integer - Valve number. Defined in ValvesEnum class + @param valve: integer - Valve number. Defined in TDValvesEnum 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 @@ -193,7 +193,7 @@ """ Constructs and sends the TD valves set position for a valve - @@param valve: integer - Valve number. Defined in ValvesEnum class + @@param valve: integer - Valve number. Defined in TDValvesEnum class @param position_count: integer value @param reset: integer - 1 to reset a previous override, 0 to override @returns 1 if successful, zero otherwise @@ -212,7 +212,7 @@ # If there is content... if received_message is not None: - self.logger.debug("Setting {} position to {} ".format(str(ValvesEnum(valve).name), position_count)) + self.logger.debug("Setting {} position to {} ".format(str(TDValvesEnum(valve).name), position_count)) # response payload is OK or not OK return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] @@ -224,7 +224,7 @@ """ Constructs and sends the TD valves set position for a valve - @@param valve: integer - Valve number. Defined in ValvesEnum class + @@param valve: integer - Valve number. Defined in TDValvesEnum class @param status: integer value @param reset: integer - 1 to reset a previous override, 0 to override @returns 1 if successful, zero otherwise @@ -243,7 +243,7 @@ # If there is content... if received_message is not None: - self.logger.debug("Setting {} status to {} ".format(str(ValvesEnum(valve).name), status)) + self.logger.debug("Setting {} status to {} ".format(str(TDValvesEnum(valve).name), status)) # response payload is OK or not OK return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] @@ -256,7 +256,7 @@ Constructs and sends a given valve to change position by a given number of encoder counts. - @@param valve: integer - Valve number. Defined in ValvesEnum class + @@param valve: integer - Valve number. Defined in TDValvesEnum class @param count: integer value @returns 1 if successful, zero otherwise """ @@ -273,7 +273,7 @@ # If there is content... if received_message is not None: - self.logger.debug("Setting {} position by {} ".format(str(ValvesEnum(valve).name), counts)) + self.logger.debug("Setting {} position by {} ".format(str(TDValvesEnum(valve).name), counts)) # response payload is OK or not OK return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX]