Index: leahi_dialin/common/__init__.py =================================================================== diff -u -rbe6aa30cfb37a47935f3c114ecece9ee75809909 -r77740bc2ccace473a471515cadd4bc1353360cd6 --- leahi_dialin/common/__init__.py (.../__init__.py) (revision be6aa30cfb37a47935f3c114ecece9ee75809909) +++ leahi_dialin/common/__init__.py (.../__init__.py) (revision 77740bc2ccace473a471515cadd4bc1353360cd6) @@ -23,4 +23,5 @@ from .alarm_priorities import * from .td_defs import * from .dd_defs import * + from .fp_defs import * from .ui_defs import * Index: leahi_dialin/common/fp_defs.py =================================================================== diff -u -r1a7cd1e4a5f691c12086e123bf9294166877a882 -r77740bc2ccace473a471515cadd4bc1353360cd6 --- leahi_dialin/common/fp_defs.py (.../fp_defs.py) (revision 1a7cd1e4a5f691c12086e123bf9294166877a882) +++ leahi_dialin/common/fp_defs.py (.../fp_defs.py) (revision 77740bc2ccace473a471515cadd4bc1353360cd6) @@ -54,4 +54,74 @@ EVENT_DATA_TYPE_S32 = 2 EVENT_DATA_TYPE_F32 = 3 EVENT_DATA_TYPE_BOOL = 4 - NUM_OF_EVENT_DATA_TYPES = 5 \ No newline at end of file + NUM_OF_EVENT_DATA_TYPES = 5 + +@unique +class FPConductivitySensorsEnum(DialinEnum): + P9_COND = 0 # CPi (P9) conductivity sensor value + P18_COND = 1 # CPo (P18) conductivity sensor value + +@unique +class FPFlowSensorNames(DialinEnum): + P7_FLOW = 0 # Water inlet flow sensor (FMS P7) + P16_FLOW = 1 # RO outlet flow sensor (FMP P16) + +@unique +class FPFloaterLevels(DialinEnum): + LEVEL_STATE_LOW = 0 + LEVEL_STATE_MEDIUM = 1 + LEVEL_STATE_HIGH = 2 + LEVEL_STATE_ILLEGAL = 3 + +@unique +class FPPressureSensorNames(DialinEnum): + M1_PRES = 0 + M3_PRES = 1 + P8_PRES = 2 + P13_PRES = 3 + P17_PRES = 4 + X1_PRES = 5 + X2_PRES = 6 + X3_PRES = 7 + X4_PRES = 8 + +@unique +class FPTemperaturesNames(DialinEnum): + P10_TEMP = 0 # P10 temperature from inlet conductivity sensor. + P19_TEMP = 1 # P19 temperature from outlet conductivity sensor. + M1_TEMP = 2 # Temperature before pressure regulator (M1) + M3_TEMP = 3 # Temperature after pressure regulator (M3) + P8_TEMP = 4 # Temperature before inlet conductivity sensor (P8) + P13_TEMP = 5 # Temperature before RO filter (P13) + P17_TEMP = 6 # Temperature after RO filter (P17) + X1_TEMP = 7 # Temperature before RO pump (X1) + X2_TEMP = 8 # Temperature RO Concentrate + X3_TEMP = 9 # Temperature RO Concentrate drop + X4_TEMP = 10 # Temperature drain drop + P7_TEMP = 11 # Temperature at p7 flow meter + P16_TEMP = 12 # Temperature at p16 flow meter + NUM_OF_TEMPERATURE_SENSORS = 13 # Number of Temperature Sensors + +@unique +class FPValveStates(DialinEnum): + VALVE_STATE_CLOSED = 0 + VALVE_STATE_OPEN = 1 + +@unique +class FPValveNames(DialinEnum): + M4_VALV = 0 # Valve (M4 VWi) + P39_VALV = 1 # Valve (P39 VROd) + P6_VALV = 2 # Valve (P6 VFF) + P11_VALV = 3 # Valve (P11 VPi) + P33_VALV = 4 # Valve (P33 VCr) + P34_VALV = 5 # Valve (P34 VCb) + P37_VALV = 6 # Valve (P37 VCd) + M7_VALV = 7 # Valve (M7) + P20_VALV = 8 # Valve (P20) + P43_VALV = 9 # Valve (P43) + NUM_OF_VALVES = 10 # Number of valves + +@unique +class FPPumpNames(DialinEnum): + P12_PUMP_RO = 0 + P40_PUMP_BOOSTER = 1 \ No newline at end of file Index: leahi_dialin/dd/dialysate_delivery.py =================================================================== diff -u -r256ffed682a9c78ee890a3f3132eb6c6518e7ee8 -r77740bc2ccace473a471515cadd4bc1353360cd6 --- leahi_dialin/dd/dialysate_delivery.py (.../dialysate_delivery.py) (revision 256ffed682a9c78ee890a3f3132eb6c6518e7ee8) +++ leahi_dialin/dd/dialysate_delivery.py (.../dialysate_delivery.py) (revision 77740bc2ccace473a471515cadd4bc1353360cd6) @@ -102,6 +102,8 @@ self.dd_operation_sub_mode = 0 self.dd_logged_in = False self.dd_set_logged_in_status(False) + self.dd_version = None + self.dd_fpga_version = None self.dd_debug_events = [''] * self._DD_DEBUG_EVENT_LIST_COUNT self.dd_debug_event_index = 0 self.dd_last_debug_event = '' Index: leahi_dialin/fp/modules/conductivity_sensors.py =================================================================== diff -u -r68422d08c4141999a13496343264483a32314d37 -r77740bc2ccace473a471515cadd4bc1353360cd6 --- leahi_dialin/fp/modules/conductivity_sensors.py (.../conductivity_sensors.py) (revision 68422d08c4141999a13496343264483a32314d37) +++ leahi_dialin/fp/modules/conductivity_sensors.py (.../conductivity_sensors.py) (revision 77740bc2ccace473a471515cadd4bc1353360cd6) @@ -25,11 +25,6 @@ from leahi_dialin.utils.conversions import integer_to_bytearray, float_to_bytearray -@unique -class FPConductivitySensorsEnum(DialinEnum): - P9_COND = 0 # CPi (P9) conductivity sensor value - P18_COND = 1 # CPo (P18) conductivity sensor value - class FPConductivitySensors(AbstractSubSystem): """ Dialin API sub-class for conductivity sensors related commands. Index: leahi_dialin/fp/modules/flow_sensors.py =================================================================== diff -u -r793bdf7874cacd0f85b11d684bedacc699232f08 -r77740bc2ccace473a471515cadd4bc1353360cd6 --- leahi_dialin/fp/modules/flow_sensors.py (.../flow_sensors.py) (revision 793bdf7874cacd0f85b11d684bedacc699232f08) +++ leahi_dialin/fp/modules/flow_sensors.py (.../flow_sensors.py) (revision 77740bc2ccace473a471515cadd4bc1353360cd6) @@ -25,12 +25,6 @@ from leahi_dialin.utils.conversions import integer_to_bytearray, float_to_bytearray -@unique -class FPFlowSensorNames(DialinEnum): - P7_FLOW = 0 # Water inlet flow sensor (FMS P7) - P16_FLOW = 1 # RO outlet flow sensor (FMP P16) - - class FPFlowSensors(AbstractSubSystem): """ Index: leahi_dialin/fp/modules/levels.py =================================================================== diff -u -r68422d08c4141999a13496343264483a32314d37 -r77740bc2ccace473a471515cadd4bc1353360cd6 --- leahi_dialin/fp/modules/levels.py (.../levels.py) (revision 68422d08c4141999a13496343264483a32314d37) +++ leahi_dialin/fp/modules/levels.py (.../levels.py) (revision 77740bc2ccace473a471515cadd4bc1353360cd6) @@ -25,14 +25,7 @@ from leahi_dialin.utils.checks import check_broadcast_interval_override_ms from leahi_dialin.utils.conversions import integer_to_bytearray, float_to_bytearray -@unique -class FPFloaterLevels(DialinEnum): - LEVEL_STATE_LOW = 0 - LEVEL_STATE_MEDIUM = 1 - LEVEL_STATE_HIGH = 2 - LEVEL_STATE_ILLEGAL = 3 - class FPLevels(AbstractSubSystem): """ Index: leahi_dialin/fp/modules/pressure_sensors.py =================================================================== diff -u -r6e95e1705ce73dd7f159564b2ac3fde75f29b215 -r77740bc2ccace473a471515cadd4bc1353360cd6 --- leahi_dialin/fp/modules/pressure_sensors.py (.../pressure_sensors.py) (revision 6e95e1705ce73dd7f159564b2ac3fde75f29b215) +++ leahi_dialin/fp/modules/pressure_sensors.py (.../pressure_sensors.py) (revision 77740bc2ccace473a471515cadd4bc1353360cd6) @@ -25,19 +25,6 @@ from leahi_dialin.utils.conversions import integer_to_bytearray, float_to_bytearray -@unique -class FPPressureSensorNames(DialinEnum): - M1_PRES = 0 - M3_PRES = 1 - P8_PRES = 2 - P13_PRES = 3 - P17_PRES = 4 - X1_PRES = 5 - X2_PRES = 6 - X3_PRES = 7 - X4_PRES = 8 - - class FPPressureSensors(AbstractSubSystem): """ Dialin API sub-class for FP pressure sensor related commands. Index: leahi_dialin/fp/modules/temperatures.py =================================================================== diff -u -rbb3864d4cd7a4e121dd63b0cae2148e66c270b93 -r77740bc2ccace473a471515cadd4bc1353360cd6 --- leahi_dialin/fp/modules/temperatures.py (.../temperatures.py) (revision bb3864d4cd7a4e121dd63b0cae2148e66c270b93) +++ leahi_dialin/fp/modules/temperatures.py (.../temperatures.py) (revision 77740bc2ccace473a471515cadd4bc1353360cd6) @@ -18,28 +18,13 @@ from logging import Logger from .constants import NO_RESET, RESET +from leahi_dialin.common.fp_defs import FPTemperaturesNames from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions 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 from leahi_dialin.utils.conversions import integer_to_bytearray, float_to_bytearray -@unique -class FPTemperaturesNames(DialinEnum): - P10_TEMP = 0 # P10 temperature from inlet conductivity sensor. - P19_TEMP = 1 # P19 temperature from outlet conductivity sensor. - M1_TEMP = 2 # Temperature before pressure regulator (M1) - M3_TEMP = 3 # Temperature after pressure regulator (M3) - P8_TEMP = 4 # Temperature before inlet conductivity sensor (P8) - P13_TEMP = 5 # Temperature before RO filter (P13) - P17_TEMP = 6 # Temperature after RO filter (P17) - X1_TEMP = 7 # Temperature before RO pump (X1) - X2_TEMP = 8 # Temperature RO Concentrate - X3_TEMP = 9 # Temperature RO Concentrate drop - X4_TEMP = 10 # Temperature drain drop - P7_TEMP = 11 # Temperature at p7 flow meter - P16_TEMP = 12 # Temperature at p16 flow meter - NUM_OF_TEMPERATURE_SENSORS = 13 # Number of Temperature Sensors class FPTemperatureSensors(AbstractSubSystem): Index: leahi_dialin/fp/modules/valves.py =================================================================== diff -u -raa57954b051832ccde447e46463baf87487c316b -r77740bc2ccace473a471515cadd4bc1353360cd6 --- leahi_dialin/fp/modules/valves.py (.../valves.py) (revision aa57954b051832ccde447e46463baf87487c316b) +++ leahi_dialin/fp/modules/valves.py (.../valves.py) (revision 77740bc2ccace473a471515cadd4bc1353360cd6) @@ -20,37 +20,19 @@ from collections import OrderedDict from .constants import NO_RESET +from leahi_dialin.common.fp_defs import FPValveStates, FPValveNames from leahi_dialin.common.msg_defs import MsgIds 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 from leahi_dialin.utils.conversions import integer_to_bytearray + # Valve states ENERGIZED = True DEENERGIZED = False -@unique -class FPValveStates(DialinEnum): - VALVE_STATE_CLOSED = 0 - VALVE_STATE_OPEN = 1 - - -@unique -class FPValveNames(DialinEnum): - M4_VALV = 0 # Valve (M4 VWi) - P39_VALV = 1 # Valve (P39 VROd) - P6_VALV = 2 # Valve (P6 VFF) - P11_VALV = 3 # Valve (P11 VPi) - P33_VALV = 4 # Valve (P33 VCr) - P34_VALV = 5 # Valve (P34 VCb) - P37_VALV = 6 # Valve (P37 VCd) - M7_VALV = 7 # Valve (M7) - P20_VALV = 8 # Valve (P20) - P43_VALV = 9 # Valve (P43) - NUM_OF_VALVES = 10 # Number of valves - class FPValves(AbstractSubSystem): """ Dialin API sub-class for FP valve related commands. Index: leahi_dialin/fp/modules/water_pumps.py =================================================================== diff -u -rac550fc5ccf5b2e56edf65e328b57cde7d4a2d60 -r77740bc2ccace473a471515cadd4bc1353360cd6 --- leahi_dialin/fp/modules/water_pumps.py (.../water_pumps.py) (revision ac550fc5ccf5b2e56edf65e328b57cde7d4a2d60) +++ leahi_dialin/fp/modules/water_pumps.py (.../water_pumps.py) (revision 77740bc2ccace473a471515cadd4bc1353360cd6) @@ -24,12 +24,7 @@ from leahi_dialin.utils.checks import check_broadcast_interval_override_ms from leahi_dialin.utils.conversions import integer_to_bytearray, float_to_bytearray -@unique -class FPPumpNames(DialinEnum): - P12_PUMP_RO = 0 - P40_PUMP_BOOSTER = 1 - class FPPumps(AbstractSubSystem): """ Dialin API sub-class for FP water pump driver related commands.