Index: leahi_dialin/common/dd_defs.py =================================================================== diff -u -rfd7a25d8f068bcba594c01410a02a03f6afbcd59 -rd0d72ba74208cb43073ec38c7bbfebb2d32dcc66 --- leahi_dialin/common/dd_defs.py (.../dd_defs.py) (revision fd7a25d8f068bcba594c01410a02a03f6afbcd59) +++ leahi_dialin/common/dd_defs.py (.../dd_defs.py) (revision d0d72ba74208cb43073ec38c7bbfebb2d32dcc66) @@ -31,39 +31,30 @@ NUM_OF_DD_MODES = 9 @unique -class DGInitStates(DialinEnum): - DG_POST_STATE_START = 0 - DG_POST_STATE_FW_COMPATIBILITY = 1 - DG_POST_STATE_FW_INTEGRITY = 2 - DG_POST_STATE_FPGA = 3 - DG_POST_STATE_RTC = 4 - DG_POST_STATE_NVDATAMGMT = 5 - DG_POST_STATE_TEMPERATURE_SENSORS = 6 - DG_POST_STATE_ACCELEROMETER = 7 - DG_POST_STATE_PRESSURES = 8 - DG_POST_STATE_RO_PUMP = 9 - DG_POST_STATE_DRAIN_PUMP = 10 - DG_POST_STATE_CONCENTRATE_PUMPS = 11 - DG_POST_STATE_CONDUCTIVITY_SENSORS = 12 - DG_POST_STATE_RESERVOIRS = 13 - DG_POST_STATE_UV_REACTORS = 14 - DG_POST_STATE_THERMISTORS = 15 - DG_POST_STATE_FANS = 16 - DG_POST_STATE_DIALYSATE_FLOW_SENSOR = 17 - DG_POST_STATE_WATCHDOG = 18 - DG_POST_STATE_SAFETY_SHUTDOWN = 19 - DG_POST_STATE_LOAD_CELL = 20 - DG_POST_STATE_COMPLETED = 21 - DG_POST_STATE_FAILED = 22 - NUM_OF_DG_POST_STATES = 23 +class DDPostStates(DialinEnum): + DD_POST_STATE_START = 0 + DD_POST_STATE_FW_COMPATIBILITY = 1 + DD_POST_STATE_FW_INTEGRITY = 2 + DD_POST_STATE_FPGA = 3 + DD_POST_STATE_NVDATAMGMT = 4 + DD_POST_STATE_TEMPERATURE_SENSORS = 5 + DD_POST_STATE_PRESSURES = 6 + DD_POST_STATE_DIALYSATE_PUMPS = 7 + DD_POST_STATE_CONCENTRATE_PUMPS = 8 + DD_POST_STATE_CONDUCTIVITY_SENSORS = 9 + DD_POST_STATE_WATCHDOG = 10 + DD_POST_STATE_SAFETY_SHUTDOWN = 11 + DD_POST_STATE_COMPLETED = 12 + DD_POST_STATE_FAILED = 13 + NUM_OF_DD_POST_STATES = 14 @unique -class DGFaultStates(DialinEnum): - DG_FAULT_STATE_START = 0 # DG fault start state - DG_FAULT_STATE_RUN_NV_POSTS = 1 # DG fault run RTC and NV data management post - DG_FAULT_STATE_COMPLETE = 2 # DG fault complete - NUM_OF_DG_FAULT_STATES = 3 # Number of fault mode states +class DDFaultStates(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_STATES = 3 # Number of fault mode states @unique class DGSoloStates(DialinEnum): @@ -74,33 +65,24 @@ @unique class DGStandByModeStates(DialinEnum): - DG_STANDBY_MODE_STATE_IDLE = 0 # Idle standby mode state - DG_STANDBY_MODE_STATE_FLUSH_FILTER = 1 # Sample water flush filter state - DG_STANDBY_MODE_STATE_FLUSH_FILTER_IDLE = 2 # Sample water flush filter idle state - DG_STANDBY_MODE_STATE_SAMPLE_WATER = 3 # Sample water state - DG_STANDBY_MODE_STATE_PAUSE = 4 # Pause state - NUM_OF_DG_STANDBY_MODE_STATES = 5 # Number of standby mode states + 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 @unique -class DGGenIdleModeStates(DialinEnum): - DG_GEN_IDLE_MODE_STATE_START = 0 - DG_GEN_IDLE_MODE_STATE_FLUSH_WATER = 1 - DG_GEN_IDLE_MODE_STATE_HANDLE_BAD_FILL = 2 - NUM_OF_DG_GEN_IDLE_MODE_STATES = 3 +class DDGenDialysateModeStates(DialinEnum): + DD_GEND_STATE_START = 0 # Gen dialysate start state + DD_GEND_HYD_CHAMBER_WATER_INLET_CHECK_STATE = 1 # Gen dialysate Hydraulic chamber water inlet check state + DD_GEND_HYD_CHAMBER_PRESSURE_CHECK_STATE = 2 # Gen dialysate Hydraulic chamber pressure check state + DD_GEND_FRESH_DIALYSATE_PRESSURE_CHECK_STATE = 3 # Gen dialysate fresh dialysate pressure check state + DD_GEND_SPENT_DIALYSATE_PRESSURE_CHECK_STATE = 4 # Gen dialysate spent dialysate pressure check state + DD_GEND_PRODUCE_DIALYSATE_STATE = 5 # Gen dialysate - produce dialysate state + DD_GEND_DIALYSATE_DELIVERY_STATE = 6 # Gen dialysate - deliver dialysate state + DD_GEND_DIALYSATE_DELIVERY_PAUSE = 7 # Gen dialysate - dialysate delivery pause state + NUM_OF_DD_GEND_MODE_STATES = 8 # Number of gen dialysate states - @unique -class DGGenIdleModeBadFillSubStates(DialinEnum): - DG_HANDLE_BAD_FILL_STATE_START = 0 - DG_HANDLE_BAD_FILL_STATE_FIRST_DRAIN = 1 - DG_HANDLE_BAD_FILL_STATE_FLUSH_FILL = 2 - DG_HANDLE_BAD_FILL_STATE_SECOND_DRAIN = 3 - DG_HANDLE_BAD_FILL_STATE_REFILL = 4 - NUM_OF_DG_HANDLE_BAD_FILL_STATES = 6 - - -@unique class DGFillModeStates(DialinEnum): DG_FILL_MODE_STATE_TEST_INLET_WATER = 0 # Test inlet water quality state DG_FILL_MODE_STATE_PRIME_CONCENTRATE_LINES = 1 # Prime the acid and bicarb concentrate lines @@ -287,32 +269,20 @@ @unique -class DGEventList(DialinEnum): - DG_EVENT_STARTUP = 0 # DG startup event - DG_EVENT_OP_MODE_CHANGE = 1 # DG Op mode change event - DG_EVENT_SUB_MODE_CHANGE = 2 # DG Op sub-mode change event - DG_EVENT_CONCENTRATE_CAP_SWITCH_CHANGE = 3 # DG concentrate cap switch change - DG_EVENT_DIALYSATE_CAP_SWITCH_CHANGE = 4 # DG dialysate cap switch change - DG_EVENT_CPU_RAM_ERROR_STATUS = 5 # DG processor RAM error - DG_EVENT_CAL_RECORD_UPDATE = 6 # DG new calibration record updated - DG_EVENT_SYSTEM_RECORD_UPDATE = 7 # DG new system record has been updated - DG_EVENT_SERVICE_UPDATE = 8 # DG new service record has been updated - DG_EVENT_USAGE_INFO_UPDATE = 9 # DG new usage information has been updated - DG_EVENT_SW_CONFIG_UPDATE = 10 # DG new software configuration has been updated - DG_EVENT_SCHEDULED_RUNS_UPDATE = 11 # DG new scheduled runs information has been updated - DG_EVENT_HEATERS_INFO_UPDATE = 12 # DG new heaters information has been updated - DG_EVENT_AVG_DIALYSATE_FILL_COND_VALUES = 13 # DG average dialysate fill conductivity values - DG_EVENT_RESERVOIR_FILL_VALUES = 14 # DG reservoir fill base reservoir weight and filled volume values - DG_EVENT_OPERATION_STATUS = 15 # DG operation status event - DG_EVENT_TEMPERATURE_DRIFT = 16 # DG temperature drift event - DG_EVENT_BICARB_CHECK_RESULT = 17 # DG bicarb check result - DG_EVENT_ACID_CHECK_RESULT = 18 # DG acid check result - DG_EVENT_COND1_VS_COND2_DIFF_RESULT = 19 # DG CD1 (acid) vs. CD2 (bicarb) different result - NUM_OF_DG_EVENT_IDS = 20 # Total number of DG events +class DDEventList(DialinEnum): + 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 + NUM_OF_DD_EVENT_IDS = 8 # Total number of DD events @unique -class DGEventDataType(DialinEnum): +class DDEventDataType(DialinEnum): EVENT_DATA_TYPE_NONE = 0 EVENT_DATA_TYPE_U32 = 1 EVENT_DATA_TYPE_S32 = 2 @@ -322,6 +292,23 @@ @unique -class DGServiceModesStates(DialinEnum): - DG_SERVICE_STATE_START = 0 # Start service mode state - NUM_OF_DG_SERVICE_STATES = 1 # Number of service mode states +class DDServiceModesStates(DialinEnum): + DD_SERVICE_STATE_START = 0 # Start service mode state + NUM_OF_DD_SERVICE_STATES = 1 # Number of service mode states + +@unique +class DDBalancingChamberStates(DialinEnum): + 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 + +@unique +class DDBalancingChamberSwitchStates(DialinEnum): + 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 \ No newline at end of file