Index: leahi_dialin/common/dd_defs.py =================================================================== diff -u -r20c821bd230fc7689a0275a2918981669ff5cc19 -r57ca71b2ff74ef3b96b29586f5aefd5abea222df --- leahi_dialin/common/dd_defs.py (.../dd_defs.py) (revision 20c821bd230fc7689a0275a2918981669ff5cc19) +++ leahi_dialin/common/dd_defs.py (.../dd_defs.py) (revision 57ca71b2ff74ef3b96b29586f5aefd5abea222df) @@ -19,7 +19,7 @@ from ..utils.base import DialinEnum -# ================================================== Enum Creators: Operations ================================================== +# ================================================== Enum Creators: Operations Lvl 1 ================================================== @unique class DDOpModes(DialinEnum): MODE_FAUL = 0 # Fault mode @@ -52,6 +52,8 @@ } +# ================================================== Enum Creators: Operations Lvl 2 ================================================== +# DDOpModes.MODE_FAUL sub states @unique class DDFaultStates(DialinEnum): DD_FAULT_STATE_START = 0 # DD Fault Start State @@ -68,23 +70,8 @@ } +# DDOpModes.MODE_SERV sub states @unique -class DDFaultNVDataStates(DialinEnum): - 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 - -DDFaultNVDataStates._str_list = { - # Official Name : Accepted strings - 'DD_FAULT_STATE_START': ['start'], - 'DD_FAULT_STATE_RUN_NV_POSTS': ['running'], - 'DD_FAULT_STATE_COMPLETE': ['complete', 'done'], - 'NUM_OF_DD_FAULT_NVDATA_STATES': [], -} - - -@unique class DDServiceStates(DialinEnum): DD_SERVICE_STATE_START = 0 # Start service mode state NUM_OF_DD_SERVICE_STATES = 1 # Number of service mode states @@ -96,6 +83,7 @@ } +# DDOpModes.MODE_INIT sub states @unique class DDInitStates(DialinEnum): DD_POST_STATE_START = 0 # Post Generate Dialysate Start State @@ -134,6 +122,7 @@ } +# DDOpModes.MODE_STAN sub states @unique class DDStandbyStates(DialinEnum): DD_STANDBY_MODE_STATE_IDLE = 0 # Idle standby mode state @@ -148,12 +137,14 @@ } +# DDOpModes.MODE_PREG sub states @unique class DDPreGenDialysateStates(DialinEnum): 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 + DD_PRE_GEN_DRY_BICART_INITIAL_FILL = 2 # DD Pre-Gen DryBicart Initial Fill + DD_PRE_GEN_DIALYSATE_WAIT_FOR_GEND = 3 # DD Pre-Gen Dialysate Wait for Gen Dialysate state transition + NUM_OF_DD_PRE_GEN_DIALYSATE_STATES = 4 # Number of Pre-Gen Dialysate mode states DDPreGenDialysateStates._str_list = { # Official Name : Accepted strings @@ -164,6 +155,7 @@ } +# DDOpModes.MODE_GEND sub states @unique class DDGenDialysateModeStates(DialinEnum): DD_GEND_STATE_START = 0 # Gen dialysate start state @@ -188,6 +180,7 @@ } +# DDOpModes.MODE_POSG sub states @unique class DDPostGenDialysateStates(DialinEnum): DD_POST_GEN_DIALYSATE_STATE_START = 0 # DD Post-Gen Dialysate state start @@ -202,6 +195,7 @@ } +# DDOpModes.MODE_HEAT sub states @unique class DDHeatDisinfectStates(DialinEnum): DD_HEAT_DISINFECT_STATE_START = 0 # Heat disinfect, start mode state @@ -216,6 +210,7 @@ } +# DDOpModes.MODE_HCOL sub states @unique class DDHeaterCoolingStates(DialinEnum): NUM_OF_DD_HEAT_COOL_STATES = 0 # Number of Heater Cooling states @@ -226,6 +221,7 @@ } +# DDOpModes.MODE_ROPS sub states @unique class DDROPermeateStates(DialinEnum): NUM_OF_RO_PERMEATE_STATES = 0 # Number of RO Permeate states @@ -236,6 +232,7 @@ } +# DDOpModes.MODE_NLEG sub states @unique class DDNotLegalStates(DialinEnum): NUM_OF_NOT_LEGAL_STATES = 0 # Number of Not Legal states @@ -246,7 +243,76 @@ } +# ================================================== Enum Creators: Operations Lvl 3 ================================================== +# DDFaultStates. sub states +@unique +class DDFaultNVDataStates(DialinEnum): + DD_NVDATA_STATE_START = 0 # DD Non-Volatile Data Management start state + DD_NVDATA_STATE_RUN_NV_POSTS = 1 # DD Non-Volatile Data Management run RTC and NV data management posts + DD_NVDATA_STATE_COMPLETE = 2 # DD Non-Volatile Data Management Complete + NUM_OF_DD_NVDATA_STATES = 3 # Number of fault mode NV Data management states +DDFaultNVDataStates._str_list = { + # Official Name : Accepted strings + 'DD_NVDATA_STATE_START': ['start'], + 'DD_NVDATA_STATE_RUN_NV_POSTS': ['running', 'run nv posts'], + 'DD_NVDATA_STATE_COMPLETE': ['complete', 'done'], + 'NUM_OF_DD_INIT_NVDATA_STATES': [], +} + + +# DDStandbyStates. sub states +@unique +class DDStanDisinfectStates(DialinEnum): + DD_DISINFECT_FLUSH_STATE = 0 # DD disinfect flush + DD_DISINFECT_HEAT_STATE = 1 # DD disinfect heat + DD_DISINFECT_RO_PERMEATE_SAMPLE_STATE = 2 # DD disinfect RO permeate sample + DD_DISINFECT_NOT_RUNNING_STATE = 3 # DD disinfect not running + NUM_OF_DD_DISINFECT_STATES = 4 # Number of DD disinfect states + +DDStanDisinfectStates._str_list = { + # Official Name : Accepted strings + 'DD_DISINFECT_FLUSH_STATE': ['flush'], + 'DD_DISINFECT_HEAT_STATE': ['heat', 'heating'], + 'DD_DISINFECT_RO_PERMEATE_SAMPLE_STATE': ['ro sample', 'ro permeate sample'], + 'DD_DISINFECT_NOT_RUNNING_STATE': ['not running', 'on hold'], + 'NUM_OF_DD_DISINFECT_STATES': [], +} + + +# DDPreGenDialysateStates.DD_PRE_GEN_WET_SELF_TEST sub states +@unique +class DDPreGenWetSelfTestStates(DialinEnum): + DD_WET_SELF_TEST_START = 0 # DD Wet Slef test Start + DD_WET_SELF_TEST_NEGATIVE_DEAERATION_PRES_CHECK = 1 # DD Wet Self Test Negative Deaeration Pressure check + DD_WET_SELF_TEST_POSITIVE_DEAERATION_PRES_CHECK = 2 # DD Wet Self Test Postive Deaeration Pressure check + DD_WET_SELF_TEST_SPENT_DIAL_PRES_CHECK = 3 # DD Wet Self Test Spent Dialysate Pressure check + DD_WET_SELF_TEST_BAL_CHAMBER_VALV_LEAK_CHECK = 4 # DD Wet Self Test Balancing Chamber Valve Leak check + DD_WET_SELF_TEST_DIAL_FLOW_PATH_LEAK_CHECK = 5 # DD Wet Self Test Dialysate flow path leak check + DD_WET_SELF_TEST_UF_PRES_DROP_CHECK = 6 # DD Wet Self Test Ultrafilter pressure drop check + DD_WET_SELF_TEST_BLOOD_LEAK_CHECK = 7 # DD Wet Self Test Ultrafilter pressure drop check + DD_WET_SELF_TEST_BAL_CHAMBER_MEMBRANE_INTEGRITY_CHECK = 8 # DD Wet Self Test Balancing Chamber Membrane Integrity check + DD_WET_SELF_TEST_LEVEL_SENSOR_CHECK = 9 # DD Wet Self Test Level Sensor check + DD_WET_SELF_TEST_PAUSE = 10 # DD Wet Self Test Pause state + NUM_OF_DD_PRE_GEN_WET_SELF_TEST_STATES = 11 # Number of Wet Self Test states + +DDPreGenWetSelfTestStates._str_list = { + # Official Name : Accepted strings + 'DD_WET_SELF_TEST_START': [ 'start', 'test start' ], + 'DD_WET_SELF_TEST_NEGATIVE_DEAERATION_PRES_CHECK': [ 'negative check' ], + 'DD_WET_SELF_TEST_POSITIVE_DEAERATION_PRES_CHECK': [ 'positive check' ], + 'DD_WET_SELF_TEST_SPENT_DIAL_PRES_CHECK': [ 'spent check' ], + 'DD_WET_SELF_TEST_BAL_CHAMBER_VALV_LEAK_CHECK': [ 'bc valve leak check' ], + 'DD_WET_SELF_TEST_DIAL_FLOW_PATH_LEAK_CHECK': [ 'flow path leak check' ], + 'DD_WET_SELF_TEST_UF_PRES_DROP_CHECK': [ 'uf check', 'ultrafiltration check' ], + 'DD_WET_SELF_TEST_BLOOD_LEAK_CHECK': [ 'blood leak check' ], + 'DD_WET_SELF_TEST_BAL_CHAMBER_MEMBRANE_INTEGRITY_CHECK': [ 'bc membrane integrity check' ], + 'DD_WET_SELF_TEST_LEVEL_SENSOR_CHECK': [ 'level sensor check' ], + 'DD_WET_SELF_TEST_PAUSE': [ 'pause', 'test pause' ], + 'NUM_OF_DD_PRE_GEN_WET_SELF_TEST_STATES': [ ] +} + + # ================================================== Enum Creators: Events ================================================== @unique class DDEventList(DialinEnum): @@ -443,21 +509,22 @@ 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 + D78_AVG_TEMP = 16 # D78 Filtered value + D9_TEMP = 17 # D9 Pressure sensor temperature value + D66_TEMP = 18 # D66 Pressure sensor temperature value + D51_TEMP = 19 # D51 Pressure sensor temperature value + D18_TEMP = 20 # D18 Pressure sensor temperature value + D41_TEMP = 21 # D41 Pressure sensor temperature value + D87_TEMP = 22 # D87 Pressure sensor temperature value + NUM_OF_TEMP_SENSORS = 23 # Number of Temperature Sensors # Aliases FIRST_PRESSURE_SENSOR = D9_TEMP LAST_PRESSURE_SENSOR = D87_TEMP FIRST_CONDUCTIVITY_SENSOR = D16_TEMP LAST_CONDUCTIVITY_SENSOR = D75_TEMP FIRST_AVERAGE_SENSOR = D4_AVG_TEMP - LAST_AVERAGE_SENSOR = D30_AVG_TEMP + LAST_AVERAGE_SENSOR = D78_AVG_TEMP DDTemperatureSensorNames._str_list = { # Official Name : Accepted strings @@ -628,6 +695,32 @@ @unique +class DDBicartChFFillExecStates(DialinEnum): + BICARB_CHAMBER_START_STATE = 0 # Initial state of Chamber F fill + BICARB_CARTRIDGE_FILL_WATER_START_STATE = 1 # Dry bicart fill water start state while dialysate delivery + BICARB_CARTRIDGE_FILL_WATER_END_STATE = 2 # Dry bicart fill water end state while dialysate delivery + BICARB_CHAMBER_CHECK_LEVEL_STATE = 3 # Bicarb Chamber check level state + BICARB_CHAMBER_FILL_STATE = 4 # Bicarb Chamber fill start state + BICARB_CHAMBER_PRESSURE_CHECK_STATE = 5 # Bicarb Chamber pressure check start state + BICARB_SUPPLY_VENT_START_STATE = 6 # Bicarb Chamber supply vent cartridge and Chamber F start state + BICARB_SUPPLY_VENT_END_STATE = 7 # Bicarb Chamber supply vent cartridge and Chamber F end state + NUM_OF_BICARB_CHAMBER_FILL_EXEC_STATES = 8 # Number of Bicarb chamber fill state + +DDBicartChFFillExecStates._str_list = { + # Official Name : Accepted strings + 'BICARB_CHAMBER_START_STATE': ['start'], + 'BICARB_CARTRIDGE_FILL_WATER_START_STATE': ['cartridge fill start', 'cartridge priming start'], + 'BICARB_CARTRIDGE_FILL_WATER_END_STATE': ['cartridge fill end', 'cartridge priming end'], + 'BICARB_CHAMBER_CHECK_LEVEL_STATE': ['chamber level check'], + 'BICARB_CHAMBER_FILL_STATE': ['champer fill'], + 'BICARB_CHAMBER_PRESSURE_CHECK_STATE': ['chamber pressure check'], + 'BICARB_SUPPLY_VENT_START_STATE': ['vent start', 'supply vent start'], + 'BICARB_SUPPLY_VENT_END_STATE': ['vent end', 'supply vent end'], + 'NUM_OF_BICARB_CHAMBER_FILL_EXEC_STATES': [], +} + + +@unique class DDBloodLeakStates(DialinEnum): BLOOD_LEAK_WAIT_FOR_POST_STATE = 0 # BLOOD_LEAK_CHECK_SET_POINT_STATE = 1 # @@ -742,6 +835,48 @@ @unique +class DDDryBicartDrainExecStates(DialinEnum): + DRY_BICART_DRAIN_START_STATE = 0 # Initial state of dry bicart drain + DRY_BICART_FLUID_DRAIN_STATE = 1 # Dry bicart fluid drain state + DRY_BICART_FLUID_DRAIN_DURATION_CHECK_STATE = 2 # Dry bicart drain duration check state + DRY_BICART_FLUID_DRAIN_END_STATE = 3 # Dry bicart drain end state + NUM_OF_DRY_BICART_DRAIN_EXEC_STATES = 4 # Number of dry bicart drain states + +DDDryBicartDrainExecStates._str_list = { + # Official Name : Accepted strings + 'DRY_BICART_DRAIN_START_STATE': ['start', 'drain start'], + 'DRY_BICART_FLUID_DRAIN_STATE': ['draining', 'drain in progress'], + 'DRY_BICART_FLUID_DRAIN_DURATION_CHECK_STATE': ['drain duration check'], + 'DRY_BICART_FLUID_DRAIN_END_STATE': ['end', 'drain end'], + 'NUM_OF_DRY_BICART_DRAIN_EXEC_STATES': [], +} + + +@unique +class DDDryBicartFillExecStates(DialinEnum): + DRY_BICART_START_STATE = 0 # Initial state of dry bicart fill + DRY_BICART_FILL_WATER_START_STATE = 1 # Dry bicart fill start state + DRY_BICART_FILL_WATER_END_STATE = 2 # Dry bicart fill end state + DRY_BICART_DEGAS_START_STATE = 3 # Dry bicart vent start state + DRY_BICART_DEGAS_END_STATE = 4 # Dry bicart vent end state + DRY_BICART_FILL_DURATION_CHECK_STATE = 5 # Dry bicart fill duration check state + DRY_BICART_FILL_COMPLETE_STATE = 6 # Dry bicart fill complete state + NUM_OF_DRY_BICART_FILL_EXEC_STATES = 7 # Number of dry bicart fill states + +DDDryBicartFillExecStates._str_list = { + # Official Name : Accepted strings + 'DRY_BICART_START_STATE': ['start'], + 'DRY_BICART_FILL_WATER_START_STATE': ['fill water start'], + 'DRY_BICART_FILL_WATER_END_STATE': ['fill water end'], + 'DRY_BICART_DEGAS_START_STATE': ['degas start', 'degasing start'], + 'DRY_BICART_DEGAS_END_STATE': ['degas end', 'degasing end'], + 'DRY_BICART_FILL_DURATION_CHECK_STATE': ['fill duration check', 'duration check'], + 'DRY_BICART_FILL_COMPLETE_STATE': ['fill complete', 'complete', 'done'], + 'NUM_OF_DRY_BICART_FILL_EXEC_STATES': [], +} + + +@unique class DDHeaterStartStop(DialinEnum): STOP = 0 # Stop heater START = 1 # Start heater @@ -814,6 +949,30 @@ @unique +class DDSpentChFillExecState(DialinEnum): + SPENT_CHAMBER_FILL_STATE_START = 0 # Initial state of spent chamber fill + SPENT_CHAMBER_FILL_STATE1_FILL_START = 1 # Spent chamber fill state 1 fill start state + SPENT_CHAMBER_FILL_STATE1_DOSING_CNTRL = 2 # Spent chamber fill state 1 dosing control + SPENT_CHAMBER_FILL_STATE1_FILL_END = 3 # Spent chamber fill state 1 fill end state + SPENT_CHAMBER_FILL_STATE2_FILL_START = 4 # Spent chamber fill state 2 fill start state + SPENT_CHAMBER_FILL_STATE2_DOSING_CNTRL = 5 # Spent chamber fill state 2 dosing control + SPENT_CHAMBER_FILL_STATE2_FILL_END = 6 # Spent chamber fill state 2 fill end state + NUM_OF_SPENT_CHAMBER_FILL_EXEC_STATES = 7 # Number of spent chamber fill states + +DDPistonPumpAttributes._str_list = { + # Official Name : Accepted strings + 'SPENT_CHAMBER_FILL_STATE_START': ['start'], + 'SPENT_CHAMBER_FILL_STATE1_FILL_START': ['state 1 start'], + 'SPENT_CHAMBER_FILL_STATE1_DOSING_CNTRL': ['state 1 dosing'], + 'SPENT_CHAMBER_FILL_STATE1_FILL_END': ['state 1 end'], + 'SPENT_CHAMBER_FILL_STATE2_FILL_START': ['state 2 start'], + 'SPENT_CHAMBER_FILL_STATE2_DOSING_CNTRL': ['state 2 dosing'], + 'SPENT_CHAMBER_FILL_STATE2_FILL_END': ['state 2 end'], + 'NUM_OF_SPENT_CHAMBER_FILL_EXEC_STATES': [], +} + + +@unique class DDValveStates(DialinEnum): VALVE_STATE_CLOSED = 0 # Valve Closed State VALVE_STATE_OPEN = 1 # Valve Open State @@ -825,3 +984,23 @@ 'VALVE_STATE_OPEN': ['open'], 'NUM_OF_VALVE_STATES': [], } + + +@unique +class DDCancelModes(DialinEnum): + CANCELLATION_MODE_NONE = 0 # Cancellation mode none. + CANCELLATION_MODE_BASIC = 1 # Cancellation mode basic. + CANCELLATION_MODE_HOT = 2 # Cancellation mode hot. + CANCELLATION_MODE_COLD = 3 # Cancellation mode cold. + CANCELLATION_MODE_WATER = 4 # Cancellation mode water. + NUM_OF_CANCELLATION_MODES = 5 # Number of cancellation modes. + +DDValveStates._str_list = { + # Official Name : Accepted strings + 'CANCELLATION_MODE_NONE': ['none'], + 'CANCELLATION_MODE_BASIC': ['basic'], + 'CANCELLATION_MODE_HOT': ['hot'], + 'CANCELLATION_MODE_COLD': ['cold'], + 'CANCELLATION_MODE_WATER': ['water'], + 'NUM_OF_CANCELLATION_MODES': [], +}