Index: dialin/common/hd_defs.py =================================================================== diff -u -r54cc04c76bea6621e78b5b9b2da7b2bca1383dcb -r92e99cf22bf332da53080a5c212d5ebea736a5cb --- dialin/common/hd_defs.py (.../hd_defs.py) (revision 54cc04c76bea6621e78b5b9b2da7b2bca1383dcb) +++ dialin/common/hd_defs.py (.../hd_defs.py) (revision 92e99cf22bf332da53080a5c212d5ebea736a5cb) @@ -300,16 +300,16 @@ NUM_OF_RINSEBACK_STATES = 5 # Number of rinseback sub-mode states @unique -#class TreatmentRecircStates(DialinEnum): # TODO - Restore this enum and delete old enum below when UI is caught up with these changes. -# TREATMENT_RECIRC_DISCONNECT_PATIENT_STATE = 0 # Disconnect patient state of the treatment re-circulate sub-mode state machine -# TREATMENT_RECIRC_RECIRC_STATE = 1 # Re-circulate Dialysate state of the treatment re-circulate sub-mode state machine -# TREATMENT_RECIRC_STOPPED_STATE = 2 # Stopped state of the treatment re-circulate sub-mode state machine -# TREATMENT_RECIRC_RECONNECT_PATIENT_STATE = 3 # Reconnect patient state of the treatment re-circulate sub-mode state machine -# NUM_OF_TREATMENT_RECIRC_STATES = 4 # Number of treatment re-circulate sub-mode states class TreatmentRecircStates(DialinEnum): - TREATMENT_RECIRC_RECIRC_STATE = 0 # Re-circulate Dialysate state of the treatment re-circulate sub-mode state machine - TREATMENT_RECIRC_STOPPED_STATE = 1 # Stopped state of the treatment re-circulate sub-mode state machine - NUM_OF_TREATMENT_RECIRC_STATES = 2 # Number of treatment re-circulate sub-mode states + TREATMENT_RECIRC_DISCONNECT_PATIENT_STATE = 0 # Disconnect patient state of the treatment re-circulate sub-mode state machine + TREATMENT_RECIRC_RECIRC_STATE = 1 # Re-circulate Dialysate state of the treatment re-circulate sub-mode state machine + TREATMENT_RECIRC_STOPPED_STATE = 2 # Stopped state of the treatment re-circulate sub-mode state machine + TREATMENT_RECIRC_RECONNECT_PATIENT_STATE = 3 # Reconnect patient state of the treatment re-circulate sub-mode state machine + NUM_OF_TREATMENT_RECIRC_STATES = 4 # Number of treatment re-circulate sub-mode states +#class TreatmentRecircStates(DialinEnum): +# TREATMENT_RECIRC_RECIRC_STATE = 0 # Re-circulate Dialysate state of the treatment re-circulate sub-mode state machine +# TREATMENT_RECIRC_STOPPED_STATE = 1 # Stopped state of the treatment re-circulate sub-mode state machine +# NUM_OF_TREATMENT_RECIRC_STATES = 2 # Number of treatment re-circulate sub-mode states @unique class TreatmentEndStates(DialinEnum):