Index: leahi_dialin/common/dd_defs.py =================================================================== diff -u -rd3147dff7c95e3ab5a507591ce5b9e1e74911a19 -r3fe3a53d3b5a54a6a06fc6511beeca9a36bd8ba0 --- leahi_dialin/common/dd_defs.py (.../dd_defs.py) (revision d3147dff7c95e3ab5a507591ce5b9e1e74911a19) +++ leahi_dialin/common/dd_defs.py (.../dd_defs.py) (revision 3fe3a53d3b5a54a6a06fc6511beeca9a36bd8ba0) @@ -8,7 +8,7 @@ # @file dd_defs.py # # @author (last) Zoltan Miskolci -# @date (last) 13-Jan-2026 +# @date (last) 28-Jan-2026 # @author (original) Peter Lucia # @date (original) 22-Jun-2021 # @@ -18,11 +18,12 @@ from aenum import extend_enum from typing import TYPE_CHECKING +from .defs_base import Defs_Base from .global_vars import GlobalVariables, test_config_change from ..utils.base import DialinEnum -class DD_Defs: +class DD_Defs(Defs_Base): # IDE autocomplete support if TYPE_CHECKING: @@ -113,356 +114,376 @@ 'DDValveStates': '_create_dd_valve_states', } - def __init__(self): - self.update_enums() - def __getattr__(self, name) -> DialinEnum: - if name in self._properties: - enum = getattr(self, self._properties[name])() - setattr(self, name, enum) - return enum - raise AttributeError(name) - - - def update_enums(self) -> None: - for prop_name in self._properties: - # Cleans the cached value - self.__dict__.pop(prop_name, None) - - # Reinitializing the enum as it's not in the cache - self.__getattr__(prop_name) - - - # ================================================== Enum Creators: Operations ================================================== def _create_dd_operation_modes(self): members = { - 'MODE_FAUL': 0, # Fault Mode - 'MODE_SERV': 1, # Service Mode - 'MODE_INIT': 2, # Initialization & POST Mode - 'MODE_STAN': 3, # Standby Mode - 'MODE_PREG': 4, # Pre-generate Dialysate Mode - 'MODE_GEND': 5, # Generate Dialysate Mode - 'MODE_POSG': 6, # Post-generate Dialysate Mode - 'MODE_HEAT': 7, # Heat Disinfect Mode - 'MODE_HCOL': 8, # Cooling Mode - 'MODE_ROPS': 9, # RO Permeate Sample Mode - 'MODE_NLEG': 10, # Non-legal Mode - an illegitimate mode transition has occurred - 'NUM_OF_DD_MODES': 11, # Number of Modes for the DD + # Official Name : Accepted strings + 'MODE_FAUL': ['fault'], # Fault mode + 'MODE_SERV': ['service'], # Service mode + 'MODE_INIT': ['initialization'], # Initialization & POST mode + 'MODE_STAN': ['standby'], # Standby mode + 'MODE_PREG': ['pre-gen dialysate', 'pre-generate dialysate'], # Pre-generate Dialysate Mode + 'MODE_GEND': ['generate dialysate'], # Generate Dialysate Mode + 'MODE_POSG': ['post-gen dialysate', 'post-generate dialysate'], # Post-generate Dialysate Mode + 'MODE_HEAT': ['heat disinfect', 'disinfect', 'heating'], # Heat Disinfect Mode + 'MODE_HCOL': ['cooling'], # Cooling Mode + 'MODE_ROPS': ['sampling', 'ro sampling', 'ro permeate sampling'], # RO Permeate Sample Mode + 'MODE_NLEG': ['not legal'], # Not legal - an illegal mode transition occurred + 'NUM_OF_DD_MODES': [], # Number of Modes for the DD } - return unique(DialinEnum('DDOpModes', members)) + created_enum = unique(DialinEnum('DDOpModes', self.create_members(members))) + created_enum._str_list = members + created_enum.from_str = classmethod(self.from_str) + return created_enum def _create_dd_fault_states(self): members = { - 'DD_FAULT_STATE_START': 0, # DD fault start state - 'DD_FAULT_DEENERGIZED_STATE': 1, # DD fault de-energized state - 'DD_FAULT_ENERGIZED_STATE': 2, # DD fault energized state - 'NUM_OF_DD_FAULT_STATES': 3, # Number of fault mode states + # Official Name : Accepted strings + 'DD_FAULT_STATE_START': ['fault start'], # DD Fault Start State + 'DD_FAULT_DEENERGIZED_STATE': ['fault deenergized'], # DD Fault De-energized State + 'DD_FAULT_ENERGIZED_STATE': ['fault energized'], # DD Fault Energized State + 'NUM_OF_FP_FAULT_STATES': [], # Number of Fault Mode State } - return unique(DialinEnum('DDFaultStates', members)) + created_enum = unique(DialinEnum('DDFaultStates', self.create_members(members))) + created_enum._str_list = members + created_enum.from_str = classmethod(self.from_str) + return created_enum + def _create_dd_fault_nvdata_states(self): members = { - 'DD_FAULT_STATE_START': 0, # DD fault start state - 'DD_FAULT_STATE_RUN_NV_POSTS': 1, # DD fault run RTC and NV data management post - 'DD_FAULT_STATE_COMPLETE': 2, # DD fault complete - 'NUM_OF_DD_FAULT_NVDATA_STATES': 3, # Number of fault mode NV Data management states + # Official Name : Accepted strings + 'DD_FAULT_STATE_START': ['start'], # DD fault start state + 'DD_FAULT_STATE_RUN_NV_POSTS': ['running'], # DD fault run RTC and NV data management post + 'DD_FAULT_STATE_COMPLETE': ['complete', 'done'], # DD fault complete + 'NUM_OF_DD_FAULT_NVDATA_STATES': [], # Number of fault mode NV Data management states } - return unique(DialinEnum('DDFaultNVDataStates', members)) + created_enum = unique(DialinEnum('DDFaultNVDataStates', self.create_members(members))) + created_enum._str_list = members + created_enum.from_str = classmethod(self.from_str) + return created_enum def _create_dd_service_states(self): members = { - 'DD_SERVICE_STATE_START': 0, # Start service mode state - 'NUM_OF_DD_SERVICE_STATES': 1, # Number of service mode states + # Official Name : Accepted strings + 'DD_SERVICE_STATE_START': ['start', 'service start'], # Start service mode state + 'NUM_OF_DD_SERVICE_STATES': [], # Number of service mode states } - return unique(DialinEnum('DDServiceStates', members)) + created_enum = unique(DialinEnum('DDServiceStates', self.create_members(members))) + created_enum._str_list = members + created_enum.from_str = classmethod(self.from_str) + return created_enum def _create_dd_init_states(self): members = { - 'DD_POST_STATE_START': 0, # Post Generate Dialysate Start State - 'DD_POST_STATE_FW_COMPATIBILITY': 1, # Firmware Compatibility State - 'DD_POST_STATE_FW_INTEGRITY': 2, # Firmware Integrity State - 'DD_POST_STATE_FPGA': 3, # FPGA State - 'DD_POST_STATE_NVDATAMGMT': 4, # Non-volatile Data Management State - 'DD_POST_STATE_TEMPERATURE_SENSORS': 5, # Temperature Sensors State - 'DD_POST_STATE_PRESSURES': 6, # Pressure Sensors State - 'DD_POST_STATE_DIALYSATE_PUMPS': 7, # Dialysate Pumps State - 'DD_POST_STATE_CONCENTRATE_PUMPS': 8, # Concentrate Pumps State - 'DD_POST_STATE_CONDUCTIVITY_SENSORS': 9, # Conductivity Sensors State - 'DD_POST_STATE_WATCHDOG': 10, # Watchdog State - 'DD_POST_STATE_SAFETY_SHUTDOWN': 11, # Safety Shutdown State - 'DD_POST_STATE_COMPLETED': 12, # Post Generate Dialysate Completed State - 'DD_POST_STATE_FAILED': 13, # Post Generate Dialysate Fail State - 'NUM_OF_DD_POST_STATES': 14, # Number of Post Generate Dialysate States + # Official Name : Accepted strings + 'DD_POST_STATE_START': ['start'], # Post Generate Dialysate Start State + 'DD_POST_STATE_FW_COMPATIBILITY': ['fw compatibility'], # Firmware Compatibility State + 'DD_POST_STATE_FW_INTEGRITY': ['fw integrity'], # Firmware Integrity State + 'DD_POST_STATE_FPGA': ['fpga'], # FPGA State + 'DD_POST_STATE_NVDATAMGMT': ['nv data management', 'data management'], # Non-volatile Data Management State + 'DD_POST_STATE_TEMPERATURE_SENSORS': ['temperature sensors check'], # Temperature Sensors State + 'DD_POST_STATE_PRESSURES': ['pressures check'], # Pressure Sensors State + 'DD_POST_STATE_DIALYSATE_PUMPS': ['dialysate pumps check'], # Dialysate Pumps State + 'DD_POST_STATE_CONCENTRATE_PUMPS': ['concentrate pumps check'], # Concentrate Pumps State + 'DD_POST_STATE_CONDUCTIVITY_SENSORS': ['conductivity sensors check'], # Conductivity Sensors State + 'DD_POST_STATE_WATCHDOG': ['watchdog'], # Watchdog State + 'DD_POST_STATE_SAFETY_SHUTDOWN': ['safety shutdown'], # Safety Shutdown State + 'DD_POST_STATE_COMPLETED': ['completed', 'done'], # Post Generate Dialysate Completed State + 'DD_POST_STATE_FAILED': ['failed'], # Post Generate Dialysate Fail State + 'NUM_OF_DD_POST_STATES': [], # Number of Post Generate Dialysate States } - return unique(DialinEnum('DDInitStates', members)) + created_enum = unique(DialinEnum('DDInitStates', self.create_members(members))) + created_enum._str_list = members + created_enum.from_str = classmethod(self.from_str) + return created_enum def _create_dd_standby_states(self): members = { - 'DD_STANDBY_MODE_STATE_IDLE': 0, # Idle standby mode state - 'DD_STANDBY_MODE_STATE_PAUSE': 1, # Pause state - 'NUM_OF_DD_STANDBY_MODE_STATES': 2, # Number of standby mode states + # Official Name : Accepted strings + 'DD_STANDBY_MODE_STATE_IDLE': ['idle'], # Idle standby mode state + 'DD_STANDBY_MODE_STATE_PAUSE': ['paused'], # Pause state + 'NUM_OF_DD_STANDBY_MODE_STATES': [], # Number of standby mode states } - return unique(DialinEnum('DDStandbyStates', members)) + created_enum = unique(DialinEnum('DDStandbyStates', self.create_members(members))) + created_enum._str_list = members + created_enum.from_str = classmethod(self.from_str) + return created_enum def _create_dd_pregen_states(self): members = { - 'DD_PRE_GEN_DIALYSATE_HYD_CHAMBER_FILL_CHECK': 0, # DD Pre-Gen Dialysate hyrochamber fill check - 'DD_PRE_GEN_WET_SELF_TEST': 1, # DD Pre-Gen Wet Self Test - 'DD_PRE_GEN_DIALYSATE_WAIT_FOR_GEND': 2, # DD Pre-Gen Dialysate Wait for Gen Dialysate state transition - 'NUM_OF_DD_PRE_GEN_DIALYSATE_STATES': 3, # Number of Pre-Gen Dialysate mode states + # Official Name : Accepted strings + 'DD_PRE_GEN_DIALYSATE_HYD_CHAMBER_FILL_CHECK': ['fill check', 'hydro chamber fill check'], # DD Pre-Gen Dialysate hyrochamber fill check + 'DD_PRE_GEN_WET_SELF_TEST': ['self test', 'wet self test'], # DD Pre-Gen Wet Self Test + 'DD_PRE_GEN_DIALYSATE_WAIT_FOR_GEND': ['wait for state transition'], # DD Pre-Gen Dialysate Wait for Gen Dialysate state transition + 'NUM_OF_DD_PRE_GEN_DIALYSATE_STATES': [], # Number of Pre-Gen Dialysate mode states } + created_enum = unique(DialinEnum('DDPreGenDialysateStates', self.create_members(members))) + created_enum._str_list = members + created_enum.from_str = classmethod(self.from_str) + return created_enum - return unique(DialinEnum('DDPreGenDialysateStates', members)) - def _create_dd_gen_states(self): members = { - 'DD_GEND_STATE_START': 0, # Gen dialysate start state - 'DD_GEND_DIALYSATE_BYPASS_STATE': 1, # Gen dialysate - Bypass dialysate state - 'DD_GEND_DIALYSATE_DELIVERY_STATE': 2, # Gen dialysate - deliver dialysate state - 'DD_GEND_ISOLATED_UF_STATE': 3, # Gen dialysate - Isolated ultrafiltration state - 'DD_GEND_SPENT_CHAMBER_FILL_STATE': 4, # Gen dialysate - spent chamber fill state - 'DD_GEND_BICARB_CHAMBER_FILL_STATE': 5, # Gen dialysate - bicarb chamber fill state - 'DD_GEND_DIALYSATE_DELIVERY_PAUSE': 6, # Gen dialysate - dialysate delivery pause state - 'NUM_OF_DD_GEND_MODE_STATES': 7, # Number of gen dialysate states + # Official Name : Accepted strings + 'DD_GEND_STATE_START': ['start'], # Gen dialysate start state + 'DD_GEND_DIALYSATE_BYPASS_STATE': ['dialysate delivery bypass', 'bypass'], # Gen dialysate - Bypass dialysate state + 'DD_GEND_DIALYSATE_DELIVERY_STATE': ['dialysate delivery'], # Gen dialysate - deliver dialysate state + 'DD_GEND_ISOLATED_UF_STATE': ['uf', 'ultrafiltration'], # Gen dialysate - Isolated ultrafiltration state + 'DD_GEND_SPENT_CHAMBER_FILL_STATE': ['spent chamber fill'], # Gen dialysate - spent chamber fill state + 'DD_GEND_BICARB_CHAMBER_FILL_STATE': ['bicarb chamber fill'], # Gen dialysate - bicarb chamber fill state + 'DD_GEND_DIALYSATE_DELIVERY_PAUSE': ['dialysate delivery pause', 'pause'], # Gen dialysate - dialysate delivery pause state + 'NUM_OF_DD_GEND_MODE_STATES': [], # Number of gen dialysate states } + created_enum = unique(DialinEnum('DDGenDialysateModeStates', self.create_members(members))) + created_enum._str_list = members + created_enum.from_str = classmethod(self.from_str) + return created_enum - return unique(DialinEnum('DDGenDialysateModeStates', members)) - def _create_dd_postgen_states(self): members = { - 'DD_POST_GEN_DIALYSATE_STATE_START': 0, # DD Post-Gen Dialysate state start - 'DD_POST_GEN_DIALYSATE_STATE_COMPLETE': 1, # DD Post-Gen Dialysate complete state - 'NUM_OF_DD_POST_GEN_DIALYSATE_STATES': 2, # Number of Post-Gen Dialysate mode states + # Official Name : Accepted strings + 'DD_POST_GEN_DIALYSATE_STATE_START': ['start'], # DD Post-Gen Dialysate state start + 'DD_POST_GEN_DIALYSATE_STATE_COMPLETE': ['complete', 'done'], # DD Post-Gen Dialysate complete state + 'NUM_OF_DD_POST_GEN_DIALYSATE_STATES': [], # Number of Post-Gen Dialysate mode states } + created_enum = unique(DialinEnum('DDPostGenDialysateStates', self.create_members(members))) + created_enum._str_list = members + created_enum.from_str = classmethod(self.from_str) + return created_enum - return unique(DialinEnum('DDPostGenDialysateStates', members)) - def _create_dd_heat_disinfect_states(self): members = { - 'DD_HEAT_DISINFECT_STATE_START': 0, # Heat disinfect, start mode state - 'DD_HEAT_DISINFECT_STATE_COMPLETE': 1, # Heat disinfect, complete state - 'NUM_OF_DD_HEAT_DISINFECT_STATES': 2 # Number of heat disinfect mode states + # Official Name : Accepted strings + 'DD_HEAT_DISINFECT_STATE_START': ['start'], # Heat disinfect, start mode state + 'DD_HEAT_DISINFECT_STATE_COMPLETE': ['done', 'complete'], # Heat disinfect, complete state + 'NUM_OF_DD_HEAT_DISINFECT_STATES': [] # Number of heat disinfect mode states } - return unique(DialinEnum('DDHeatDisinfectStates', members)) + created_enum = unique(DialinEnum('DDHeatDisinfectStates', self.create_members(members))) + created_enum._str_list = members + created_enum.from_str = classmethod(self.from_str) + return created_enum def _create_dd_heater_cooling_states(self): members = { - 'NUM_OF_DD_HEAT_COOL_STATES': 0, # Number of Heater Cooling states + # Official Name : Accepted strings + 'NUM_OF_DD_HEAT_COOL_STATES': [], # Number of Heater Cooling states } - return unique(DialinEnum('DDHeaterCoolingStates', members)) + created_enum = unique(DialinEnum('DDHeaterCoolingStates', self.create_members(members))) + created_enum._str_list = members + created_enum.from_str = classmethod(self.from_str) + return created_enum def _create_dd_ro_permeate_states(self): members = { - 'NUM_OF_RO_PERMEATE_STATES': 0, # Number of RO Permeate states + # Official Name : Accepted strings + 'NUM_OF_RO_PERMEATE_STATES': [], # Number of RO Permeate states } - return unique(DialinEnum('DDROPermeateStates', members)) + created_enum = unique(DialinEnum('DDROPermeateStates', self.create_members(members))) + created_enum._str_list = members + created_enum.from_str = classmethod(self.from_str) + return created_enum def _create_dd_not_legal_states(self): members = { - 'NUM_OF_NOT_LEGAL_STATES': 0, # Number of Not Legal states + # Official Name : Accepted strings + 'NUM_OF_NOT_LEGAL_STATES': [], # Number of Not Legal states } - return unique(DialinEnum('DDNotLegalStates', members)) + created_enum = unique(DialinEnum('DDNotLegalStates', self.create_members(members))) + created_enum._str_list = members + created_enum.from_str = classmethod(self.from_str) + return created_enum def _create_dd_event_list(self): members = { - 'DD_EVENT_STARTUP': 0, # DD startup event - 'DD_EVENT_OP_MODE_CHANGE': 1, # DD Op mode change event - 'DD_EVENT_SUB_MODE_CHANGE': 2, # DD Op sub-mode change event - 'DD_EVENT_OPERATION_STATUS': 3, # DD operation status event - 'DD_EVENT_D6_LEVL_CHANGE': 4, # DD floater level change event - 'DD_EVENT_D63_LEVL_CHANGE': 5, # DD bicarb level change event - 'DD_EVENT_D46_LEVL_CHANGE': 6, # DD spent dialysate air seperation level change event - 'DD_EVENT_TD_COMMUNICATION_LOSS': 7, # DD TD communication loss - 'DD_EVENT_TEMPERATURE_DRIFT': 8, # DD dialysate temperature drift - 'DD_EVENT_BLOOD_LEAK_ZEROING_REQUEST': 9, # DD blood leak zeroing request - 'DD_EVENT_BLOOD_LEAK_ZEROING_REQUIRED': 10, # DD blood leak zeroing required - 'DD_EVENT_BLOOD_LEAK_NUM_OF_SET_POINT_CHECK_FAILURES': 11, # DD blood leak number of setpoint check failures - 'DD_EVENT_BLOOD_LEAK_SELF_TEST_RESULT': 12, # DD blood leak self test result - 'NUM_OF_DD_EVENT_IDS': 13, # Total number of DD events + # Official Name : Accepted strings + 'DD_EVENT_STARTUP': ['startup'], # DD startup event + 'DD_EVENT_OP_MODE_CHANGE': ['op mode change', 'operation mode change'], # DD Op mode change event + 'DD_EVENT_SUB_MODE_CHANGE': ['sub mode change'], # DD Op sub-mode change event + 'DD_EVENT_OPERATION_STATUS': ['status', 'operation status'], # DD operation status event + 'DD_EVENT_D6_LEVL_CHANGE': ['d6 level change'], # DD floater level change event + 'DD_EVENT_D63_LEVL_CHANGE': ['d63 level change'], # DD bicarb level change event + 'DD_EVENT_D46_LEVL_CHANGE': ['d46 level change'], # DD spent dialysate air seperation level change event + 'DD_EVENT_TD_COMMUNICATION_LOSS': ['td communication loss'], # DD TD communication loss + 'DD_EVENT_TEMPERATURE_DRIFT': ['temperature drift'], # DD dialysate temperature drift + 'DD_EVENT_BLOOD_LEAK_ZEROING_REQUEST': ['blood leak zeroing request'], # DD blood leak zeroing request + 'DD_EVENT_BLOOD_LEAK_ZEROING_REQUIRED': ['blood leak zeroing required'], # DD blood leak zeroing required + 'DD_EVENT_BLOOD_LEAK_NUM_OF_SET_POINT_CHECK_FAILURES': ['blood leak check failed'], # DD blood leak number of setpoint check failures + 'DD_EVENT_BLOOD_LEAK_SELF_TEST_RESULT': ['blood leak self test'], # DD blood leak self test result + 'NUM_OF_DD_EVENT_IDS': [], # Total number of DD events } - return unique(DialinEnum('DDEventList', members)) + created_enum = unique(DialinEnum('DDEventList', self.create_members(members))) + created_enum._str_list = members + created_enum.from_str = classmethod(self.from_str) + return created_enum def _create_dd_event_data_types(self): members = { - 'EVENT_DATA_TYPE_NONE': 0, # No Event Data Type - 'EVENT_DATA_TYPE_U32': 1, # Unsigned 32bit Event Data Type - 'EVENT_DATA_TYPE_S32': 2, # Signed 32bit Event Data Type - 'EVENT_DATA_TYPE_F32': 3, # Float 32bit Event Data Type - 'EVENT_DATA_TYPE_BOOL': 4, # Boolean Event Data Type - 'NUM_OF_EVENT_DATA_TYPES': 5, # Number of Event Data Types + # Official Name : Accepted strings + 'EVENT_DATA_TYPE_NONE': ['none'], # No Event Data Type + 'EVENT_DATA_TYPE_U32': ['u32'], # Unsigned 32bit Event Data Type + 'EVENT_DATA_TYPE_S32': ['s32'], # Signed 32bit Event Data Type + 'EVENT_DATA_TYPE_F32': ['f32'], # Float 32bit Event Data Type + 'EVENT_DATA_TYPE_BOOL': ['bool', 'boolean'], # Boolean Event Data Type + 'NUM_OF_EVENT_DATA_TYPES': [], # Number of Event Data Types } - return unique(DialinEnum('DDEventDataTypes', members)) - + created_enum = unique(DialinEnum('DDEventDataTypes', self.create_members(members))) + created_enum._str_list = members + created_enum.from_str = classmethod(self.from_str) + return created_enum + # ================================================== Enum Creators: Names ================================================== def _create_dd_concentrate_pump_names(self): members = { - 'D11_CP1_ACID': 0, # Acid Concentrate Pump - 'D10_CP2_BICARB': 1, # Bicarbonate Concentrate Pump - 'D76_UF': 2, # Ultrafiltration Concentrate Pump - 'NUM_OF_CONCENTRATE_PUMPS': 3, # Number of Concentrate Pumps + # Official Name : Accepted strings + 'D11_CP1_ACID': ['d11', 'acid', 'acid pump'], # Acid Concentrate Pump + 'D10_CP2_BICARB': ['d10', 'bicarb', 'bicarb pump'], # Bicarbonate Concentrate Pump + 'D76_UF': ['d76', 'uf pump', 'ultrafiltration pump'], # Ultrafiltration Concentrate Pump + 'NUM_OF_CONCENTRATE_PUMPS': [], # Number of Concentrate Pumps } - return unique(DialinEnum('DDConcentratePumpNames', members)) + created_enum = unique(DialinEnum('DDConcentratePumpNames', self.create_members(members))) + created_enum._str_list = members + created_enum.from_str = classmethod(self.from_str) + return created_enum def _create_dd_conductivity_sensor_names(self): members = { - '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 - 'D43_COND': 3, # Self Test Conductivity Sensor (not used for dialysate conductivity) - 'D74_COND': 4, # Water and Bicarbonate Collective Conductivity Sensor - 'D98_COND': 5, # D98 Conductivity Sensor - 'NUM_OF_CONDUCTIVITY_SENSORS': 6 # Number of Conductivity Sensors + # Official Name : Accepted strings + 'D17_COND': ['d17'], # Closed Loop Control of Dosing for D74 Conductivity Sensor + 'D27_COND': ['d27'], # Closed Loop Control of Dosing for D29 Conductivity Sensor + 'D29_COND': ['d29'], # Water, Bicarbonate, and Acid Collective Conductivity Sensor + 'D43_COND': ['d43'], # Self Test Conductivity Sensor (not used for dialysate conductivity) + 'D74_COND': ['d74'], # Water and Bicarbonate Collective Conductivity Sensor + 'D98_COND': ['d98'], # D98 Conductivity Sensor + 'NUM_OF_CONDUCTIVITY_SENSORS': [] # Number of Conductivity Sensors } - return unique(DialinEnum('DDConductivitySensorNames', members)) + created_enum = unique(DialinEnum('DDConductivitySensorNames', self.create_members(members))) + created_enum._str_list = members + created_enum.from_str = classmethod(self.from_str) + return created_enum def _create_dd_dialysate_pump_names(self): members = { - 'D12_PUMP': 0, # Fresh Dialysate Pump - 'D48_PUMP': 1, # Spent Dialysate Pump - 'NUM_OF_DIALYSATE_PUMPS': 2, # Number of Dialysate Pumps + # Official Name : Accepted strings + 'D12_PUMP': ['d12'], # Fresh Dialysate Pump + 'D48_PUMP': ['d48'], # Spent Dialysate Pump + 'NUM_OF_DIALYSATE_PUMPS': [], # Number of Dialysate Pumps } - return unique(DialinEnum('DDDialysatePumpNames', members)) + created_enum = unique(DialinEnum('DDDialysatePumpNames', self.create_members(members))) + created_enum._str_list = members + created_enum.from_str = classmethod(self.from_str) + return created_enum def _create_dd_heater_names(self): members = { - 'D5_HEAT': 0, # Primary heater - 'D45_HEAT': 1, # Trimmer heater - 'NUM_OF_DD_HEATERS': 2, # Number of Heaters + # Official Name : Accepted strings + 'D5_HEAT': ['d5'], # Primary heater + 'D45_HEAT': ['d45'], # Trimmer heater + 'NUM_OF_DD_HEATERS': [], # Number of Heaters } - return unique(DialinEnum('DDHeaterNames', members)) + created_enum = unique(DialinEnum('DDHeaterNames', self.create_members(members))) + created_enum._str_list = members + created_enum.from_str = classmethod(self.from_str) + return created_enum def _create_dd_level_sensor_names(self): - if GlobalVariables().HW_BETA_1_9 == True: - members = { - 'D6_LEVEL': 0, # floater switch low, medium and high status - 'D63_LEVEL': 1, # bicarb level low or high status - 'D46_LEVEL': 2, # Spent dialysate air separation chamber level low or high status - 'D98_LEVEL': 3, # D98 Conductivity Level Sensor - 'NUM_OF_LEVELS': 4, # Number of Level Sensors - } - else: - members = { - 'D6_LEVEL': 0, # floater switch low, medium and high status - 'D63_LEVEL': 1, # bicarb level low or high status - 'D46_LEVEL': 2, # Spent dialysate air separation chamber level low or high status - 'D98_LEVEL': 3, # D98 Conductivity Level Sensor - 'NUM_OF_LEVELS': 4, # Number of Level Sensors - } - return unique(DialinEnum('DDLevelSensorNames', members)) + members = { + # Official Name : Accepted strings + 'D6_LEVEL': ['d6'], # floater switch low, medium and high status + 'D63_LEVEL': ['d63'], # bicarb level low or high status + 'D46_LEVEL': ['d46'], # Spent dialysate air separation chamber level low or high status + 'D98_LEVEL': ['d98'], # D98 Conductivity Level Sensor + 'NUM_OF_LEVELS': [], # Number of Level Sensors + } + created_enum = unique(DialinEnum('DDLevelSensorNames', self.create_members(members))) + created_enum._str_list = members + created_enum.from_str = classmethod(self.from_str) + return created_enum def _create_dd_piston_pump_names(self): members = { - 'ACID': 0, # Acid piston pump - 'BICARB': 1, # Bicarbonate piston pump - 'UF': 2, # Ultrafiltration piston pump - 'NUM_OF_PISTON_PUMPS': 3, # Number of piston pumps + # Official Name : Accepted strings + 'ACID': ['d11', 'acid', 'acid pump'], # Acid piston pump + 'BICARB': ['d10', 'bicarb', 'bicarb pump'], # Bicarbonate piston pump + 'UF': ['d76', 'uf pump', 'ultrafiltration pump'], # Ultrafiltration piston pump + 'NUM_OF_PISTON_PUMPS': [], # Number of piston pumps } - return unique(DialinEnum('DDPistonPumpNames', members)) + created_enum = unique(DialinEnum('DDPistonPumpNames', self.create_members(members))) + created_enum._str_list = members + created_enum.from_str = classmethod(self.from_str) + return created_enum def _create_dd_pressure_sensor_names(self): - if GlobalVariables().HW_BETA_1_9 == True: - members = { - 'D9_PRES': 0, # Hydraulics outlet pressure (PHo/Pn) - 'D66_PRES': 1, # Dry Bicarb pressure (PDB/PCb) - 'D51_PRES': 2, # Spent Dialysate pressure (PDs) - 'D18_PRES': 3, # Fresh Dialysate pressure (PDf) - 'D41_PRES': 4, # Transmembrane pressure (Ptm) - 'D87_PRES': 5, # D87 Pressure Sensor - 'NUM_OF_PRESSURE_SENSORS': 6, # Number of pressure sensors - } - else: - members = { - 'D9_PRES': 0, # Hydraulics outlet pressure (PHo/Pn) - 'D66_PRES': 1, # Dry Bicarb pressure (PDB/PCb) - 'D51_PRES': 2, # Spent Dialysate pressure (PDs) - 'D18_PRES': 3, # Fresh Dialysate pressure (PDf) - 'D41_PRES': 4, # Transmembrane pressure (Ptm) - 'D87_PRES': 5, # D87 Pressure Sensor - 'NUM_OF_PRESSURE_SENSORS': 6, # Number of pressure sensors - } - return unique(DialinEnum('DDPressureSensorNames', members)) + members = { + # Official Name : Accepted strings + 'D9_PRES': ['d9'], # Hydraulics outlet pressure (PHo/Pn) + 'D66_PRES': ['d66'], # Dry Bicarb pressure (PDB/PCb) + 'D51_PRES': ['d51'], # Spent Dialysate pressure (PDs) + 'D18_PRES': ['d18'], # Fresh Dialysate pressure (PDf) + 'D41_PRES': ['d41'], # Transmembrane pressure (Ptm) + 'D87_PRES': ['d87'], # D87 Pressure Sensor + 'NUM_OF_PRESSURE_SENSORS': [], # Number of pressure sensors + } + created_enum = unique(DialinEnum('DDPressureSensorNames', self.create_members(members))) + created_enum._str_list = members + created_enum.from_str = classmethod(self.from_str) + return created_enum def _create_dd_temperature_sensor_names(self): - if GlobalVariables().HW_BETA_1_9 == True: - members = { - 'D1_TEMP': 0, # Heat exchanger Inlet temperature sensor - 'D78_TEMP': 1, # Heat exchanger Outlet temperature sensor - 'D4_TEMP': 2, # Hydraulics primary heater temperature sensor - 'D50_TEMP': 3, # Trimmer heater temperature sensor - 'D99_TEMP': 4, # D98(D99) Conductivity sensor temperature value - 'BRD_TEMP': 5, # Barometric temperature sensor - 'D16_TEMP': 6, # D16(D17) Conductivity sensor temperature value - 'D28_TEMP': 7, # D28(D27) Conductivity sensor temperature value - 'D30_TEMP': 8, # D30(D29) Conductivity sensor temperature value - 'D44_TEMP': 9, # D44(D43) Conductivity sensor temperature value - 'D75_TEMP': 10, # D75(D74) Conductivity sensor temperature value - 'D99_TEMP': 11, # D98(D99) Conductivity sensor temperature value - 'D4_AVG_TEMP': 11, # D4 Filtered value - 'D50_AVG_TEMP': 12, # D50 Filtered value - 'D99_AVG_TEMP': 13, # D99 Filtered value - 'D28_AVG_TEMP': 14, # D28 Filtered value - 'D30_AVG_TEMP': 15, # D30 Filtered value - 'D9_TEMP': 16, # D9 Pressure sensor temperature value - 'D66_TEMP': 17, # D66 Pressure sensor temperature value - 'D51_TEMP': 18, # D51 Pressure sensor temperature value - 'D18_TEMP': 19, # D18 Pressure sensor temperature value - 'D41_TEMP': 20, # D41 Pressure sensor temperature value - 'D87_TEMP': 21, # D87 Pressure sensor temperature value - 'NUM_OF_TEMP_SENSORS': 22, # Number of Temperature Sensors - } - else: - members = { - 'D1_TEMP': 0, # Heat exchanger Inlet temperature sensor - 'D78_TEMP': 1, # Heat exchanger Outlet temperature sensor - 'D4_TEMP': 2, # Hydraulics primary heater temperature sensor - 'D50_TEMP': 3, # Trimmer heater temperature sensor - 'D99_TEMP': 4, # D98(D99) Conductivity sensor temperature value - 'BRD_TEMP': 5, # Barometric temperature sensor - 'D16_TEMP': 6, # D16(D17) Conductivity sensor temperature value - 'D28_TEMP': 7, # D28(D27) Conductivity sensor temperature value - 'D30_TEMP': 8, # D30(D29) Conductivity sensor temperature value - 'D44_TEMP': 9, # D44(D43) Conductivity sensor temperature value - 'D75_TEMP': 10, # D75(D74) Conductivity sensor temperature value - 'D99_TEMP': 11, # D98(D99) Conductivity sensor temperature value - 'D4_AVG_TEMP': 11, # D4 Filtered value - 'D50_AVG_TEMP': 12, # D50 Filtered value - 'D99_AVG_TEMP': 13, # D99 Filtered value - 'D28_AVG_TEMP': 14, # D28 Filtered value - 'D30_AVG_TEMP': 15, # D30 Filtered value - 'D9_TEMP': 16, # D9 Pressure sensor temperature value - 'D66_TEMP': 17, # D66 Pressure sensor temperature value - 'D51_TEMP': 18, # D51 Pressure sensor temperature value - 'D18_TEMP': 19, # D18 Pressure sensor temperature value - 'D41_TEMP': 20, # D41 Pressure sensor temperature value - 'D87_TEMP': 21, # D87 Pressure sensor temperature value - 'NUM_OF_TEMP_SENSORS': 22, # Number of Temperature Sensors - } - created_enum = DialinEnum('DDTemperatureSensorNames', members) + members = { + # Official Name : Accepted strings + 'D1_TEMP': ['d1'], # Heat exchanger Inlet temperature sensor + 'D78_TEMP': ['d78'], # Heat exchanger Outlet temperature sensor + 'D4_TEMP': ['d4'], # Hydraulics primary heater temperature sensor + 'D50_TEMP': ['d50'], # Trimmer heater temperature sensor + 'D99_TEMP': ['d90'], # D98(D99) Conductivity sensor temperature value + 'BRD_TEMP': ['brd', 'board'], # Barometric temperature sensor + 'D16_TEMP': ['d16'], # D16(D17) Conductivity sensor temperature value + 'D28_TEMP': ['d28'], # D28(D27) Conductivity sensor temperature value + 'D30_TEMP': ['d30'], # D30(D29) Conductivity sensor temperature value + 'D44_TEMP': ['d44'], # D44(D43) Conductivity sensor temperature value + 'D75_TEMP': ['d75'], # D75(D74) Conductivity sensor temperature value + 'D4_AVG_TEMP': ['d4 avg', 'd4 average'], # D4 Filtered value + 'D50_AVG_TEMP': ['d50 avg', 'd50 average'], # D50 Filtered value + 'D99_AVG_TEMP': ['d99 avg', 'd99 average'], # D99 Filtered value + 'D28_AVG_TEMP': ['d28 avg', 'd28 average'], # D28 Filtered value + 'D30_AVG_TEMP': ['d39 avg', 'd39 average'], # D30 Filtered value + 'D9_TEMP': ['d9'], # D9 Pressure sensor temperature value + 'D66_TEMP': ['d66'], # D66 Pressure sensor temperature value + 'D51_TEMP': ['d51'], # D51 Pressure sensor temperature value + 'D18_TEMP': ['d18'], # D18 Pressure sensor temperature value + 'D41_TEMP': ['d41'], # D41 Pressure sensor temperature value + 'D87_TEMP': ['d87'], # D87 Pressure sensor temperature value + 'NUM_OF_TEMP_SENSORS': [], # Number of Temperature Sensors + } + created_enum = unique(DialinEnum('DDTemperatureSensorNames', self.create_members(members))) + created_enum._str_list = members + created_enum.from_str = classmethod(self.from_str) # Add aliases extend_enum(created_enum, 'FIRST_PRESSURE_SENSOR', created_enum.D9_TEMP.value) @@ -485,195 +506,256 @@ def _create_dd_valve_names(self): members = { - 'D14_VALV': 0, # Valve Hydraulics Outlet (D14) - 'D52_VALV': 1, # Valve Thermal Disinfect (D52) - 'D8_VALV': 2, # Valve Hydraulics Bypass (D8) - 'D54_VALV': 3, # Valve Rinse Port (D54) - 'D53_VALV': 4, # Valve Drain (D53) - 'D34_VALV': 5, # Valve Dialyzer Bypass (D34) - 'D64_VALV': 6, # Valve Purge 1 (D64) - 'D31_VALV': 7, # Valve Pressure Test (D31) - 'D65_VALV': 8, # Valve DryBcarb Inlet (D65) - 'D35_VALV': 9, # Valve Dialyzer Inlet (D35) - 'D40_VALV': 10, # Valve Dialyzer Outlet (D40) - 'D47_VALV': 11, # Valve Dialysate Out Purge 2 (D47) - 'D3_VALV': 12, # Valve Hydraulics Inlet (D3) - 'D80_VALV': 13, # Valve Dry Bicarb (D80) - 'D81_VALV': 14, # Valve De-scaler (D81) - 'D85_VALV': 15, # Valve De-scaler (D85) - 'D23_VALV': 16, # Balancing chamber Valve 1 (D23) - 'D19_VALV': 17, # Balancing chamber Valve 2 (D19) - 'D25_VALV': 18, # Balancing chamber Valve 3 (D25) - 'D21_VALV': 19, # Balancing chamber Valve 4 (D21) - 'D24_VALV': 20, # Balancing chamber Valve 5 (D24) - 'D20_VALV': 21, # Balancing chamber Valve 6 (D20) - 'D26_VALV': 22, # Balancing chamber Valve 7 (D26) - 'D22_VALV': 23, # Balancing chamber Valve 8 (D22) - 'D79_PMP_VALV': 24, # D79 pump mapped to Spare Valve 0 - 'D83_VALV': 25, # D83 De-scaler Valve mapped to Spare Valve 1 - 'D91_VALV': 26, # D91 De-scaler Valve mapped to Spare Valve 2 - 'SPARE3_VALV': 27, # Spare Valve 3 - 'SPARE4_VALV': 28, # Spare Valve 4 - 'SPARE5_VALV': 29, # Spare Valve 5 - 'D100_VALV': 30, # D100 De-scaler Valve mapped to Spare Valve 6 - 'SPARE7_VALV': 31, # Spare Valve 7 - 'NUM_OF_DD_VALVES': 32, # Number of Valves for the DD + # Official Name : Accepted strings + 'D14_VALV': ['d14'], # Valve Hydraulics Outlet (D14) + 'D52_VALV': ['d52'], # Valve Thermal Disinfect (D52) + 'D8_VALV': ['d8'], # Valve Hydraulics Bypass (D8) + 'D54_VALV': ['d54'], # Valve Rinse Port (D54) + 'D53_VALV': ['d53'], # Valve Drain (D53) + 'D34_VALV': ['d34'], # Valve Dialyzer Bypass (D34) + 'D64_VALV': ['d64'], # Valve Purge 1 (D64) + 'D31_VALV': ['d31'], # Valve Pressure Test (D31) + 'D65_VALV': ['d65'], # Valve DryBcarb Inlet (D65) + 'D35_VALV': ['d35'], # Valve Dialyzer Inlet (D35) + 'D40_VALV': ['d40'], # Valve Dialyzer Outlet (D40) + 'D47_VALV': ['d47'], # Valve Dialysate Out Purge 2 (D47) + 'D3_VALV': ['d3'], # Valve Hydraulics Inlet (D3) + 'D80_VALV': ['d80'], # Valve Dry Bicarb (D80) + 'D81_VALV': ['d81'], # Valve De-scaler (D81) + 'D85_VALV': ['d85'], # Valve De-scaler (D85) + 'D23_VALV': ['d23'], # Balancing chamber Valve 1 (D23) + 'D19_VALV': ['d19'], # Balancing chamber Valve 2 (D19) + 'D25_VALV': ['d25'], # Balancing chamber Valve 3 (D25) + 'D21_VALV': ['d21'], # Balancing chamber Valve 4 (D21) + 'D24_VALV': ['d24'], # Balancing chamber Valve 5 (D24) + 'D20_VALV': ['d20'], # Balancing chamber Valve 6 (D20) + 'D26_VALV': ['d26'], # Balancing chamber Valve 7 (D26) + 'D22_VALV': ['d22'], # Balancing chamber Valve 8 (D22) + 'D79_PMP_VALV': ['d79'], # D79 pump mapped to Spare Valve 0 + 'D83_VALV': ['d83'], # D83 De-scaler Valve mapped to Spare Valve 1 + 'D91_VALV': ['d91'], # D91 De-scaler Valve mapped to Spare Valve 2 + 'SPARE3_VALV': ['spare3'], # Spare Valve 3 + 'SPARE4_VALV': ['spare4'], # Spare Valve 4 + 'SPARE5_VALV': ['spare5'], # Spare Valve 5 + 'D100_VALV': ['d100'], # D100 De-scaler Valve mapped to Spare Valve 6 + 'SPARE7_VALV': ['spare7'], # Spare Valve 7 + 'NUM_OF_DD_VALVES': [], # Number of Valves for the DD } - return unique(DialinEnum('DDValveNames', members)) + created_enum = unique(DialinEnum('DDValveNames', self.create_members(members))) + created_enum._str_list = members + created_enum.from_str = classmethod(self.from_str) + return created_enum def _create_dd_monitored_voltages(self): members = { - 'MONITORED_LINE_1_2V': 0, # Processor voltage (1.2V) - 'MONITORED_LINE_3_3V': 1, # Logic voltage (3.3V) - 'MONITORED_LINE_5V_LOGIC': 2, # Logic voltage (5V) - 'MONITORED_LINE_24V_1': 3, # Actuators voltage (24V) - 'MONITORED_LINE_24V_2': 4, # Actuators regen voltage (24V) - 'MONITORED_LINE_FPGA_VCC_V': 5, # FPGA Vcc (3V) - 'MONITORED_LINE_FPGA_AUX_V': 6, # FPGA Vaux (3V) - 'MONITORED_LINE_FPGA_PVN_V': 7, # FPGA Vpvn (1V) - 'NUM_OF_MONITORED_VOLTAGE_LINES': 8, # Number of TD operation modes + # Official Name : Accepted strings + 'MONITORED_LINE_1_2V': ['1.2v'], # Processor voltage (1.2V) + 'MONITORED_LINE_3_3V': ['3.3v'], # Logic voltage (3.3V) + 'MONITORED_LINE_5V_LOGIC': ['5v'], # Logic voltage (5V) + 'MONITORED_LINE_24V_1': ['24v line 1'], # Actuators voltage (24V) + 'MONITORED_LINE_24V_2': ['24v line 1'], # Actuators regen voltage (24V) + 'MONITORED_LINE_FPGA_VCC_V': ['fpga vcc'], # FPGA Vcc (3V) + 'MONITORED_LINE_FPGA_AUX_V': ['fpga aux'], # FPGA Vaux (3V) + 'MONITORED_LINE_FPGA_PVN_V': ['fpga pvn'], # FPGA Vpvn (1V) + 'NUM_OF_MONITORED_VOLTAGE_LINES': [], # Number of TD operation modes } - return unique(DialinEnum('DDMonitoredVoltages', members)) + created_enum = unique(DialinEnum('DDMonitoredVoltages', self.create_members(members))) + created_enum._str_list = members + created_enum.from_str = classmethod(self.from_str) + return created_enum # ================================================== Enum Creators: Support ================================================== def _create_dd_balancing_chamber_states(self): members = { - 'BAL_CHAMBER_STATE_START': 0, # Initial state of balancing chamber - 'BAL_CHAMBER_STATE1_FILL_START': 1, # Balancing chamber state 1 fill start state - 'BAL_CHAMBER_STATE1_BICARB_ACID_DOSING_CNTRL': 2, # Balancing Chamber state 1 Bicarb and acid dosing control state - 'BAL_CHAMBER_STATE1_FILL_END': 3, # Balancing Chamber state 1 fill end state - 'BAL_CHAMBER_STATE2_FILL_START': 4, # Balancing chamber state 2 fill start state - 'BAL_CHAMBER_STATE2_BICARB_ACID_DOSING_CNTRL': 5, # Balancing Chamber state 2 Bicarb and acid dosing control state - 'BAL_CHAMBER_STATE2_FILL_END': 6, # Balancing Chamber state 2 fill end state - 'NUM_OF_BAL_CHAMBER_EXEC_STATES': 7, # Number of balancing chamber states + # Official Name : Accepted strings + 'BAL_CHAMBER_STATE_START': ['start'], # Initial state of balancing chamber + 'BAL_CHAMBER_STATE1_FILL_START': ['state 1 fill start'], # Balancing chamber state 1 fill start state + 'BAL_CHAMBER_STATE1_BICARB_ACID_DOSING_CNTRL': ['state 1 bicarb acid dosing control', 'state 1 dosing control'], # Balancing Chamber state 1 Bicarb and acid dosing control state + 'BAL_CHAMBER_STATE1_FILL_END': ['state 1 fill end'], # Balancing Chamber state 1 fill end state + 'BAL_CHAMBER_STATE2_FILL_START': ['state 2 fill start'], # Balancing chamber state 2 fill start state + 'BAL_CHAMBER_STATE2_BICARB_ACID_DOSING_CNTRL': ['state 2 bicarb acid dosing control', 'state 2 dosing control'], # Balancing Chamber state 2 Bicarb and acid dosing control state + 'BAL_CHAMBER_STATE2_FILL_END': ['state 2 fill end'], # Balancing Chamber state 2 fill end state + 'NUM_OF_BAL_CHAMBER_EXEC_STATES': [], # Number of balancing chamber states } - return unique(DialinEnum('DDBalancingChamberStates', members)) + created_enum = unique(DialinEnum('DDBalancingChamberStates', self.create_members(members))) + created_enum._str_list = members + created_enum.from_str = classmethod(self.from_str) + return created_enum def _create_dd_balancing_chamber_switch_states(self): members = { - 'BAL_CHAMBER_SW_STATE1': 0, # Balancing chamber switching state 1 (V2,V5 and V3, V8 open, rest closed) - 'BAL_CHAMBER_SW_STATE2': 1, # Balancing chamber switching state 2 ( V1,V6 and V4, V7 open, rest closed) - 'NUM_OF_BAL_CHAMBER_SW': 2, # Number of balancing chamber states + # Official Name : Accepted strings + 'BAL_CHAMBER_SW_STATE1': ['state 1'], # Balancing chamber switching state 1 (V2,V5 and V3, V8 open, rest closed) + 'BAL_CHAMBER_SW_STATE2': ['state 2'], # Balancing chamber switching state 2 ( V1,V6 and V4, V7 open, rest closed) + 'NUM_OF_BAL_CHAMBER_SW': [], # Number of balancing chamber states } - return unique(DialinEnum('DDBalancingChamberSwitchStates', members)) + created_enum = unique(DialinEnum('DDBalancingChamberSwitchStates', self.create_members(members))) + created_enum._str_list = members + created_enum.from_str = classmethod(self.from_str) + return created_enum def _create_dd_blood_leak_states(self): members = { - 'BLOOD_LEAK_WAIT_FOR_POST_STATE': 0, # - 'BLOOD_LEAK_CHECK_SET_POINT_STATE': 1, # - 'BLOOD_LEAK_INIT_STATE': 2, # - 'BLOOD_LEAK_CHECK_ZERO_AND_SELF_TEST_STATE': 3, # - 'BLOOD_LEAK_VERIFY_INTENSITY_AFTER_ZEROING_STATE': 4, # - 'BLOOD_LEAK_NORMAL_STATE': 5, # - 'BLOOD_LEAK_RECOVER_BLOOD_DETECT_STATE': 6, # - 'NUM_OF_BLOOD_LEAK_STATES': 7, # Number of blood leak states + # Official Name : Accepted strings + 'BLOOD_LEAK_WAIT_FOR_POST_STATE': ['wait for post', 'wait'], # + 'BLOOD_LEAK_CHECK_SET_POINT_STATE': ['check set point'], # + 'BLOOD_LEAK_INIT_STATE': ['init'], # + 'BLOOD_LEAK_CHECK_ZERO_AND_SELF_TEST_STATE': ['check zero and self test'], # + 'BLOOD_LEAK_VERIFY_INTENSITY_AFTER_ZEROING_STATE': ['verify', 'verify intensity after zeroing'], # + 'BLOOD_LEAK_NORMAL_STATE': ['normal'], # + 'BLOOD_LEAK_RECOVER_BLOOD_DETECT_STATE': ['recover blood', 'recover blood detect'], # + 'NUM_OF_BLOOD_LEAK_STATES': [], # Number of blood leak states } - return unique(DialinEnum('DDBloodLeakStates', members)) + created_enum = unique(DialinEnum('DDBloodLeakStates', self.create_members(members))) + created_enum._str_list = members + created_enum.from_str = classmethod(self.from_str) + return created_enum def _create_dd_concentrate_pump_attributes(self): members = { - 'CURRENT_STATE': 0, # Current State Concentrate Pump Attribute - 'CURRENT_SET_SPEED': 1, # Current Set Speed Concentrate Pump Attribute - 'MEASURED_SPEED': 2, # Measured Speed Concentrate Pump Attribute - 'TARGET_SPEED': 3, # Target Speed Concentrate Pump Attribute - 'PULSE_US': 4, # Hall Sensor Pulse Width (in micro seconds) Concentrate Pump Attribute - 'TARGET_REV_COUNT': 5, # Target Revolutions Concentrate Pump Attribute - 'MEASURED_REV_COUNT': 6, # Measured Revolutions Concentrate Pump Attribute - 'PARKED': 7, # Parked Concentrate Pump Attribute - 'PARK_FAULT': 8, # Park Fault Concentrate Pump Attribute - 'NUM_OF_D10_D11_CONCENTRATE_PUMP_ATTRIBUTES': 9, # Number of Acid (D11) and Bicarbonate (D10) Concentrate Pump Attributes + # Official Name : Accepted strings + 'CURRENT_STATE': ['current state'], # Current State Concentrate Pump Attribute + 'CURRENT_SET_SPEED': ['current speed'], # Current Set Speed Concentrate Pump Attribute + 'MEASURED_SPEED': ['measured speed'], # Measured Speed Concentrate Pump Attribute + 'TARGET_SPEED': ['target speed'], # Target Speed Concentrate Pump Attribute + 'PULSE_US': ['pulse'], # Hall Sensor Pulse Width (in micro seconds) Concentrate Pump Attribute + 'TARGET_REV_COUNT': ['target revolutions count', 'target rev count'], # Target Revolutions Concentrate Pump Attribute + 'MEASURED_REV_COUNT': ['measured revolutions count', 'measured rev count'], # Measured Revolutions Concentrate Pump Attribute + 'PARKED': ['parked'], # Parked Concentrate Pump Attribute + 'PARK_FAULT': ['fault', 'park fault'], # Park Fault Concentrate Pump Attribute + 'NUM_OF_D10_D11_CONCENTRATE_PUMP_ATTRIBUTES': [], # Number of Acid (D11) and Bicarbonate (D10) Concentrate Pump Attributes } - return unique(DialinEnum('DDConcentratePumpAttributes', members)) + created_enum = unique(DialinEnum('DDConcentratePumpAttributes', self.create_members(members))) + created_enum._str_list = members + created_enum.from_str = classmethod(self.from_str) + return created_enum def _create_dd_concentrate_pump_states(self): members = { - 'CONCENTRATE_PUMP_OFF_STATE': 0, # Concentrate Pump Off State - 'CONCENTRATE_PUMP_RAMP_TO_TARGET_SPEED_STATE': 1, # Ramp to Target Speed Concentrate Pump State - 'CONCENTRATE_PUMP_CONTROL_TARGET_SPEED_STATE': 2, # Control Target Speed Concentrate Pump State - 'NUM_OF_CONCENTRATE_PUMP_STATES': 3, # Number of Concentrate Pump States + # Official Name : Accepted strings + 'CONCENTRATE_PUMP_OFF_STATE': ['off'], # Concentrate Pump Off State + 'CONCENTRATE_PUMP_RAMP_TO_TARGET_SPEED_STATE': ['ramp to target speed'], # Ramp to Target Speed Concentrate Pump State + 'CONCENTRATE_PUMP_CONTROL_TARGET_SPEED_STATE': ['control target speed'], # Control Target Speed Concentrate Pump State + 'NUM_OF_CONCENTRATE_PUMP_STATES': [], # Number of Concentrate Pump States } - return unique(DialinEnum('DDConcentratePumpStates', members)) + created_enum = unique(DialinEnum('DDConcentratePumpStates', self.create_members(members))) + created_enum._str_list = members + created_enum.from_str = classmethod(self.from_str) + return created_enum def _create_dd_dialysate_pump_attributes(self): members = { - 'TARGET_RPM': 0, # Target RPM Dialysate Pump Attribute - 'MEASURED_SPEED': 1, # Measured Speed Dialysate Pump Attribute - 'CURRENT_SPEED': 2, # Current Speed Dialysate Pump Attribute - 'STATE': 3, # State to command Dialysate Pump Attribute - 'TARGET_PRESSURE': 4, # Target Pressure Dialysate Pump Attribute - 'MEASURED_PRESSURE': 5, # Measured Pressure Dialysate Pump Attribute - 'MEASURED_CURRENT': 6, # Measured Current Dialysate Pump Attribute - 'CONTROL': 7, # Pump Run/Stop Control Pump Attribute - 'DIRECTION_ERROR_COUNT': 8, # Direction Error Count Dialysate Pump Attribute - 'MEASURED_DIRECTION': 9, # Measured Direction Dialysate Pump Attribute - 'NUM_OF_DIALYSATE_PUMP_ATTRIBUTES': 10, # Number of Dialysate Pump Attributes + # Official Name : Accepted strings + 'TARGET_RPM': ['target rp,'], # Target RPM Dialysate Pump Attribute + 'MEASURED_SPEED': ['measured speed'], # Measured Speed Dialysate Pump Attribute + 'CURRENT_SPEED': ['current speed'], # Current Speed Dialysate Pump Attribute + 'STATE': ['state'], # State to command Dialysate Pump Attribute + 'TARGET_PRESSURE': ['target pressure'], # Target Pressure Dialysate Pump Attribute + 'MEASURED_PRESSURE': ['measured pressure'], # Measured Pressure Dialysate Pump Attribute + 'MEASURED_CURRENT': ['measured pressure'], # Measured Current Dialysate Pump Attribute + 'CONTROL': ['control'], # Pump Run/Stop Control Pump Attribute + 'DIRECTION_ERROR_COUNT': ['direction error count', 'error count'], # Direction Error Count Dialysate Pump Attribute + 'MEASURED_DIRECTION': ['measured direction'], # Measured Direction Dialysate Pump Attribute + 'NUM_OF_DIALYSATE_PUMP_ATTRIBUTES': [], # Number of Dialysate Pump Attributes } - return unique(DialinEnum('DDDialysatePumpAttributes', members)) + created_enum = unique(DialinEnum('DDDialysatePumpAttributes', self.create_members(members))) + created_enum._str_list = members + created_enum.from_str = classmethod(self.from_str) + return created_enum def _create_dd_dialysate_pump_states(self): members = { - 'DIALYSATE_PUMP_OFF_STATE': 0, # Dialysate Pump Off State - 'DIALYSATE_PUMP_RAMP_UP_STATE': 1, # Dialysate Pump Ramp Up State - 'DIALYSATE_PUMP_CONTROL_TO_TARGET_STATE': 2, # Dialysate Pump Control to Target State - 'NUM_OF_DIALYSATE_PUMP_STATES': 3, # Number of Dialysate Pump States + # Official Name : Accepted strings + 'DIALYSATE_PUMP_OFF_STATE': ['off'], # Dialysate Pump Off State + 'DIALYSATE_PUMP_RAMP_UP_STATE': ['ramp up'], # Dialysate Pump Ramp Up State + 'DIALYSATE_PUMP_CONTROL_TO_TARGET_STATE': ['control to target'], # Dialysate Pump Control to Target State + 'NUM_OF_DIALYSATE_PUMP_STATES': [], # Number of Dialysate Pump States } - return unique(DialinEnum('DDDialysatePumpsStates', members)) + created_enum = unique(DialinEnum('DDDialysatePumpsStates', self.create_members(members))) + created_enum._str_list = members + created_enum.from_str = classmethod(self.from_str) + return created_enum def _create_dd_heater_start_stop(self): - return unique(DialinEnum('DDHeaterStartStop', {'STOP': 0, 'START': 1})) + members = { + # Official Name : Accepted strings + 'STOP': ['stop'], + 'START': ['start'], + } + created_enum = unique(DialinEnum('DDHeaterStartStop', self.create_members(members))) + created_enum._str_list = members + created_enum.from_str = classmethod(self.from_str) + return created_enum def _create_dd_heater_attributes(self): members = { - '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 - 'DUTY_CYCLE_COUNT': 3, # Duty Cycle Count Attribute for Heaters - 'PWM_PERIOD': 4, # Pulse Width Modulation Attribute for Heaters - 'ADJUSTED_TARGET_TEMP': 5, # Adjusted Target Temperature Attribute for Heaters - 'TARGET_TEMP_TD': 6, # Target Temperature Attribute for Heaters - 'NUM_OF_DD_HEATER_ATTRIBUTES': 7, # Number of Heater Attributes + # Official Name : Accepted strings + 'HEAT_DUTY_CYCLE': ['duty cycle'], # Heat Duty Cycle Attribute for Heaters + 'HEAT_TARGET_TEMP': ['target temperature', 'target temp'], # Target Temperature Attribute for Heaters + 'HEAT_STATE': ['state', 'heat state'], # State to command Attribute for Heaters + 'DUTY_CYCLE_COUNT': ['duty cycle count'], # Duty Cycle Count Attribute for Heaters + 'PWM_PERIOD': ['pwm', 'pwm period'], # Pulse Width Modulation Attribute for Heaters + 'ADJUSTED_TARGET_TEMP': ['adjusted target temperature', 'adj target temp'], # Adjusted Target Temperature Attribute for Heaters + 'TARGET_TEMP_TD': ['target temperature td', 'target temp td'], # Target Temperature Attribute for Heaters + 'NUM_OF_DD_HEATER_ATTRIBUTES': [], # Number of Heater Attributes } - return unique(DialinEnum('DDHeaterAttributes', members)) + created_enum = unique(DialinEnum('DDHeaterAttributes', self.create_members(members))) + created_enum._str_list = members + created_enum.from_str = classmethod(self.from_str) + return created_enum def _create_dd_heater_exec_states(self): members = { - '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_EXEC_STATE': 4, # Number of Heater Execution States + # Official Name : Accepted strings + 'HEATER_EXEC_STATE_OFF': ['heater off', 'off'], # Heater Execution Off State + 'HEATER_EXEC_STATE_RAMP_TO_TARGET': ['ramp to target'], # Heater Execution Ramp to Target State + 'HEATER_EXEC_STATE_CONTROL_TO_TARGET': ['control to target'], # Heater Execution Control to Target State + 'HEATER_EXEC_STATE_CONTROL_TO_DISINFECT_TARGET': ['control to disinfect target'], # Heater Execution Control to Disinfection State + 'NUM_OF_HEATERS_EXEC_STATE': [], # Number of Heater Execution States } - return unique(DialinEnum('DDHeaterExecState', members)) + created_enum = unique(DialinEnum('DDHeaterExecState', self.create_members(members))) + created_enum._str_list = members + created_enum.from_str = classmethod(self.from_str) + return created_enum def _create_dd_piston_pump_attributes(self): members = { - 'CONTROL_STATE': 0, # Control State for the Piston Pumps - 'SW_COUNTER': 1, # Software counter attribute for the Piston Pumps - 'CYCLE_COUNTER': 2, # Cycle Counter for the Piston Pumps - 'NUM_OF_PISTON_PUMP_ATTRIBUTES': 3, # Number of Piston Pump Attributes + # Official Name : Accepted strings + 'CONTROL_STATE': ['control', 'control state'], # Control State for the Piston Pumps + 'SW_COUNTER': ['sw', 'sw counter', 'software counter'], # Software counter attribute for the Piston Pumps + 'CYCLE_COUNTER': ['cycle', 'cycle counter'], # Cycle Counter for the Piston Pumps + 'NUM_OF_PISTON_PUMP_ATTRIBUTES': [], # Number of Piston Pump Attributes } - return unique(DialinEnum('DDPistonPumpAttributes', members)) + created_enum = unique(DialinEnum('DDPistonPumpAttributes', self.create_members(members))) + created_enum._str_list = members + created_enum.from_str = classmethod(self.from_str) + return created_enum def _create_dd_valve_states(self): members = { - 'VALVE_STATE_CLOSED': 0, # Valve Closed State - 'VALVE_STATE_OPEN': 1, # Valve Open State + # Official Name : Accepted strings + 'VALVE_STATE_CLOSED': ['closed'], # Valve Closed State + 'VALVE_STATE_OPEN': ['open'], # Valve Open State + 'NUM_OF_VALVE_STATES': [], # Valve Open State } - return unique(DialinEnum('DDValveStates', members)) + created_enum = unique(DialinEnum('DDValveStates', self.create_members(members))) + created_enum._str_list = members + created_enum.from_str = classmethod(self.from_str) + return created_enum